Script: Disable compilation rate limit in general cache for tests (#79862) (#79865)

stu-elastic · web-flow · commit cd94c34e89f6 · 2021-10-26T16:40:08.000-04:00
`script.disable_max_compilations_rate` was not respected for the general cache, only the context caches. Fixes: #79720
diff --git a/server/src/main/java/org/elasticsearch/script/ScriptService.java b/server/src/main/java/org/elasticsearch/script/ScriptService.java
@@ -592,8 +592,12 @@ void setCacheHolder(Settings settings) {
     }
 
     CacheHolder generalCacheHolder(Settings settings) {
-        return new CacheHolder(SCRIPT_GENERAL_CACHE_SIZE_SETTING.get(settings), SCRIPT_GENERAL_CACHE_EXPIRE_SETTING.get(settings),
-            SCRIPT_GENERAL_MAX_COMPILATIONS_RATE_SETTING.get(settings), SCRIPT_GENERAL_MAX_COMPILATIONS_RATE_SETTING.getKey());
+        ScriptCache.CompilationRate rate = SCRIPT_GENERAL_MAX_COMPILATIONS_RATE_SETTING.get(settings);
+        if (SCRIPT_DISABLE_MAX_COMPILATIONS_RATE_SETTING.get(settings) || compilationLimitsEnabled() == false) {
+            rate = SCRIPT_COMPILATION_RATE_ZERO;
+        }
+        return new CacheHolder(SCRIPT_GENERAL_CACHE_SIZE_SETTING.get(settings), SCRIPT_GENERAL_CACHE_EXPIRE_SETTING.get(settings), rate,
+                SCRIPT_GENERAL_MAX_COMPILATIONS_RATE_SETTING.getKey());
     }
 
     CacheHolder contextCacheHolder(Settings settings) {

Original file line number	Diff line number	Diff line change
`@@ -592,8 +592,12 @@ void setCacheHolder(Settings settings) {`
`592`	`592`	`}`
`593`	`593`
`594`	`594`	`CacheHolder generalCacheHolder(Settings settings) {`
`595`		`- return new CacheHolder(SCRIPT_GENERAL_CACHE_SIZE_SETTING.get(settings), SCRIPT_GENERAL_CACHE_EXPIRE_SETTING.get(settings),`
`596`		`- SCRIPT_GENERAL_MAX_COMPILATIONS_RATE_SETTING.get(settings), SCRIPT_GENERAL_MAX_COMPILATIONS_RATE_SETTING.getKey());`
	`595`	`+ ScriptCache.CompilationRate rate = SCRIPT_GENERAL_MAX_COMPILATIONS_RATE_SETTING.get(settings);`
	`596`	`+ if (SCRIPT_DISABLE_MAX_COMPILATIONS_RATE_SETTING.get(settings) \|\| compilationLimitsEnabled() == false) {`
	`597`	`+ rate = SCRIPT_COMPILATION_RATE_ZERO;`
	`598`	`+ }`
	`599`	`+ return new CacheHolder(SCRIPT_GENERAL_CACHE_SIZE_SETTING.get(settings), SCRIPT_GENERAL_CACHE_EXPIRE_SETTING.get(settings), rate,`
	`600`	`+ SCRIPT_GENERAL_MAX_COMPILATIONS_RATE_SETTING.getKey());`
`597`	`601`	`}`
`598`	`602`
`599`	`603`	`CacheHolder contextCacheHolder(Settings settings) {`