Merge branch 'stable-3.2' into master
* stable-3.2:
Remove disableDeleteForTesting flag
ReplicationFanoutIT: Fix invalid replicationDelay setting
Make the shouldReplicateNewProject test more reliable
Change-Id: I5215f927f5e0fb27f22d7bb6e4530414b8eaf9a9
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
index e2f9515..8054eb4 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
@@ -26,9 +26,9 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSet.Builder;
import com.google.common.collect.Lists;
-import com.google.gerrit.common.data.GroupReference;
import com.google.gerrit.entities.AccountGroup;
import com.google.gerrit.entities.BranchNameKey;
+import com.google.gerrit.entities.GroupReference;
import com.google.gerrit.entities.Project;
import com.google.gerrit.entities.RefNames;
import com.google.gerrit.exceptions.StorageException;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationFilter.java b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationFilter.java
index 5b4204e..28f2fba 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationFilter.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationFilter.java
@@ -14,7 +14,7 @@
package com.googlesource.gerrit.plugins.replication;
-import com.google.gerrit.common.data.AccessSection;
+import com.google.gerrit.entities.AccessSection;
import com.google.gerrit.entities.Project;
import java.util.Collections;
import java.util.List;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java
index 5a4d56c..94b3f31 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java
@@ -203,10 +203,6 @@
try {
replaying = true;
for (ReplicationTasksStorage.ReplicateRefUpdate t : replicationTasksStorage.listWaiting()) {
- if (t == null) {
- repLog.atWarning().log("Encountered null replication event in ReplicationTasksStorage");
- continue;
- }
try {
fire(new URIish(t.uri), Project.nameKey(t.project), t.ref);
} catch (URISyntaxException e) {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorage.java b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorage.java
index e1b1c0a5..8c6d55b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorage.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorage.java
@@ -32,6 +32,7 @@
import java.nio.file.StandardCopyOption;
import java.util.ArrayList;
import java.util.List;
+import java.util.Optional;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.transport.URIish;
@@ -64,6 +65,24 @@
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
public static class ReplicateRefUpdate {
+ public static Optional<ReplicateRefUpdate> createOptionally(Path file) {
+ try {
+ return Optional.of(create(file));
+ } catch (NoSuchFileException e) {
+ logger.atFine().log("File %s not found while reading task", file);
+ } catch (IOException e) {
+ if (!e.getMessage().equals("Is a directory")) {
+ logger.atSevere().withCause(e).log("Error while reading task %", file);
+ }
+ }
+ return Optional.empty();
+ }
+
+ public static ReplicateRefUpdate create(Path file) throws IOException {
+ String json = new String(Files.readAllBytes(file), UTF_8);
+ return GSON.fromJson(json, ReplicateRefUpdate.class);
+ }
+
public final String project;
public final String ref;
public final String uri;
@@ -146,17 +165,9 @@
List<ReplicateRefUpdate> results = new ArrayList<>();
try (DirectoryStream<Path> events = Files.newDirectoryStream(tasks)) {
for (Path path : events) {
- if (Files.isRegularFile(path)) {
- try {
- String json = new String(Files.readAllBytes(path), UTF_8);
- results.add(GSON.fromJson(json, ReplicateRefUpdate.class));
- } catch (NoSuchFileException ex) {
- logger.atFine().log(
- "File %s not found while listing waiting tasks (likely in-flight or completed by another node)",
- path);
- } catch (IOException e) {
- logger.atSevere().withCause(e).log("Error when firing pending event %s", path);
- }
+ Optional<ReplicateRefUpdate> update = ReplicateRefUpdate.createOptionally(path);
+ if (update.isPresent()) {
+ results.add(update.get());
} else if (Files.isDirectory(path)) {
try {
results.addAll(list(path));
