opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

Browse Source 
* stable-2.14:
  BaseInit: Don't throw if schema cannot be upgraded

Change-Id: I71094412a13efadfe02ca7ea544345008acabae3
This commit is contained in:
David Pursehouse
2019-07-10 17:59:39 +09:00
parent 89753166f9 88cb135736
commit bd06cac77f
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/BaseInit.java
View File

@@ -35,7 +35,6 @@ import com.google.gerrit.pgm.init.index.elasticsearch.ElasticIndexModuleOnInit;
import com.google.gerrit.pgm.init.index.lucene.LuceneIndexModuleOnInit; import com.google.gerrit.pgm.init.index.lucene.LuceneIndexModuleOnInit;
import com.google.gerrit.pgm.util.SiteProgram; import com.google.gerrit.pgm.util.SiteProgram;
import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.config.GerritServerConfigModule; import com.google.gerrit.server.config.GerritServerConfigModule;
import com.google.gerrit.server.config.SitePath; import com.google.gerrit.server.config.SitePath;
import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.config.SitePaths;
@@ -58,7 +57,6 @@ import com.google.inject.CreationException;
import com.google.inject.Guice; import com.google.inject.Guice;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Injector; import com.google.inject.Injector;
import com.google.inject.Key;
import com.google.inject.Module; import com.google.inject.Module;
import com.google.inject.Provider; import com.google.inject.Provider;
import com.google.inject.TypeLiteral; import com.google.inject.TypeLiteral;
@@ -78,7 +76,6 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import javax.sql.DataSource; import javax.sql.DataSource;
import org.eclipse.jgit.lib.Config;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -92,7 +89,6 @@ public class BaseInit extends SiteProgram {
private final List<String> pluginsToInstall; private final List<String> pluginsToInstall;
private Injector sysInjector; private Injector sysInjector;
private Config config;
protected BaseInit(PluginsDistribution pluginsDistribution, List<String> pluginsToInstall) { protected BaseInit(PluginsDistribution pluginsDistribution, List<String> pluginsToInstall) {
this.standalone = true; this.standalone = true;
@@ -150,9 +146,6 @@ public class BaseInit extends SiteProgram {
try { try {
run.upgradeSchema(); run.upgradeSchema();
} catch (OrmException e) { } catch (OrmException e) {
if (config.getBoolean("container", "slave", false)) {
throw e;
}
String msg = "Couldn't upgrade schema. Expected if slave and read-only database"; String msg = "Couldn't upgrade schema. Expected if slave and read-only database";
System.err.println(msg); System.err.println(msg);
log.warn(msg, e); log.warn(msg, e);
@@ -480,7 +473,6 @@ public class BaseInit extends SiteProgram {
} }
}); });
Injector dbInjector = createDbInjector(SINGLE_USER); Injector dbInjector = createDbInjector(SINGLE_USER);
config = dbInjector.getInstance(Key.get(Config.class, GerritServerConfig.class));
switch (IndexModule.getIndexType(dbInjector)) { switch (IndexModule.getIndexType(dbInjector)) {
case LUCENE: case LUCENE: