Skip to content

Removed old output vars #137

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
merged 1 commit into from
Apr 11, 2023
Merged

Removed old output vars #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
61 changes: 4 additions & 57 deletions cws-engine-service/src/main/java/jpl/cws/engine/CwsExternalTaskThread.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,55 +176,17 @@ private void runTask() {
}
}
catch (Throwable t) {
String msg = "Failed to retrieve and/or parse input variables. Details: " + t.getMessage();
log.error("Error: " + msg, t);

// See if we have any more retries for variable lookup failure
String fieldName = activityId + "_cwsVariableLookupFailRetries";

// Initialize it to 3 if not already set
int variableLookupRetries = 3;

if (task.getVariables().containsKey(fieldName)) {

// It does exist, so read it in
variableLookupRetries = Integer.parseInt((String)task.getVariables().get(fieldName));
}

log.warn("Error: Failed to retrieve input variables from execution listener. " + variableLookupRetries + " retries remaining.");

if (variableLookupRetries > 0) {

// Decrement variable lookup retries
variableLookupRetries--;

// Update in database
setOutputVariable(fieldName, variableLookupRetries + "");

// Allow for this task to be fetched again and wait for the listener to set the input variables
//
// Get retries for this task
int taskRetries = getAndIncrementRetriesForTask(task, cmdInputFields.retries);

// Retry this external task
handleCamundaApiCall(Resolution.HANDLE_FAILURE, task.getId(), "Retrying due to variable lookup failure...", t.toString(), taskRetries, 3000L);
}
else
{
// We got an error and failed to retry this task 3 times, indicating that a critical failure caused the
// variables to never get set. An incident can now be reasonably thrown.

String msg = "Failed to retrieve and/or parse input variables. Details: " + t.getMessage();
log.error("Error: " + msg, t);

// Create an incident
handleCamundaApiCall(Resolution.HANDLE_FAILURE, task.getId(), msg, t.toString(), 0, 0L);
}
// Create an incident
handleCamundaApiCall(Resolution.HANDLE_FAILURE, task.getId(), msg, t.toString(), 0, 0L);

// Don't do anything else with this task -- go to the next one.
return;
}

try {
setOutputVariable("lockedTime", lockedTime);
cmdOutputFields.lockedTime = lockedTime;

boolean success = executeTask(cmdInputFields, cmdOutputFields);
Expand Down Expand Up @@ -565,9 +527,6 @@ private Boolean executeTask(CmdLineInputFields cmdInputFields, CmdLineOutputFiel
int exitValue = resultHandler.getExitValue();
log.info("Command '" + cmdInputFields.command + "' exit code: " + exitValue + "\nRan in " + (t1 - t0) + " ms.");

// putting redundant names here on purpose to reduce operator error
setOutputVariable("exitValue", exitValue + "");
setOutputVariable("exitCode", exitValue + "");
cmdOutputFields.exitCode = exitValue;

// Set "success" variable based on comparison with successExitValue
Expand All @@ -583,14 +542,12 @@ private Boolean executeTask(CmdLineInputFields cmdInputFields, CmdLineOutputFiel
if (!success) {
log.warn("Exit value " + exitValue + " determined to be a FAILURE");
}
setOutputVariable("success", success.toString());
cmdOutputFields.success = success;

// Detect whether a certain event case applies (based on exit code)
//
for (String eventCode : exitCodeEventsMap.keySet()) {
if (new Boolean(Integer.parseInt(eventCode) == exitValue)) {
setOutputVariable("event", exitCodeEventsMap.get(eventCode));
cmdOutputFields.event = exitCodeEventsMap.get(eventCode);
break; // can only be one event
}
Expand All @@ -608,24 +565,14 @@ private Boolean executeTask(CmdLineInputFields cmdInputFields, CmdLineOutputFiel
sortedLines.put(stdErrLine, stdErrLine);
}

// Get trimmed output variable
String outputStr = StringUtils.join(
Collections2.transform(sortedLines.values(), new StripOrderId<String, String>()), '\n');

// trim out the cwsVariable section (if present)
outputStr.replaceAll(CWS_VARS_FROM_STDOUT_REGEX, "");
setOutputVariable("output", outputStr);

// Set stdout output into variable
//
String stdoutStr = StringUtils.join(Collections2.transform(stdOutLines, new StripOrderId<String, String>()), '\n');
setOutputVariable("stdout", stdoutStr);
cmdOutputFields.stdout = stdoutStr;

// Set stderr output into variable
//
String stderrStr = StringUtils.join(Collections2.transform(stdErrLines, new StripOrderId<String, String>()), '\n');
setOutputVariable("stderr", stderrStr);
cmdOutputFields.stderr = stderrStr;

setStdOutVariables(stdOutLines);
Expand Down
10 changes: 0 additions & 10 deletions cws-tasks/src/main/java/jpl/cws/task/CmdLineExecTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,6 @@ public void executeTask() {

CmdLineOutputFields cmdOutputFields = new CmdLineOutputFields();

// putting redundant names here on purpose to reduce operator error
setOutputVariable("exitValue", exitValue + "");
setOutputVariable("exitCode", exitValue + "");
cmdOutputFields.exitCode = exitValue;

// Set "success" variable based on comparison with successExitValue
Expand All @@ -198,14 +195,12 @@ public void executeTask() {
if (!success) {
log.warn("Exit value " + exitValue + " determined to be a FAILURE");
}
setOutputVariable("success", success.toString());
cmdOutputFields.success = success;

// Detect whether a certain event case applies (based on exit code)
//
for (String eventCode : exitCodeEventsMap.keySet()) {
if (new Boolean(Integer.parseInt(eventCode) == exitValue)) {
setOutputVariable("event", exitCodeEventsMap.get(eventCode));
cmdOutputFields.event = exitCodeEventsMap.get(eventCode);
break; // can only be one event
}
Expand All @@ -226,20 +221,15 @@ public void executeTask() {
// Get trimmed output variable
String outputStr = StringUtils.join(
Collections2.transform(sortedLines.values(), new StripOrderId<String, String>()), '\n');
// trim out the cwsVariable section (if present)
outputStr.replaceAll(CWS_VARS_FROM_STDOUT_REGEX, "");
setOutputVariable("output", outputStr);

// Set stdout output into variable
//
String stdoutStr = StringUtils.join(Collections2.transform(stdOutLines, new StripOrderId<String, String>()), '\n');
setOutputVariable("stdout", stdoutStr);
cmdOutputFields.stdout = stdoutStr;

// Set stderr output into variable
//
String stderrStr = StringUtils.join(Collections2.transform(stdErrLines, new StripOrderId<String, String>()), '\n');
setOutputVariable("stderr", stderrStr);
cmdOutputFields.stderr = stderrStr;

setStdOutVariables(stdOutLines);
Expand Down