Bind mounting /workspace in ring1 only if not running FWB

Author: aledbf

components/workspacekit/cmd/rings.go

@@ -96,7 +96,10 @@ var ring0Cmd = &cobra.Command{
 		cmd.Stdin = os.Stdin
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
-		cmd.Env = append(os.Environ(), "WORKSPACEKIT_FSSHIFT="+prep.FsShift.String())
+		cmd.Env = append(os.Environ(),
+			"WORKSPACEKIT_FSSHIFT="+prep.FsShift.String(),
+			fmt.Sprintf("WORKSPACEKIT_FULL_WORKSPACE_BACKUP=%v", prep.FullWorkspaceBackup),
+		)
 
 		if err := cmd.Start(); err != nil {
 			log.WithError(err).Error("failed to start ring0")
@@ -256,14 +259,20 @@ var ring1Cmd = &cobra.Command{
 		mnts = append(mnts,
 			mnte{Target: "/sys", Flags: unix.MS_BIND | unix.MS_REC},
 			mnte{Target: "/dev", Flags: unix.MS_BIND | unix.MS_REC},
-			// TODO(cw): only mount /workspace if it's in the mount table, i.e. this isn't an FWB workspace
-			mnte{Target: "/workspace", Flags: unix.MS_BIND | unix.MS_REC},
 			mnte{Target: "/etc/hosts", Flags: unix.MS_BIND | unix.MS_REC},
 			mnte{Target: "/etc/hostname", Flags: unix.MS_BIND | unix.MS_REC},
 			mnte{Target: "/etc/resolv.conf", Flags: unix.MS_BIND | unix.MS_REC},
 			mnte{Target: "/tmp", Source: "tmpfs", FSType: "tmpfs"},
 		)
 
+		// FWB workspaces do not require mounting /workspace
+		// if that is done, the backup will not contain any change in the directory
+		if os.Getenv("WORKSPACEKIT_FULL_WORKSPACE_BACKUP") != "true" {
+			mnts = append(mnts,
+				mnte{Target: "/workspace", Flags: unix.MS_BIND | unix.MS_REC},
+			)
+		}
+
 		for _, m := range mnts {
 			dst := filepath.Join(ring2Root, m.Target)
 			_ = os.MkdirAll(dst, 0644)

components/ws-daemon-api/go/workspace_daemon.pb.go

@@ -32,6 +32,8 @@ export namespace PrepareForUserNSRequest {
 export class PrepareForUserNSResponse extends jspb.Message {
     getFsShift(): FSShiftMethod;
     setFsShift(value: FSShiftMethod): PrepareForUserNSResponse;
+    getFullWorkspaceBackup(): boolean;
+    setFullWorkspaceBackup(value: boolean): PrepareForUserNSResponse;
 
     serializeBinary(): Uint8Array;
     toObject(includeInstance?: boolean): PrepareForUserNSResponse.AsObject;
@@ -46,6 +48,7 @@ export class PrepareForUserNSResponse extends jspb.Message {
 export namespace PrepareForUserNSResponse {
     export type AsObject = {
         fsShift: FSShiftMethod,
+        fullWorkspaceBackup: boolean,
     }
 }
 

components/ws-daemon-api/typescript/src/workspace_daemon_pb.d.ts

@@ -397,7 +397,8 @@ proto.iws.PrepareForUserNSResponse.prototype.toObject = function(opt_includeInst
  */
 proto.iws.PrepareForUserNSResponse.toObject = function(includeInstance, msg) {
   var f, obj = {
-    fsShift: jspb.Message.getFieldWithDefault(msg, 1, 0)
+    fsShift: jspb.Message.getFieldWithDefault(msg, 1, 0),
+    fullWorkspaceBackup: jspb.Message.getBooleanFieldWithDefault(msg, 2, false)
   };
 
   if (includeInstance) {
@@ -438,6 +439,10 @@ proto.iws.PrepareForUserNSResponse.deserializeBinaryFromReader = function(msg, r
       var value = /** @type {!proto.iws.FSShiftMethod} */ (reader.readEnum());
       msg.setFsShift(value);
       break;
+    case 2:
+      var value = /** @type {boolean} */ (reader.readBool());
+      msg.setFullWorkspaceBackup(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -474,6 +479,13 @@ proto.iws.PrepareForUserNSResponse.serializeBinaryToWriter = function(message, w
       f
     );
   }
+  f = message.getFullWorkspaceBackup();
+  if (f) {
+    writer.writeBool(
+      2,
+      f
+    );
+  }
 };
 
 
@@ -495,6 +507,24 @@ proto.iws.PrepareForUserNSResponse.prototype.setFsShift = function(value) {
 };
 
 
+/**
+ * optional bool full_workspace_backup = 2;
+ * @return {boolean}
+ */
+proto.iws.PrepareForUserNSResponse.prototype.getFullWorkspaceBackup = function() {
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 2, false));
+};
+
+
+/**
+ * @param {boolean} value
+ * @return {!proto.iws.PrepareForUserNSResponse} returns this
+ */
+proto.iws.PrepareForUserNSResponse.prototype.setFullWorkspaceBackup = function(value) {
+  return jspb.Message.setProto3BooleanField(this, 2, value);
+};
+
+
 
 
 

components/ws-daemon-api/typescript/src/workspace_daemon_pb.js

@@ -35,6 +35,7 @@ service InWorkspaceService {
 message PrepareForUserNSRequest {}
 message PrepareForUserNSResponse {
     FSShiftMethod fs_shift = 1;
+    bool full_workspace_backup = 2;
 }
 
 // FSShiftMethod describes the means by which we establish the ID shift for

components/ws-daemon-api/workspace_daemon.proto

@@ -468,7 +468,7 @@ func (s *WorkspaceService) uploadWorkspaceContent(ctx context.Context, sess *ses
 			)
 		}
 
-		err = BuildTarbal(ctx, loc, tmpf.Name(),sess.FullWorkspaceBackup, opts...)
+		err = BuildTarbal(ctx, loc, tmpf.Name(), sess.FullWorkspaceBackup, opts...)
 		if err != nil {
 			return
 		}

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

@@ -254,7 +254,8 @@ func (wbs *InWorkspaceServiceServer) PrepareForUserNS(ctx context.Context, req *
 		}
 
 		return &api.PrepareForUserNSResponse{
-			FsShift: api.FSShiftMethod_FUSE,
+			FsShift:             api.FSShiftMethod_FUSE,
+			FullWorkspaceBackup: wbs.Session.FullWorkspaceBackup,
 		}, nil
 	}
 
@@ -278,7 +279,8 @@ func (wbs *InWorkspaceServiceServer) PrepareForUserNS(ctx context.Context, req *
 	}
 
 	return &api.PrepareForUserNSResponse{
-		FsShift: api.FSShiftMethod_SHIFTFS,
+		FsShift:             api.FSShiftMethod_SHIFTFS,
+		FullWorkspaceBackup: wbs.Session.FullWorkspaceBackup,
 	}, nil
 }