Fix#488 remove namespace directory

Signed-off-by: Royce Zhao <[email protected]>

Author: RoyceDavison

internal/vm/dir.go

@@ -49,7 +49,7 @@ func shimDir(varRunDir, namespace, vmID string) (Dir, error) {
 		return "", errors.Wrapf(err, "failed evaluating any symlinks in path %q", varRunDir)
 	}
 
-	return Dir(filepath.Join(resolvedVarRunDir, namespace, vmID)), nil
+	return Dir(filepath.Join(resolvedVarRunDir, namespace+"#"+vmID)), nil
 }
 
 // Dir represents the root of a firecracker-containerd VM directory, which

internal/vm/dir_test.go

@@ -48,9 +48,11 @@ func TestShimDir(t *testing.T) {
 		{name: "id with ?", ns: "test", id: "?", outErr: `invalid vm id: identifier "?" must match`},
 		{name: "id with *", ns: "test", id: "*", outErr: `invalid vm id: identifier "*" must match`},
 		{name: "id with ,", ns: "test", id: ",", outErr: `invalid vm id: identifier "," must match`},
-		{name: "valid", ns: "ns", id: "1", outDir: "ns/1"},
-		{name: "valid with dashes", ns: "test-123", id: "123-456", outDir: "test-123/123-456"},
-		{name: "valid with dots", ns: "test.123", id: "123.456", outDir: "test.123/123.456"},
+		{name: "valid", ns: "ns", id: "1", outDir: "ns#1"},
+		{name: "valid with dashes", ns: "test-123", id: "123-456", outDir: "test-123#123-456"},
+		{name: "valid with dots", ns: "test.123", id: "123.456", outDir: "test.123#123.456"},
+		{name: "ns with aaa", ns: "aaa", id: "bbb-ccc", outDir: "aaa#bbb-ccc"},
+		{name: "ns with aaa-bbb", ns: "aaa-bbb", id: "ccc", outDir: "aaa-bbb#ccc"},
 	}
 
 	for _, tc := range tests {

runtime/jailer_integ_test.go

@@ -138,7 +138,7 @@ func testJailer(t *testing.T, jailerConfig *proto.JailerConfig) {
 	stdout := startAndWaitTask(ctx, t, c)
 	require.Equal("hello\nadditional drive\n", stdout)
 
-	stat, err := os.Stat(filepath.Join(shimBaseDir(), "default", vmID))
+	stat, err := os.Stat(filepath.Join(shimBaseDir(), "default#"+vmID))
 	require.NoError(err)
 	assert.True(t, stat.IsDir())
 
@@ -148,9 +148,13 @@ func testJailer(t *testing.T, jailerConfig *proto.JailerConfig) {
 	_, err = fcClient.StopVM(ctx, &proto.StopVMRequest{VMID: vmID})
 	require.NoError(err)
 
-	_, err = os.Stat(filepath.Join(shimBaseDir(), "default", vmID))
+	_, err = os.Stat(filepath.Join(shimBaseDir(), "default#"+vmID))
 	assert.Error(t, err)
 	assert.True(t, os.IsNotExist(err))
+
+	shimContents, err := ioutil.ReadDir(shimBaseDir())
+	require.NoError(err)
+	assert.Len(t, shimContents, 0)
 }
 
 func TestJailerCPUSet_Isolated(t *testing.T) {

runtime/service_integ_test.go

@@ -191,10 +191,9 @@ func TestShimExitsUponContainerDelete_Isolated(t *testing.T) {
 
 		cfg, err := config.LoadConfig("")
 		require.NoError(t, err, "failed to load config")
-		namespaceShimBaseDir := filepath.Join(cfg.ShimBaseDir, namespaces.Default)
-		varRunFCContents, err := ioutil.ReadDir(namespaceShimBaseDir)
-		require.NoError(t, err, `failed to list directory "%s"`, namespaceShimBaseDir)
-		require.Len(t, varRunFCContents, 0, "expect %s to be cleared after shims shutdown", namespaceShimBaseDir)
+		varRunFCContents, err := ioutil.ReadDir(cfg.ShimBaseDir)
+		require.NoError(t, err, `failed to list directory "%s"`, cfg.ShimBaseDir)
+		require.Len(t, varRunFCContents, 0, "expect %s to be empty", cfg.ShimBaseDir)
 	case err = <-exitEventErrCh:
 		require.Fail(t, "unexpected error", "unexpectedly received on task exit error channel: %s", err.Error())
 	case <-testCtx.Done():
@@ -379,11 +378,12 @@ func TestMultipleVMs_Isolated(t *testing.T) {
 			require.NoError(t, err, "failed to get VM Info for VM %d", vmID)
 			require.Equal(t, vmInfoResp.VMID, strconv.Itoa(vmID))
 
+			nspVMid := defaultNamespace + "#" + strconv.Itoa(vmID)
 			cfg, err := config.LoadConfig("")
 			require.NoError(t, err, "failed to load config")
-			require.Equal(t, vmInfoResp.SocketPath, filepath.Join(cfg.ShimBaseDir, defaultNamespace, strconv.Itoa(vmID), "firecracker.sock"))
-			require.Equal(t, vmInfoResp.LogFifoPath, filepath.Join(cfg.ShimBaseDir, defaultNamespace, strconv.Itoa(vmID), "fc-logs.fifo"))
-			require.Equal(t, vmInfoResp.MetricsFifoPath, filepath.Join(cfg.ShimBaseDir, defaultNamespace, strconv.Itoa(vmID), "fc-metrics.fifo"))
+			require.Equal(t, vmInfoResp.SocketPath, filepath.Join(cfg.ShimBaseDir, nspVMid, "firecracker.sock"))
+			require.Equal(t, vmInfoResp.LogFifoPath, filepath.Join(cfg.ShimBaseDir, nspVMid, "fc-logs.fifo"))
+			require.Equal(t, vmInfoResp.MetricsFifoPath, filepath.Join(cfg.ShimBaseDir, nspVMid, "fc-metrics.fifo"))
 			require.Equal(t, resp.CgroupPath, vmInfoResp.CgroupPath)
 
 			// just verify that updating the metadata doesn't return an error, a separate test case is needed
@@ -867,7 +867,7 @@ func testCreateContainerWithSameName(t *testing.T, vmID string) {
 	require.NoError(t, err, "failed to load config")
 
 	if len(vmID) != 0 {
-		shimPath := fmt.Sprintf("%s/default/%s/%s", cfg.ShimBaseDir, vmID, containerName)
+		shimPath := fmt.Sprintf("%s/default#%s/%s/%s", cfg.ShimBaseDir, vmID, vmID, containerName)
 		_, err = os.Stat(shimPath)
 		require.True(t, os.IsNotExist(err))
 	}
@@ -889,7 +889,7 @@ func testCreateContainerWithSameName(t *testing.T, vmID string) {
 	require.True(t, os.IsNotExist(err))
 
 	if len(vmID) != 0 {
-		shimPath := fmt.Sprintf("%s/default/%s/%s", cfg.ShimBaseDir, vmID, containerName)
+		shimPath := fmt.Sprintf("%s/default#%s/%s/%s", cfg.ShimBaseDir, vmID, vmID, containerName)
 		_, err = os.Stat(shimPath)
 		require.True(t, os.IsNotExist(err))
 	}