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

test: fixed deleteAllSchedulers(...) method 

Original commit: elastic/x-pack-elasticsearch@641c8c16b9
This commit is contained in:
Martijn van Groningen 2016-12-27 20:34:05 +01:00
parent b409b72629
commit b94b79a411
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/utils/SchedulerStatusObserver.java
View File

@ -31,7 +31,6 @@ public class SchedulerStatusObserver {
this.clusterService = clusterService;
}
public void waitForStatus(String schedulerId, TimeValue waitTimeout, SchedulerStatus expectedStatus, Consumer<Exception> handler) {
ClusterStateObserver observer =
new ClusterStateObserver(clusterService, LOGGER, threadPool.getThreadContext());

37
elasticsearch/src/test/java/org/elasticsearch/xpack/prelert/action/ScheduledJobsIT.java
View File

@ -5,6 +5,8 @@
*/
package org.elasticsearch.xpack.prelert.action;
import org.elasticsearch.ElasticsearchStatusException;
import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.action.bulk.BulkRequestBuilder;
import org.elasticsearch.action.bulk.BulkResponse;
import org.elasticsearch.action.get.GetResponse;
@ -17,6 +19,7 @@ import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.XContentHelper;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.test.ESIntegTestCase;
import org.elasticsearch.xpack.prelert.PrelertPlugin;
import org.elasticsearch.xpack.prelert.job.AnalysisConfig;
@ -35,6 +38,7 @@ import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
@ -215,31 +219,28 @@ public class ScheduledJobsIT extends ESIntegTestCase {
PrelertMetadata prelertMetadata = metaData.custom(PrelertMetadata.TYPE);
for (Scheduler scheduler : prelertMetadata.getSchedulers().values()) {
String schedulerId = scheduler.getId();
String jobId = scheduler.getJobId();
try {
StopSchedulerAction.Response response =
StopSchedulerAction.Response stopResponse =
client.execute(StopSchedulerAction.INSTANCE, new StopSchedulerAction.Request(schedulerId)).get();
assertTrue(response.isAcknowledged());
assertTrue(stopResponse.isAcknowledged());
} catch (ExecutionException e) {
// CONFLICT is ok, as it means the scheduler has already stopped, which isn't an issue at all.
if (RestStatus.CONFLICT != ExceptionsHelper.status(e.getCause())) {
throw new RuntimeException(e);
}
}
assertBusy(() -> {
GetSchedulersStatsAction.Response r = null;
try {
GetSchedulersStatsAction.Request request = new GetSchedulersStatsAction.Request(jobId);
r = client.execute(GetSchedulersStatsAction.INSTANCE, request).get();
} catch (Exception e) {
fail();
}
GetSchedulersStatsAction.Request request = new GetSchedulersStatsAction.Request(schedulerId);
GetSchedulersStatsAction.Response r = client.execute(GetSchedulersStatsAction.INSTANCE, request).get();
assertThat(r.getResponse().results().get(0).getSchedulerStatus(), equalTo(SchedulerStatus.STOPPED));
} catch (InterruptedException | ExecutionException e) {
throw new RuntimeException(e);
}
});
} catch (Exception e) {
// ignore
}
try {
DeleteSchedulerAction.Response response =
DeleteSchedulerAction.Response deleteResponse =
client.execute(DeleteSchedulerAction.INSTANCE, new DeleteSchedulerAction.Request(schedulerId)).get();
assertTrue(response.isAcknowledged());
} catch (Exception e) {
// ignore
}
assertTrue(deleteResponse.isAcknowledged());
}
}