Skip to content

TPT-4616: Honor cancelled retries and use go work for vet/build #1027

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

Open
zliang-akamai wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −7
Open

TPT-4616: Honor cancelled retries and use go work for vet/build #1027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,10 @@ test-smoke:
cd test && make test-smoke TEST_TIMEOUT=$(TEST_TIMEOUT)

build: vet lint
go build ./...
cd k8s && go build ./...
go build work

vet:
go vet ./...
cd k8s && go vet ./...
go vet work

lint:
ifeq ($(SKIP_LINT), 1)
Expand Down
7 changes: 5 additions & 2 deletions client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,8 +622,11 @@ func (c *Client) doRequest(ctx context.Context, method, endpoint string, params
waitTime = c.retryMaxWaitTime
}

// Sleep for the calculated duration before retrying
time.Sleep(waitTime)
select {
case <-ctx.Done():
return ctx.Err()
case <-time.After(waitTime):
}
Comment on lines +625 to +629
Comment on lines +625 to +629
}

return err
Expand Down
2 changes: 1 addition & 1 deletion test/unit/vpc_subnets_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func TestVPCSubnet_Create(t *testing.T) {
IPv4: "192.168.1.0/24",
IPv6: []linodego.VPCSubnetCreateOptionsIPv6{
{
linodego.Pointer("auto"),
Range: linodego.Pointer("auto"),
},
},
}
Expand Down