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

Put error message from inside the process into the exception that is thrown when the process doesn't start correctly. (#45846) (#45875)

This commit is contained in:
Przemysław Witek 2019-08-23 07:02:50 +02:00 committed by GitHub
parent ba6d72ea9f
commit 2ed19b2c81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/process/MemoryUsageEstimationProcessManager.java
View File

@ -83,7 +83,8 @@ public class MemoryUsageEstimationProcessManager {
onProcessCrash(jobId, processHolder)); onProcessCrash(jobId, processHolder));
processHolder.process = process; processHolder.process = process;
if (process.isProcessAlive() == false) { if (process.isProcessAlive() == false) {
String errorMsg = new ParameterizedMessage("[{}] Error while starting process", jobId).getFormattedMessage(); String errorMsg =
new ParameterizedMessage("[{}] Error while starting process: {}", jobId, process.readError()).getFormattedMessage();
throw ExceptionsHelper.serverError(errorMsg); throw ExceptionsHelper.serverError(errorMsg);
} }
try { try {

3
x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/dataframe/process/MemoryUsageEstimationProcessManagerTests.java
View File

@ -95,6 +95,7 @@ public class MemoryUsageEstimationProcessManagerTests extends ESTestCase {
public void testRunJob_ProcessNotAlive() { public void testRunJob_ProcessNotAlive() {
when(process.isProcessAlive()).thenReturn(false); when(process.isProcessAlive()).thenReturn(false);
when(process.readError()).thenReturn("Error from inside the process");
processManager.runJobAsync(TASK_ID, dataFrameAnalyticsConfig, dataExtractorFactory, listener); processManager.runJobAsync(TASK_ID, dataFrameAnalyticsConfig, dataExtractorFactory, listener);
@ -103,8 +104,10 @@ public class MemoryUsageEstimationProcessManagerTests extends ESTestCase {
assertThat(exception.status(), equalTo(RestStatus.INTERNAL_SERVER_ERROR)); assertThat(exception.status(), equalTo(RestStatus.INTERNAL_SERVER_ERROR));
assertThat(exception.getMessage(), containsString(TASK_ID)); assertThat(exception.getMessage(), containsString(TASK_ID));
assertThat(exception.getMessage(), containsString("Error while starting process")); assertThat(exception.getMessage(), containsString("Error while starting process"));
assertThat(exception.getMessage(), containsString("Error from inside the process"));
verify(process).isProcessAlive(); verify(process).isProcessAlive();
verify(process).readError();
verifyNoMoreInteractions(process, listener); verifyNoMoreInteractions(process, listener);
} }