X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=0e1907d8e99ed5fef30dd1e52f1bf802b51381ea;hp=f97d869e6900fc9a9efd9903e67c164b0f78fc08;hb=9bbfb88c5a3b6b581c81d2c9a9db14246f84675a;hpb=e38d96f9a1077b329d2239aabc50f57fcd3a73e4

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index f97d869e6..0e1907d8e 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -3019,7 +3019,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);
-		goto error;
+		goto error_remove_from_registry;
 	}
 
 	ret = send_channel_pid_to_ust(app, ua_sess, ua_chan);
@@ -3027,7 +3027,7 @@ static int create_channel_per_pid(struct ust_app *app,
 		if (ret != -ENOTCONN) {
 			ERR("Error sending channel to application");
 		}
-		goto error;
+		goto error_remove_from_registry;
 	}
 
 	chan_reg_key = ua_chan->key;
@@ -3047,9 +3047,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");
-		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;
@@ -6062,15 +6066,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,
@@ -6078,6 +6084,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;
 			}
 		}