X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/40f551004ab4e5f1d8ab02ddb55dca225ee8f6ac..cac999f47113207f1b05405ee24daab19ac97de4:/lib/mount/command.go

diff --git a/lib/mount/command.go b/lib/mount/command.go
index d6d1ae0308..7ab518faee 100644
--- a/lib/mount/command.go
+++ b/lib/mount/command.go
@@ -14,15 +14,17 @@ import (
 	_ "net/http/pprof"
 	"os"
 
+	"git.arvados.org/arvados.git/lib/cmd"
 	"git.arvados.org/arvados.git/sdk/go/arvados"
 	"git.arvados.org/arvados.git/sdk/go/arvadosclient"
 	"git.arvados.org/arvados.git/sdk/go/keepclient"
 	"github.com/arvados/cgofuse/fuse"
+	"github.com/ghodss/yaml"
 )
 
-var Command = &cmd{}
+var Command = &mountCommand{}
 
-type cmd struct {
+type mountCommand struct {
 	// ready, if non-nil, will be closed when the mount is
 	// initialized.  If ready is non-nil, it RunCommand() should
 	// not be called more than once, or when ready is already
@@ -37,17 +39,15 @@ type cmd struct {
 //
 // The "-d" fuse option (and perhaps other features) ignores the
 // stderr argument and prints to os.Stderr instead.
-func (c *cmd) RunCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int {
+func (c *mountCommand) RunCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int {
 	logger := log.New(stderr, prog+" ", 0)
 	flags := flag.NewFlagSet(prog, flag.ContinueOnError)
 	ro := flags.Bool("ro", false, "read-only")
 	experimental := flags.Bool("experimental", false, "acknowledge this is an experimental command, and should not be used in production (required)")
-	blockCache := flags.Int("block-cache", 4, "read cache size (number of 64MiB blocks)")
+	cacheSizeStr := flags.String("cache-size", "0", "cache size as percent of home filesystem size (\"5%\") or size (\"10GiB\") or 0 for automatic")
 	pprof := flags.String("pprof", "", "serve Go profile data at `[addr]:port`")
-	err := flags.Parse(args)
-	if err != nil {
-		logger.Print(err)
-		return 2
+	if ok, code := cmd.ParseFlags(flags, prog, args, "[FUSE mount options]", stderr); !ok {
+		return code
 	}
 	if !*experimental {
 		logger.Printf("error: experimental command %q used without --experimental flag", prog)
@@ -60,6 +60,10 @@ func (c *cmd) RunCommand(prog string, args []string, stdin io.Reader, stdout, st
 	}
 
 	client := arvados.NewClientFromEnv()
+	if err := yaml.Unmarshal([]byte(*cacheSizeStr), &client.DiskCacheSize); err != nil {
+		logger.Printf("error parsing -cache-size argument: %s", err)
+		return 2
+	}
 	ac, err := arvadosclient.New(client)
 	if err != nil {
 		logger.Print(err)
@@ -70,7 +74,6 @@ func (c *cmd) RunCommand(prog string, args []string, stdin io.Reader, stdout, st
 		logger.Print(err)
 		return 1
 	}
-	kc.BlockCache = &keepclient.BlockCache{MaxBlocks: *blockCache}
 	host := fuse.NewFileSystemHost(&keepFS{
 		Client:     client,
 		KeepClient: kc,