Fix: sessiond: no rotation performed from null chunk to new chunk

[lttng-tools.git] / src / bin / lttng-sessiond / notification-thread.c

diff --git a/src/bin/lttng-sessiond/notification-thread.c b/src/bin/lttng-sessiond/notification-thread.c
index b42b282e10cfbc98e262eca77ad6fd6dbeac1213..8d69ef7c45919448d227056ad82880e21a476e48 100644 (file)
--- a/src/bin/lttng-sessiond/notification-thread.c
+++ b/src/bin/lttng-sessiond/notification-thread.c
@@ -172,7 +172,7 @@ char *get_notification_channel_sock_path(void)
                        goto error;
                }
        } else {
-               char *home_path = utils_get_home_dir();
+               const char *home_path = utils_get_home_dir();
 
                if (!home_path) {
                        ERR("Can't get HOME directory for socket creation");
@@ -239,8 +239,16 @@ int notification_channel_socket_create(void)
        }
 
        if (getuid() == 0) {
-               ret = chown(sock_path, 0,
-                               utils_get_group_id(config.tracing_group_name.value));
+               gid_t gid;
+
+               ret =  utils_get_group_id(config.tracing_group_name.value, true,
+                               &gid);
+               if (ret) {
+                       /* Default to root group. */
+                       gid = 0;
+               }
+
+               ret = chown(sock_path, 0, gid);
                if (ret) {
                        ERR("Failed to set the notification channel socket's group");
                        ret = -1;
@@ -522,15 +530,15 @@ void *thread_notification(void *data)
 
        DBG("[notification-thread] Started notification thread");
 
+       health_register(health_sessiond, HEALTH_SESSIOND_TYPE_NOTIFICATION);
+       rcu_register_thread();
+       rcu_thread_online();
+
        if (!handle) {
                ERR("[notification-thread] Invalid thread context provided");
                goto end;
        }
 
-       rcu_register_thread();
-       rcu_thread_online();
-
-       health_register(health_sessiond, HEALTH_SESSIOND_TYPE_NOTIFICATION);
        health_code_update();
 
        ret = init_thread_state(handle, &state);
@@ -562,9 +570,6 @@ void *thread_notification(void *data)
                        int fd = LTTNG_POLL_GETFD(&state.events, i);
                        uint32_t revents = LTTNG_POLL_GETEV(&state.events, i);
 
-                       if (!revents) {
-                               continue;
-                       }
                        DBG("[notification-thread] Handling fd (%i) activity (%u)", fd, revents);
 
                        if (fd == state.notification_channel_socket) {
@@ -637,10 +642,10 @@ void *thread_notification(void *data)
 exit:
 error:
        fini_thread_state(&state);
-       health_unregister(health_sessiond);
+end:
        rcu_thread_offline();
        rcu_unregister_thread();
-end:
+       health_unregister(health_sessiond);
        return NULL;
 }