Fixed ACLK shutdown sequence (#9367)

* fix aclk shutdown sequence

2 files changed, 8 insertions, 3 deletions

diff --git a/aclk/aclk_stats.c b/aclk/aclk_stats.c
index 2d9f5e43b5..2356ccdbc2 100644
--- a/aclk/aclk_stats.c
+++ b/aclk/aclk_stats.c
@@ -160,6 +160,7 @@ void *aclk_stats_main_thread(void *ptr)
         // Wait for the next iteration point.
 
         heartbeat_next(&hb, step_ut);
+        if (netdata_exit) break;
 
         ACLK_STATS_LOCK;
         // to not hold lock longer than necessary, especially not to hold it
diff --git a/aclk/agent_cloud_link.c b/aclk/agent_cloud_link.c
index 7b5aad5c4a..a12c51cf9e 100644
--- a/aclk/agent_cloud_link.c
+++ b/aclk/agent_cloud_link.c
@@ -1063,9 +1063,6 @@ static void aclk_main_cleanup(void *ptr)
         QUERY_THREAD_WAKEUP;
         aclk_graceful_disconnect();
     }
-
-
-    static_thread->enabled = NETDATA_MAIN_THREAD_EXITED;
 }
 
 struct dictionary_singleton {
@@ -1538,6 +1535,13 @@ exited:
         freez(stats_thread);
     }
 
+    /*
+     * this must be last -> if all static threads signal
+     * THREAD_EXITED rrdengine will dealloc the RRDSETs
+     * and RRDDIMs that are used by still runing stat thread.
+     * see netdata_cleanup_and_exit() for reference
+     */
+    static_thread->enabled = NETDATA_MAIN_THREAD_EXITED;
     return NULL;
 }