Skip to content

[ML] making test more determinate #40374

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
merged 4 commits into from
Mar 22, 2019
Merged

[ML] making test more determinate #40374

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
667b9e3
[ML] making test more determinate
benwtrent Mar 22, 2019
2569d80
Merge branch 'master' into test/data-frame-fix-failed-test-40368
benwtrent Mar 22, 2019
225d8eb
Merge remote-tracking branch 'upstream/master' into test/data-frame-f…
benwtrent Mar 22, 2019
d78b05f
unmuting test
benwtrent Mar 22, 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
19 changes: 12 additions & 7 deletions ...g/elasticsearch/xpack/dataframe/checkpoint/DataFrameTransformsCheckpointServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ public void testExtractIndexCheckpointsLostPrimaries() {
}
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/40368")
public void testExtractIndexCheckpointsInconsistentGlobalCheckpoints() {
Map<String, long[]> expectedCheckpoints = new HashMap<>();
Set<String> indices = randomUserIndices();
Expand Down Expand Up @@ -141,9 +140,19 @@ private static ShardStats[] createRandomShardStats(Map<String, long[]> expectedC
// we need at least one replica for testing
int numShardCopies = randomIntBetween(2, 4);

int primaryShard = 0;
if (skipPrimaries) {
primaryShard = randomInt(numShardCopies - 1);
}
int inconsistentReplica = -1;
if (inconsistentGlobalCheckpoints) {
inconsistentReplica = randomIntBetween(0, numShardCopies - 1);
List<Integer> replicas = new ArrayList<>(numShardCopies - 1);
for (int i = 0; i < numShardCopies; i++) {
if (primaryShard != i) {
replicas.add(i);
}
}
inconsistentReplica = randomFrom(replicas);
}

// SeqNoStats asserts that checkpoints are logical
Expand All @@ -156,11 +165,7 @@ private static ShardStats[] createRandomShardStats(Map<String, long[]> expectedC

for (int replica = 0; replica < numShardCopies; replica++) {
ShardId shardId = new ShardId(index, shardIndex);
boolean primary = (replica == 0);

if (skipPrimaries) {
primary = randomBoolean();
}
boolean primary = (replica == primaryShard);

Path path = createTempDir().resolve("indices").resolve(index.getUUID()).resolve(String.valueOf(shardIndex));
ShardRouting shardRouting = ShardRouting.newUnassigned(shardId, primary,
Expand Down