Remove workerId parameter from postWorkerError. (#17072)

* Remove workerId parameter from postWorkerError. It was redundant to MSQErrorReport#getTaskId. * Fix javadoc.
apache · Oct 4, 2024 · a975ac9 · a975ac9
1 parent 50a5f9c
commit a975ac9
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 10 deletions.
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/Controller.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/Controller.java
@@ -87,7 +87,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);
 

diff --git a/...ions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerClient.java b/...ions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerClient.java
@@ -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.

diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerImpl.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerImpl.java
@@ -203,7 +203,7 @@ public void run()
         log.warn("%s", logMessage);
 
         if (controllerAlive) {
-          controllerClient.postWorkerError(context.workerId(), errorReport);
+          controllerClient.postWorkerError(errorReport);
         }
 
         if (t != null) {

diff --git a/...age-query/src/main/java/org/apache/druid/msq/indexing/client/IndexerControllerClient.java b/...age-query/src/main/java/org/apache/druid/msq/indexing/client/IndexerControllerClient.java
@@ -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(

diff --git a/...y/src/main/java/org/apache/druid/msq/indexing/error/MSQWarningReportLimiterPublisher.java b/...y/src/main/java/org/apache/druid/msq/indexing/error/MSQWarningReportLimiterPublisher.java
@@ -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);

diff --git a/...re/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestControllerClient.java b/...re/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestControllerClient.java
@@ -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);
   }