Skip to content

Refactor Server ResizeWaitHandler #873

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 2 commits into from
Oct 10, 2024
Merged

Refactor Server ResizeWaitHandler #873

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12fc995
Refactor server resizeWaitHandler
vicentepinto98 Oct 10, 2024
66ef57f
Change after review
vicentepinto98 Oct 10, 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
11 changes: 6 additions & 5 deletions core/wait/wait.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@ type AsyncActionCheck[T any] func() (waitFinished bool, response *T, err error)

// AsyncActionHandler handles waiting for a specific async action to be finished.
type AsyncActionHandler[T any] struct {
checkFn AsyncActionCheck[T]
sleepBeforeWait time.Duration
throttle time.Duration
timeout time.Duration
tempErrRetryLimit int
checkFn AsyncActionCheck[T]
sleepBeforeWait time.Duration
throttle time.Duration
timeout time.Duration
tempErrRetryLimit int
IntermediateStateReached bool
}

// New initializes an AsyncActionHandler
Expand Down
46 changes: 16 additions & 30 deletions services/iaasalpha/wait/wait.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,47 +100,33 @@ func CreateServerWaitHandler(ctx context.Context, a APIClientInterface, projectI
return handler
}

// ResizingServerWaitHandler will wait for a server to be resizing
// Ii is an intermediate step inside the ResizeServerWaitHandler
func resizingServerWaitHandler(ctx context.Context, a APIClientInterface, projectId, serverId string) *wait.AsyncActionHandler[iaasalpha.Server] {
// ResizeServerWaitHandler will wait for server resize
// It checks for an intermediate resizing status and only then waits for the server to become active
func ResizeServerWaitHandler(ctx context.Context, a APIClientInterface, projectId, serverId string) (h *wait.AsyncActionHandler[iaasalpha.Server]) {
handler := wait.New(func() (waitFinished bool, response *iaasalpha.Server, err error) {
server, err := a.GetServerExecute(ctx, projectId, serverId)
if err != nil {
return false, server, err
}

if server.Id == nil || server.Status == nil {
return false, server, fmt.Errorf("resizing failed for server with id %s, the response is not valid: the id or the status are missing", serverId)
}
if *server.Id == serverId && *server.Status == ServerResizingStatus {
return true, server, nil
}
if *server.Id == serverId && *server.Status == ErrorStatus {
if server.ErrorMessage != nil {
return true, server, fmt.Errorf("resizing failed for server with id %s: %s", serverId, *server.ErrorMessage)

if !h.IntermediateStateReached {
if *server.Id == serverId && *server.Status == ServerResizingStatus {
h.IntermediateStateReached = true
return false, server, nil
}
return true, server, fmt.Errorf("resizing failed for server with id %s", serverId)
if *server.Id == serverId && *server.Status == ErrorStatus {
if server.ErrorMessage != nil {
return true, server, fmt.Errorf("resizing failed for server with id %s: %s", serverId, *server.ErrorMessage)
}
return true, server, fmt.Errorf("resizing failed for server with id %s", serverId)
}
return false, server, nil
}
return false, server, nil
})
handler.SetTimeout(10 * time.Minute)
return handler
}

// ResizeServerWaitHandler will wait for server resize
// It checks for an intermediate resizing status and only then waits for the server to become active
func ResizeServerWaitHandler(ctx context.Context, a APIClientInterface, projectId, serverId string) *wait.AsyncActionHandler[iaasalpha.Server] {
handler := wait.New(func() (waitFinished bool, response *iaasalpha.Server, err error) {
server, err := resizingServerWaitHandler(ctx, a, projectId, serverId).WaitWithContext(ctx)
if err != nil {
return false, server, err
}
server, err = a.GetServerExecute(ctx, projectId, serverId)
if err != nil {
return false, server, err
}
if server.Id == nil || server.Status == nil {
return false, server, fmt.Errorf("resizing failed for server with id %s, the response is not valid: the id or the status are missing", serverId)
}
if *server.Id == serverId && *server.Status == ServerActiveStatus {
return true, server, nil
}
Expand Down
72 changes: 2 additions & 70 deletions services/iaasalpha/wait/wait_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,72 +319,6 @@ func TestDeleteServerWaitHandler(t *testing.T) {
}
}

func TestResizingServerWaitHandler(t *testing.T) {
tests := []struct {
desc string
getFails bool
resourceState string
wantErr bool
wantResp bool
}{
{
desc: "resizing",
getFails: false,
resourceState: ServerResizingStatus,
wantErr: false,
wantResp: true,
},
{
desc: "error_status",
getFails: false,
resourceState: ErrorStatus,
wantErr: true,
wantResp: true,
},
{
desc: "get_fails",
getFails: true,
resourceState: "",
wantErr: true,
wantResp: false,
},
{
desc: "timeout",
getFails: false,
resourceState: "ANOTHER Status",
wantErr: true,
wantResp: true,
},
}
for _, tt := range tests {
t.Run(tt.desc, func(t *testing.T) {
apiClient := &apiClientMocked{
getServerFails: tt.getFails,
resourceState: tt.resourceState,
}

var wantRes *iaasalpha.Server
if tt.wantResp {
wantRes = &iaasalpha.Server{
Id: utils.Ptr("sid"),
Status: &tt.resourceState,
}
}

handler := resizingServerWaitHandler(context.Background(), apiClient, "pid", "sid")

gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background())

if (err != nil) != tt.wantErr {
t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr)
}
if !cmp.Equal(gotRes, wantRes) {
t.Fatalf("handler gotRes = %v, want %v", gotRes, wantRes)
}
})
}
}

func TestResizeServerWaitHandler(t *testing.T) {
tests := []struct {
desc string
Expand Down Expand Up @@ -449,11 +383,9 @@ func TestResizeServerWaitHandler(t *testing.T) {
}
}

timeoutCtx, cancel := context.WithTimeout(context.Background(), 10*time.Millisecond)
defer cancel()
handler := ResizeServerWaitHandler(timeoutCtx, apiClient, "pid", "sid")
handler := ResizeServerWaitHandler(context.Background(), apiClient, "pid", "sid")

gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(timeoutCtx)
gotRes, err := handler.SetThrottle(1 * time.Millisecond).SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background())

if (err != nil) != tt.wantErr {
t.Fatalf("handler error = %v, wantErr %v", err, tt.wantErr)
Expand Down
Loading