mirror of
https://github.com/hanzoai/visor.git
synced 2026-09-24 17:04:14 +00:00
Jing ChenandgVisor bot
3a8691ae47
Remove os.Exit(0) from shimRedirector.Shutdown. The abrupt exit prevents the containerd shutdown service from executing registered callbacks, specifically the one that removes the Unix socket inside /run/containerd/s. The shim process will now exit gracefully via the containerd shim framework after all callbacks are completed. Fix #13509 PiperOrigin-RevId: 938771223
105 lines
2.9 KiB
Go
105 lines
2.9 KiB
Go
// Copyright 2026 The gVisor Authors.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package v1
|
|
|
|
import (
|
|
"context"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
"time"
|
|
|
|
task "github.com/containerd/containerd/api/runtime/task/v2"
|
|
"github.com/containerd/containerd/v2/core/events"
|
|
"github.com/containerd/containerd/v2/pkg/shim"
|
|
"github.com/containerd/containerd/v2/pkg/shutdown"
|
|
)
|
|
|
|
type mockPublisher struct{}
|
|
|
|
var _ shim.Publisher = (*mockPublisher)(nil)
|
|
|
|
func (m *mockPublisher) Publish(ctx context.Context, topic string, event events.Event) error {
|
|
return nil
|
|
}
|
|
|
|
func (m *mockPublisher) Close() error {
|
|
return nil
|
|
}
|
|
|
|
// TestShutdownSocketCleanup verifies that the shim cleans up its Unix socket
|
|
// when receiving a Shutdown request.
|
|
func TestShutdownSocketCleanup(t *testing.T) {
|
|
tmpDir, err := os.MkdirTemp("", "shim-test-")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer os.RemoveAll(tmpDir)
|
|
|
|
socketPath := filepath.Join(tmpDir, "shim.sock")
|
|
|
|
// Create a dummy file to simulate the socket.
|
|
if err := os.WriteFile(socketPath, []byte("dummy"), 0644); err != nil {
|
|
t.Fatalf("Failed to create dummy socket file: %v", err)
|
|
}
|
|
|
|
// Write the "address" file which NewShimRedirector reads.
|
|
addressContent := "unix://" + socketPath
|
|
if err := os.WriteFile(filepath.Join(tmpDir, "address"), []byte(addressContent), 0644); err != nil {
|
|
t.Fatalf("Failed to write address file: %v", err)
|
|
}
|
|
|
|
// Temporarily change CWD to tmpDir so NewShimRedirector can find "address" file.
|
|
origCwd, err := os.Getwd()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if err := os.Chdir(tmpDir); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer os.Chdir(origCwd)
|
|
|
|
ctx, sd := shutdown.WithShutdown(context.Background())
|
|
|
|
p := &mockPublisher{}
|
|
srv, err := NewShimRedirector(ctx, p, sd)
|
|
if err != nil {
|
|
t.Fatalf("NewShimRedirector failed: %v", err)
|
|
}
|
|
|
|
redirector := srv.(*shimRedirector)
|
|
|
|
// Trigger Shutdown.
|
|
_, err = redirector.Shutdown(ctx, &task.ShutdownRequest{ID: "test-id"})
|
|
if err != nil {
|
|
t.Fatalf("Shutdown failed: %v", err)
|
|
}
|
|
|
|
// Wait for the shutdown callbacks to complete.
|
|
select {
|
|
case <-sd.Done():
|
|
// Graceful exit after callbacks completed.
|
|
case <-time.After(5 * time.Second):
|
|
t.Fatal("Timeout waiting for shutdown callbacks")
|
|
}
|
|
|
|
// Verify that the socket file was removed.
|
|
if _, err := os.Stat(socketPath); err == nil {
|
|
t.Errorf("Socket file %s still exists, cleanup failed", socketPath)
|
|
} else if !os.IsNotExist(err) {
|
|
t.Errorf("Unexpected error checking socket file: %v", err)
|
|
}
|
|
}
|