Synchronize doEvalScript and doRelease operations in MvelInvokeService

application/src/main/resources/thingsboard.yml

@@ -625,7 +625,7 @@ mvel:
   max_black_list_duration_sec: "${MVEL_MAX_BLACKLIST_DURATION_SEC:60}"
   # Specify thread pool size for javascript executor service
   thread_pool_size: "${MVEL_THREAD_POOL_SIZE:50}"
-  compiled_scripts_cache_size: "${MVEL_COMPILED_SCRIPTS_CACHE_SIZE:2000}"
+  compiled_scripts_cache_size: "${MVEL_COMPILED_SCRIPTS_CACHE_SIZE:1000}"
   stats:
     enabled: "${TB_MVEL_STATS_ENABLED:false}"
     print_interval_ms: "${TB_MVEL_STATS_PRINT_INTERVAL_MS:10000}"

common/script/script-api/src/main/java/org/thingsboard/script/api/mvel/DefaultMvelInvokeService.java

@@ -53,6 +53,8 @@ import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.regex.Pattern;
 
 @Slf4j
@@ -100,11 +102,13 @@ public class DefaultMvelInvokeService extends AbstractScriptInvokeService implem
     @Value("${mvel.max_memory_limit_mb:8}")
     private long maxMemoryLimitMb;
 
-    @Value("${mvel.compiled_scripts_cache_size:2000}")
+    @Value("${mvel.compiled_scripts_cache_size:1000}")
     private int compiledScriptsCacheSize;
 
     private ListeningExecutorService executor;
 
+    private final Lock lock = new ReentrantLock();
+
     protected DefaultMvelInvokeService(Optional<TbApiUsageStateClient> apiUsageStateClient, Optional<TbApiUsageReportClient> apiUsageReportClient) {
         super(apiUsageStateClient, apiUsageReportClient);
     }
@@ -166,10 +170,15 @@ public class DefaultMvelInvokeService extends AbstractScriptInvokeService implem
                 compiledScriptsCache.get(scriptHash, k -> {
                     return compileScript(scriptBody);
                 });
-                scriptIdToHash.put(scriptId, scriptHash);
-                scriptMap.computeIfAbsent(scriptHash, k -> {
-                    return new MvelScript(scriptBody, argNames);
-                });
+                lock.lock();
+                try {
+                    scriptIdToHash.put(scriptId, scriptHash);
+                    scriptMap.computeIfAbsent(scriptHash, k -> {
+                        return new MvelScript(scriptBody, argNames);
+                    });
+                } finally {
+                    lock.unlock();
+                }
                 return scriptId;
             } catch (Exception e) {
                 throw new TbScriptException(scriptId, TbScriptException.ErrorCode.COMPILATION, scriptBody, e);
@@ -203,11 +212,15 @@ public class DefaultMvelInvokeService extends AbstractScriptInvokeService implem
     protected void doRelease(UUID scriptId) throws Exception {
         String scriptHash = scriptIdToHash.remove(scriptId);
         if (scriptHash != null) {
-            if (scriptIdToHash.containsValue(scriptHash)) {
-                return;
+            lock.lock();
+            try {
+                if (!scriptIdToHash.containsValue(scriptHash)) {
+                    scriptMap.remove(scriptHash);
+                    compiledScriptsCache.invalidate(scriptHash);
+                }
+            } finally {
+                lock.unlock();
             }
-            scriptMap.remove(scriptHash);
-            compiledScriptsCache.invalidate(scriptHash);
         }
     }