Merge branch 'stable-3.7' into stable-3.8
* stable-3.7:
Rename metric tasks/max_retries to tasks/failed_max_retries
Document metrics
Fix completed tasks metrics
Log fetch tasks when graceful shutdown fails
Displaying refs for fetch tasks
Leverage ShutdownState in SourcesCollection
Fix pull replication queue metric prefix
Set pull replication tests as large
Introduce replication queue metrics
Handle fetch tasks gracefully during shutdown
Add integration test for new project creation
Do not honor gerrit.replicateOnStartup on primary side
Change-Id: Ib05b146593f47b38ccc49e933287dfa907043b31
diff --git a/example-setup/broker/Dockerfile b/example-setup/broker/Dockerfile
index 67eecd9..d615273 100644
--- a/example-setup/broker/Dockerfile
+++ b/example-setup/broker/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritcodereview/gerrit:3.7.2-almalinux8
+FROM gerritcodereview/gerrit:3.8.1-almalinux9
USER root
diff --git a/example-setup/http/Dockerfile b/example-setup/http/Dockerfile
index afadb4f..6f1d1f9 100644
--- a/example-setup/http/Dockerfile
+++ b/example-setup/http/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritcodereview/gerrit:3.7.2-almalinux8
+FROM gerritcodereview/gerrit:3.8.1-almalinux9
USER root
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java
index 0e840bd..0a22a5a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java
@@ -229,6 +229,11 @@
return 0;
}
+ @Override
+ public boolean replicateNoteDbMetaRefs() {
+ return true;
+ }
+
public int getShutDownDrainTimeout() {
return shutDownDrainTimeout;
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/ProjectDeletionActionIT.java b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/ProjectDeletionActionIT.java
index cf7515e..7c7846c 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/ProjectDeletionActionIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/ProjectDeletionActionIT.java
@@ -23,7 +23,6 @@
import com.google.inject.Inject;
import javax.servlet.http.HttpServletResponse;
import org.apache.http.client.methods.HttpRequestBase;
-import org.junit.Ignore;
import org.junit.Test;
public class ProjectDeletionActionIT extends ActionITBase {
@@ -80,7 +79,6 @@
@Test
@GerritConfig(name = "gerrit.instanceId", value = "testInstanceId")
- @Ignore("Failing in RestApiServlet: to be enabled again once that is fixed in core")
public void shouldReturnBadRequestWhenDeletingAnInvalidProjectName() throws Exception {
url = getURLWithAuthenticationPrefix(INVALID_TEST_PROJECT_NAME);
