This is an automated email from the ASF dual-hosted git repository.
kfaraz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 323d67a0ac7 Add errorCode to failure type `InternalServerError`
(#16186)
323d67a0ac7 is described below
commit 323d67a0ac734078daf5b6ebcc34690c1a6ff4f4
Author: Kashif Faraz <[email protected]>
AuthorDate: Sun Mar 24 04:24:09 2024 +0530
Add errorCode to failure type `InternalServerError` (#16186)
Changes:
- Use error code `internalServerError` for failures of this type
- Remove the error code argument from `InternalServerError.exception()`
methods
thus fixing a bug in the callers.
---
.../apache/druid/k8s/overlord/taskadapter/K8sTaskAdapter.java | 3 ++-
.../k8s/overlord/taskadapter/PodTemplateTaskAdapter.java | 3 ++-
.../main/java/org/apache/druid/error/InternalServerError.java | 11 +++++------
.../java/org/apache/druid/error/InternalServerErrorTest.java | 6 +++---
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/K8sTaskAdapter.java
b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/K8sTaskAdapter.java
index 4dfb66ba706..c15698803d9 100644
---
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/K8sTaskAdapter.java
+++
b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/K8sTaskAdapter.java
@@ -153,7 +153,8 @@ public abstract class K8sTaskAdapter implements TaskAdapter
com.google.common.base.Optional<InputStream> taskBody =
taskLogs.streamTaskPayload(getTaskId(from).getOriginalTaskId());
if (!taskBody.isPresent()) {
throw InternalServerError.exception(
- "Could not load task payload from deep storage for job [%s]. Check
the overlord logs for any errors in uploading task payload to deep storage.",
+ "Could not load task payload from deep storage for job [%s]."
+ + " Check the overlord logs for any errors in uploading task payload
to deep storage.",
from.getMetadata().getName()
);
}
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateTaskAdapter.java
b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateTaskAdapter.java
index 87a27688902..c22fa5869d8 100644
---
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateTaskAdapter.java
+++
b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateTaskAdapter.java
@@ -188,7 +188,8 @@ public class PodTemplateTaskAdapter implements TaskAdapter
com.google.common.base.Optional<InputStream> taskBody =
taskLogs.streamTaskPayload(getTaskId(from).getOriginalTaskId());
if (!taskBody.isPresent()) {
throw InternalServerError.exception(
- "Could not load task payload from deep storage for job [%s]. Check
the overlord logs for errors uploading task payloads to deep storage.",
+ "Could not load task payload from deep storage for job [%s]."
+ + " Check the overlord logs for errors uploading task payloads to
deep storage.",
from.getMetadata().getName()
);
}
diff --git
a/processing/src/main/java/org/apache/druid/error/InternalServerError.java
b/processing/src/main/java/org/apache/druid/error/InternalServerError.java
index 4ba221920d5..6369546df33 100644
--- a/processing/src/main/java/org/apache/druid/error/InternalServerError.java
+++ b/processing/src/main/java/org/apache/druid/error/InternalServerError.java
@@ -21,25 +21,24 @@ package org.apache.druid.error;
public class InternalServerError extends BaseFailure
{
- public static DruidException exception(String errorCode, String msg,
Object... args)
+ public static DruidException exception(String msg, Object... args)
{
- return exception(null, errorCode, msg, args);
+ return exception(null, msg, args);
}
- public static DruidException exception(Throwable t, String errorCode, String
msg, Object... args)
+ public static DruidException exception(Throwable t, String msg, Object...
args)
{
- return DruidException.fromFailure(new InternalServerError(t, errorCode,
msg, args));
+ return DruidException.fromFailure(new InternalServerError(t, msg, args));
}
private InternalServerError(
Throwable t,
- String errorCode,
String msg,
Object... args
)
{
super(
- errorCode,
+ "internalServerError",
DruidException.Persona.OPERATOR,
DruidException.Category.RUNTIME_FAILURE,
t, msg, args
diff --git
a/processing/src/test/java/org/apache/druid/error/InternalServerErrorTest.java
b/processing/src/test/java/org/apache/druid/error/InternalServerErrorTest.java
index b28296b2c41..13672bea690 100644
---
a/processing/src/test/java/org/apache/druid/error/InternalServerErrorTest.java
+++
b/processing/src/test/java/org/apache/druid/error/InternalServerErrorTest.java
@@ -31,14 +31,14 @@ public class InternalServerErrorTest
@Test
public void testAsErrorResponse()
{
- ErrorResponse errorResponse = new
ErrorResponse(InternalServerError.exception("runtimeFailure", "Internal Server
Error"));
+ ErrorResponse errorResponse = new
ErrorResponse(InternalServerError.exception("Internal Server Error"));
final Map<String, Object> asMap = errorResponse.getAsMap();
MatcherAssert.assertThat(
asMap,
DruidMatchers.mapMatcher(
"error", "druidException",
- "errorCode", "runtimeFailure",
+ "errorCode", "internalServerError",
"persona", "OPERATOR",
"category", "RUNTIME_FAILURE",
"errorMessage", "Internal Server Error"
@@ -52,7 +52,7 @@ public class InternalServerErrorTest
new DruidExceptionMatcher(
DruidException.Persona.OPERATOR,
DruidException.Category.RUNTIME_FAILURE,
- "runtimeFailure"
+ "internalServerError"
).expectMessageContains("Internal Server Error")
);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
