X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=23f29c13ca414a0a02903952879701b73dda397b;hb=45798a31cc31b86a669221676ab490c035c8dfdd;hp=2c1b845adf56bc35ef2ec1875599e2c2113904ae;hpb=5b951542a175819b62269e6904641f1a26149c96;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 2c1b845ad..23f29c13c 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -489,6 +489,11 @@ void delete_ust_app_channel(int sock, struct ust_app_channel *ua_chan,
 			ust_registry_channel_del_free(registry, ua_chan->key,
 				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);
 		}
@@ -6066,15 +6071,17 @@ int ust_app_snapshot_record(struct ltt_ust_session *usess,
 						nb_packets_per_stream,
 						trace_archive_id);
 				if (ret < 0) {
+					if (ret == -LTTNG_ERR_CHAN_NOT_FOUND) {
+						continue;
+					}
 					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,
 					registry->metadata_key, output,
@@ -6082,6 +6089,9 @@ int ust_app_snapshot_record(struct ltt_ust_session *usess,
 					pathname, wait, 0,
 					trace_archive_id);
 			if (ret < 0) {
+				if (ret == -LTTNG_ERR_CHAN_NOT_FOUND) {
+					continue;
+				}
 				goto error;
 			}
 		}
@@ -6331,11 +6341,12 @@ int ust_app_regenerate_statedump_all(struct ltt_ust_session *usess)
 /*
  * Rotate all the channels of a session.
  *
- * Return 0 on success or else a negative value.
+ * Return LTTNG_OK on success or else an LTTng error code.
  */
-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;
@@ -6358,7 +6369,7 @@ int ust_app_rotate_session(struct ltt_session *session)
 			socket = consumer_find_socket_by_bitness(reg->bits_per_long,
 					usess->consumer);
 			if (!socket) {
-				ret = -EINVAL;
+				cmd_ret = LTTNG_ERR_INVALID;
 				goto error;
 			}
 
@@ -6367,6 +6378,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");
+				cmd_ret = LTTNG_ERR_INVALID;
 				goto error;
 			}
 
@@ -6380,6 +6392,7 @@ int ust_app_rotate_session(struct ltt_session *session)
 						/* is_metadata_channel */ false,
 						session->current_archive_id);
 				if (ret < 0) {
+					cmd_ret = LTTNG_ERR_ROTATION_FAIL_CONSUMER;
 					goto error;
 				}
 			}
@@ -6393,6 +6406,7 @@ int ust_app_rotate_session(struct ltt_session *session)
 					/* is_metadata_channel */ true,
 					session->current_archive_id);
 			if (ret < 0) {
+				cmd_ret = LTTNG_ERR_ROTATION_FAIL_CONSUMER;
 				goto error;
 			}
 		}
@@ -6417,6 +6431,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");
+				cmd_ret = LTTNG_ERR_INVALID;
 				goto error;
 			}
 
@@ -6424,15 +6439,14 @@ int ust_app_rotate_session(struct ltt_session *session)
 			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) {
-				DBG("Application session is being torn down. Abort session rotation.");
-				ret = -1;
-				goto error;
+				DBG("Application session is being torn down. Skip application.");
+				continue;
 			}
 
 
@@ -6445,6 +6459,10 @@ int ust_app_rotate_session(struct ltt_session *session)
 						/* 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;
 				}
 			}
@@ -6457,6 +6475,10 @@ int ust_app_rotate_session(struct ltt_session *session)
 					/* 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;
 			}
 		}
@@ -6467,9 +6489,9 @@ int ust_app_rotate_session(struct ltt_session *session)
 		break;
 	}
 
-	ret = LTTNG_OK;
+	cmd_ret = LTTNG_OK;
 
 error:
 	rcu_read_unlock();
-	return ret;
+	return cmd_ret;
 }