wip

Author: sagor999

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

@@ -241,18 +241,20 @@ func (s *WorkspaceService) InitWorkspace(ctx context.Context, req *api.InitWorks
 		}
 	}
 
-	// create a folder that is used to store data from running prestophook
-	deamonDir := fmt.Sprintf("%s-daemon", req.Id)
-	prestophookDir := filepath.Join(s.config.WorkingArea, deamonDir, "prestophookdata")
-	_, err = exec.CommandContext(ctx, "mkdir", "-p", prestophookDir).CombinedOutput()
-	if err != nil {
-		log.WithError(err).WithField("workspaceId", req.Id).Error("cannot create prestophookdata folder")
-		return nil, status.Error(codes.FailedPrecondition, fmt.Sprintf("cannot create prestophookdata: %v", err))
-	}
-	_, err = exec.CommandContext(ctx, "chown", "-R", fmt.Sprintf("%d:%d", wsinit.GitpodUID, wsinit.GitpodGID), prestophookDir).CombinedOutput()
-	if err != nil {
-		log.WithError(err).WithField("workspaceId", req.Id).Error("cannot chown prestophookdata folder")
-		return nil, status.Error(codes.FailedPrecondition, fmt.Sprintf("cannot chown prestophookdata: %v", err))
+	if req.PersistentVolumeClaim {
+		// create a folder that is used to store data from running prestophook
+		deamonDir := fmt.Sprintf("%s-daemon", req.Id)
+		prestophookDir := filepath.Join(s.config.WorkingArea, deamonDir, "prestophookdata")
+		_, err = exec.CommandContext(ctx, "mkdir", "-p", prestophookDir).CombinedOutput()
+		if err != nil {
+			log.WithError(err).WithField("workspaceId", req.Id).Error("cannot create prestophookdata folder")
+			return nil, status.Error(codes.FailedPrecondition, fmt.Sprintf("cannot create prestophookdata: %v", err))
+		}
+		_, err = exec.CommandContext(ctx, "chown", "-R", fmt.Sprintf("%d:%d", wsinit.GitpodUID, wsinit.GitpodGID), prestophookDir).CombinedOutput()
+		if err != nil {
+			log.WithError(err).WithField("workspaceId", req.Id).Error("cannot chown prestophookdata folder")
+			return nil, status.Error(codes.FailedPrecondition, fmt.Sprintf("cannot chown prestophookdata: %v", err))
+		}
 	}
 
 	// Tell the world we're done

components/ws-manager/pkg/manager/monitor.go

@@ -383,10 +383,8 @@ func actOnPodEvent(ctx context.Context, m actingManager, status *api.WorkspaceSt
 
 		_, gone := wso.Pod.Annotations[wsk8s.ContainerIsGoneAnnotation]
 		_, alreadyFinalized := wso.Pod.Annotations[disposalStatusAnnotation]
-		log.Infof("alreadyFinalize: %v, annotations: %v", alreadyFinalized, wso.Pod.Annotations)
 
 		if (terminated || gone) && !alreadyFinalized {
-			log.Infof("about to call finalizeWorkspaceContent: %v and %v", terminated, gone)
 			// We start finalizing the workspace content only after the container is gone. This way we ensure there's
 			// no process modifying the workspace content as we create the backup.
 			go m.finalizeWorkspaceContent(ctx, wso)
@@ -825,8 +823,6 @@ func (m *Monitor) finalizeWorkspaceContent(ctx context.Context, wso *workspaceOb
 	defer tracing.FinishSpan(span, nil)
 	log := log.WithFields(wso.GetOWI())
 
-	log.Infof("finalizeWorkspaceContent called")
-
 	workspaceID, ok := wso.WorkspaceID()
 	if !ok {
 		tracing.LogError(span, xerrors.Errorf("cannot find %s annotation", workspaceIDAnnotation))
@@ -927,23 +923,6 @@ func (m *Monitor) finalizeWorkspaceContent(ctx context.Context, wso *workspaceOb
 						VolumeSnapshotClassName: &snapshotClassname,
 					},
 				}
-				//volumesnapshotRes := schema.GroupVersionResource{Group: "snapshot.storage.k8s.io", Version: "v1", Resource: "volumesnapshots"}
-				/*snapshot := &unstructured.Unstructured{
-					Object: map[string]interface{}{
-						"apiVersion": "snapshot.storage.k8s.io/v1",
-						"kind":       "VolumeSnapshot",
-						"metadata": map[string]interface{}{
-							"name":      snapshotName,
-							"namespace": m.manager.Config.Namespace,
-						},
-						"spec": map[string]interface{}{
-							"volumeSnapshotClassName": "csi-gce-pd-snapshot-class",
-							"source": map[string]interface{}{
-								"persistentVolumeClaimName": pvcName,
-							},
-						},
-					},
-				}*/
 
 				err = m.manager.Clientset.Create(ctx, volumeSnapshot)
 				if err != nil {