Minor fixes for Orborus and Worker
This commit is contained in:
@@ -4005,7 +4005,7 @@ func sendWorkerRequest(workflowExecution shuffle.ExecutionRequest, image string,
|
||||
newresp, err := client.Do(req)
|
||||
if err != nil {
|
||||
// Connection refused?
|
||||
log.Printf("[ERROR] Error running worker request to %s (1): %s", streamUrl, err)
|
||||
log.Printf("[ERROR][%s] Error running worker request to %s (1): %s", workflowExecution.ExecutionId, streamUrl, err)
|
||||
|
||||
if strings.Contains(fmt.Sprintf("%s", err), "connection refused") || strings.Contains(fmt.Sprintf("%s", err), "EOF") {
|
||||
workerImage := fmt.Sprintf("ghcr.io/shuffle/shuffle-worker:%s", workerVersion)
|
||||
@@ -4052,7 +4052,7 @@ func sendWorkerRequest(workflowExecution shuffle.ExecutionRequest, image string,
|
||||
debugCommand = fmt.Sprintf("kubectl logs -n %s deployment/shuffle-workers | grep %s", kubernetesNamespace, workflowExecution.ExecutionId)
|
||||
}
|
||||
|
||||
log.Printf("[DEBUG] Ran worker from request with execution ID: %s. Worker URL: %s. DEBUGGING:\n%s", workflowExecution.ExecutionId, streamUrl, debugCommand)
|
||||
log.Printf("[DEBUG][%s] Ran worker from requests. Worker URL: %s. DEBUGGING:\n%s", workflowExecution.ExecutionId, streamUrl, debugCommand)
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
@@ -2022,7 +2022,9 @@ func executionInit(workflowExecution shuffle.WorkflowExecution) error {
|
||||
}
|
||||
|
||||
if len(onpremApps) == 0 {
|
||||
return errors.New(fmt.Sprintf("No apps to handle onprem (%s)", environment))
|
||||
//return errors.New(fmt.Sprintf("No apps to handle onprem (%s)", environment))
|
||||
log.Printf("[INFO][%s] No apps to handle onprem (%s). Returning 200 OK anyway", workflowExecution.ExecutionId, environment)
|
||||
return nil
|
||||
}
|
||||
|
||||
pullOptions := dockerimage.PullOptions{}
|
||||
|
||||
Reference in New Issue
Block a user