only create snap dir for full local

Author: amohoste

ctriface/manual_cleanup_test.go

@@ -78,8 +78,9 @@ func TestSnapLoad(t *testing.T) {
 	require.NoError(t, err, "Failed to pause VM")
 
 	snap := snapshotting.NewSnapshot(snapId, "/fccd/snapshots", TestImageName, 256, 1, *isSparseSnaps)
-	err = snap.CreateSnapDir()
-	require.NoError(t, err, "Failed to create directory for snapshot")
+	if *isFullLocal {
+		err = snap.CreateSnapDir()
+	}
 
 	err = orch.CreateSnapshot(ctx, vmID, snap, *isFullLocal)
 	require.NoError(t, err, "Failed to create snapshot of VM")
@@ -147,7 +148,9 @@ func TestSnapLoadMultiple(t *testing.T) {
 	require.NoError(t, err, "Failed to pause VM")
 
 	snap := snapshotting.NewSnapshot(snapId, "/fccd/snapshots", TestImageName, 256, 1, *isSparseSnaps)
-	err = snap.CreateSnapDir()
+	if *isFullLocal {
+		err = snap.CreateSnapDir()
+	}
 	require.NoError(t, err, "Failed to create directory for snapshot")
 
 	err = orch.CreateSnapshot(ctx, vmID, snap, *isFullLocal)
@@ -239,7 +242,9 @@ func TestParallelSnapLoad(t *testing.T) {
 			require.NoError(t, err, "Failed to pause VM, "+vmID)
 
 			snap := snapshotting.NewSnapshot(snapId, "/fccd/snapshots", TestImageName, 256, 1, *isSparseSnaps)
-			err = snap.CreateSnapDir()
+			if *isFullLocal {
+				err = snap.CreateSnapDir()
+			}
 			require.NoError(t, err, "Failed to create directory for snapshot")
 
 			err = orch.CreateSnapshot(ctx, vmID, snap, *isFullLocal)
@@ -342,7 +347,9 @@ func TestParallelPhasedSnapLoad(t *testing.T) {
 					snapId = fmt.Sprintf("myrev-%d", i+vmIDBase)
 				}
 				snap := snapshotting.NewSnapshot(snapId, "/fccd/snapshots", TestImageName, 256, 1, *isSparseSnaps)
-				err = snap.CreateSnapDir()
+				if *isFullLocal {
+					err = snap.CreateSnapDir()
+				}
 				require.NoError(t, err, "Failed to create directory for snapshot")
 
 				err = orch.CreateSnapshot(ctx, vmID, snap, *isFullLocal)

ctriface/orch.go

@@ -214,7 +214,7 @@ func (o *Orchestrator) getWorkingSetFile(vmID string) string {
 }
 
 func (o *Orchestrator) getVMBaseDir(vmID string) string {
-	return filepath.Join(o.snapshotsDir, vmID)
+	return filepath.Join(o.snapshotsDir,  vmID)
 }
 
 func (o *Orchestrator) setupHeartbeat() {

snapshotting/regular/manager.go

@@ -112,10 +112,10 @@ func (mgr *RegularSnapshotManager) InitSnapshot(vmID, image string, coldStartTim
 	mgr.Unlock()
 
 	// Create directory to store snapshot data
-	err := snap.CreateSnapDir()
+	/*err := snap.CreateSnapDir()
 	if err != nil {
 		return removeContainerSnaps, nil, errors.Wrapf(err, "creating snapDir for snapshots %s", vmID)
-	}
+	}*/
 
 	return removeContainerSnaps, snap, nil
 }