Skip to content
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

Jump to bottom

Add retry mechanism while ContainedInspectContainer return NotFound #146

Closed
wants to merge 1 commit into from
Closed

Add retry mechanism while ContainedInspectContainer return NotFound #146

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
98 changes: 51 additions & 47 deletions pkg/gc/flannel_gc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func (gc *flannelGC) Run() {
if err := gc.cleanupVeth(); err != nil {
glog.Errorf("failed cleanup links: %v", err)
}
}, *flagFlannelGCInterval*3, gc.quit)
}, *flagFlannelGCInterval*2, gc.quit)
}

func (gc *flannelGC) cleanupIP() error {
Expand Down Expand Up @@ -195,52 +195,56 @@ func (gc *flannelGC) cleanupVeth() error {
}

func (gc *flannelGC) shouldCleanup(cid string) bool {
if os.Getenv("CONTAINERD_HOST") != "" {
if c, err := gc.dockerCli.ContainedInspectContainer(cid); err != nil {
if stausErr, ok := status.FromError(err); ok {
if stausErr.Code() == codes.NotFound {
glog.Infof("container %s not found", cid)
return true
}
glog.Warningf("Error inspect container %s: %v", cid, err)
} else {
glog.Warningf("Error inspect container %s: %v", cid, err)
}
} else {
if c != nil && (c.State == criapi.PodSandboxState_SANDBOX_NOTREADY) {
pod, err := gc.kubeCli.CoreV1().Pods(c.Annotations[SandboxNamespace]).Get(context.Background(), c.Annotations[SandboxName], metav1.GetOptions{})
if err != nil {
if apierrors.IsNotFound(err) {
return true
}
glog.Errorf("failed to get pod %s", fmt.Sprintf("%s/%s", c.Annotations[SandboxNamespace], c.Annotations[SandboxName]))
return false
}
for _, status := range pod.Status.ContainerStatuses {
if status.State.Waiting != nil || status.State.Running != nil {
return false
}
}
glog.Infof("container %s exited %s", c.Id, c.State.String())
return true
}
}
return false
}
if c, err := gc.dockerCli.DockerInspectContainer(cid); err != nil {
if _, ok := err.(docker.ContainerNotFoundError); ok {
glog.Infof("container %s not found", cid)
return true
} else {
glog.Warningf("Error inspect container %s: %v", cid, err)
}
} else {
if c.State != nil && (c.State.Status == ContainerExited || c.State.Status == ContainerDead) {
glog.Infof("container %s(%s) exited %s", c.ID, c.Name, c.State.Status)
return true
}
}
return false
if os.Getenv("CONTAINERD_HOST") != "" {
for i := 0; i < 3; i++ { // 重试3次
c, err := gc.dockerCli.ContainedInspectContainer(cid)
if err != nil {
if statusErr, ok := status.FromError(err); ok {
if statusErr.Code() == codes.NotFound {
glog.Infof("container %s not found", cid)
return true
}
glog.Warningf("Error inspect container %s: %v", cid, err)
} else {
glog.Warningf("Error inspect container %s: %v", cid, err)
}
} else {
if c != nil && c.State == criapi.PodSandboxState_SANDBOX_NOTREADY {
pod, err := gc.kubeCli.CoreV1().Pods(c.Annotations[SandboxNamespace]).Get(context.Background(), c.Annotations[SandboxName], metav1.GetOptions{})
if err != nil {
if apierrors.IsNotFound(err) {
return true
}
glog.Errorf("failed to get pod %s: %v", fmt.Sprintf("%s/%s", c.Annotations[SandboxNamespace], c.Annotations[SandboxName]), err)
return false
}
for _, status := range pod.Status.ContainerStatuses {
if status.State.Waiting != nil || status.State.Running != nil {
return false
}
}
glog.Infof("container %s exited %s", c.Id, c.State.String())
return true
}
}
time.Sleep(1 * time.Second) // 等待1秒后重试
}
return false
}
if c, err := gc.dockerCli.DockerInspectContainer(cid); err != nil {
if _, ok := err.(docker.ContainerNotFoundError); ok {
glog.Infof("container %s not found", cid)
return true
} else {
glog.Warningf("Error inspect container %s: %v", cid, err)
}
} else {
if c.State != nil && (c.State.Status == ContainerExited || c.State.Status == ContainerDead) {
glog.Infof("container %s(%s) exited %s", c.ID, c.Name, c.State.Status)
return true
}
}
return false
}

func removeLeakyIPFile(ipFile, containerId string) {
Expand Down
Loading