surround ttl-compact with SWAP_ENABLED.

ctripcorp · Jan 7, 2025 · cfd0708 · cfd0708
1 parent 603ae91
commit cfd0708
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 23 deletions.
diff --git a/deps/rocksdb b/deps/rocksdb
diff --git a/src/config.c b/src/config.c
@@ -163,13 +163,6 @@ configEnum swap_info_propagate_mode_enum[] = {
  {NULL, 0}
 };
 
-/* Output buffer limits presets. */
-clientBufferLimitsConfig clientBufferLimitsDefaults[CLIENT_TYPE_OBUF_COUNT] = {
-    {0, 0, 0}, /* normal */
-    {1024*1024*256, 1024*1024*64, 60}, /* slave */
-    {1024*1024*32, 1024*1024*8, 60}  /* pubsub */
-};
-
 /* swap batch limits presets. */
 swapBatchLimitsConfig swapBatchLimitsDefaults[SWAP_TYPES] = {
     {0, 0}, /* NOP */
@@ -3055,7 +3048,9 @@ standardConfig configs[] = {
 
     /* Unsigned int configs */
     createUIntConfig("maxclients", NULL, MODIFIABLE_CONFIG, 1, UINT_MAX, server.maxclients, 10000, INTEGER_CONFIG, NULL, updateMaxclients),
+#ifdef ENABLE_SWAP
     createUIntConfig("swap-ttl-compact-expire-percentile", NULL, MODIFIABLE_CONFIG, 1, 100, server.swap_ttl_compact_expire_percentile, 99, INTEGER_CONFIG, NULL, NULL),
+#endif
 
     /* Unsigned Long configs */
     createULongConfig("active-defrag-max-scan-fields", NULL, MODIFIABLE_CONFIG, 1, LONG_MAX, server.active_defrag_max_scan_fields, 1000, INTEGER_CONFIG, NULL, NULL), /* Default: keys with more than 1000 fields will be processed separately */

diff --git a/src/db.c b/src/db.c
@@ -502,6 +502,10 @@ long long emptyDb(int dbnum, int flags, void(callback)(void*)) {
 #ifdef ENABLE_SWAP
     if ((rocksFlushDB(dbnum)))
         serverLog(LL_WARNING,"[ROCKS] flushd rocks db(%d) failed.",dbnum);
+
+    if (server.swap_ttl_compact_ctx) {
+        swapTtlCompactCtxReset(server.swap_ttl_compact_ctx);
+    }
 #endif
     /* Fire the flushdb modules event. */
     moduleFireServerEvent(REDISMODULE_EVENT_FLUSHDB,
@@ -516,10 +520,6 @@ long long emptyDb(int dbnum, int flags, void(callback)(void*)) {
     /* Empty redis database structure. */
     removed = emptyDbStructure(server.db, dbnum, async, callback);
 
-    if (server.swap_ttl_compact_ctx) {
-        swapTtlCompactCtxReset(server.swap_ttl_compact_ctx);
-    }
-
     /* Flush slots to keys map if enable cluster, we can flush entire
      * slots to keys map whatever dbnum because only support one DB
      * in cluster mode. */

diff --git a/src/rdb.c b/src/rdb.c
@@ -1625,7 +1625,9 @@ int rdbSaveBackground(char *filename, rdbSaveInfo *rsi) {
     pid_t childpid;
 
     if (hasActiveChildProcess()) {
+#ifdef ENABLE_SWAP
         swapForkRocksdbCtxRelease(sfrctx);
+#endif
         return C_ERR;
     }
 

diff --git a/src/server.c b/src/server.c
@@ -3394,13 +3394,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
         if (server.maxmemory_scale_from > server.maxmemory)
             updateMaxMemoryScaleFrom();
     }
-#endif
-    run_with_period(1000) {
-        if (server.repl_mode->mode == REPL_MODE_XSYNC) {
-            xsyncReplicationCron();
-        }
-    }
-
+
     run_with_period(1000*(int)server.swap_sst_age_limit_refresh_period) {
         ttlCompactRefreshSstAgeLimit();
     }
@@ -3409,11 +3403,11 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
         /* producing and consuming task are both in swap util thread
          * so producing should be slower than consuming, otherwise consuming
          * will be starved to death. */
-        ttlCompactProduceTask();  
+        ttlCompactProduceTask();
     }
 
     run_with_period(1000*(int)server.swap_ttl_compact_period / 2) {
-        ttlCompactConsumeTask();   
+        ttlCompactConsumeTask();
     }
 
     run_with_period(1000*(int)server.swap_swap_info_slave_period) {
@@ -3424,7 +3418,12 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
             swapPropagateSwapInfoCmd(3, argv);
             swapDestorySwapInfoSstAgeLimitCmd(argv);
         }
-
+    }
+#endif
+    run_with_period(1000) {
+        if (server.repl_mode->mode == REPL_MODE_XSYNC) {
+            xsyncReplicationCron();
+        }
     }
 
     /* Fire the cron loop modules event. */
@@ -3788,7 +3787,9 @@ void createSharedObjects(void) {
     shared.persist = createStringObject("PERSIST",7);
     shared.set = createStringObject("SET",3);
     shared.eval = createStringObject("EVAL",4);
+#ifdef ENABLE_SWAP
     shared.swap_info = createStringObject("swap.info",9);
+#endif
 
     /* Shared command argument */
     shared.left = createStringObject("left",4);
@@ -3810,7 +3811,9 @@ void createSharedObjects(void) {
     shared.special_asterick = createStringObject("*",1);
     shared.special_equals = createStringObject("=",1);
     shared.redacted = makeObjectShared(createStringObject("(redacted)",10));
+#ifdef ENABLE_SWAP
     shared.sst_age_limit = createStringObject("SST-AGE-LIMIT",13);
+#endif
 
     shared.gtid = createStringObject("GTID",4);
 
@@ -5873,14 +5876,15 @@ void pingCommand(client *c) {
         if (c->argc == 1) {
             addReply(c,shared.pong);
         } else {
+#ifdef ENABLE_SWAP
             /* extend ping argv for swap.info */
             if (!strncasecmp(c->argv[1]->ptr, "swap.info", 9)) {
                 int swap_info_argc = 0;
                 sds *swap_info_argv = swapDecodeSwapInfo(c->argv[1]->ptr, &swap_info_argc);
                 swapApplySwapInfo(swap_info_argc, swap_info_argv);
                 sdsfreesplitres(swap_info_argv, swap_info_argc);
             }
-
+#endif
             addReplyBulk(c,c->argv[1]);
         }
     }
+1 −1		Makefile
+5 −0		db/c.cc
+4 −4		db/db_impl/db_impl.cc
+8 −0		include/rocksdb/c.h
+1 −0		table/block_based/data_block_hash_index.h
+1 −1		table/plain/plain_table_builder.cc
+1 −0		util/string_util.h