Merge pull request #63337 from vikaschoudhary16/fix-e2e

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix e2e "When checkpoint file is corrupted should complete pod sandbo… …x clean up" **What this PR does / why we need it**: This PR fixes the e2e-node test, "When checkpoint file is corrupted should complete pod sandbox clean up" **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #62738 Related #62937 **Special notes for your reviewer**: **Release note**: ```release-note None ``` /cc @dashpole @derekwaynecarr /sig node

Merge pull request #63337 from vikaschoudhary16/fix-e2e
1b950d1e · Kubernetes Submit Queue · GitHub · e6688fc6 · f06fca98 · 1b950d1e
Unverified Commit 1b950d1e authored May 18, 2018 by Kubernetes Submit Queue Committed by GitHub May 18, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

BUILD pkg/kubelet/dockershim/BUILD +0 -1

docker_service.go pkg/kubelet/dockershim/docker_service.go +6 -2

No files found.
--- a/pkg/kubelet/dockershim/BUILD
+++ b/pkg/kubelet/dockershim/BUILD
@@ -100,7 +100,6 @@ go_library(
        "//pkg/kubelet/types:go_default_library",
        "//pkg/kubelet/util/cache:go_default_library",
        "//pkg/kubelet/util/ioutils:go_default_library",
-        "//pkg/kubelet/util/store:go_default_library",
        "//pkg/security/apparmor:go_default_library",
        "//pkg/util/parsers:go_default_library",
        "//vendor/github.com/armon/circbuf:go_default_library",

--- a/pkg/kubelet/dockershim/docker_service.go
+++ b/pkg/kubelet/dockershim/docker_service.go
@@ -33,6 +33,7 @@ import (
 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 	"k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig"
 	"k8s.io/kubernetes/pkg/kubelet/checkpointmanager"
+	"k8s.io/kubernetes/pkg/kubelet/checkpointmanager/errors"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 	"k8s.io/kubernetes/pkg/kubelet/dockershim/cm"
 	"k8s.io/kubernetes/pkg/kubelet/dockershim/network"
@@ -41,7 +42,6 @@ import (
 	"k8s.io/kubernetes/pkg/kubelet/dockershim/network/kubenet"
 	"k8s.io/kubernetes/pkg/kubelet/server/streaming"
 	"k8s.io/kubernetes/pkg/kubelet/util/cache"
-	utilstore "k8s.io/kubernetes/pkg/kubelet/util/store"

 	"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
 	"k8s.io/kubernetes/pkg/kubelet/dockershim/metrics"
@@ -372,9 +372,13 @@ func (ds *dockerService) GetPodPortMappings(podSandboxID string) ([]*hostport.Po
 	err := ds.checkpointManager.GetCheckpoint(podSandboxID, checkpoint)
 	// Return empty portMappings if checkpoint is not found
 	if err != nil {
-		if err == utilstore.ErrKeyNotFound {
+		if err == errors.ErrCheckpointNotFound {
 			return nil, nil
 		}
+		errRem := ds.checkpointManager.RemoveCheckpoint(podSandboxID)
+		if errRem != nil {
+			glog.Errorf("Failed to delete corrupt checkpoint for sandbox %q: %v", podSandboxID, errRem)
+		}
 		return nil, err
 	}
 	_, _, _, checkpointedPortMappings, _ := checkpoint.GetData()