From 71b6d03540d2b3827ac60d76fbabd0f486782cd8 Mon Sep 17 00:00:00 2001 From: MDeLuise <66636702+MDeLuise@users.noreply.github.com> Date: Mon, 30 Jan 2023 15:45:54 +0100 Subject: [PATCH] Add step name and step index --- .../engine/commons/operation/DefaultTargetReader.java | 7 +++++-- .../engine/commons/operation/DefaultTargetWriter.java | 7 +++++-- .../commons/wrappers/StepContextPropertyNames.java | 5 +++++ .../job/engine/commons/wrappers/StepContextWrapper.java | 9 +++++++++ .../jbatch/driver/utils/JobDefinitionBuildUtils.java | 5 +++++ 5 files changed, 29 insertions(+), 4 deletions(-) diff --git a/job-engine/commons/src/main/java/org/eclipse/kapua/job/engine/commons/operation/DefaultTargetReader.java b/job-engine/commons/src/main/java/org/eclipse/kapua/job/engine/commons/operation/DefaultTargetReader.java index 1bbbc85a5b0..5320ea93993 100644 --- a/job-engine/commons/src/main/java/org/eclipse/kapua/job/engine/commons/operation/DefaultTargetReader.java +++ b/job-engine/commons/src/main/java/org/eclipse/kapua/job/engine/commons/operation/DefaultTargetReader.java @@ -79,7 +79,10 @@ public void open(Serializable arg0) throws Exception { JobLogger jobLogger = jobContextWrapper.getJobLogger(); jobLogger.setClassLog(LOG); - jobLogger.info("Opening cursor..."); + int stepIndex = stepContextWrapper.getStepIndex(); + String stepName = stepContextWrapper.getKapuaStepName(); + + jobLogger.info("Reading target chunk. Step:{} (index:{})...", stepName, stepIndex); // // Job Id and JobTarget status filtering @@ -107,7 +110,7 @@ public void open(Serializable arg0) throws Exception { // Wrap the JobTargets in a wrapper object to store additional informations jobTargets.getItems().forEach(jt -> wrappedJobTargets.add(new JobTargetWrapper(jt))); - jobLogger.info("Opening cursor... DONE!"); + jobLogger.info("Reading target chunk. Step:{} (index:{})...DONE", stepName, stepIndex); } @Override diff --git a/job-engine/commons/src/main/java/org/eclipse/kapua/job/engine/commons/operation/DefaultTargetWriter.java b/job-engine/commons/src/main/java/org/eclipse/kapua/job/engine/commons/operation/DefaultTargetWriter.java index abe7e47fd01..73e0d5ab899 100644 --- a/job-engine/commons/src/main/java/org/eclipse/kapua/job/engine/commons/operation/DefaultTargetWriter.java +++ b/job-engine/commons/src/main/java/org/eclipse/kapua/job/engine/commons/operation/DefaultTargetWriter.java @@ -61,7 +61,10 @@ public void writeItems(List items) throws Exception { JobLogger jobLogger = jobContextWrapper.getJobLogger(); jobLogger.setClassLog(LOG); - jobLogger.info("Writing items..."); + int stepIndex = stepContextWrapper.getStepIndex(); + String stepName = stepContextWrapper.getKapuaStepName(); + + jobLogger.info("Writing chunk results. Step:{} (index:{})...", stepName, stepIndex); for (Object item : items) { JobTargetWrapper processedWrappedJobTarget = (JobTargetWrapper) item; @@ -96,6 +99,6 @@ public void writeItems(List items) throws Exception { } } - jobLogger.info("Writing items... DONE!"); + jobLogger.info("Writing chunk results. Step:{} (index:{})... DONE!", stepName, stepIndex); } } diff --git a/job-engine/commons/src/main/java/org/eclipse/kapua/job/engine/commons/wrappers/StepContextPropertyNames.java b/job-engine/commons/src/main/java/org/eclipse/kapua/job/engine/commons/wrappers/StepContextPropertyNames.java index 89b4ae10e38..df58d64edcd 100644 --- a/job-engine/commons/src/main/java/org/eclipse/kapua/job/engine/commons/wrappers/StepContextPropertyNames.java +++ b/job-engine/commons/src/main/java/org/eclipse/kapua/job/engine/commons/wrappers/StepContextPropertyNames.java @@ -28,4 +28,9 @@ public interface StepContextPropertyNames { * @since 1.0.0 */ String STEP_NEXT_INDEX = "step.nextStepIndex"; + + /** + * @since 2.0.0 + */ + String STEP_NAME = "step.name"; } diff --git a/job-engine/commons/src/main/java/org/eclipse/kapua/job/engine/commons/wrappers/StepContextWrapper.java b/job-engine/commons/src/main/java/org/eclipse/kapua/job/engine/commons/wrappers/StepContextWrapper.java index a31c34acb8d..8e39b5b96ab 100644 --- a/job-engine/commons/src/main/java/org/eclipse/kapua/job/engine/commons/wrappers/StepContextWrapper.java +++ b/job-engine/commons/src/main/java/org/eclipse/kapua/job/engine/commons/wrappers/StepContextWrapper.java @@ -152,4 +152,13 @@ public Exception getException() { public Metric[] getMetrics() { return stepContext.getMetrics(); } + + public String getKapuaStepName() { + Properties stepContextProperties = stepContext.getProperties(); + String stepName = stepContextProperties.getProperty(StepContextPropertyNames.STEP_NAME); + if (Strings.isNullOrEmpty(stepName)) { + throw KapuaRuntimeException.internalError("stepName is not available in the StepContext.properties"); + } + return stepName; + } } diff --git a/job-engine/jbatch/src/main/java/org/eclipse/kapua/job/engine/jbatch/driver/utils/JobDefinitionBuildUtils.java b/job-engine/jbatch/src/main/java/org/eclipse/kapua/job/engine/jbatch/driver/utils/JobDefinitionBuildUtils.java index f225899c074..9209e08f100 100644 --- a/job-engine/jbatch/src/main/java/org/eclipse/kapua/job/engine/jbatch/driver/utils/JobDefinitionBuildUtils.java +++ b/job-engine/jbatch/src/main/java/org/eclipse/kapua/job/engine/jbatch/driver/utils/JobDefinitionBuildUtils.java @@ -128,6 +128,11 @@ public static JSLProperties buildStepProperties(@NotNull JobStepDefinition jobSt jslStepIndexProperty.setValue(String.valueOf(jobStep.getStepIndex())); jslPropertyList.add(jslStepIndexProperty); + Property jslStepNameProperty = new Property(); + jslStepNameProperty.setName(StepContextPropertyNames.STEP_NAME); + jslStepNameProperty.setValue(jobStep.getName()); + jslPropertyList.add(jslStepNameProperty); + if (hasNext) { Property jslStepNextIndexProperty = new Property(); jslStepNextIndexProperty.setName(StepContextPropertyNames.STEP_NEXT_INDEX);