From 3df01eb1c607f2a316810550b51b5965863a26a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Ar=C3=A8s?= Date: Thu, 11 Aug 2016 11:23:53 -0400 Subject: [PATCH] Fix online reindexer not starting Since Ie88b7effd, the online reindexer was no longer starting automatically. Before that change, the OnlineReindexer was only created if index version was not the latest. The intention of that change was to always create the OnlineReindexer for the latest index version to allow forcing a reindex using the ssh command. The problem is that the way it was implemented, the OnlineReindexer was created but never started. Fix this by always creating the OnlineReindexer and starting it if index version is not latest. Change-Id: I34c99c041d4665a3dbe76aaeb70e5e759f827ceb --- .../com/google/gerrit/lucene/LuceneVersionManager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneVersionManager.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneVersionManager.java index 0a6acaa9e8..b46f1f604a 100644 --- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneVersionManager.java +++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneVersionManager.java @@ -164,10 +164,10 @@ public class LuceneVersionManager implements LifecycleListener { int latest = write.get(0).version; OnlineReindexer reindexer = new OnlineReindexer<>(def, latest); - reindexers.put(def.getName(), reindexer); - if (onlineUpgrade && latest != search.version) { - synchronized (this) { - if (!reindexers.containsKey(def.getName())) { + synchronized (this) { + if (!reindexers.containsKey(def.getName())) { + reindexers.put(def.getName(), reindexer); + if (onlineUpgrade && latest != search.version) { reindexer.start(); } }