Avoid defragging scripts during eval

This can happen when long scripts are being run and we are attempting to defrag it in the whileBlockedCron. Signed-off-by: Ran Shidlansik <[email protected]>
valkey-io · Dec 10, 2024 · d0ac884 · d0ac884
1 parent e8078b7
commit d0ac884
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/defrag.c b/src/defrag.c
@@ -34,6 +34,7 @@
  */
 
 #include "server.h"
+#include "script.h"
 #include <stddef.h>
 
 #ifdef HAVE_DEFRAG
@@ -280,6 +281,12 @@ robj *activeDefragStringOb(robj *ob) {
 static luaScript *activeDefragLuaScript(luaScript *script) {
     luaScript *ret = NULL;
 
+    /* In case we are in the process of eval some script we do not want to replace the script being run
+     * so we just bail out without really defragging here. */
+    if (scriptIsRunning()) {
+        return script;
+    }
+
     /* try to defrag script struct */
     if ((ret = activeDefragAlloc(script))) {
         script = ret;