opendev/gerrit
Code Issues Proposed changes

Generify OnlineReindexer and friends

Browse Source 
Change-Id: I0730547a0ff8e1c001639e06488c8b2f54a106ac
This commit is contained in:
Dave Borowitz
2016-03-16 15:07:58 +01:00
parent cbb99428d8
commit b518e69abc
6 changed files with 437 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,6 @@ public class LuceneIndexModule extends LifecycleModule {
@Override
protected void configure() {
factory(LuceneChangeIndex.Factory.class);
factory(OnlineReindexer.Factory.class);
install(new IndexModule(threads));
if (singleVersion == null) {
install(new MultiVersionModule());

14
gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneVersionManager.java
View File

@@ -20,9 +20,13 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.primitives.Ints;
import com.google.gerrit.extensions.events.LifecycleListener;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.index.OnlineReindexer;
import com.google.gerrit.server.index.Schema;
import com.google.gerrit.server.index.change.AllChangesIndexer;
import com.google.gerrit.server.index.change.ChangeIndex;
import com.google.gerrit.server.index.change.ChangeIndexCollection;
import com.google.gerrit.server.index.change.ChangeSchemas;
import com.google.gerrit.server.query.change.ChangeData;
@@ -93,9 +97,9 @@ public class LuceneVersionManager implements LifecycleListener {
private final SitePaths sitePaths;
private final LuceneChangeIndex.Factory indexFactory;
private final ChangeIndexCollection indexes;
private final OnlineReindexer.Factory reindexerFactory;
private final AllChangesIndexer allChangesIndexer;
private final boolean onlineUpgrade;
private OnlineReindexer reindexer;
private OnlineReindexer<Change.Id, ChangeData, ChangeIndex> reindexer;
@Inject
LuceneVersionManager(
@@ -103,11 +107,11 @@ public class LuceneVersionManager implements LifecycleListener {
SitePaths sitePaths,
LuceneChangeIndex.Factory indexFactory,
ChangeIndexCollection indexes,
OnlineReindexer.Factory reindexerFactory) {
AllChangesIndexer allChangesIndexer) {
this.sitePaths = sitePaths;
this.indexFactory = indexFactory;
this.indexes = indexes;
this.reindexerFactory = reindexerFactory;
this.allChangesIndexer = allChangesIndexer;
this.onlineUpgrade = cfg.getBoolean("index", null, "onlineUpgrade", true);
}
@@ -171,7 +175,7 @@ public class LuceneVersionManager implements LifecycleListener {
int latest = write.get(0).version;
if (onlineUpgrade && latest != search.version) {
reindexer = reindexerFactory.create(latest);
reindexer = new OnlineReindexer<>(indexes, allChangesIndexer, latest);
reindexer.start();
}
}

133
gerrit-lucene/src/main/java/com/google/gerrit/lucene/OnlineReindexer.java
View File

@@ -1,133 +0,0 @@
// Copyright (C) 2013 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 static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.collect.Lists;
import com.google.gerrit.server.index.Index;
import com.google.gerrit.server.index.SiteIndexer;
import com.google.gerrit.server.index.change.ChangeIndex;
import com.google.gerrit.server.index.change.ChangeIndexCollection;
import com.google.gerrit.server.project.ProjectCache;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
public class OnlineReindexer {
private static final Logger log = LoggerFactory
.getLogger(OnlineReindexer.class);
public interface Factory {
OnlineReindexer create(int version);
}
private final ChangeIndexCollection indexes;
private final SiteIndexer batchIndexer;
private final ProjectCache projectCache;
private final int version;
private ChangeIndex index;
private final AtomicBoolean running = new AtomicBoolean();
@Inject
OnlineReindexer(
ChangeIndexCollection indexes,
SiteIndexer batchIndexer,
ProjectCache projectCache,
@Assisted int version) {
this.indexes = indexes;
this.batchIndexer = batchIndexer;
this.projectCache = projectCache;
this.version = version;
}
public void start() {
if (running.compareAndSet(false, true)) {
Thread t = new Thread() {
@Override
public void run() {
try {
reindex();
} finally {
running.set(false);
}
}
};
t.setName(String.format("Reindex v%d-v%d",
version(indexes.getSearchIndex()), version));
t.start();
}
}
public boolean isRunning() {
return running.get();
}
public int getVersion() {
return version;
}
private static int version(Index<?, ?> i) {
return i.getSchema().getVersion();
}
private void reindex() {
index = checkNotNull(indexes.getWriteIndex(version),
"not an active write schema version: %s", version);
log.info("Starting online reindex from schema version {} to {}",
version(indexes.getSearchIndex()), version(index));
SiteIndexer.Result result =
batchIndexer.indexAll(index, projectCache.all());
if (!result.success()) {
log.error("Online reindex of schema version {} failed. Successfully"
+ " indexed {} changes, failed to index {} changes",
version(index), result.doneCount(), result.failedCount());
return;
}
log.info("Reindex to version {} complete", version(index));
activateIndex();
}
void activateIndex() {
indexes.setSearchIndex(index);
log.info("Using schema version {}", version(index));
try {
index.markReady(true);
} catch (IOException e) {
log.warn("Error activating new schema version {}", version(index));
}
List<ChangeIndex> toRemove = Lists.newArrayListWithExpectedSize(1);
for (ChangeIndex i : indexes.getWriteIndexes()) {
if (version(i) != version(index)) {
toRemove.add(i);
}
}
for (ChangeIndex i : toRemove) {
try {
i.markReady(false);
indexes.removeWriteIndex(version(i));
} catch (IOException e) {
log.warn("Error deactivating old schema version {}", version(i));
}
}
}
}