honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix SnapshotLifecycleServiceTests.testPolicyCRUD (#51653) (#51755) 

(cherry picked from commit 8f9a87fa576a8a1c6ea3efb29bf1296d50d89ace)
Signed-off-by: Andrei Dan <andrei.dan@elastic.co>
This commit is contained in:
Andrei Dan 2020-01-31 18:17:38 +00:00 committed by GitHub
parent 227621dd13
commit 20f47b14b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SnapshotLifecycleServiceTests.java
View File

@ -31,6 +31,7 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
@ -40,6 +41,7 @@ import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.hasItem;
public class SnapshotLifecycleServiceTests extends ESTestCase { public class SnapshotLifecycleServiceTests extends ESTestCase {
@ -150,7 +152,6 @@ public class SnapshotLifecycleServiceTests extends ESTestCase {
* Test new policies getting scheduled correctly, updated policies also being scheduled, * Test new policies getting scheduled correctly, updated policies also being scheduled,
* and deleted policies having their schedules cancelled. * and deleted policies having their schedules cancelled.
*/ */
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/44997")
public void testPolicyCRUD() throws Exception { public void testPolicyCRUD() throws Exception {
ClockMock clock = new ClockMock(); ClockMock clock = new ClockMock();
final AtomicInteger triggerCount = new AtomicInteger(0); final AtomicInteger triggerCount = new AtomicInteger(0);
@ -206,13 +207,20 @@ public class SnapshotLifecycleServiceTests extends ESTestCase {
sls.clusterChanged(event); sls.clusterChanged(event);
assertThat(sls.getScheduler().scheduledJobIds(), equalTo(Collections.singleton("foo-2"))); assertThat(sls.getScheduler().scheduledJobIds(), equalTo(Collections.singleton("foo-2")));
CopyOnWriteArrayList<String> triggeredJobs = new CopyOnWriteArrayList<>();
trigger.set(e -> { trigger.set(e -> {
// Make sure the job got updated triggeredJobs.add(e.getJobName());
assertThat(e.getJobName(), equalTo("foo-2"));
triggerCount.incrementAndGet(); triggerCount.incrementAndGet();
}); });
clock.fastForwardSeconds(1); clock.fastForwardSeconds(1);
// Let's make sure the job got updated
// We don't simply assert that triggeredJobs has one element with value "foo-2" because of a race condition that can see the
// list containing <foo-2, foo-1>. This can happen because when we update the policy to version 2 (ie. to foo-2) we will
// cancel the existing policy (foo-1) without waiting for the thread executing foo-1 to actually interrupt
// (see org.elasticsearch.common.util.concurrent.FutureUtils#cancel) which means that foo-1 could actually get to be
// rescheduled and re-run before it is indeed cancelled.
assertBusy(() -> assertThat(triggeredJobs, hasItem("foo-2")));
assertBusy(() -> assertThat(triggerCount.get(), greaterThan(currentCount))); assertBusy(() -> assertThat(triggerCount.get(), greaterThan(currentCount)));
final int currentCount2 = triggerCount.get(); final int currentCount2 = triggerCount.get();