[ZOOKEEPER-3642] Fix potential data inconsistency due to DIFF sync after partial SNAP sync
@eolivelli @hanm interested to take a look at this, the potential issue is mentioned in the description of the Jira.
@eolivelli do you want to give a look at this given you were tagged?
If no issues I will merge this once we get a green build on per-merge job (I think my nits are addressed - the sleeping in test is not ideal but I would not consider it's blocking).
ok, I will merge after CI is back to good shape.
@hanm I have sent a fix for CI https://github.com/apache/zookeeper/pull/1510
thanks for quick fix on CI issue @eolivelli ; looks like the test needs update to work with latest master. I'll do a rebase if @lvfangmin didn't have a chance to rebase.
thank you @hanm the fix should be pretty simple, ping me when you are ready
[2020-10-21T02:26:03.778Z] [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.8.1:testCompile (default-testCompile) on project zookeeper: Compilation failure
[2020-10-21T02:26:03.778Z] [ERROR] /home/jenkins/jenkins-home/workspace/eper-precommit-github-pr_PR-1224/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java:[1733,17] no suitable method found for assertNotNull(java.lang.String,org.apache.zookeeper.data.Stat)
[2020-10-21T02:26:03.778Z] [ERROR] method org.junit.jupiter.api.Assertions.assertNotNull(java.lang.Object,java.util.function.Supplier<java.lang.String>) is not applicable
[2020-10-21T02:26:03.778Z] [ERROR] (argument mismatch; org.apache.zookeeper.data.Stat cannot be converted to java.util.function.Supplier<java.lang.String>)
[2020-10-21T02:26:03.778Z] [ERROR] method org.junit.jupiter.api.Assertions.assertNotNull(java.lang.Object,java.lang.String) is not applicable
[2020-10-21T02:26:03.778Z] [ERROR] (argument mismatch; org.apache.zookeeper.data.Stat cannot be converted to java.lang.String)
[2020-10-21T02:26:03.778Z] [ERROR]
[2020-10-21T02:26:03.778Z] [ERROR] -> [Help 1]
@eolivelli https://github.com/apache/zookeeper/pull/1515 is rebased version, thanks.