Merge "prolog_rules cache: only use memoryLimit from cache.projects" into stable-3.4
diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index 8ad5cef..d209afc 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -1132,7 +1132,7 @@
cache `"prolog_rules"`::
+
Caches parsed `rules.pl` contents for each project. This cache uses the same
-size as the `projects` cache, and cannot be configured independently.
+size as the `projects` cache when `cache.prolog_rules.memoryLimit` is not set.
cache `"pure_revert"`::
+
diff --git a/java/com/google/gerrit/pgm/util/BatchProgramModule.java b/java/com/google/gerrit/pgm/util/BatchProgramModule.java
index 71aec5b..8fb5663 100644
--- a/java/com/google/gerrit/pgm/util/BatchProgramModule.java
+++ b/java/com/google/gerrit/pgm/util/BatchProgramModule.java
@@ -55,6 +55,7 @@
import com.google.gerrit.server.config.DefaultUrlFormatter;
import com.google.gerrit.server.config.EnablePeerIPInReflogRecord;
import com.google.gerrit.server.config.EnablePeerIPInReflogRecordProvider;
+import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.config.GitReceivePackGroups;
import com.google.gerrit.server.config.GitUploadPackGroups;
import com.google.gerrit.server.config.SysExecutorModule;
@@ -87,6 +88,7 @@
import com.google.gerrit.server.rules.SubmitRule;
import com.google.gerrit.server.update.BatchUpdate;
import com.google.inject.Injector;
+import com.google.inject.Key;
import com.google.inject.Module;
import com.google.inject.TypeLiteral;
import com.google.inject.util.Providers;
@@ -94,6 +96,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Set;
+import org.eclipse.jgit.lib.Config;
/** Module for programs that perform batch operations on a site. */
public class BatchProgramModule extends FactoryModule {
@@ -187,7 +190,7 @@
// Submit rules
DynamicSet.setOf(binder(), SubmitRule.class);
factory(SubmitRuleEvaluator.Factory.class);
- modules.add(new PrologModule());
+ modules.add(new PrologModule(getConfig()));
modules.add(new DefaultSubmitRule.Module());
modules.add(new IgnoreSelfApprovalRule.Module());
@@ -203,4 +206,8 @@
.stream()
.forEach(this::install);
}
+
+ protected Config getConfig() {
+ return parentInjector.getInstance(Key.get(Config.class, GerritServerConfig.class));
+ }
}
diff --git a/java/com/google/gerrit/server/config/GerritGlobalModule.java b/java/com/google/gerrit/server/config/GerritGlobalModule.java
index bb851e2..3fd017c 100644
--- a/java/com/google/gerrit/server/config/GerritGlobalModule.java
+++ b/java/com/google/gerrit/server/config/GerritGlobalModule.java
@@ -261,7 +261,7 @@
install(new GroupDbModule());
install(new GroupModule());
install(new NoteDbModule());
- install(new PrologModule());
+ install(new PrologModule(cfg));
install(new DefaultSubmitRule.Module());
install(new IgnoreSelfApprovalRule.Module());
install(new ReceiveCommitsModule());
diff --git a/java/com/google/gerrit/server/rules/PrologModule.java b/java/com/google/gerrit/server/rules/PrologModule.java
index 37dbba6..1c9f588 100644
--- a/java/com/google/gerrit/server/rules/PrologModule.java
+++ b/java/com/google/gerrit/server/rules/PrologModule.java
@@ -17,12 +17,19 @@
import com.google.gerrit.extensions.annotations.Exports;
import com.google.gerrit.extensions.config.FactoryModule;
import com.google.gerrit.extensions.registration.DynamicSet;
+import org.eclipse.jgit.lib.Config;
public class PrologModule extends FactoryModule {
+ protected final Config config;
+
+ public PrologModule(Config config) {
+ this.config = config;
+ }
+
@Override
protected void configure() {
install(new EnvironmentModule());
- install(new RulesCache.Module());
+ install(new RulesCache.Module(config));
bind(PrologEnvironment.Args.class);
factory(PrologRuleEvaluator.Factory.class);
diff --git a/java/com/google/gerrit/server/rules/RulesCache.java b/java/com/google/gerrit/server/rules/RulesCache.java
index 8b72714..a83afa9 100644
--- a/java/com/google/gerrit/server/rules/RulesCache.java
+++ b/java/com/google/gerrit/server/rules/RulesCache.java
@@ -17,6 +17,7 @@
import static com.googlecode.prolog_cafe.lang.PrologMachineCopy.save;
import com.google.common.base.Joiner;
+import com.google.common.base.Strings;
import com.google.common.cache.Cache;
import com.google.common.collect.ImmutableList;
import com.google.gerrit.entities.Project;
@@ -73,11 +74,25 @@
@Singleton
public class RulesCache {
public static class Module extends CacheModule {
+ protected final Config config;
+
+ public Module(Config config) {
+ this.config = config;
+ }
+
@Override
protected void configure() {
- cache(RulesCache.CACHE_NAME, ObjectId.class, PrologMachineCopy.class)
- // This cache is auxiliary to the project cache, so size it the same.
- .configKey(ProjectCacheImpl.CACHE_NAME);
+ if (has(ProjectCacheImpl.CACHE_NAME, "memoryLimit")) {
+ // As this cache is auxiliary to the project cache, so size it the same when available
+ cache(RulesCache.CACHE_NAME, ObjectId.class, PrologMachineCopy.class)
+ .maximumWeight(config.getLong("cache", ProjectCacheImpl.CACHE_NAME, "memoryLimit", 0));
+ } else {
+ cache(RulesCache.CACHE_NAME, ObjectId.class, PrologMachineCopy.class);
+ }
+ }
+
+ private boolean has(String name, String var) {
+ return !Strings.isNullOrEmpty(config.getString("cache", name, var));
}
}
