Consider robot comments as mutable ref for validation
Change has two ref-names for mutable data:
- /meta, which contains all meta-data associated with the change
and comments performed by humans
- /robot-comments which contains all comments and associated
meta-data performed by robots
The /robot-comments ref was initially missed, causing issues
with replication consistency and opening the risk of causing
split brains on robot-generated comments.
Bug: Issue 288965461
Change-Id: I3adda3cdd55257100d69fe10e18dc3f828646a41
diff --git a/src/main/java/com/gerritforge/gerrit/globalrefdb/validation/dfsrefdb/SharedRefEnforcement.java b/src/main/java/com/gerritforge/gerrit/globalrefdb/validation/dfsrefdb/SharedRefEnforcement.java
index a765975..4e8b2f7 100644
--- a/src/main/java/com/gerritforge/gerrit/globalrefdb/validation/dfsrefdb/SharedRefEnforcement.java
+++ b/src/main/java/com/gerritforge/gerrit/globalrefdb/validation/dfsrefdb/SharedRefEnforcement.java
@@ -14,6 +14,8 @@
package com.gerritforge.gerrit.globalrefdb.validation.dfsrefdb;
+import com.google.gerrit.entities.RefNames;
+
/** Type of enforcement to implement between the local and shared RefDb. */
public interface SharedRefEnforcement {
public enum EnforcePolicy {
@@ -54,7 +56,9 @@
default boolean isRefToBeIgnoredBySharedRefDb(String refName) {
return refName == null
|| refName.startsWith("refs/draft-comments")
- || (refName.startsWith("refs/changes") && !refName.endsWith("/meta"))
+ || (refName.startsWith("refs/changes")
+ && !refName.endsWith("/meta")
+ && !refName.endsWith(RefNames.ROBOT_COMMENTS_SUFFIX))
|| refName.startsWith("refs/cache-automerge");
}
}
diff --git a/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/dfsrefdb/DefaultSharedRefEnforcementTest.java b/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/dfsrefdb/DefaultSharedRefEnforcementTest.java
index a9f0cb2..d8f5ff7 100644
--- a/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/dfsrefdb/DefaultSharedRefEnforcementTest.java
+++ b/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/dfsrefdb/DefaultSharedRefEnforcementTest.java
@@ -17,6 +17,7 @@
import static com.google.common.truth.Truth.assertThat;
import com.gerritforge.gerrit.globalrefdb.validation.dfsrefdb.SharedRefEnforcement.EnforcePolicy;
+import com.google.gerrit.entities.RefNames;
import org.eclipse.jgit.lib.Ref;
import org.junit.Test;
@@ -39,6 +40,14 @@
}
@Test
+ public void aChangeRobotCommentsShouldNotBeIgnored() {
+ Ref robotCommentsMutableRef =
+ newRef("refs/changes/01/1" + RefNames.ROBOT_COMMENTS_SUFFIX, AN_OBJECT_ID_1);
+ assertThat(refEnforcement.getPolicy(A_TEST_PROJECT_NAME, robotCommentsMutableRef.getName()))
+ .isEqualTo(EnforcePolicy.REQUIRED);
+ }
+
+ @Test
public void aCacheAutomergeShouldBeIgnored() {
Ref immutableChangeRef = newRef("refs/cache-automerge/01/1/1000000", AN_OBJECT_ID_1);
assertThat(refEnforcement.getPolicy(A_TEST_PROJECT_NAME, immutableChangeRef.getName()))
