opendev/gerrit
Code Issues Proposed changes

Fix binding of VersionManager

Browse Source 
Change Ibd8d22dca on stable-2.14 fixed the index start/activate ssh
commands to work with Elasticsearch, but in the merge to stable-2.15
with change I0227ce9f0 it was broken by an incorrect merge conflict
resolution.

Change-Id: I32d34c1a4bd212b6837639d6cf9be1e9b31a9c74
This commit is contained in:
David Pursehouse
2018-04-10 21:59:48 +09:00
parent 5110f5fa43
commit 724574672d
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexModule.java
View File

@@ -82,6 +82,7 @@ public class ElasticIndexModule extends AbstractModule {
} else { } else {
install(new SingleVersionModule(singleVersions)); install(new SingleVersionModule(singleVersions));
} }
bind(VersionManager.class).to(ElasticVersionManager.class);
} }
@Provides @Provides
@@ -93,7 +94,6 @@ public class ElasticIndexModule extends AbstractModule {
private class MultiVersionModule extends LifecycleModule { private class MultiVersionModule extends LifecycleModule {
@Override @Override
public void configure() { public void configure() {
bind(VersionManager.class).to(ElasticVersionManager.class);
listener().to(ElasticVersionManager.class); listener().to(ElasticVersionManager.class);
if (onlineUpgrade) { if (onlineUpgrade) {
listener().to(OnlineUpgrader.class); listener().to(OnlineUpgrader.class);

3
gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneIndexModule.java
View File

@@ -91,8 +91,8 @@ public class LuceneIndexModule extends AbstractModule {
install(new MultiVersionModule()); install(new MultiVersionModule());
} else { } else {
install(new SingleVersionModule(singleVersions)); install(new SingleVersionModule(singleVersions));
bind(VersionManager.class).to(LuceneVersionManager.class);
} }
bind(VersionManager.class).to(LuceneVersionManager.class);
} }
@Provides @Provides
@@ -106,7 +106,6 @@ public class LuceneIndexModule extends AbstractModule {
private class MultiVersionModule extends LifecycleModule { private class MultiVersionModule extends LifecycleModule {
@Override @Override
public void configure() { public void configure() {
bind(VersionManager.class).to(LuceneVersionManager.class);
listener().to(LuceneVersionManager.class); listener().to(LuceneVersionManager.class);
if (onlineUpgrade) { if (onlineUpgrade) {
listener().to(OnlineUpgrader.class); listener().to(OnlineUpgrader.class);