Internal change

PiperOrigin-RevId: 919856743

Author: zkoopmans

pkg/shim/v1/BUILD

@@ -20,7 +20,6 @@ go_library(
         "//pkg/shim/v1/extension",
         "//pkg/shim/v1/proc",
         "//pkg/shim/v1/runsc",
-        "//pkg/shim/v1/runsc:hibernate_go_proto",
         "//pkg/shim/v1/runsccmd",
         "//pkg/sync",
         "//runsc/specutils",

pkg/shim/v1/extension/BUILD

@@ -10,7 +10,6 @@ go_library(
     srcs = ["extension.go"],
     visibility = ["//visibility:public"],
     deps = [
-        "//pkg/shim/v1/runsc:hibernate_go_proto",
         "@com_github_containerd_console//:go_default_library",
         "@com_github_containerd_containerd_api//runtime/task/v2:go_default_library",
         "@com_github_containerd_containerd_v2//pkg/stdio:go_default_library",

pkg/shim/v1/extension/extension.go

@@ -23,7 +23,6 @@ import (
 	"github.com/containerd/console"
 	task "github.com/containerd/containerd/api/runtime/task/v2"
 	"github.com/containerd/containerd/v2/pkg/stdio"
-	hibernatepb "gvisor.dev/gvisor/pkg/shim/v1/runsc/hibernate_go_proto"
 )
 
 // NewExtension registers an extension constructor. It may return nil, nil to indicate that the
@@ -99,6 +98,4 @@ type TaskServiceExt interface {
 	task.TaskService
 	CreateWithFSRestore(ctx context.Context, req *CreateWithFSRestoreRequest) (*task.CreateTaskResponse, error)
 	Restore(ctx context.Context, req *RestoreRequest) (*task.StartResponse, error)
-	Hide(ctx context.Context, req *hibernatepb.HideRequest, resp *hibernatepb.HideResponse) error
-	Unhide(ctx context.Context, req *hibernatepb.UnhideRequest, resp *hibernatepb.UnhideResponse) error
 }

pkg/shim/v1/runsc/BUILD

@@ -1,29 +1,17 @@
-load("//tools:defs.bzl", "go_library", "go_test", "proto_library")
+load("//tools:defs.bzl", "go_library", "go_test")
 
 package(
     default_applicable_licenses = ["//:license"],
     licenses = ["notice"],
 )
 
-proto_library(
-    name = "hibernate",
-    srcs = ["hibernate.proto"],
-    has_services = True,
-    visibility = [
-        "//cloud/kubernetes/node/snapshot:__subpackages__",
-        "//pkg/shim:__subpackages__",
-    ],
-)
-
 go_library(
     name = "runsc",
     srcs = [
         "api.go",
         "container.go",
         "debug.go",
         "epoll.go",
-        "hibernate.go",
-        "hibernate_impl.go",
         "oom_v2.go",
         "options.go",
         "service.go",
@@ -32,7 +20,6 @@ go_library(
     ],
     visibility = ["//pkg/shim:__subpackages__"],
     deps = [
-        ":hibernate_go_proto",
         "//pkg/cleanup",
         "//pkg/shim/v1/extension",
         "//pkg/shim/v1/proc",
@@ -67,7 +54,6 @@ go_library(
         "@com_github_containerd_fifo//:go_default_library",
         "@com_github_containerd_go_runc//:go_default_library",
         "@com_github_containerd_log//:go_default_library",
-        "@com_github_containerd_ttrpc//:go_default_library",
         "@com_github_containerd_typeurl_v2//:go_default_library",
         "@com_github_opencontainers_runtime_spec//specs-go:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",

pkg/shim/v1/runsc/hibernate.go

@@ -17,7 +17,6 @@ package v1
 
 import (
 	"context"
-	"fmt"
 	"os"
 
 	task "github.com/containerd/containerd/api/runtime/task/v2"
@@ -27,7 +26,6 @@ import (
 	errgrpc "github.com/containerd/errdefs/pkg/errgrpc"
 	"github.com/containerd/log"
 	"github.com/containerd/ttrpc"
-	hibernatepb "gvisor.dev/gvisor/pkg/shim/v1/runsc/hibernate_go_proto"
 
 	"gvisor.dev/gvisor/pkg/shim/v1/extension"
 	rsc "gvisor.dev/gvisor/pkg/shim/v1/runsc"
@@ -93,12 +91,6 @@ type shimRedirector struct {
 	// grouping indicates if shim grouping is enabled.
 	grouping bool
 
-	// hibernateServerOnce ensures that the hibernate service is only started once.
-	hibernateServerOnce sync.Once
-
-	// hibernateServerEndpoint is the ttrpc server that listens for hibernate requests.
-	hibernateServerEndpoint *rsc.HibernateServerEndpoint
-
 	shutdown       shutdown.Service
 	runtimeOptions *rsc.Options
 }
@@ -168,31 +160,6 @@ func (s *shimRedirector) initExt(ctx context.Context, r *task.CreateTaskRequest)
 			}
 		}
 	}
-	if s.runtimeOptions.EnableHibernateServer && isDaemon() {
-		s.hibernateServerOnce.Do(func() {
-			var err error
-			s.hibernateServerEndpoint, err = rsc.NewHibernateServerEndpoint(s.runtimeOptions.Root, "shim", r.ID)
-			if err != nil {
-				log.L.Errorf("Failed to create hibernate server endpoint: %v", err)
-				return
-			}
-			s.hibernateServerEndpoint.RegisterService(s.getLocked())
-			s.shutdown.RegisterCallback(func(context.Context) error {
-				return s.hibernateServerEndpoint.Shutdown(ctx)
-			})
-			if address, _ := shim.ReadAddress("hibernate_server"); len(address) > 0 {
-				s.shutdown.RegisterCallback(func(context.Context) error {
-					shim.RemoveSocket(fmt.Sprintf("unix://%s", address))
-					return nil
-				})
-			}
-			go func() {
-				if err := s.hibernateServerEndpoint.Serve(context.Background()); err != nil {
-					log.L.Errorf("Failed to start hibernate server: %v", err)
-				}
-			}()
-		})
-	}
 	return nil
 }
 
@@ -347,18 +314,6 @@ func (s *shimRedirector) Restore(ctx context.Context, r *extension.RestoreReques
 	return resp, errgrpc.ToGRPC(err)
 }
 
-func (s *shimRedirector) Hide(ctx context.Context, r *hibernatepb.HideRequest, resp *hibernatepb.HideResponse) error {
-	log.L.Debugf("Hide, id: %s", r.GetContainerId())
-	err := s.get().Hide(ctx, r, resp)
-	return errgrpc.ToGRPC(err)
-}
-
-func (s *shimRedirector) Unhide(ctx context.Context, r *hibernatepb.UnhideRequest, resp *hibernatepb.UnhideResponse) error {
-	log.L.Debugf("Unhide, id: %s", r.GetContainerId())
-	err := s.get().Unhide(ctx, r, resp)
-	return errgrpc.ToGRPC(err)
-}
-
 func (s *shimRedirector) RegisterTTRPC(server *ttrpc.Server) error {
 	task.RegisterTaskService(server, s)
 	return nil

pkg/shim/v1/runsc/hibernate.proto

@@ -9,7 +9,6 @@ go_library(
     name = "maincli",
     srcs = [
         "maincli.go",
-        "maincli_impl.go",
     ],
     visibility = [
         "//:__pkg__",

pkg/shim/v1/runsc/hibernate_impl.go

@@ -91,7 +91,6 @@ func commands() (map[util.SubCommand]string, []subcommands.Command) {
 		new(cmd.Gofer):  internalGroup,
 		new(cmd.Umount): internalGroup,
 	}
-	extraCmds(cmds)
 
 	helpCmds := []subcommands.Command{
 		// For historical reasons, these subcommands are invoked as `runsc help