commit ea4b037b301bc15bb9dfea28091bccc8612f24b1
author Dmitrii Filippov <dmfilippov@google.com> Tue Jul 20 11:58:18 2021 +0200
committer Dmitrii Filippov <dmfilippov@google.com> Tue Jul 20 13:32:45 2021 +0200
tree 296114670648309b75bcd73fb921e8a3be1c926a
parent f4e81cab18442a93341c664ea686c02d7444ecd4

Avoid Path.toFile() method for creating PluginConfig from GerritConfig

The Path.toFile() methods works only for Path on default filesystem
and fails with other filesystems (like JimFS). Internally in google
we are going to use JimFS for storing sites data and provide config
from a non-file source.

Having Path.toFile() call in the PluginConfigFactory leads to exception
even if config files are not used at all.

This change removes the .toFile() call from the constructor and
the getFromGerritConfig method. We don't need to check if config file
is modifed, because cfgProvider.get() returns either cached config or
a new config if file is modified.

Other usages of .toFile() in the PluginConfigFactory will be removed
in upcoming changes.

Change-Id: I2df784f71daab1b1ff87eb1e4aceaf917990c587

java/com/google/gerrit/server/config/PluginConfigFactory.java

diff --git a/java/com/google/gerrit/server/config/PluginConfigFactory.java b/java/com/google/gerrit/server/config/PluginConfigFactory.java
index 2d0f9a5..c49e928 100644
--- a/java/com/google/gerrit/server/config/PluginConfigFactory.java
+++ b/java/com/google/gerrit/server/config/PluginConfigFactory.java
@@ -28,13 +28,11 @@
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.google.inject.Singleton;
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
 import org.eclipse.jgit.errors.ConfigInvalidException;
-import org.eclipse.jgit.internal.storage.file.FileSnapshot;
 import org.eclipse.jgit.lib.Config;
 import org.eclipse.jgit.storage.file.FileBasedConfig;
 import org.eclipse.jgit.util.FS;
@@ -52,7 +50,6 @@
   private final SecureStore secureStore;
   private final Map<String, Config> pluginConfigs;
 
-  private volatile FileSnapshot cfgSnapshot;
   private volatile Config cfg;
 
   @Inject
@@ -69,7 +66,6 @@
     this.secureStore = secureStore;
 
     this.pluginConfigs = new HashMap<>();
-    this.cfgSnapshot = FileSnapshot.save(site.gerrit_config.toFile());
     this.cfg = cfgProvider.get();
   }
 
@@ -103,12 +99,10 @@
    * @return the plugin configuration from the 'gerrit.config' file
    */
   public PluginConfig getFromGerritConfig(String pluginName, boolean refresh) {
-    if (refresh && secureStore.isOutdated()) {
-      secureStore.reload();
-    }
-    File configFile = site.gerrit_config.toFile();
-    if (refresh && cfgSnapshot.isModified(configFile)) {
-      cfgSnapshot = FileSnapshot.save(configFile);
+    if (refresh) {
+      if (secureStore.isOutdated()) {
+        secureStore.reload();
+      }
       cfg = cfgProvider.get();
     }
     return PluginConfig.createFromGerritConfig(pluginName, cfg);