Skip to content

Remove workerId parameter from postWorkerError. #17072

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

Merged
gianm merged 2 commits into from
Sep 17, 2024
Merged

Remove workerId parameter from postWorkerError. #17072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac018f1
Remove workerId parameter from postWorkerError.
gianm Sep 16, 2024
63582e7
Fix javadoc.
gianm Sep 17, 2024
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
2 changes: 1 addition & 1 deletion extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ void updatePartialKeyStatisticsInformation(
* taskId, not by query/stage/worker, because system errors are associated
* with a task rather than a specific query/stage/worker execution context.
*
* @see ControllerClient#postWorkerError(String, MSQErrorReport)
* @see ControllerClient#postWorkerError(MSQErrorReport)
*/
void workerError(MSQErrorReport errorReport);

Expand Down
5 changes: 1 addition & 4 deletions ...ions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,7 @@ void postResultsComplete(
/**
* Client side method to inform the controller that the error has occured in the given worker.
*/
void postWorkerError(
String workerId,
MSQErrorReport errorWrapper
) throws IOException;
void postWorkerError(MSQErrorReport errorWrapper) throws IOException;

/**
* Client side method to inform the controller about the warnings generated by the given worker.
Expand Down
2 changes: 1 addition & 1 deletion extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ public void run()
log.warn("%s", logMessage);

if (controllerAlive) {
controllerClient.postWorkerError(context.workerId(), errorReport);
controllerClient.postWorkerError(errorReport);
}

if (t != null) {
Expand Down
4 changes: 2 additions & 2 deletions ...age-query/src/main/java/org/apache/druid/msq/indexing/client/IndexerControllerClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,11 @@ public void postResultsComplete(StageId stageId, int workerNumber, @Nullable Obj
}

@Override
public void postWorkerError(String workerId, MSQErrorReport errorWrapper) throws IOException
public void postWorkerError(MSQErrorReport errorWrapper) throws IOException
{
final String path = StringUtils.format(
"/workerError/%s",
StringUtils.urlEncode(workerId)
StringUtils.urlEncode(errorWrapper.getTaskId())
);

doRequest(
Expand Down
2 changes: 1 addition & 1 deletion ...y/src/main/java/org/apache/druid/msq/indexing/error/MSQWarningReportLimiterPublisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public void publishException(int stageNumber, Throwable e)
// Send the warning as an error if it is disallowed altogether
if (criticalWarningCodes.contains(errorCode)) {
try {
controllerClient.postWorkerError(workerId, MSQErrorReport.fromException(workerId, host, stageNumber, e));
controllerClient.postWorkerError(MSQErrorReport.fromException(workerId, host, stageNumber, e));
}
catch (IOException postException) {
throw new RE(postException, "Failed to post the worker error [%s] to the controller", errorCode);
Expand Down
2 changes: 1 addition & 1 deletion ...re/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestControllerClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public void postResultsComplete(StageId stageId, int workerNumber, @Nullable Obj
}

@Override
public void postWorkerError(String workerId, MSQErrorReport errorWrapper)
public void postWorkerError(MSQErrorReport errorWrapper)
{
controller.workerError(errorWrapper);
}
Expand Down