From 0627ba50bbde852c7d48fc5eb5b51bcf285a37a5 Mon Sep 17 00:00:00 2001 From: furq-aws <127275086+furq-aws@users.noreply.github.com> Date: Wed, 22 Mar 2023 09:33:28 -0700 Subject: [PATCH] Fix flaky HashRangesAreAlwaysComplete test (#1066) Updates depth value for Merge and Reshard with some In-Progress Parents tests to prevent invalid hierarchy trees. --- .../kinesis/coordinator/PeriodicShardSyncManagerTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/coordinator/PeriodicShardSyncManagerTest.java b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/coordinator/PeriodicShardSyncManagerTest.java index a2047a6b..9f8b34ac 100644 --- a/amazon-kinesis-client/src/test/java/software/amazon/kinesis/coordinator/PeriodicShardSyncManagerTest.java +++ b/amazon-kinesis-client/src/test/java/software/amazon/kinesis/coordinator/PeriodicShardSyncManagerTest.java @@ -58,6 +58,8 @@ import static software.amazon.kinesis.leases.LeaseManagementConfig.DEFAULT_CONSE public class PeriodicShardSyncManagerTest { + private static final int MAX_DEPTH_WITH_IN_PROGRESS_PARENTS = 1; + private StreamIdentifier streamIdentifier; private PeriodicShardSyncManager periodicShardSyncManager; @Mock @@ -446,7 +448,7 @@ public class PeriodicShardSyncManagerTest { for (int i = 0; i < 1000; i++) { int maxInitialLeaseCount = 100; List leases = generateInitialLeases(maxInitialLeaseCount); - reshard(leases, 5, ReshardType.MERGE, maxInitialLeaseCount, true); + reshard(leases, MAX_DEPTH_WITH_IN_PROGRESS_PARENTS, ReshardType.MERGE, maxInitialLeaseCount, true); Collections.shuffle(leases); Assert.assertFalse(periodicShardSyncManager.hasHoleInLeases(streamIdentifier, leases).isPresent()); } @@ -457,7 +459,7 @@ public class PeriodicShardSyncManagerTest { for (int i = 0; i < 1000; i++) { int maxInitialLeaseCount = 100; List leases = generateInitialLeases(maxInitialLeaseCount); - reshard(leases, 5, ReshardType.ANY, maxInitialLeaseCount, true); + reshard(leases, MAX_DEPTH_WITH_IN_PROGRESS_PARENTS, ReshardType.ANY, maxInitialLeaseCount, true); Collections.shuffle(leases); Assert.assertFalse(periodicShardSyncManager.hasHoleInLeases(streamIdentifier, leases).isPresent()); }