htwkmooc/poseidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move the error handler to the api querier

Browse Source 
to catch the ws normal close error for all Execute requests
This commit is contained in:
Maximilian Paß
2021-12-09 18:52:16 +01:00
parent 825ebdd3e6
commit dce895faff
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/nomad/api_querier.go
View File

@ -4,6 +4,7 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"github.com/gorilla/websocket"
nomadApi "github.com/hashicorp/nomad/api" nomadApi "github.com/hashicorp/nomad/api"
"github.com/openHPI/poseidon/internal/config" "github.com/openHPI/poseidon/internal/config"
"io" "io"
@ -99,7 +100,10 @@ func (nc *nomadAPIClient) Execute(runnerID string,
return 1, fmt.Errorf("error retrieving allocation info: %w", err) return 1, fmt.Errorf("error retrieving allocation info: %w", err)
} }
exitCode, err := nc.client.Allocations().Exec(ctx, allocation, TaskName, tty, command, stdin, stdout, stderr, nil, nil) exitCode, err := nc.client.Allocations().Exec(ctx, allocation, TaskName, tty, command, stdin, stdout, stderr, nil, nil)
if err != nil { if err != nil && websocket.IsCloseError(err, websocket.CloseNormalClosure) {
log.WithError(err).Info("The exit code could not be received.")
return 0, nil
} else if err != nil {
return 1, fmt.Errorf("error executing command in allocation: %w", err) return 1, fmt.Errorf("error executing command in allocation: %w", err)
} }
return exitCode, nil return exitCode, nil

6
internal/nomad/nomad.go
View File

@ -4,7 +4,6 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"github.com/gorilla/websocket"
nomadApi "github.com/hashicorp/nomad/api" nomadApi "github.com/hashicorp/nomad/api"
"github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/nomad/structs"
"github.com/openHPI/poseidon/internal/config" "github.com/openHPI/poseidon/internal/config"
@ -353,10 +352,7 @@ func (a *APIClient) ExecuteCommand(allocationID string,
return a.executeCommandInteractivelyWithStderr(allocationID, ctx, command, stdin, stdout, stderr) return a.executeCommandInteractivelyWithStderr(allocationID, ctx, command, stdin, stdout, stderr)
} }
exitCode, err := a.apiQuerier.Execute(allocationID, ctx, command, tty, stdin, stdout, stderr) exitCode, err := a.apiQuerier.Execute(allocationID, ctx, command, tty, stdin, stdout, stderr)
if err != nil && websocket.IsCloseError(err, websocket.CloseNormalClosure) { if err != nil {
log.WithError(err).Info("The exit code could not be received.")
return 0, nil
} else if err != nil {
return 1, fmt.Errorf("error executing command in API: %w", err) return 1, fmt.Errorf("error executing command in API: %w", err)
} }
return exitCode, nil return exitCode, nil