From c41459963509eaa43a3c05f85f895bf57d0867e1 Mon Sep 17 00:00:00 2001
From: Peng Tao <bergwolf@hyper.sh>
Date: Tue, 9 Apr 2019 01:30:09 -0700
Subject: [PATCH] types: remove pid from sandbox state

No longer needed.

Signed-off-by: Peng Tao <bergwolf@hyper.sh>
---
 virtcontainers/cgroups_test.go    | 7 +++----
 virtcontainers/kata_agent_test.go | 1 -
 virtcontainers/sandbox.go         | 1 -
 virtcontainers/types/sandbox.go   | 4 ----
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/virtcontainers/cgroups_test.go b/virtcontainers/cgroups_test.go
index a9a7c920c0..27d848f5c5 100644
--- a/virtcontainers/cgroups_test.go
+++ b/virtcontainers/cgroups_test.go
@@ -154,8 +154,7 @@ func TestUpdateCgroups(t *testing.T) {
 	// fake workload
 	cmd := exec.Command("tail", "-f", "/dev/null")
 	assert.NoError(cmd.Start())
-	s.state.Pid = cmd.Process.Pid
-	s.hypervisor = &mockHypervisor{mockPid: s.state.Pid}
+	s.hypervisor = &mockHypervisor{mockPid: cmd.Process.Pid}
 
 	// no containers
 	err = s.updateCgroups()
@@ -167,7 +166,7 @@ func TestUpdateCgroups(t *testing.T) {
 	s.containers = map[string]*Container{
 		"abc": {
 			process: Process{
-				Pid: s.state.Pid,
+				Pid: cmd.Process.Pid,
 			},
 			config: &ContainerConfig{
 				Annotations: containerAnnotations,
@@ -175,7 +174,7 @@ func TestUpdateCgroups(t *testing.T) {
 		},
 		"xyz": {
 			process: Process{
-				Pid: s.state.Pid,
+				Pid: cmd.Process.Pid,
 			},
 			config: &ContainerConfig{
 				Annotations: containerAnnotations,
diff --git a/virtcontainers/kata_agent_test.go b/virtcontainers/kata_agent_test.go
index cc3b8a97b7..cda2dc26f6 100644
--- a/virtcontainers/kata_agent_test.go
+++ b/virtcontainers/kata_agent_test.go
@@ -570,7 +570,6 @@ func TestHandlePidNamespace(t *testing.T) {
 	}
 
 	sandbox := &Sandbox{}
-	sandbox.state.Pid = 0
 
 	k := kataAgent{}
 
diff --git a/virtcontainers/sandbox.go b/virtcontainers/sandbox.go
index d207fc018e..7f88973adc 100644
--- a/virtcontainers/sandbox.go
+++ b/virtcontainers/sandbox.go
@@ -1009,7 +1009,6 @@ func (s *Sandbox) addContainer(c *Container) error {
 
 	ann := c.GetAnnotations()
 	if ann[annotations.ContainerTypeKey] == string(PodSandbox) {
-		s.state.Pid = c.process.Pid
 		s.state.CgroupPath = c.state.CgroupPath
 		return s.store.Store(store.State, s.state)
 	}
diff --git a/virtcontainers/types/sandbox.go b/virtcontainers/types/sandbox.go
index 002230c393..7317365168 100644
--- a/virtcontainers/types/sandbox.go
+++ b/virtcontainers/types/sandbox.go
@@ -34,10 +34,6 @@ type SandboxState struct {
 	// Index of the block device passed to hypervisor.
 	BlockIndex int `json:"blockIndex"`
 
-	// Pid is the process id of the sandbox container which is the first
-	// container to be started.
-	Pid int `json:"pid"`
-
 	// GuestMemoryBlockSizeMB is the size of memory block of guestos
 	GuestMemoryBlockSizeMB uint32 `json:"guestMemoryBlockSize"`