Merge branch 'stable-3.4' into stable-3.5
* stable-3.4:
Revert "Set forward context for events having a different instanceId"
Use Gerrit v3.2.14 on Ubuntu as CentOS is discontinued
Serve reindexing simulating a GET request for /meta ref caching
Auto-reload the indexTs file for auto-reindexing
Download plugins from archive-ci.gerritforge.com
Pin haproxy to 1.8.30-buster and fix associated issues
Pin haproxy to 1.8.30-buster and fix associated issues
Fix issue with change indexing during the NoteDb online migration
Remove references to ReviewDb in README.md
Change-Id: I84759070bdc02a1f823c0961c946ca4239ea4317
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 74c8f13..da477e6 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -15,6 +15,6 @@
maven_jar(
name = "global-refdb",
- artifact = "com.gerritforge:global-refdb:3.4.8",
- sha1 = "a05e1684c0b02867c203e3f55efe62ced2c0fe61",
+ artifact = "com.gerritforge:global-refdb:3.5.4",
+ sha1 = "6f96965d4cedd8b01b1fd9047d8c443c752bd675",
)
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java
index cdca21b..e0d5a50 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java
@@ -123,7 +123,7 @@
log.atInfo().log("Loading configuration from %s", fileConfigFileName);
cfg.load();
} catch (IOException | ConfigInvalidException e) {
- log.atSevere().withCause(e).log("Unable to load configuration from " + fileConfigFileName);
+ log.atSevere().withCause(e).log("Unable to load configuration from %s", fileConfigFileName);
}
return cfg;
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/ChangeReindexRunnable.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/ChangeReindexRunnable.java
index fcd345d..2de2122 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/ChangeReindexRunnable.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/autoreindex/ChangeReindexRunnable.java
@@ -88,7 +88,7 @@
return true;
}
log.atWarning().withCause(cnr.error().get()).log(
- "Error fetching change " + cnr.id());
+ "Error fetching change %s", cnr.id());
return false;
})
.map(cnr -> cnr.notes().getChange());
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventLocks.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventLocks.java
index 3fd26db..bbff4ee 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventLocks.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/index/IndexEventLocks.java
@@ -65,7 +65,7 @@
String.format(
"Acquisition of the locking of %s timed out after %d msec: consider increasing the number of shards",
indexId, WAIT_TIMEOUT_MS);
- log.atWarning().log(timeoutMessage);
+ log.atWarning().log("%s", timeoutMessage);
lockAcquireTimeoutCallback.invoke();
CompletableFuture<?> failureFuture = new CompletableFuture<>();
failureFuture.completeExceptionally(new InterruptedException(timeoutMessage));
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionCache.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionCache.java
index 674de10..92253f7 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionCache.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/websession/file/FileBasedWebsessionCache.java
@@ -210,7 +210,7 @@
"Entry %s in cache %s has an incompatible class and can't be"
+ " deserialized. Invalidating entry.",
path, websessionsDir);
- log.atFine().withCause(e).log(e.getMessage());
+ log.atFine().withCause(e).log("%s", e.getMessage());
invalidate(path.getFileName().toString());
} catch (IOException e) {
log.atWarning().withCause(e).log("Cannot read cache %s", websessionsDir);
diff --git a/src/test/docker/gerrit/Dockerfile b/src/test/docker/gerrit/Dockerfile
index b4f9c6e..7d277db 100644
--- a/src/test/docker/gerrit/Dockerfile
+++ b/src/test/docker/gerrit/Dockerfile
@@ -1,6 +1,6 @@
-FROM gerritcodereview/gerrit:3.4.5-ubuntu20
+FROM gerritcodereview/gerrit:3.5.0-rc2
-ENV GERRIT_BRANCH=stable-3.4
+ENV GERRIT_BRANCH=stable-3.5
ENV GERRIT_CI_URL=https://archive-ci.gerritforge.com/job
