From 68c831c2e6647e63f659a2a5e4465b8a3da9ccb8 Mon Sep 17 00:00:00 2001 From: furq-aws Date: Thu, 16 Mar 2023 04:52:56 -0700 Subject: [PATCH] Fix flaky HashRangesAreAlwaysComplete test 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 d66217ab..6e31f733 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); boolean isHoleInHashRanges = periodicShardSyncManager.hasHoleInLeases(streamIdentifier, leases).isPresent(); if (isHoleInHashRanges) {