marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Orborus worker override fixes

Browse Source
This commit is contained in:
Frikky
2024-10-01 10:15:54 +02:00
parent 14c61e6b36
commit 7b99a98d03
1 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
functions/onprem/orborus/orborus.go
+25 -11
View File
@@ -724,6 +724,8 @@ func buildEnvVars(envMap map[string]string) []corev1.EnvVar {
} }
func handleBackendImageDownload(ctx context.Context, images string) error { func handleBackendImageDownload(ctx context.Context, images string) error {
// Replicate images with lowercase, as the name may be wrong // Replicate images with lowercase, as the name may be wrong
// Most of the time lowercase is correct. Swapping to have that first // Most of the time lowercase is correct. Swapping to have that first
originalImages := images originalImages := images
@@ -731,9 +733,11 @@ func handleBackendImageDownload(ctx context.Context, images string) error {
// Remove the image // Remove the image
handled := []string{} handled := []string{}
log.Printf("[DEBUG] Should remove existing image (s): %s", images) log.Printf("[DEBUG] Should remove existing image (s): %s. Waiting 30 seconds to ensure backend has the latest images built and ready to distribute.", images)
removeOptions := image.RemoveOptions{} removeOptions := image.RemoveOptions{}
time.Sleep(time.Duration(30) * time.Second)
newImages := []string{} newImages := []string{}
for _, image := range strings.Split(images, ",") { for _, image := range strings.Split(images, ",") {
image = strings.TrimSpace(image) image = strings.TrimSpace(image)
@@ -2110,12 +2114,9 @@ func main() {
if len(incRequest.ExecutionArgument) > 0 { if len(incRequest.ExecutionArgument) > 0 {
// FIXME: Wait X seconds before running this as the image build may not be done yet. This is shitty, but may be ok to do in Orborus. Easy fix for the future: Just let it run through jobs 5-10 times before actually picking it up // FIXME: Wait X seconds before running this as the image build may not be done yet. This is shitty, but may be ok to do in Orborus. Easy fix for the future: Just let it run through jobs 5-10 times before actually picking it up
//time.Sleep(time.Duration(25) * time.Second)
err = handleBackendImageDownload(ctx, incRequest.ExecutionArgument) // Run after 25 seconds in the goroutine instead
if err != nil { go handleBackendImageDownload(ctx, incRequest.ExecutionArgument)
log.Printf("[ERROR] Failed handling image delete -> download: %s", err)
}
} else { } else {
log.Printf("[ERROR] No image name provided for download. Removing job from queue.") log.Printf("[ERROR] No image name provided for download. Removing job from queue.")
} }
@@ -3656,13 +3657,26 @@ func sendWorkerRequest(workflowExecution shuffle.ExecutionRequest, image string,
} }
} }
if len(workerServerUrl) > 0 { if strings.Contains(streamUrl, "shuffler.io") || strings.Contains(streamUrl, "localhost") || strings.Contains(streamUrl, "127.0.0.1") || strings.Contains(streamUrl, "shuffle-backend") {
streamUrl = fmt.Sprintf("%s:33333/api/v1/execute", workerServerUrl)
// Specific to debugging
if len(workerServerUrl) == 0 {
log.Printf("[INFO] Using default worker server url as previous is invalid: %s", streamUrl)
}
streamUrl = fmt.Sprintf("http://shuffle-workers:33333/api/v1/execute")
} }
if strings.Contains(streamUrl, "shuffler.io") || strings.Contains(streamUrl, "localhost") || strings.Contains(streamUrl, "shuffle-backend") { if len(workerServerUrl) > 0 {
log.Printf("[INFO] Using default worker server url as previous is invalid: %s", streamUrl) // Check if a port is supplied or not
streamUrl = fmt.Sprintf("http://shuffle-workers:33333/api/v1/execute") if strings.Contains(workerServerUrl, "/api/v1/execute") {
streamUrl = workerServerUrl
} else {
streamUrl = fmt.Sprintf("%s/api/v1/execute", workerServerUrl)
if !strings.Contains(workerServerUrl, ":") {
streamUrl = fmt.Sprintf("%s:33333/api/v1/execute", workerServerUrl)
}
}
} }
client := &http.Client{} client := &http.Client{}