Skip to content

Merge Release v2.56.0 to Main #996

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 5 commits into from
Feb 21, 2024
Merged

Merge Release v2.56.0 to Main #996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b7ae172
ONECOND-2298-Improve logging to debug http task retry
sangeetanadgir Nov 22, 2023
dc8d31c
ONECOND-2298
sangeetanadgir Nov 22, 2023
0b5bf0f
Merge pull request #992 from d3sw/ONECOND-2298
pradeeppalat01 Dec 5, 2023
758648a
ONECOND-2310
pradeeppalat01 Jan 29, 2024
747624c
Merge pull request #993 from d3sw/ONECOND-2310
pradeeppalat01 Jan 29, 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
5 changes: 2 additions & 3 deletions contribs/src/main/java/com/netflix/conductor/contribs/http/GenericHttpTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ HttpResponse httpCall(Input input, Task task, Workflow workflow, WorkflowExecuto
response.headers = cr.getHeaders();
return response;
} catch (UniformInterfaceException ex) {
logger.error(ex.getMessage(), ex);
logger.error("HTTP task failed for workflowId{}, taskId {}, taskRefname {}, url {}, errorMessage {}", workflow.getWorkflowId(), task.getTaskId(), task.getReferenceTaskName(), input.getUri(), ex.getMessage());
ClientResponse cr = ex.getResponse();
logger.error("Status Code: {}", cr.getStatus());
if (cr.getStatus() > 199 && cr.getStatus() < 300) {
Expand All @@ -204,11 +204,10 @@ HttpResponse httpCall(Input input, Task task, Workflow workflow, WorkflowExecuto
return response;
} else {
String reason = cr.getEntity(String.class);
logger.error(reason, ex);
throw new Exception(reason);
}
} catch (Exception ex) {
logger.error(ex.getMessage(), ex);
logger.error("HTTP task failed for workflowId{}, taskId {}, taskRefname {}, url {}, errorMessage {}", workflow.getWorkflowId(), task.getTaskId(), task.getReferenceTaskName(), input.getUri(), ex.getMessage());
response.body = null;
response.headers = null;
response.statusCode = -1;
Expand Down
4 changes: 3 additions & 1 deletion core/src/main/java/com/netflix/conductor/core/execution/WorkflowSweeper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,9 @@ public void sweep(List<String> workflowIds, WorkflowExecutor executor) throws Ex

Future<?> future = es.submit(() -> {
NDC.push("sweep-" + UUID.randomUUID().toString());
logger.debug("Calling decider from sweeper for workflow {}", workflowId);
if (logger.isDebugEnabled()) {
logger.debug("Calling decider from sweeper for workflow {}", workflowId);
}
try {

WorkflowContext ctx = new WorkflowContext(config.getAppId());
Expand Down