Skip to content
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

Jump to bottom

Handle null retention leases in WaitForNoFollowersStep #40477

Merged
merged 2 commits into from
Mar 28, 2019
Merged

Handle null retention leases in WaitForNoFollowersStep #40477

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
49f6ada
Handle null retention leases in WaitForNoFollowersStep
dakrone Mar 26, 2019
d25c720
Add unit test
dakrone Mar 26, 2019
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
9 changes: 7 additions & 2 deletions ...ore/src/main/java/org/elasticsearch/xpack/core/indexlifecycle/WaitForNoFollowersStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@

import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
import java.util.Objects;
import java.util.Optional;

/**
* A step that waits until the index it's used on is no longer a leader index.
Expand Down Expand Up @@ -57,8 +59,11 @@ public void evaluateCondition(IndexMetaData indexMetaData, Listener listener) {

boolean isCurrentlyLeaderIndex = Arrays.stream(indexStats.getShards())
.map(ShardStats::getRetentionLeaseStats)
.flatMap(retentionLeaseStats -> retentionLeaseStats.retentionLeases().leases().stream())
.anyMatch(lease -> CCR_LEASE_KEY.equals(lease.source()));
.map(Optional::ofNullable)
.map(o -> o.flatMap(stats -> Optional.ofNullable(stats.retentionLeases())))
.map(o -> o.flatMap(leases -> Optional.ofNullable(leases.leases())))
.map(o -> o.map(Collection::stream))
.anyMatch(lease -> lease.isPresent() && lease.get().anyMatch(l -> CCR_LEASE_KEY.equals(l.source())));

if (isCurrentlyLeaderIndex) {
listener.onResponse(false, new Info());
Expand Down
36 changes: 36 additions & 0 deletions ...rc/test/java/org/elasticsearch/xpack/core/indexlifecycle/WaitForNoFollowersStepTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,42 @@ public void onFailure(Exception e) {
containsString("this index is a leader index; waiting for all following indices to cease following before proceeding"));
}

public void testNoShardStats() {
WaitForNoFollowersStep step = createRandomInstance();

String indexName = randomAlphaOfLengthBetween(5,10);

int numberOfShards = randomIntBetween(1, 100);
final IndexMetaData indexMetaData = IndexMetaData.builder(indexName)
.settings(settings(Version.CURRENT))
.numberOfShards(numberOfShards)
.numberOfReplicas(randomIntBetween(1, 10))
.build();

ShardStats sStats = new ShardStats(null, mockShardPath(), null, null, null, null);
ShardStats[] shardStats = new ShardStats[1];
shardStats[0] = sStats;
mockIndexStatsCall(step.getClient(), indexName, new IndexStats(indexName, "uuid", shardStats));

final SetOnce<Boolean> conditionMetHolder = new SetOnce<>();
final SetOnce<ToXContentObject> stepInfoHolder = new SetOnce<>();
step.evaluateCondition(indexMetaData, new AsyncWaitStep.Listener() {
@Override
public void onResponse(boolean conditionMet, ToXContentObject infomationContext) {
conditionMetHolder.set(conditionMet);
stepInfoHolder.set(infomationContext);
}

@Override
public void onFailure(Exception e) {
fail("onFailure should not be called in this test, called with exception: " + e.getMessage());
}
});

assertTrue(conditionMetHolder.get());
assertNull(stepInfoHolder.get());
}

public void testFailure() {
WaitForNoFollowersStep step = createRandomInstance();

Expand Down