Dont send NodeInfo during first database cleanup (#13740)
Emmanuel Vasilakis committed
Sep 28, 2022 at 20:35 UTC
95cf9a870213c3561e88578c46528511ab691dbc
2 files changed
+8
-4
database/sqlite/sqlite_aclk.c
+7
-3
@@ -513,12 +513,16 @@ void aclk_database_worker(void *arg)
513
// MAINTENANCE
514
case ACLK_DATABASE_CLEANUP:
515
debug(D_ACLK_SYNC, "Database cleanup for %s", wc->host_guid);
516
+
517
+ if (wc->startup_time + ACLK_DATABASE_CLEANUP_FIRST + 2 < now_realtime_sec() && claimed() && aclk_connected) {
518
+ cmd.opcode = ACLK_DATABASE_NODE_INFO;
519
+ cmd.completion = NULL;
520
+ (void) aclk_database_enq_cmd_noblock(wc, &cmd);
521
+ }
522
+
523
sql_maint_aclk_sync_database(wc, cmd);
524
if (wc->host == localhost)
525
sql_check_aclk_table_list(wc);
519
- cmd.opcode = ACLK_DATABASE_NODE_INFO;
520
- cmd.completion = NULL;
521
- (void) aclk_database_enq_cmd_noblock(wc, &cmd);
526
break;
527
528
case ACLK_DATABASE_DELETE_HOST:
database/sqlite/sqlite_aclk.h
+1
-1
@@ -13,7 +13,7 @@
13
#define ACLK_MAX_CHART_BATCH_COUNT (10)
14
#endif
15
#define ACLK_MAX_ALERT_UPDATES (5)
16
-#define ACLK_DATABASE_CLEANUP_FIRST (60)
16
+#define ACLK_DATABASE_CLEANUP_FIRST (1200)
17
#define ACLK_DATABASE_CLEANUP_INTERVAL (3600)
18
#define ACLK_DELETE_ACK_ALERTS_INTERNAL (86400)
19
#define ACLK_SYNC_QUERY_SIZE 512