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

[TEST] Don't lose the actual cause of the exception. 

Original commit: elastic/x-pack-elasticsearch@8720288ef5
This commit is contained in:
Martijn van Groningen 2017-03-27 15:23:06 +02:00
parent c0a6b6741e
commit fc29fd159a
3 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugin/src/test/java/org/elasticsearch/xpack/ml/integration/MlRestTestStateCleaner.java
View File

@ -83,19 +83,18 @@ public class MlRestTestStateCleaner {
if (statusCode != 200) {
logger.error("Got status code " + statusCode + " when closing job " + jobId);
}
} catch (Exception e) {
if (e.getMessage().contains("expected job state [opened], but got [closed]")
|| e.getMessage().contains("expected job state [opened], but got [closing]")) {
logger.debug("job [" + jobId + "] has already been closed", e);
} catch (Exception e1) {
if (e1.getMessage().contains("expected job state [opened], but got [closed]")
|| e1.getMessage().contains("expected job state [opened], but got [closing]")) {
logger.debug("job [" + jobId + "] has already been closed", e1);
} else {
logger.warn("failed to close job [" + jobId + "]. Forcing closed.", e);
logger.warn("failed to close job [" + jobId + "]. Forcing closed.", e1);
try {
adminClient.performRequest("POST", "/_xpack/ml/anomaly_detectors/" + jobId + "/_close?force=true");
throw new RuntimeException("Had to resort to force-closing job, something went wrong?");
} catch (Exception e2) {
throw new RuntimeException("Force-closing job [" + jobId + "] failed.", e2);
}
throw new RuntimeException("Had to resort to force-closing job, something went wrong?", e1);
}
}
int statusCode = adminClient.performRequest("DELETE", "/_xpack/ml/anomaly_detectors/" + jobId).getStatusLine().getStatusCode();

19
plugin/src/test/java/org/elasticsearch/xpack/ml/support/BaseMlIntegTestCase.java
View File

@ -251,19 +251,19 @@ public abstract class BaseMlIntegTestCase extends ESIntegTestCase {
StopDatafeedAction.Response stopResponse =
client.execute(StopDatafeedAction.INSTANCE, new StopDatafeedAction.Request(datafeedId)).get();
assertTrue(stopResponse.isStopped());
} catch (ExecutionException e) {
if (e.getMessage().contains("datafeed already stopped, expected datafeed state [started], but got [stopped]")) {
logger.debug("failed to stop datafeed [" + datafeedId + "], already stopped", e);
} catch (ExecutionException e1) {
if (e1.getMessage().contains("datafeed already stopped, expected datafeed state [started], but got [stopped]")) {
logger.debug("failed to stop datafeed [" + datafeedId + "], already stopped", e1);
} else {
try {
StopDatafeedAction.Request request = new StopDatafeedAction.Request(datafeedId);
request.setForce(true);
StopDatafeedAction.Response stopResponse = client.execute(StopDatafeedAction.INSTANCE, request).get();
assertTrue(stopResponse.isStopped());
throw new RuntimeException("Had to resort to force-stopping datafeed, something went wrong?");
} catch (Exception e2) {
throw new RuntimeException("Force-stopping datafeed [" + datafeedId + "] failed.", e2);
}
throw new RuntimeException("Had to resort to force-stopping datafeed, something went wrong?", e1);
}
}
assertBusy(() -> {
@ -292,10 +292,10 @@ public abstract class BaseMlIntegTestCase extends ESIntegTestCase {
CloseJobAction.Response response =
client.execute(CloseJobAction.INSTANCE, closeRequest).get();
assertTrue(response.isClosed());
} catch (Exception e) {
if (e.getMessage().contains("expected job state [opened], but got [closed]")
|| e.getMessage().contains("expected job state [opened], but got [closing]")) {
logger.debug("job [" + jobId + "] has already been closed", e);
} catch (Exception e1) {
if (e1.getMessage().contains("expected job state [opened], but got [closed]")
|| e1.getMessage().contains("expected job state [opened], but got [closing]")) {
logger.debug("job [" + jobId + "] has already been closed", e1);
} else {
try {
CloseJobAction.Request closeRequest = new CloseJobAction.Request(jobId);
@ -304,11 +304,10 @@ public abstract class BaseMlIntegTestCase extends ESIntegTestCase {
CloseJobAction.Response response =
client.execute(CloseJobAction.INSTANCE, closeRequest).get();
assertTrue(response.isClosed());
throw new RuntimeException("Had to resort to force-closing job, something went wrong?");
} catch (Exception e2) {
throw new RuntimeException("Force-closing datafeed [" + jobId + "] failed.", e2);
}
throw new RuntimeException("Had to resort to force-closing job, something went wrong?", e1);
}
}
assertBusy(() -> {

13
qa/smoke-test-ml-with-security/src/test/java/org/elasticsearch/xpack/ml/integration/MlRestTestStateCleaner.java
View File

@ -83,19 +83,18 @@ public class MlRestTestStateCleaner {
if (statusCode != 200) {
logger.error("Got status code " + statusCode + " when closing job " + jobId);
}
} catch (Exception e) {
if (e.getMessage().contains("expected job state [opened], but got [closed]")
|| e.getMessage().contains("expected job state [opened], but got [closing]")) {
logger.debug("job [" + jobId + "] has already been closed", e);
} catch (Exception e1) {
if (e1.getMessage().contains("expected job state [opened], but got [closed]")
|| e1.getMessage().contains("expected job state [opened], but got [closing]")) {
logger.debug("job [" + jobId + "] has already been closed", e1);
} else {
logger.warn("failed to close job [" + jobId + "]. Forcing closed.", e);
logger.warn("failed to close job [" + jobId + "]. Forcing closed.", e1);
try {
adminClient.performRequest("POST", "/_xpack/ml/anomaly_detectors/" + jobId + "/_close?force=true");
throw new RuntimeException("Had to resort to force-closing job, something went wrong?");
} catch (Exception e2) {
throw new RuntimeException("Force-closing job [" + jobId + "] failed.", e2);
}
throw new RuntimeException("Had to resort to force-closing job, something went wrong?", e1);
}
}
int statusCode = adminClient.performRequest("DELETE", "/_xpack/ml/anomaly_detectors/" + jobId).getStatusLine().getStatusCode();