bugfix:fix container logs lost because io close too quickly

ningmingxiao · k8s-infra-cherrypick-robot · commit 7d9f09ba048d · 2025-10-16T02:41:40.000Z
Signed-off-by: ningmingxiao &lt;ning.mingxiao@zte.com.cn&gt;
diff --git a/cmd/containerd-shim-runc-v2/process/exec.go b/cmd/containerd-shim-runc-v2/process/exec.go
@@ -35,6 +35,7 @@ import (
 	"github.com/containerd/errdefs"
 	"github.com/containerd/fifo"
 	runc "github.com/containerd/go-runc"
+	"github.com/containerd/log"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )
 
@@ -106,7 +107,9 @@ func (e *execProcess) Delete(ctx context.Context) error {
 }
 
 func (e *execProcess) delete(ctx context.Context) error {
-	waitTimeout(ctx, &e.wg, 2*time.Second)
+	if err := waitTimeout(ctx, &e.wg, 10*time.Second); err != nil {
+		log.G(ctx).WithError(err).Errorf("failed to drain exec process %s io", e.id)
+	}
 	if e.io != nil {
 		for _, c := range e.closers {
 			c.Close()
diff --git a/cmd/containerd-shim-runc-v2/process/init.go b/cmd/containerd-shim-runc-v2/process/init.go
@@ -293,7 +293,9 @@ func (p *Init) Delete(ctx context.Context) error {
 }
 
 func (p *Init) delete(ctx context.Context) error {
-	waitTimeout(ctx, &p.wg, 2*time.Second)
+	if err := waitTimeout(ctx, &p.wg, 10*time.Second); err != nil {
+		log.G(ctx).WithError(err).Errorf("failed to drain init process %s io", p.id)
+	}
 	err := p.runtime.Delete(ctx, p.id, nil)
 	// ignore errors if a runtime has already deleted the process
 	// but we still hold metadata and pipes
