[TEST] Make sure that there are no relocating shards before taking snapshot
Temporary workaround for #5531
This commit is contained in:
parent
b0beb3c8e1
commit
6354bc4861
|
@ -201,7 +201,9 @@ public class IndicesOptionsTests extends ElasticsearchIntegrationTest {
|
||||||
|
|
||||||
options = IndicesOptions.strict();
|
options = IndicesOptions.strict();
|
||||||
assertAcked(prepareCreate("test2"));
|
assertAcked(prepareCreate("test2"));
|
||||||
ensureYellow();
|
//TODO: temporary work-around for #5531
|
||||||
|
ensureGreen();
|
||||||
|
waitForRelocation();
|
||||||
verify(snapshot("snap3", "test1", "test2").setIndicesOptions(options), false);
|
verify(snapshot("snap3", "test1", "test2").setIndicesOptions(options), false);
|
||||||
verify(restore("snap3", "test1", "test2").setIndicesOptions(options), false);
|
verify(restore("snap3", "test1", "test2").setIndicesOptions(options), false);
|
||||||
}
|
}
|
||||||
|
@ -361,7 +363,9 @@ public class IndicesOptionsTests extends ElasticsearchIntegrationTest {
|
||||||
verify(restore("snap2", "foo*", "bar*").setIndicesOptions(options), false);
|
verify(restore("snap2", "foo*", "bar*").setIndicesOptions(options), false);
|
||||||
|
|
||||||
assertAcked(prepareCreate("barbaz"));
|
assertAcked(prepareCreate("barbaz"));
|
||||||
ensureYellow();
|
//TODO: temporary work-around for #5531
|
||||||
|
ensureGreen();
|
||||||
|
waitForRelocation();
|
||||||
options = IndicesOptions.fromOptions(false, false, true, false);
|
options = IndicesOptions.fromOptions(false, false, true, false);
|
||||||
verify(snapshot("snap3", "foo*", "bar*").setIndicesOptions(options), false);
|
verify(snapshot("snap3", "foo*", "bar*").setIndicesOptions(options), false);
|
||||||
verify(restore("snap3", "foo*", "bar*").setIndicesOptions(options), false);
|
verify(restore("snap3", "foo*", "bar*").setIndicesOptions(options), false);
|
||||||
|
|
Loading…
Reference in New Issue