Fixing bad merge
This commit is contained in:
parent
482fd886be
commit
75c4ee8b38
1 changed files with 0 additions and 64 deletions
|
|
@ -276,70 +276,6 @@ public class HierarchicalShardSyncerTest {
|
||||||
verify(dynamoDBLeaseRefresher, never()).deleteLease(any(Lease.class));
|
verify(dynamoDBLeaseRefresher, never()).deleteLease(any(Lease.class));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testCheckAndCreateLeasesForShardsWithShardList() throws Exception {
|
|
||||||
final List<Shard> shards = constructShardListForGraphA();
|
|
||||||
|
|
||||||
final ArgumentCaptor<Lease> leaseCaptor = ArgumentCaptor.forClass(Lease.class);
|
|
||||||
when(shardDetector.listShards()).thenReturn(shards);
|
|
||||||
when(dynamoDBLeaseRefresher.listLeases()).thenReturn(Collections.emptyList());
|
|
||||||
when(dynamoDBLeaseRefresher.createLeaseIfNotExists(leaseCaptor.capture())).thenReturn(true);
|
|
||||||
|
|
||||||
hierarchicalShardSyncer
|
|
||||||
.checkAndCreateLeaseForNewShards(shards, shardDetector, dynamoDBLeaseRefresher, INITIAL_POSITION_LATEST,
|
|
||||||
cleanupLeasesOfCompletedShards, false, SCOPE);
|
|
||||||
|
|
||||||
final Set<String> expectedShardIds = new HashSet<>(
|
|
||||||
Arrays.asList("shardId-4", "shardId-8", "shardId-9", "shardId-10"));
|
|
||||||
|
|
||||||
final List<Lease> requestLeases = leaseCaptor.getAllValues();
|
|
||||||
final Set<String> requestLeaseKeys = requestLeases.stream().map(Lease::leaseKey).collect(Collectors.toSet());
|
|
||||||
final Set<ExtendedSequenceNumber> extendedSequenceNumbers = requestLeases.stream().map(Lease::checkpoint)
|
|
||||||
.collect(Collectors.toSet());
|
|
||||||
|
|
||||||
assertThat(requestLeases.size(), equalTo(expectedShardIds.size()));
|
|
||||||
assertThat(requestLeaseKeys, equalTo(expectedShardIds));
|
|
||||||
assertThat(extendedSequenceNumbers.size(), equalTo(1));
|
|
||||||
|
|
||||||
extendedSequenceNumbers.forEach(seq -> assertThat(seq, equalTo(ExtendedSequenceNumber.LATEST)));
|
|
||||||
|
|
||||||
verify(shardDetector, never()).listShards();
|
|
||||||
verify(dynamoDBLeaseRefresher, times(expectedShardIds.size())).createLeaseIfNotExists(any(Lease.class));
|
|
||||||
verify(dynamoDBLeaseRefresher, never()).deleteLease(any(Lease.class));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testCheckAndCreateLeasesForShardsWithEmptyShardList() throws Exception {
|
|
||||||
final List<Shard> shards = constructShardListForGraphA();
|
|
||||||
|
|
||||||
final ArgumentCaptor<Lease> leaseCaptor = ArgumentCaptor.forClass(Lease.class);
|
|
||||||
when(shardDetector.listShards()).thenReturn(shards);
|
|
||||||
when(dynamoDBLeaseRefresher.listLeases()).thenReturn(Collections.emptyList());
|
|
||||||
when(dynamoDBLeaseRefresher.createLeaseIfNotExists(leaseCaptor.capture())).thenReturn(true);
|
|
||||||
|
|
||||||
hierarchicalShardSyncer
|
|
||||||
.checkAndCreateLeaseForNewShards(new ArrayList<Shard>(), shardDetector, dynamoDBLeaseRefresher, INITIAL_POSITION_LATEST,
|
|
||||||
cleanupLeasesOfCompletedShards, false, SCOPE);
|
|
||||||
|
|
||||||
final Set<String> expectedShardIds = new HashSet<>(
|
|
||||||
Arrays.asList("shardId-4", "shardId-8", "shardId-9", "shardId-10"));
|
|
||||||
|
|
||||||
final List<Lease> requestLeases = leaseCaptor.getAllValues();
|
|
||||||
final Set<String> requestLeaseKeys = requestLeases.stream().map(Lease::leaseKey).collect(Collectors.toSet());
|
|
||||||
final Set<ExtendedSequenceNumber> extendedSequenceNumbers = requestLeases.stream().map(Lease::checkpoint)
|
|
||||||
.collect(Collectors.toSet());
|
|
||||||
|
|
||||||
assertThat(requestLeases.size(), equalTo(expectedShardIds.size()));
|
|
||||||
assertThat(requestLeaseKeys, equalTo(expectedShardIds));
|
|
||||||
assertThat(extendedSequenceNumbers.size(), equalTo(1));
|
|
||||||
|
|
||||||
extendedSequenceNumbers.forEach(seq -> assertThat(seq, equalTo(ExtendedSequenceNumber.LATEST)));
|
|
||||||
|
|
||||||
verify(shardDetector).listShards();
|
|
||||||
verify(dynamoDBLeaseRefresher, times(expectedShardIds.size())).createLeaseIfNotExists(any(Lease.class));
|
|
||||||
verify(dynamoDBLeaseRefresher, never()).deleteLease(any(Lease.class));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testCheckAndCreateLeasesForNewShardsAtTrimHorizon() throws Exception {
|
public void testCheckAndCreateLeasesForNewShardsAtTrimHorizon() throws Exception {
|
||||||
testCheckAndCreateLeaseForShardsIfMissing(constructShardListForGraphA(), INITIAL_POSITION_TRIM_HORIZON);
|
testCheckAndCreateLeaseForShardsIfMissing(constructShardListForGraphA(), INITIAL_POSITION_TRIM_HORIZON);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue