Skip to content

Fix the error message of the exception handle #825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hellolittlej wants to merge 1 commit into
base: master
Choose a base branch
from
+59 −6
Open

Fix the error message of the exception handle #825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ...in/java/io/mantisrx/server/master/resourcecluster/TaskExecutorTaskCancelledException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
package io.mantisrx.server.master.resourcecluster;

import io.mantisrx.server.core.domain.WorkerId;

import io.mantisrx.shaded.com.fasterxml.jackson.databind.JsonNode;
import io.mantisrx.shaded.com.fasterxml.jackson.databind.ObjectMapper;
import lombok.Getter;

/**
Expand All @@ -25,6 +28,7 @@
@Getter
public class TaskExecutorTaskCancelledException extends Exception {
private static final long serialVersionUID = 1L;
private static final ObjectMapper mapper = new ObjectMapper();

private final WorkerId workerId;

Expand All @@ -38,4 +42,12 @@ public synchronized Throwable fillInStackTrace() {
// Do not include stack trace to be returned to clients
return this;
}

/**
* Serializes the full exception object including workerId to JsonNode.
* @return JsonNode representation of this exception
*/
public JsonNode toJsonNode() {
return mapper.valueToTree(this);
}
}
35 changes: 31 additions & 4 deletions ...is-control-plane-server/src/main/java/io/mantisrx/master/api/akka/route/v1/BaseRoute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import io.mantisrx.server.master.resourcecluster.RequestThrottledException;
import io.mantisrx.server.master.resourcecluster.ResourceCluster.TaskExecutorNotFoundException;
import io.mantisrx.server.master.resourcecluster.TaskExecutorTaskCancelledException;
import io.mantisrx.shaded.com.fasterxml.jackson.databind.JsonNode;
import io.mantisrx.shaded.com.fasterxml.jackson.databind.node.JsonNodeFactory;
import io.mantisrx.shaded.com.fasterxml.jackson.databind.node.ObjectNode;
import io.mantisrx.shaded.com.fasterxml.jackson.databind.ser.FilterProvider;
Expand Down Expand Up @@ -304,6 +305,15 @@ protected String generateFailureResponsePayload(String errorMsg, long requestId)
return node.toString();
}

protected String generateFailureResponsePayload(JsonNode errorMsgNode, long requestId) {
ObjectNode node = JsonNodeFactory.instance.objectNode();
node.put("time", System.currentTimeMillis());
node.put("host", this.hostName);
node.set("error", errorMsgNode);
node.put("requestId", requestId);
return node.toString();
}

FilterProvider parseFilter(String fields, String target) {
if (Strings.isNullOrEmpty(fields)) {
return null;
Expand Down Expand Up @@ -351,18 +361,31 @@ protected <T> Route withFuture(CompletableFuture<T> tFuture) {
throwable -> {
if (throwable instanceof TaskExecutorNotFoundException) {
MasterApiMetrics.getInstance().incrementResp4xx();
return complete(StatusCodes.NOT_FOUND);
return complete(
StatusCodes.NOT_FOUND,
HttpEntities.create(
ContentTypes.APPLICATION_JSON,
generateFailureResponsePayload(throwable.getMessage(), -1)));
}

if (throwable instanceof RequestThrottledException) {
MasterApiMetrics.getInstance().incrementResp4xx();
MasterApiMetrics.getInstance().incrementThrottledRequestCount();
return complete(StatusCodes.TOO_MANY_REQUESTS);
return complete(
StatusCodes.TOO_MANY_REQUESTS,
HttpEntities.create(
ContentTypes.APPLICATION_JSON,
generateFailureResponsePayload(throwable.getMessage(), -1)));
}

if (throwable instanceof TaskExecutorTaskCancelledException) {
MasterApiMetrics.getInstance().incrementResp4xx();
return complete(StatusCodes.NOT_ACCEPTABLE, throwable, Jackson.marshaller() );
TaskExecutorTaskCancelledException ex = (TaskExecutorTaskCancelledException) throwable;
return complete(
StatusCodes.NOT_ACCEPTABLE,
HttpEntities.create(
ContentTypes.APPLICATION_JSON,
generateFailureResponsePayload(ex.toJsonNode(), -1)));
}

if (throwable instanceof AskTimeoutException) {
Expand All @@ -371,7 +394,11 @@ protected <T> Route withFuture(CompletableFuture<T> tFuture) {

MasterApiMetrics.getInstance().incrementResp5xx();
logger.error("withFuture error: ", throwable);
return complete(StatusCodes.INTERNAL_SERVER_ERROR, throwable, Jackson.marshaller());
return complete(
StatusCodes.INTERNAL_SERVER_ERROR,
HttpEntities.create(
ContentTypes.APPLICATION_JSON,
generateFailureResponsePayload(throwable.getMessage(), -1)));
},
r -> complete(StatusCodes.OK, r, Jackson.marshaller())));
}
Expand Down
18 changes: 16 additions & 2 deletions ...t/java/io/mantisrx/master/api/akka/route/v1/ResourceClustersLeaderExclusiveRouteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
import io.mantisrx.server.master.resourcecluster.TaskExecutorReport;
import io.mantisrx.server.master.resourcecluster.TaskExecutorTaskCancelledException;
import java.io.IOException;

import io.mantisrx.shaded.com.fasterxml.jackson.databind.JsonNode;
import io.mantisrx.shaded.com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.ArgumentMatchers;
Expand Down Expand Up @@ -71,10 +74,21 @@ public void testGetTaskExecutorStateWithCancelledWorker() throws IOException {
);
String encoded = serializer.toJson(heartbeat);

testRoute.run(
String response = testRoute.run(
HttpRequest.POST("/api/v1/resourceClusters/myCluster/actions/heartBeatFromTaskExecutor")
.withEntity(HttpEntities.create(ContentTypes.APPLICATION_JSON, encoded)))
.assertStatusCode(StatusCodes.NOT_ACCEPTABLE)
.assertEntity(serializer.toJson(err));
.entityString();

// Parse response and verify the error field contains the exception
ObjectMapper mapper = new ObjectMapper();
JsonNode responseNode = mapper.readTree(response);
JsonNode errorNode = responseNode.get("error");

String expectedError = serializer.toJson(err);
String actualError = mapper.writeValueAsString(errorNode);

assert actualError.equals(expectedError) :
String.format("Expected error: %s, but got: %s", expectedError, actualError);
}
}
Loading