From 32e4a28deaafa64209d54ec67984dc727194059e Mon Sep 17 00:00:00 2001 From: Ayush Ranjan Date: Thu, 27 Oct 2022 10:43:31 -0700 Subject: [PATCH] Update docs to reference LISAFS instead of 9P. PiperOrigin-RevId: 484293317 --- g3doc/user_guide/filesystem.md | 2 +- runsc/boot/vfs.go | 4 ++-- runsc/cmd/boot.go | 2 +- runsc/sandbox/sandbox.go | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/g3doc/user_guide/filesystem.md b/g3doc/user_guide/filesystem.md index e0e0a112b..3122987fa 100644 --- a/g3doc/user_guide/filesystem.md +++ b/g3doc/user_guide/filesystem.md @@ -4,7 +4,7 @@ gVisor accesses the filesystem through a file proxy, called the Gofer. The gofer runs as a separate process, that is isolated from the sandbox. Gofer instances -communicate with their respective sentry using the 9P protocol. +communicate with their respective sentry using the LISAFS protocol. Configuring the filesystem provides performance benefits, but isn't the only step to optimizing gVisor performance. See the [Production guide] for more. diff --git a/runsc/boot/vfs.go b/runsc/boot/vfs.go index 69f8519eb..5c78a94b0 100644 --- a/runsc/boot/vfs.go +++ b/runsc/boot/vfs.go @@ -412,7 +412,7 @@ func (c *containerMounter) createMountNamespace(ctx context.Context, conf *confi // Configure the gofer dentry cache size. gofer.SetDentryCacheSize(conf.DCache) - log.Infof("Mounting root over 9P, ioFD: %d", fd) + log.Infof("Mounting root with gofer, ioFD: %d", fd) opts := &vfs.MountOptions{ ReadOnly: c.root.Readonly, GetFilesystemOptions: vfs.GetFilesystemOptions{ @@ -709,7 +709,7 @@ func (c *containerMounter) getMountNameAndOptions(conf *config.Config, m *mountA if m.fd == 0 { // Check that an FD was provided to fails fast. Technically FD=0 is valid, // but unlikely to be correct in this context. - return "", nil, false, fmt.Errorf("9P mount requires a connection FD") + return "", nil, false, fmt.Errorf("gofer mount requires a connection FD") } data = goferMountData(m.fd, c.getMountAccessType(conf, m.mount), conf.Lisafs) internalData = gofer.InternalFilesystemOptions{ diff --git a/runsc/cmd/boot.go b/runsc/cmd/boot.go index 95143e90b..b1615c79f 100644 --- a/runsc/cmd/boot.go +++ b/runsc/cmd/boot.go @@ -133,7 +133,7 @@ func (b *Boot) SetFlags(f *flag.FlagSet) { f.IntVar(&b.specFD, "spec-fd", -1, "required fd with the container spec") f.IntVar(&b.controllerFD, "controller-fd", -1, "required FD of a stream socket for the control server that must be donated to this process") f.IntVar(&b.deviceFD, "device-fd", -1, "FD for the platform device file") - f.Var(&b.ioFDs, "io-fds", "list of FDs to connect 9P clients. They must follow this order: root first, then mounts as defined in the spec") + f.Var(&b.ioFDs, "io-fds", "list of FDs to connect gofer clients. They must follow this order: root first, then mounts as defined in the spec") f.Var(&b.stdioFDs, "stdio-fds", "list of FDs containing sandbox stdin, stdout, and stderr in that order") f.IntVar(&b.userLogFD, "user-log-fd", 0, "file descriptor to write user logs to. 0 means no logging.") f.IntVar(&b.startSyncFD, "start-sync-fd", -1, "required FD to used to synchronize sandbox startup") diff --git a/runsc/sandbox/sandbox.go b/runsc/sandbox/sandbox.go index e721c2684..a97464c8f 100644 --- a/runsc/sandbox/sandbox.go +++ b/runsc/sandbox/sandbox.go @@ -151,9 +151,9 @@ type Args struct { // UserLog is the filename to send user-visible logs to. It may be empty. UserLog string - // IOFiles is the list of files that connect to a 9P endpoint for the mounts - // points using Gofers. They must be in the same order as mounts appear in - // the spec. + // IOFiles is the list of files that connect to a gofer endpoint for the + // mounts points using Gofers. They must be in the same order as mounts + // appear in the spec. IOFiles []*os.File // MountsFile is a file container mount information from the spec. It's