Skip to content

[FLINK-26797][runtime] Hardens ZKCheckpointIDCounterMultiServersTest #19199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
XComp merged 2 commits into from
Apr 1, 2022
Merged

[FLINK-26797][runtime] Hardens ZKCheckpointIDCounterMultiServersTest #19199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cea4347
[FLINK-26797][runtime] Makes the test less strict
XComp Mar 22, 2022
8f24707
[hotfix][runtime] Adds debug logs for FinalRequestProcessor to CI run
XComp Mar 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions .../test/java/org/apache/flink/runtime/checkpoint/ZKCheckpointIDCounterMultiServersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@
import org.junit.Rule;
import org.junit.Test;

import java.util.concurrent.atomic.AtomicLong;

import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.number.OrderingComparison.greaterThan;
import static org.junit.Assert.assertThat;

/** Tests for {@link ZooKeeperCheckpointIDCounter} in a ZooKeeper ensemble. */
Expand Down Expand Up @@ -71,22 +69,14 @@ public void testRecoveredAfterConnectionLoss() throws Exception {
curatorFrameworkWrapper.asCuratorFramework(), listener);
idCounter.start();

AtomicLong localCounter = new AtomicLong(1L);

assertThat(
"ZooKeeperCheckpointIDCounter doesn't properly work.",
idCounter.getAndIncrement(),
is(localCounter.getAndIncrement()));
final long initialID = idCounter.getAndIncrement();

zooKeeperResource.restart();

connectionLossLatch.await();
reconnectedLatch.await();

assertThat(
"ZooKeeperCheckpointIDCounter doesn't properly work after reconnected.",
idCounter.getAndIncrement(),
is(localCounter.getAndIncrement()));
assertThat(idCounter.getAndIncrement(), greaterThan(initialID));
} finally {
curatorFrameworkWrapper.close();
}
Expand Down
5 changes: 5 additions & 0 deletions tools/ci/log4j.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ logger.zookeeper.name = org.apache.zookeeper
logger.zookeeper.level = INFO
logger.zookeeper.additivity = false
logger.zookeeper.appenderRef.zk.ref = ZooKeeperServerAppender
# FinalRequestProcessor in DEBUG mode enables us to see requests being processed by the ZK server
logger.zookeeper_FinalRequestProcessor.name = org.apache.zookeeper.server.FinalRequestProcessor
logger.zookeeper_FinalRequestProcessor.level = DEBUG
logger.zookeeper_FinalRequestProcessor.additivity = false
logger.zookeeper_FinalRequestProcessor.appenderRef.zk.ref = ZooKeeperServerAppender
logger.shaded_zookeeper.name = org.apache.flink.shaded.zookeeper3
logger.shaded_zookeeper.level = INFO
logger.shaded_zookeeper.additivity = false
Expand Down