projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: cmd_snapshot_record can return unexpected error codes
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ust-app.c
diff --git
a/src/bin/lttng-sessiond/ust-app.c
b/src/bin/lttng-sessiond/ust-app.c
index 2a810aba15fd2db25f4c47bf5d98bf3a70b0d607..7b44fb4b48a050927fe2c897650dd2fda156dfac 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-app.c
+++ b/
src/bin/lttng-sessiond/ust-app.c
@@
-487,9
+487,16
@@
void delete_ust_app_channel(int sock, struct ust_app_channel *ua_chan,
registry = get_session_registry(ua_chan->session);
if (registry) {
ust_registry_channel_del_free(registry, ua_chan->key,
registry = get_session_registry(ua_chan->session);
if (registry) {
ust_registry_channel_del_free(registry, ua_chan->key,
- true);
+ sock >= 0);
+ }
+ /*
+ * A negative socket can be used by the caller when
+ * cleaning-up a ua_chan in an error path. Skip the
+ * accounting in this case.
+ */
+ if (sock >= 0) {
+ save_per_pid_lost_discarded_counters(ua_chan);
}
}
- save_per_pid_lost_discarded_counters(ua_chan);
}
if (ua_chan->obj != NULL) {
}
if (ua_chan->obj != NULL) {
@@
-3017,7
+3024,7
@@
static int create_channel_per_pid(struct ust_app *app,
if (ret < 0) {
ERR("Error creating UST channel \"%s\" on the consumer daemon",
ua_chan->name);
if (ret < 0) {
ERR("Error creating UST channel \"%s\" on the consumer daemon",
ua_chan->name);
- goto error;
+ goto error
_remove_from_registry
;
}
ret = send_channel_pid_to_ust(app, ua_sess, ua_chan);
}
ret = send_channel_pid_to_ust(app, ua_sess, ua_chan);
@@
-3025,7
+3032,7
@@
static int create_channel_per_pid(struct ust_app *app,
if (ret != -ENOTCONN) {
ERR("Error sending channel to application");
}
if (ret != -ENOTCONN) {
ERR("Error sending channel to application");
}
- goto error;
+ goto error
_remove_from_registry
;
}
chan_reg_key = ua_chan->key;
}
chan_reg_key = ua_chan->key;
@@
-3045,9
+3052,13
@@
static int create_channel_per_pid(struct ust_app *app,
if (cmd_ret != LTTNG_OK) {
ret = - (int) cmd_ret;
ERR("Failed to add channel to notification thread");
if (cmd_ret != LTTNG_OK) {
ret = - (int) cmd_ret;
ERR("Failed to add channel to notification thread");
- goto error;
+ goto error
_remove_from_registry
;
}
}
+error_remove_from_registry:
+ if (ret) {
+ ust_registry_channel_del_free(registry, ua_chan->key, false);
+ }
error:
rcu_read_unlock();
return ret;
error:
rcu_read_unlock();
return ret;
@@
-5429,7
+5440,7
@@
static int reply_ust_register_channel(int sock, int cobjd,
size_t nr_fields, struct ustctl_field *fields)
{
int ret, ret_code = 0;
size_t nr_fields, struct ustctl_field *fields)
{
int ret, ret_code = 0;
- uint32_t chan_id
, reg_count
;
+ uint32_t chan_id;
uint64_t chan_reg_key;
enum ustctl_channel_header type;
struct ust_app *app;
uint64_t chan_reg_key;
enum ustctl_channel_header type;
struct ust_app *app;
@@
-5481,13
+5492,12
@@
static int reply_ust_register_channel(int sock, int cobjd,
assert(chan_reg);
if (!chan_reg->register_done) {
assert(chan_reg);
if (!chan_reg->register_done) {
- reg_count = ust_registry_get_event_count(chan_reg);
- if (reg_count < 31) {
- type = USTCTL_CHANNEL_HEADER_COMPACT;
- } else {
- type = USTCTL_CHANNEL_HEADER_LARGE;
- }
-
+ /*
+ * TODO: eventually use the registry event count for
+ * this channel to better guess header type for per-pid
+ * buffers.
+ */
+ type = USTCTL_CHANNEL_HEADER_LARGE;
chan_reg->nr_ctx_fields = nr_fields;
chan_reg->ctx_fields = fields;
fields = NULL;
chan_reg->nr_ctx_fields = nr_fields;
chan_reg->ctx_fields = fields;
fields = NULL;
@@
-5942,13
+5952,14
@@
void ust_app_destroy(struct ust_app *app)
* Take a snapshot for a given UST session. The snapshot is sent to the given
* output.
*
* Take a snapshot for a given UST session. The snapshot is sent to the given
* output.
*
- * Return
0 on success or else a negative valu
e.
+ * Return
s LTTNG_OK on success or a LTTNG_ERR error cod
e.
*/
*/
-
int
ust_app_snapshot_record(struct ltt_ust_session *usess,
+
enum lttng_error_code
ust_app_snapshot_record(struct ltt_ust_session *usess,
struct snapshot_output *output, int wait,
uint64_t nb_packets_per_stream)
{
int ret = 0;
struct snapshot_output *output, int wait,
uint64_t nb_packets_per_stream)
{
int ret = 0;
+ enum lttng_error_code status = LTTNG_OK;
struct lttng_ht_iter iter;
struct ust_app *app;
char pathname[PATH_MAX];
struct lttng_ht_iter iter;
struct ust_app *app;
char pathname[PATH_MAX];
@@
-5984,7
+5995,7
@@
int ust_app_snapshot_record(struct ltt_ust_session *usess,
socket = consumer_find_socket_by_bitness(reg->bits_per_long,
usess->consumer);
if (!socket) {
socket = consumer_find_socket_by_bitness(reg->bits_per_long,
usess->consumer);
if (!socket) {
-
ret = -EINVAL
;
+
status = LTTNG_ERR_INVALID
;
goto error;
}
goto error;
}
@@
-5994,27
+6005,28
@@
int ust_app_snapshot_record(struct ltt_ust_session *usess,
reg->uid, reg->bits_per_long);
if (ret < 0) {
PERROR("snprintf snapshot path");
reg->uid, reg->bits_per_long);
if (ret < 0) {
PERROR("snprintf snapshot path");
+ status = LTTNG_ERR_INVALID;
goto error;
}
/* Add the UST default trace dir to path. */
cds_lfht_for_each_entry(reg->registry->channels->ht, &iter.iter,
reg_chan, node.node) {
goto error;
}
/* Add the UST default trace dir to path. */
cds_lfht_for_each_entry(reg->registry->channels->ht, &iter.iter,
reg_chan, node.node) {
-
ret
= consumer_snapshot_channel(socket,
+
status
= consumer_snapshot_channel(socket,
reg_chan->consumer_key,
output, 0, usess->uid,
usess->gid, pathname, wait,
nb_packets_per_stream,
trace_archive_id);
reg_chan->consumer_key,
output, 0, usess->uid,
usess->gid, pathname, wait,
nb_packets_per_stream,
trace_archive_id);
- if (
ret < 0
) {
+ if (
status != LTTNG_OK
) {
goto error;
}
}
goto error;
}
}
-
ret
= consumer_snapshot_channel(socket,
+
status
= consumer_snapshot_channel(socket,
reg->registry->reg.ust->metadata_key, output, 1,
usess->uid, usess->gid, pathname, wait, 0,
trace_archive_id);
reg->registry->reg.ust->metadata_key, output, 1,
usess->uid, usess->gid, pathname, wait, 0,
trace_archive_id);
- if (
ret < 0
) {
+ if (
status != LTTNG_OK
) {
goto error;
}
}
goto error;
}
}
@@
-6039,7
+6051,7
@@
int ust_app_snapshot_record(struct ltt_ust_session *usess,
socket = consumer_find_socket_by_bitness(app->bits_per_long,
output->consumer);
if (!socket) {
socket = consumer_find_socket_by_bitness(app->bits_per_long,
output->consumer);
if (!socket) {
-
ret = -EINVAL
;
+
status = LTTNG_ERR_INVALID
;
goto error;
}
goto error;
}
@@
-6048,35
+6060,45
@@
int ust_app_snapshot_record(struct ltt_ust_session *usess,
ret = snprintf(pathname, sizeof(pathname), DEFAULT_UST_TRACE_DIR "/%s",
ua_sess->path);
if (ret < 0) {
ret = snprintf(pathname, sizeof(pathname), DEFAULT_UST_TRACE_DIR "/%s",
ua_sess->path);
if (ret < 0) {
+ status = LTTNG_ERR_INVALID;
PERROR("snprintf snapshot path");
goto error;
}
cds_lfht_for_each_entry(ua_sess->channels->ht, &chan_iter.iter,
ua_chan, node.node) {
PERROR("snprintf snapshot path");
goto error;
}
cds_lfht_for_each_entry(ua_sess->channels->ht, &chan_iter.iter,
ua_chan, node.node) {
-
ret
= consumer_snapshot_channel(socket,
+
status
= consumer_snapshot_channel(socket,
ua_chan->key, output,
0, ua_sess->euid, ua_sess->egid,
pathname, wait,
nb_packets_per_stream,
trace_archive_id);
ua_chan->key, output,
0, ua_sess->euid, ua_sess->egid,
pathname, wait,
nb_packets_per_stream,
trace_archive_id);
- if (ret < 0) {
+ switch (status) {
+ case LTTNG_OK:
+ break;
+ case LTTNG_ERR_CHAN_NOT_FOUND:
+ continue;
+ default:
goto error;
}
}
registry = get_session_registry(ua_sess);
if (!registry) {
goto error;
}
}
registry = get_session_registry(ua_sess);
if (!registry) {
- DBG("Application session is being torn down. Abort snapshot record.");
- ret = -1;
- goto error;
+ DBG("Application session is being torn down. Skip application.");
+ continue;
}
}
-
ret
= consumer_snapshot_channel(socket,
+
status
= consumer_snapshot_channel(socket,
registry->metadata_key, output,
1, ua_sess->euid, ua_sess->egid,
pathname, wait, 0,
trace_archive_id);
registry->metadata_key, output,
1, ua_sess->euid, ua_sess->egid,
pathname, wait, 0,
trace_archive_id);
- if (ret < 0) {
+ switch (status) {
+ case LTTNG_OK:
+ break;
+ case LTTNG_ERR_CHAN_NOT_FOUND:
+ continue;
+ default:
goto error;
}
}
goto error;
}
}
@@
-6089,7
+6111,7
@@
int ust_app_snapshot_record(struct ltt_ust_session *usess,
error:
rcu_read_unlock();
error:
rcu_read_unlock();
- return
ret
;
+ return
status
;
}
/*
}
/*
@@
-6326,11
+6348,12
@@
int ust_app_regenerate_statedump_all(struct ltt_ust_session *usess)
/*
* Rotate all the channels of a session.
*
/*
* Rotate all the channels of a session.
*
- * Return
0 on success or else a negative valu
e.
+ * Return
LTTNG_OK on success or else an LTTng error cod
e.
*/
*/
-
int
ust_app_rotate_session(struct ltt_session *session)
+
enum lttng_error_code
ust_app_rotate_session(struct ltt_session *session)
{
{
- int ret = 0;
+ int ret;
+ enum lttng_error_code cmd_ret = LTTNG_OK;
struct lttng_ht_iter iter;
struct ust_app *app;
struct ltt_ust_session *usess = session->ust_session;
struct lttng_ht_iter iter;
struct ust_app *app;
struct ltt_ust_session *usess = session->ust_session;
@@
-6353,7
+6376,7
@@
int ust_app_rotate_session(struct ltt_session *session)
socket = consumer_find_socket_by_bitness(reg->bits_per_long,
usess->consumer);
if (!socket) {
socket = consumer_find_socket_by_bitness(reg->bits_per_long,
usess->consumer);
if (!socket) {
-
ret = -EINVAL
;
+
cmd_ret = LTTNG_ERR_INVALID
;
goto error;
}
goto error;
}
@@
-6362,6
+6385,7
@@
int ust_app_rotate_session(struct ltt_session *session)
reg->uid, reg->bits_per_long);
if (ret < 0 || ret == sizeof(pathname)) {
PERROR("Failed to format rotation path");
reg->uid, reg->bits_per_long);
if (ret < 0 || ret == sizeof(pathname)) {
PERROR("Failed to format rotation path");
+ cmd_ret = LTTNG_ERR_INVALID;
goto error;
}
goto error;
}
@@
-6375,6
+6399,7
@@
int ust_app_rotate_session(struct ltt_session *session)
/* is_metadata_channel */ false,
session->current_archive_id);
if (ret < 0) {
/* is_metadata_channel */ false,
session->current_archive_id);
if (ret < 0) {
+ cmd_ret = LTTNG_ERR_ROTATION_FAIL_CONSUMER;
goto error;
}
}
goto error;
}
}
@@
-6388,6
+6413,7
@@
int ust_app_rotate_session(struct ltt_session *session)
/* is_metadata_channel */ true,
session->current_archive_id);
if (ret < 0) {
/* is_metadata_channel */ true,
session->current_archive_id);
if (ret < 0) {
+ cmd_ret = LTTNG_ERR_ROTATION_FAIL_CONSUMER;
goto error;
}
}
goto error;
}
}
@@
-6412,6
+6438,7
@@
int ust_app_rotate_session(struct ltt_session *session)
ua_sess->path);
if (ret < 0 || ret == sizeof(pathname)) {
PERROR("Failed to format rotation path");
ua_sess->path);
if (ret < 0 || ret == sizeof(pathname)) {
PERROR("Failed to format rotation path");
+ cmd_ret = LTTNG_ERR_INVALID;
goto error;
}
goto error;
}
@@
-6419,15
+6446,14
@@
int ust_app_rotate_session(struct ltt_session *session)
socket = consumer_find_socket_by_bitness(app->bits_per_long,
usess->consumer);
if (!socket) {
socket = consumer_find_socket_by_bitness(app->bits_per_long,
usess->consumer);
if (!socket) {
-
ret = -EINVAL
;
+
cmd_ret = LTTNG_ERR_INVALID
;
goto error;
}
registry = get_session_registry(ua_sess);
if (!registry) {
goto error;
}
registry = get_session_registry(ua_sess);
if (!registry) {
- DBG("Application session is being torn down. Abort snapshot record.");
- ret = -1;
- goto error;
+ DBG("Application session is being torn down. Skip application.");
+ continue;
}
}
@@
-6440,6
+6466,10
@@
int ust_app_rotate_session(struct ltt_session *session)
/* is_metadata_channel */ false,
session->current_archive_id);
if (ret < 0) {
/* is_metadata_channel */ false,
session->current_archive_id);
if (ret < 0) {
+ /* Per-PID buffer and application going away. */
+ if (ret == -LTTNG_ERR_CHAN_NOT_FOUND)
+ continue;
+ cmd_ret = LTTNG_ERR_ROTATION_FAIL_CONSUMER;
goto error;
}
}
goto error;
}
}
@@
-6452,6
+6482,10
@@
int ust_app_rotate_session(struct ltt_session *session)
/* is_metadata_channel */ true,
session->current_archive_id);
if (ret < 0) {
/* is_metadata_channel */ true,
session->current_archive_id);
if (ret < 0) {
+ /* Per-PID buffer and application going away. */
+ if (ret == -LTTNG_ERR_CHAN_NOT_FOUND)
+ continue;
+ cmd_ret = LTTNG_ERR_ROTATION_FAIL_CONSUMER;
goto error;
}
}
goto error;
}
}
@@
-6462,9
+6496,9
@@
int ust_app_rotate_session(struct ltt_session *session)
break;
}
break;
}
- ret = LTTNG_OK;
+
cmd_
ret = LTTNG_OK;
error:
rcu_read_unlock();
error:
rcu_read_unlock();
- return ret;
+ return
cmd_
ret;
}
}
This page took
0.028905 seconds
and
4
git commands to generate.