Merge pull request #179 from Random-Liu/checkpoint-container-status

Checkpoint container status onto disk.

pkg/server/container_create.go

@@ -204,7 +204,8 @@ func (c *criContainerdService) CreateContainer(ctx context.Context, r *runtime.C
 	}()
 
 	status := containerstore.Status{CreatedAt: time.Now().UnixNano()}
-	container, err := containerstore.NewContainer(meta, status,
+	container, err := containerstore.NewContainer(meta,
+		containerstore.WithStatus(status, containerRootDir),
 		containerstore.WithContainer(cntr),
 		containerstore.WithContainerIO(containerIO),
 	)

pkg/server/container_list_test.go

@@ -47,15 +47,17 @@ func TestToCRIContainer(t *testing.T) {
 			Config:    config,
 			ImageRef:  "test-image-ref",
 		},
-		containerstore.Status{
-			Pid:        1234,
-			CreatedAt:  createdAt,
-			StartedAt:  time.Now().UnixNano(),
-			FinishedAt: time.Now().UnixNano(),
-			ExitCode:   1,
-			Reason:     "test-reason",
-			Message:    "test-message",
-		},
+		containerstore.WithFakeStatus(
+			containerstore.Status{
+				Pid:        1234,
+				CreatedAt:  createdAt,
+				StartedAt:  time.Now().UnixNano(),
+				FinishedAt: time.Now().UnixNano(),
+				ExitCode:   1,
+				Reason:     "test-reason",
+				Message:    "test-message",
+			},
+		),
 	)
 	assert.NoError(t, err)
 	expect := &runtime.Container{
@@ -158,7 +160,10 @@ type containerForTest struct {
 }
 
 func (c containerForTest) toContainer() (containerstore.Container, error) {
-	return containerstore.NewContainer(c.metadata, c.status)
+	return containerstore.NewContainer(
+		c.metadata,
+		containerstore.WithFakeStatus(c.status),
+	)
 }
 
 func TestListContainers(t *testing.T) {

pkg/server/container_remove_test.go

@@ -61,7 +61,7 @@ func TestSetContainerRemoving(t *testing.T) {
 		t.Logf("TestCase %q", desc)
 		container, err := containerstore.NewContainer(
 			containerstore.Metadata{ID: testID},
-			test.status,
+			containerstore.WithFakeStatus(test.status),
 		)
 		assert.NoError(t, err)
 		err = setContainerRemoving(container)

pkg/server/container_status_test.go

@@ -122,7 +122,10 @@ func TestToCRIContainerStatus(t *testing.T) {
 		status.ExitCode = test.exitCode
 		status.Reason = test.reason
 		status.Message = test.message
-		container, err := containerstore.NewContainer(*metadata, *status)
+		container, err := containerstore.NewContainer(
+			*metadata,
+			containerstore.WithFakeStatus(*status),
+		)
 		assert.NoError(t, err)
 		// Set expectation based on test case.
 		expected.State = test.expectedState
@@ -172,7 +175,10 @@ func TestContainerStatus(t *testing.T) {
 		// Update status with test case.
 		status.FinishedAt = test.finishedAt
 		status.Reason = test.reason
-		container, err := containerstore.NewContainer(*metadata, *status)
+		container, err := containerstore.NewContainer(
+			*metadata,
+			containerstore.WithFakeStatus(*status),
+		)
 		assert.NoError(t, err)
 		if test.exist {
 			assert.NoError(t, c.containerStore.Add(container))

pkg/server/container_stop_test.go

@@ -70,7 +70,7 @@ func TestWaitContainerStop(t *testing.T) {
 		if test.status != nil {
 			container, err := containerstore.NewContainer(
 				containerstore.Metadata{ID: id},
-				*test.status,
+				containerstore.WithFakeStatus(*test.status),
 			)
 			assert.NoError(t, err)
 			assert.NoError(t, c.containerStore.Add(container))