WIP

Author: geropl

components/workspacekit/cmd/rings.go

@@ -210,6 +210,11 @@ var ring1Cmd = &cobra.Command{
 		defer handleExit(&exitCode)
 
 		defer log.Info("ring1 stopped")
+		defer func() {
+			log.Info("ring1 going to sleep")
+			time.Sleep(5 * time.Minute)
+			log.Info("ring1 woke up again")
+		}()
 
 		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 		defer cancel()

components/ws-daemon/pkg/container/container.go

@@ -10,6 +10,7 @@ import (
 	"golang.org/x/xerrors"
 
 	"github.com/containerd/containerd/api/types/task"
+	"github.com/containerd/containerd/sandbox"
 	workspacev1 "github.com/gitpod-io/gitpod/ws-manager/api/crd/v1"
 )
 
@@ -57,6 +58,7 @@ type Runtime interface {
 	DisposeContainer(ctx context.Context, workspaceInstanceID string)
 
 	GetContainerTaskInfo(ctx context.Context, id ID) (*task.Process, error)
+	GetSandboxStatus(ctx context.Context, instanceId string) (*sandbox.ControllerStatus, error)
 
 	ForceKillContainerTask(ctx context.Context, id ID) error
 }

components/ws-daemon/pkg/container/containerd.go

@@ -24,6 +24,7 @@ import (
 	"github.com/containerd/containerd/containers"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/images"
+	"github.com/containerd/containerd/sandbox"
 	"github.com/containerd/platforms"
 	"github.com/containerd/typeurl/v2"
 	ocispecs "github.com/opencontainers/runtime-spec/specs-go"
@@ -577,6 +578,19 @@ func (s *Containerd) IsContainerdReady(ctx context.Context) (bool, error) {
 	return true, nil
 }
 
+func (s *Containerd) GetSandboxStatus(ctx context.Context, instanceId string) (*sandbox.ControllerStatus, error) {
+	info, ok := s.wsiIdx[instanceId]
+	if !ok || info.ID == "" {
+		return nil, fmt.Errorf("no SandboxID found")
+	}
+
+	resp, err := s.Client.SandboxController().Status(ctx, string(info.ID), true)
+	if err != nil {
+		return nil, fmt.Errorf("error retrieving sandbox status: %w", err)
+	}
+	return &resp, nil
+}
+
 func (s *Containerd) GetContainerTaskInfo(ctx context.Context, id ID) (*task.Process, error) {
 	task, err := s.Client.TaskService().Get(ctx, &tasks.GetRequest{
 		ContainerID: string(id),

components/ws-daemon/pkg/content/hooks.go

@@ -48,7 +48,7 @@ func WorkspaceLifecycleHooks(cfg Config, workspaceCIDR string, uidmapper *iws.Ui
 			hookInstallQuota(xfs, true),
 		},
 		session.WorkspaceDisposed: {
-			hookWipingTeardown(), // if ws.DoWipe == true: make sure we 100% tear down the workspace
+			hookUnmount(),
 			iws.StopServingWorkspace,
 			hookRemoveQuota(xfs),
 		},
@@ -170,15 +170,17 @@ func hookRemoveQuota(xfs *quota.XFS) session.WorkspaceLivecycleHook {
 	}
 }
 
-func hookWipingTeardown() session.WorkspaceLivecycleHook {
+func hookUnmount() session.WorkspaceLivecycleHook {
 	return func(ctx context.Context, ws *session.Workspace) error {
 		log := log.WithFields(ws.OWI())
 
-		if !ws.DoWipe {
-			// this is the "default" case for 99% of all workspaces
-			// TODO(gpl): We should probably make this the default for all workspaces - but not with this PR
-			return nil
-		}
+		// if !ws.DoWipe {
+		// 	// this is the "default" case for 99% of all workspaces
+		// 	// TODO(gpl): We should probably make this the default for all workspaces - but not with this PR
+		// 	return nil
+		// }
+		doWipe := true
+		log.Info("unmount hook")
 
 		socketFN := filepath.Join(ws.ServiceLocDaemon, "daemon.sock")
 		conn, err := grpc.DialContext(ctx, "unix://"+socketFN, grpc.WithTransportCredentials(insecure.NewCredentials()))
@@ -189,12 +191,12 @@ func hookWipingTeardown() session.WorkspaceLivecycleHook {
 		client := daemonapi.NewInWorkspaceServiceClient(conn)
 
 		res, err := client.WipingTeardown(ctx, &daemonapi.WipingTeardownRequest{
-			DoWipe: ws.DoWipe,
+			DoWipe: doWipe,
 		})
 		if err != nil {
 			return err
 		}
-		log.WithField("success", res.Success).Debug("wiping teardown done")
+		log.WithField("success", res.Success).Info("unmount hook done")
 
 		return nil
 	}

components/ws-daemon/pkg/controller/workspace_controller.go

@@ -6,6 +6,7 @@ package controller
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"time"
 
@@ -482,6 +483,7 @@ func (wsc *WorkspaceController) dumpWorkspaceContainerInfo(ctx context.Context,
 	if err != nil {
 		return fmt.Errorf("failed to wait for container: %w", err)
 	}
+
 	task, err := wsc.runtime.GetContainerTaskInfo(ctx, id)
 	if err != nil {
 		return fmt.Errorf("failed to get container task info: %w", err)
@@ -493,6 +495,22 @@ func (wsc *WorkspaceController) dumpWorkspaceContainerInfo(ctx context.Context,
 		"exitedAt":    task.ExitedAt.AsTime(),
 		"status":      task.Status.String(),
 	}).Info("container task info")
+
+	sandboxStatus, err := wsc.runtime.GetSandboxStatus(ctx, ws.Name)
+	if err != nil {
+		return fmt.Errorf("failed to get container sandbox status: %w", err)
+	}
+
+	infoJson, _ := json.Marshal(sandboxStatus.Info)
+	glog.WithFields(ws.OWI()).WithFields(logrus.Fields{
+		"sandboxID":  sandboxStatus.SandboxID,
+		"sandboxPid": sandboxStatus.Pid,
+		"createdAt":  sandboxStatus.CreatedAt.String(),
+		"exitedAt":   sandboxStatus.ExitedAt.String(),
+		"state":      sandboxStatus.State,
+		"extra":      string(sandboxStatus.Extra.GetValue()),
+		"info":       string(infoJson),
+	}).Info("container sandbox status")
 	return nil
 }