Fix: consumer recv command error path

[lttng-tools.git] / src / common / consumer.c

diff --git a/src/common/consumer.c b/src/common/consumer.c
index ee5575262ec5667d448007a8ab82eec0607e19c9..024ee17853c03c053dfa0ae4382a7e3763346b1f 100644 (file)
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -636,6 +636,9 @@ void lttng_consumer_cleanup(void)
        }
 
        rcu_read_unlock();
+
+       lttng_ht_destroy(consumer_data.stream_ht);
+       lttng_ht_destroy(consumer_data.channel_ht);
 }
 
 /*
@@ -1218,8 +1221,12 @@ void *lttng_consumer_thread_receive_fds(void *data)
                        DBG("Received STOP command");
                        goto end;
                }
-               if (ret < 0) {
-                       ERR("Communication interrupted on command socket");
+               if (ret <= 0) {
+                       /*
+                        * This could simply be a session daemon quitting. Don't output
+                        * ERR() here.
+                        */
+                       DBG("Communication interrupted on command socket");
                        goto end;
                }
                if (consumer_quit) {