handle restore goto load_error label

Signed-off-by: Binbin <[email protected]>
enjoy-binbin · Nov 4, 2024 · 0d43d18 · 0d43d18
1 parent f399485
commit 0d43d18
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/src/functions.c b/src/functions.c
@@ -189,22 +189,22 @@ void functionsLibCtxClearCurrent(int async) {
 }
 
 /* Free the given functions ctx */
-void functionsLibCtxFree(functionsLibCtx *functions_lib_ctx) {
-    functionsLibCtxClear(functions_lib_ctx);
-    dictRelease(functions_lib_ctx->functions);
-    dictRelease(functions_lib_ctx->libraries);
-    dictRelease(functions_lib_ctx->engines_stats);
-    zfree(functions_lib_ctx);
+void functionsLibCtxFree(functionsLibCtx *functions_lib_ctx, int async) {
+    if (async) {
+        freeFunctionsAsync(functions_lib_ctx);
+    } else {
+        functionsLibCtxClear(functions_lib_ctx);
+        dictRelease(functions_lib_ctx->functions);
+        dictRelease(functions_lib_ctx->libraries);
+        dictRelease(functions_lib_ctx->engines_stats);
+        zfree(functions_lib_ctx);
+    }
 }
 
 /* Swap the current functions ctx with the given one.
  * Free the old functions ctx. */
 void functionsLibCtxSwapWithCurrent(functionsLibCtx *new_lib_ctx, int async) {
-    if (async) {
-        freeFunctionsAsync(curr_functions_lib_ctx);
-    } else {
-        functionsLibCtxFree(curr_functions_lib_ctx);
-    }
+    functionsLibCtxFree(curr_functions_lib_ctx, async);
     curr_functions_lib_ctx = new_lib_ctx;
 }
 
@@ -796,7 +796,7 @@ void functionRestoreCommand(client *c) {
         addReply(c, shared.ok);
     }
     if (functions_lib_ctx) {
-        functionsLibCtxFree(functions_lib_ctx);
+        functionsLibCtxFree(functions_lib_ctx, server.lazyfree_lazy_user_flush);
     }
 }
 

diff --git a/src/functions.h b/src/functions.h
@@ -134,7 +134,7 @@ size_t functionsLibCtxFunctionsLen(functionsLibCtx *functions_ctx);
 functionsLibCtx *functionsLibCtxGetCurrent(void);
 functionsLibCtx *functionsLibCtxCreate(void);
 void functionsLibCtxClearCurrent(int async);
-void functionsLibCtxFree(functionsLibCtx *lib_ctx);
+void functionsLibCtxFree(functionsLibCtx *functions_lib_ctx, int async);
 void functionsLibCtxClear(functionsLibCtx *lib_ctx);
 void functionsLibCtxSwapWithCurrent(functionsLibCtx *new_lib_ctx, int async);
 

diff --git a/src/lazyfree.c b/src/lazyfree.c
@@ -64,7 +64,7 @@ void lazyFreeLuaScripts(void *args[]) {
 void lazyFreeFunctionsCtx(void *args[]) {
     functionsLibCtx *functions_lib_ctx = args[0];
     size_t len = functionsLibCtxFunctionsLen(functions_lib_ctx);
-    functionsLibCtxFree(functions_lib_ctx);
+    functionsLibCtxFree(functions_lib_ctx, 0);
     atomic_fetch_sub_explicit(&lazyfree_objects, len, memory_order_relaxed);
     atomic_fetch_add_explicit(&lazyfreed_objects, len, memory_order_relaxed);
 }
@@ -240,7 +240,7 @@ void freeFunctionsAsync(functionsLibCtx *functions_lib_ctx) {
                                   memory_order_relaxed);
         bioCreateLazyFreeJob(lazyFreeFunctionsCtx, 1, functions_lib_ctx);
     } else {
-        functionsLibCtxFree(functions_lib_ctx);
+        functionsLibCtxFree(functions_lib_ctx, 0);
     }
 }
 

diff --git a/src/replication.c b/src/replication.c
@@ -2268,7 +2268,7 @@ void readSyncBulkPayload(connection *conn) {
                                       NULL);
 
                 disklessLoadDiscardTempDb(diskless_load_tempDb);
-                functionsLibCtxFree(temp_functions_lib_ctx);
+                functionsLibCtxFree(temp_functions_lib_ctx, 0);
                 serverLog(LL_NOTICE, "PRIMARY <-> REPLICA sync: Discarding temporary DB in background");
             } else {
                 /* Remove the half-loaded data in case we started with an empty replica. */