Thanks to visit codestin.com
Credit goes to github.com

Skip to content

server: return already created ID for duplicated requests #6123

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
openshift-merge-robot merged 1 commit into from
Sep 15, 2022
Merged

server: return already created ID for duplicated requests #6123

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
4 changes: 2 additions & 2 deletions server/container_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,9 +374,9 @@ func (s *Server) CreateContainer(ctx context.Context, req *types.CreateContainer
return nil, fmt.Errorf("failed to get ID of container with reserved name (%s), after failing to reserve name with %v: %w", ctr.Name(), getErr, getErr)
}
// if we're able to find the container, and it's created, this is actually a duplicate request
// from a client that does not behave like the kubelet (like crictl)
// Just return that container
if reservedCtr := s.GetContainer(reservedID); reservedCtr != nil && reservedCtr.Created() {
return nil, err
return &types.CreateContainerResponse{ContainerId: reservedID}, nil
}
cachedID, resourceErr := s.getResourceOrWait(ctx, ctr.Name(), "container")
if resourceErr == nil {
Expand Down
4 changes: 2 additions & 2 deletions server/sandbox_run_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,9 +368,9 @@ func (s *Server) runPodSandbox(ctx context.Context, req *types.RunPodSandboxRequ
return nil, fmt.Errorf("failed to get ID of pod with reserved name (%s), after failing to reserve name with %v: %w", sbox.Name(), getErr, getErr)
}
// if we're able to find the sandbox, and it's created, this is actually a duplicate request
// from a client that does not behave like the kubelet (like crictl)
// Just return that sandbox
if reservedSbox := s.GetSandbox(reservedID); reservedSbox != nil && reservedSbox.Created() {
return nil, err
return &types.RunPodSandboxResponse{PodSandboxId: reservedID}, nil
}
cachedID, resourceErr := s.getResourceOrWait(ctx, sbox.Name(), "sandbox")
if resourceErr == nil {
Expand Down
5 changes: 3 additions & 2 deletions test/timeout.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,11 @@ function wait_clean() {

@test "should not wait for actual duplicate pod request" {
start_crio
crictl runp "$TESTDATA"/sandbox_config.json
pod_1=$(crictl runp "$TESTDATA"/sandbox_config.json)
SECONDS=0
! crictl runp "$TESTDATA"/sandbox_config.json
pod_2=$(crictl runp "$TESTDATA"/sandbox_config.json)
[[ "$SECONDS" -lt 240 ]]
[[ "$pod_1" == "$pod_2" ]]
}

@test "should clean up container after timeout if not re-requested" {
Expand Down