Extract gerrit_index.config into its own class
Change-Id: I5cdc77239dd0c8d6a2732220738c35ef88d33016
diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java
index 28ad605..b40d46b 100644
--- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java
+++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java
@@ -48,7 +48,6 @@
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.Directory;
import org.eclipse.jgit.errors.ConfigInvalidException;
-import org.eclipse.jgit.storage.file.FileBasedConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -70,13 +69,11 @@
return f.getName() + "_SORT";
}
- public static void setReady(SitePaths sitePaths, int version, boolean ready)
- throws IOException {
+ public static void setReady(SitePaths sitePaths, String name, int version,
+ boolean ready) throws IOException {
try {
- // TODO(dborowitz): Totally broken for non-change indexes.
- FileBasedConfig cfg =
- LuceneVersionManager.loadGerritIndexConfig(sitePaths);
- LuceneVersionManager.setReady(cfg, version, ready);
+ GerritIndexStatus cfg = new GerritIndexStatus(sitePaths);
+ cfg.setReady(name, version, ready);
cfg.save();
} catch (ConfigInvalidException e) {
throw new IOException(e);
@@ -86,6 +83,7 @@
private final Schema<V> schema;
private final SitePaths sitePaths;
private final Directory dir;
+ private final String name;
private final TrackingIndexWriter writer;
private final ReferenceManager<IndexSearcher> searcherManager;
private final ControlledRealTimeReopenThread<IndexSearcher> reopenThread;
@@ -102,6 +100,7 @@
this.schema = schema;
this.sitePaths = sitePaths;
this.dir = dir;
+ this.name = name;
final String index = Joiner.on('_').skipNulls().join(name, subIndex);
IndexWriter delegateWriter;
long commitPeriod = writerConfig.getCommitWithinMs();
@@ -184,7 +183,7 @@
@Override
public void markReady(boolean ready) throws IOException {
- setReady(sitePaths, schema.getVersion(), ready);
+ setReady(sitePaths, name, schema.getVersion(), ready);
}
@Override
diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/GerritIndexStatus.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/GerritIndexStatus.java
new file mode 100644
index 0000000..f43e385
--- /dev/null
+++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/GerritIndexStatus.java
@@ -0,0 +1,78 @@
+// Copyright (C) 2016 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.lucene;
+
+import com.google.common.primitives.Ints;
+import com.google.gerrit.server.config.SitePaths;
+import com.google.gerrit.server.index.change.ChangeSchemaDefinitions;
+
+import org.eclipse.jgit.errors.ConfigInvalidException;
+import org.eclipse.jgit.storage.file.FileBasedConfig;
+import org.eclipse.jgit.util.FS;
+
+import java.io.IOException;
+
+class GerritIndexStatus {
+ private static final String SECTION = "index";
+ private static final String KEY_READY = "ready";
+
+ private final FileBasedConfig cfg;
+
+ GerritIndexStatus(SitePaths sitePaths)
+ throws ConfigInvalidException, IOException {
+ cfg = new FileBasedConfig(
+ sitePaths.index_dir.resolve("gerrit_index.config").toFile(),
+ FS.detect());
+ cfg.load();
+ convertLegacyConfig();
+ }
+
+ void setReady(String indexName, int version, boolean ready) {
+ cfg.setBoolean(SECTION, indexDirName(indexName, version), KEY_READY, ready);
+ }
+
+ boolean getReady(String indexName, int version) {
+ return cfg.getBoolean(SECTION, indexDirName(indexName, version), KEY_READY,
+ false);
+ }
+
+ void save() throws IOException {
+ cfg.save();
+ }
+
+ private void convertLegacyConfig() throws IOException {
+ boolean dirty = false;
+ // Convert legacy [index "25"] to modern [index "changes_0025"].
+ for (String subsection : cfg.getSubsections(SECTION)) {
+ Integer v = Ints.tryParse(subsection);
+ if (v != null) {
+ String ready = cfg.getString(SECTION, subsection, KEY_READY);
+ if (ready != null) {
+ dirty = false;
+ cfg.unset(SECTION, subsection, KEY_READY);
+ cfg.setString(SECTION,
+ indexDirName(ChangeSchemaDefinitions.NAME, v), KEY_READY, ready);
+ }
+ }
+ }
+ if (dirty) {
+ cfg.save();
+ }
+ }
+
+ private static String indexDirName(String indexName, int version) {
+ return String.format("%s_%04d", indexName, version);
+ }
+}
diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
index f4fa0cb..275fa48 100644
--- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
+++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
@@ -126,7 +126,6 @@
return QueryBuilder.intTerm(LEGACY_ID.getName(), id.get());
}
- private final SitePaths sitePaths;
private final FillArgs fillArgs;
private final ListeningExecutorService executor;
private final Provider<ReviewDb> db;
@@ -145,7 +144,6 @@
ChangeData.Factory changeDataFactory,
FillArgs fillArgs,
@Assisted Schema<ChangeData> schema) throws IOException {
- this.sitePaths = sitePaths;
this.fillArgs = fillArgs;
this.executor = executor;
this.db = db;
@@ -252,9 +250,9 @@
@Override
public void markReady(boolean ready) throws IOException {
- // Do not delegate to ChangeSubIndex#markReady, since changes have an
- // additional level of directory nesting.
- AbstractLuceneIndex.setReady(sitePaths, schema.getVersion(), ready);
+ // Arbitrary done on open index, as ready bit is set
+ // per index and not sub index
+ openIndex.markReady(ready);
}
private Sort getSort() {
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 6ccf829..b49a9f2 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
@@ -34,8 +34,6 @@
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.Config;
-import org.eclipse.jgit.storage.file.FileBasedConfig;
-import org.eclipse.jgit.util.FS;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -76,23 +74,6 @@
prefix, schema.getVersion()));
}
- static FileBasedConfig loadGerritIndexConfig(SitePaths sitePaths)
- throws ConfigInvalidException, IOException {
- FileBasedConfig cfg = new FileBasedConfig(
- sitePaths.index_dir.resolve("gerrit_index.config").toFile(),
- FS.detect());
- cfg.load();
- return cfg;
- }
-
- static void setReady(Config cfg, int version, boolean ready) {
- cfg.setBoolean("index", Integer.toString(version), "ready", ready);
- }
-
- private static boolean getReady(Config cfg, int version) {
- return cfg.getBoolean("index", Integer.toString(version), "ready", false);
- }
-
private final SitePaths sitePaths;
private final Map<String, IndexDefinition<?, ?, ?>> defs;
private final Map<String, OnlineReindexer<?, ?, ?>> reindexers;
@@ -120,9 +101,9 @@
@Override
public void start() {
- FileBasedConfig cfg;
+ GerritIndexStatus cfg;
try {
- cfg = loadGerritIndexConfig(sitePaths);
+ cfg = new GerritIndexStatus(sitePaths);
} catch (ConfigInvalidException | IOException e) {
throw fail(e);
}
@@ -140,7 +121,7 @@
}
private <K, V, I extends Index<K, V>> void initIndex(
- IndexDefinition<K, V, I> def, FileBasedConfig cfg) {
+ IndexDefinition<K, V, I> def, GerritIndexStatus cfg) {
TreeMap<Integer, Version<V>> versions = scanVersions(def, cfg);
// Search from the most recent ready version.
// Write to the most recent ready version and the most recent version.
@@ -179,8 +160,7 @@
}
}
- // TODO: include index name.
- markNotReady(cfg, versions.values(), write);
+ markNotReady(cfg, def.getName(), versions.values(), write);
int latest = write.get(0).version;
if (onlineUpgrade && latest != search.version) {
@@ -245,7 +225,7 @@
}
private <K, V, I extends Index<K, V>> TreeMap<Integer, Version<V>>
- scanVersions(IndexDefinition<K, V, I> def, Config cfg) {
+ scanVersions(IndexDefinition<K, V, I> def, GerritIndexStatus cfg) {
TreeMap<Integer, Version<V>> versions = Maps.newTreeMap();
for (Schema<V> schema : def.getSchemas().values()) {
// This part is Lucene-specific.
@@ -255,7 +235,8 @@
log.warn("Not a directory: %s", p.toAbsolutePath());
}
int v = schema.getVersion();
- versions.put(v, new Version<>(schema, v, isDir, getReady(cfg, v)));
+ versions.put(v, new Version<>(
+ schema, v, isDir, cfg.getReady(def.getName(), v)));
}
String prefix = def.getName() + "_";
@@ -274,7 +255,8 @@
continue;
}
if (!versions.containsKey(v)) {
- versions.put(v, new Version<V>(null, v, true, getReady(cfg, v)));
+ versions.put(v, new Version<V>(
+ null, v, true, cfg.getReady(def.getName(), v)));
}
}
} catch (IOException e) {
@@ -283,12 +265,12 @@
return versions;
}
- private <V> void markNotReady(FileBasedConfig cfg, Iterable<Version<V>> versions,
- Collection<Version<V>> inUse) {
+ private <V> void markNotReady(GerritIndexStatus cfg, String name,
+ Iterable<Version<V>> versions, Collection<Version<V>> inUse) {
boolean dirty = false;
for (Version<V> v : versions) {
if (!inUse.contains(v) && v.exists) {
- setReady(cfg, v.version, false);
+ cfg.setReady(name, v.version, false);
dirty = true;
}
}
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitIndex.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitIndex.java
index 28b7b17..77c466e 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitIndex.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitIndex.java
@@ -59,9 +59,8 @@
IndexType type = index.select("Type", "type", IndexType.LUCENE);
for (SchemaDefinitions<?> def : IndexModule.ALL_SCHEMA_DEFS) {
- // TODO(dborowitz): Totally broken for non-change indexes.
AbstractLuceneIndex.setReady(
- site, def.getLatest().getVersion(), true);
+ site, def.getName(), def.getLatest().getVersion(), true);
}
if ((site.isNew || isEmptySite()) && type == IndexType.LUCENE) {
// Do nothing
