Add StartUpTask timeout errors to pipeline logs

cdapio · Aug 9, 2023 · a274712 · a274712
1 parent 3a07df7
commit a274712
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/cdap-app-fabric/src/main/java/io/cdap/cdap/app/runtime/AbstractProgramRuntimeService.java b/cdap-app-fabric/src/main/java/io/cdap/cdap/app/runtime/AbstractProgramRuntimeService.java
@@ -138,7 +138,7 @@ public final RuntimeInfo run(ProgramDescriptor programDescriptor, ProgramOptions
       } catch (Exception e) {
         controller.failed(e);
         programStateWriter.error(programRunId, e);
-        LOG.error("Exception while trying to run program run {}", programRunId, e);
+        LOG.error("Exception while trying to run program with runID {}", programRunId, e);
       }
     });
     return runtimeInfo;

diff --git a/.../cdap/cdap/internal/app/runtime/distributed/remote/RemoteExecutionTwillRunnerService.java b/.../cdap/cdap/internal/app/runtime/distributed/remote/RemoteExecutionTwillRunnerService.java
@@ -632,6 +632,10 @@ public TwillController create(@Nullable Callable<Void> startupTask, long timeout
 
           // If the startup task failed, publish failure state and delete the program running state
           startupTaskCompletion.whenComplete((res, throwable) -> {
+            Map<String, String> systemArgs = programOpts.getArguments().asMap();
+            LoggingContext loggingContext = LoggingContextHelper.getLoggingContextWithRunId(
+              programRunId, systemArgs);
+            Cancellable restoreContext = LoggingContextAccessor.setLoggingContext(loggingContext);
             if (throwable == null) {
               LOG.debug("Startup task completed for program run {}", programRunId);
             } else {
@@ -649,6 +653,7 @@ public TwillController create(@Nullable Callable<Void> startupTask, long timeout
               }
               programStateWriter.error(programRunId, throwable);
             }
+            restoreContext.cancel();
           });
         } else {
           // Otherwise, complete the startup task immediately