Add Debug fields to all Options structs, and use those.

SetDebug methods are maintained for compatibility.

This is part of a patch series to process the INIT opcode on
mount. This will enable filesystems to switch functionality depending
on kernel settings.

In order to get the debug output for the INIT opcode, the debug option
must be passed to the mount method.

Deprecate the SetDebug methods. There is often little practical use in
toggling debug on the fly, since the error scenarios depend on timing
details, and must usually be isolated into unittests.

Change-Id: I221c995add5f7621b627f738d7e97af7daf81b2a

benchmark/stat_test.go

@@ -31,7 +31,6 @@ func setupFs(fs pathfs.FileSystem) (string, func()) {
 	lmap := NewLatencyMap()
 
 	state.RecordLatencies(lmap)
-	// state.SetDebug(true)
 	go state.Serve()
 
 	return mountPoint, func() {

example/autounionfs/main.go

@@ -43,6 +43,7 @@ func main() {
 			AttrTimeout:     time.Second,
 			NegativeTimeout: time.Second,
 			Owner:           fuse.CurrentOwner(),
+			Debug:           *debug,
 		},
 		UpdateOnMount: true,
 		PathNodeFsOptions: pathfs.PathNodeFsOptions{
@@ -52,19 +53,18 @@ func main() {
 	}
 	fsOpts := nodefs.Options{
 		PortableInodes: *portableInodes,
+		Debug:          *debug,
 	}
 	gofs := unionfs.NewAutoUnionFs(flag.Arg(1), options)
-	pathfs := pathfs.NewPathNodeFs(gofs, nil)
-	state, conn, err := nodefs.MountRoot(flag.Arg(0), pathfs.Root(), &fsOpts)
+	pathfs := pathfs.NewPathNodeFs(gofs, &pathfs.PathNodeFsOptions{
+		Debug: *debug,
+	})
+	state, _, err := nodefs.MountRoot(flag.Arg(0), pathfs.Root(), &fsOpts)
 	if err != nil {
 		fmt.Printf("Mount fail: %v\n", err)
 		os.Exit(1)
 	}
 
-	pathfs.SetDebug(*debug)
-	conn.SetDebug(*debug)
-	state.SetDebug(*debug)
-
 	state.Serve()
 	time.Sleep(1 * time.Second)
 }

example/loopback/main.go

@@ -82,13 +82,13 @@ func main() {
 		AllowOther: *other,
 		Name:       "loopbackfs",
 		FsName:     origAbs,
+		Debug:      *debug,
 	}
 	state, err := fuse.NewServer(conn.RawFS(), mountPoint, mOpts)
 	if err != nil {
 		fmt.Printf("Mount fail: %v\n", err)
 		os.Exit(1)
 	}
-	state.SetDebug(*debug)
 
 	fmt.Println("Mounted!")
 	state.Serve()

example/memfs/main.go

@@ -25,12 +25,13 @@ func main() {
 	prefix := flag.Arg(1)
 	root := nodefs.NewMemNodeFSRoot(prefix)
 	conn := nodefs.NewFileSystemConnector(root, nil)
-	server, err := fuse.NewServer(conn.RawFS(), mountPoint, nil)
+	server, err := fuse.NewServer(conn.RawFS(), mountPoint, &fuse.MountOptions{
+		Debug: *debug,
+	})
 	if err != nil {
 		fmt.Printf("Mount fail: %v\n", err)
 		os.Exit(1)
 	}
-	server.SetDebug(*debug)
 	fmt.Println("Mounted!")
 	server.Serve()
 }

example/multizip/main.go

@@ -23,12 +23,13 @@ func main() {
 
 	fs := zipfs.NewMultiZipFs()
 	nfs := pathfs.NewPathNodeFs(fs, nil)
-	state, _, err := nodefs.MountRoot(flag.Arg(0), nfs.Root(), nil)
+	opts := nodefs.NewOptions()
+	opts.Debug = *debug
+	state, _, err := nodefs.MountRoot(flag.Arg(0), nfs.Root(), opts)
 	if err != nil {
 		fmt.Printf("Mount fail: %v\n", err)
 		os.Exit(1)
 	}
 
-	state.SetDebug(*debug)
 	state.Serve()
 }

example/statfs/main.go

@@ -53,6 +53,7 @@ func main() {
 	opts := &nodefs.Options{
 		AttrTimeout:  time.Duration(*ttl * float64(time.Second)),
 		EntryTimeout: time.Duration(*ttl * float64(time.Second)),
+		Debug:        *debug,
 	}
 	state, _, err := nodefs.MountRoot(flag.Arg(0), nfs.Root(), opts)
 	if err != nil {
@@ -60,7 +61,6 @@ func main() {
 		os.Exit(1)
 	}
 
-	state.SetDebug(*debug)
 	runtime.GC()
 	if profFile != nil {
 		pprof.StartCPUProfile(profFile)

example/unionfs/main.go

@@ -47,12 +47,12 @@ func main() {
 		AttrTimeout:     time.Duration(*entry_ttl * float64(time.Second)),
 		NegativeTimeout: time.Duration(*negative_ttl * float64(time.Second)),
 		PortableInodes:  *portable,
+		Debug:           *debug,
 	}
 	mountState, _, err := nodefs.MountRoot(flag.Arg(0), nodeFs.Root(), &mOpts)
 	if err != nil {
 		log.Fatal("Mount fail:", err)
 	}
 
-	mountState.SetDebug(*debug)
 	mountState.Serve()
 }

example/zipfs/main.go

@@ -53,6 +53,7 @@ func main() {
 	opts := &nodefs.Options{
 		AttrTimeout:  time.Duration(*ttl * float64(time.Second)),
 		EntryTimeout: time.Duration(*ttl * float64(time.Second)),
+		Debug:        *debug,
 	}
 	state, _, err := nodefs.MountRoot(flag.Arg(0), root, opts)
 	if err != nil {
@@ -60,7 +61,6 @@ func main() {
 		os.Exit(1)
 	}
 
-	state.SetDebug(*debug)
 	runtime.GC()
 	if profFile != nil {
 		pprof.StartCPUProfile(profFile)

fuse/api.go

@@ -65,6 +65,9 @@ type MountOptions struct {
 	// If set, return ENOSYS for Getxattr calls, so the kernel does not issue any
 	// Xattr operations at all.
 	DisableXAttrs bool
+
+	// If set, print debugging information.
+	Debug bool
 }
 
 // RawFileSystem is an interface close to the FUSE wire protocol.

fuse/nodefs/api.go

@@ -172,10 +172,13 @@ type Options struct {
 	NegativeTimeout time.Duration
 
 	// If set, replace all uids with given UID.
-	// NewFileSystemOptions() will set this to the daemon's
+	// NewOptions() will set this to the daemon's
 	// uid/gid.
 	*fuse.Owner
 
 	// This option exists for compatibility and is ignored.
 	PortableInodes bool
+
+	// If set, print debug information.
+	Debug bool
 }

fuse/nodefs/fileless_test.go

@@ -36,6 +36,12 @@ func (n *nodeReadNode) Read(file File, dest []byte, off int64, context *fuse.Con
 	return fuse.ReadResultData(n.data[off:int(e)]), fuse.OK
 }
 
+func (n *nodeReadNode) GetAttr(out *fuse.Attr, file File, context *fuse.Context) (code fuse.Status) {
+	out.Mode = fuse.S_IFREG | 0644
+	out.Size = uint64(len(n.data))
+	return fuse.OK
+}
+
 func (n *nodeReadNode) Lookup(out *fuse.Attr, name string, context *fuse.Context) (*Inode, fuse.Status) {
 	out.Mode = fuse.S_IFREG | 0644
 	out.Size = uint64(len(name))
@@ -52,11 +58,10 @@ func TestNoOpen(t *testing.T) {
 	root := newNodeReadNode(true, nil)
 	root.noOpen = true
 
-	s, _, err := MountRoot(dir, root, nil)
+	s, _, err := MountRoot(dir, root, &Options{Debug: VerboseTest()})
 	if err != nil {
 		t.Fatalf("MountRoot: %v", err)
 	}
-	s.SetDebug(VerboseTest())
 	defer s.Unmount()
 	go s.Serve()
 
@@ -92,7 +97,9 @@ func TestNodeRead(t *testing.T) {
 	}
 
 	root := newNodeReadNode(false, nil)
-	s, _, err := MountRoot(dir, root, nil)
+	opts := NewOptions()
+	opts.Debug = true
+	s, _, err := MountRoot(dir, root, opts)
 	if err != nil {
 		t.Fatalf("MountRoot: %v", err)
 	}
@@ -106,5 +113,4 @@ func TestNodeRead(t *testing.T) {
 	if string(content) != want {
 		t.Fatalf("got %q, want %q", content, want)
 	}
-
 }

fuse/nodefs/fsconnector.go

@@ -60,6 +60,7 @@ func NewFileSystemConnector(root Node, opts *Options) (c *FileSystemConnector) {
 	// FUSE does not issue a LOOKUP for 1 (obviously), but it does
 	// issue a forget.  This lookupUpdate is to make the counts match.
 	c.lookupUpdate(c.rootNode)
+	c.debug = opts.Debug
 
 	return c
 }
@@ -69,7 +70,8 @@ func (c *FileSystemConnector) Server() *fuse.Server {
 	return c.server
 }
 
-// SetDebug toggles printing of debug information.
+// SetDebug toggles printing of debug information. This function is
+// deprecated. Set the Debug option in the Options struct instead.
 func (c *FileSystemConnector) SetDebug(debug bool) {
 	c.debug = debug
 }

fuse/nodefs/fuse.go

@@ -7,7 +7,12 @@ import (
 // Mounts a filesystem with the given root node on the given directory
 func MountRoot(mountpoint string, root Node, opts *Options) (*fuse.Server, *FileSystemConnector, error) {
 	conn := NewFileSystemConnector(root, opts)
-	s, err := fuse.NewServer(conn.RawFS(), mountpoint, nil)
+
+	mountOpts := fuse.MountOptions{}
+	if opts != nil && opts.Debug {
+		mountOpts.Debug = opts.Debug
+	}
+	s, err := fuse.NewServer(conn.RawFS(), mountpoint, &mountOpts)
 	if err != nil {
 		return nil, nil, err
 	}

fuse/nodefs/memnode_test.go

@@ -27,16 +27,13 @@ func setupMemNodeTest(t *testing.T) (wd string, root Node, clean func()) {
 			EntryTimeout:    testTtl,
 			AttrTimeout:     testTtl,
 			NegativeTimeout: 0.0,
+			Debug:           VerboseTest(),
 		})
-	connector.SetDebug(VerboseTest())
-	state, err := fuse.NewServer(connector.RawFS(), mnt, nil)
+	state, err := fuse.NewServer(connector.RawFS(), mnt, &fuse.MountOptions{Debug: VerboseTest()})
 	if err != nil {
 		t.Fatal("NewServer", err)
 	}
 
-	//me.state.SetDebug(false)
-	state.SetDebug(VerboseTest())
-
 	// Unthreaded, but in background.
 	go state.Serve()
 	return mnt, root, func() {

fuse/opcode.go

@@ -262,7 +262,7 @@ func doBatchForget(server *Server, req *request) {
 
 	forgets := *(*[]_ForgetOne)(unsafe.Pointer(h))
 	for i, f := range forgets {
-		if server.debug {
+		if server.opts.Debug {
 			log.Printf("doBatchForget: forgetting %d of %d: NodeId: %d, Nlookup: %d", i+1, len(forgets), f.NodeId, f.Nlookup)
 		}
 		server.fileSystem.Forget(f.NodeId, f.Nlookup)

fuse/pathfs/api.go

@@ -75,4 +75,7 @@ type PathNodeFsOptions struct {
 	// If ClientInodes is set, use Inode returned from GetAttr to
 	// find hard-linked files.
 	ClientInodes bool
+
+	// Debug controls printing of debug information.
+	Debug bool
 }

fuse/pathfs/xattr_test.go

@@ -107,11 +107,11 @@ func xattrTestCase(t *testing.T, nm string, m map[string][]byte) (mountPoint str
 	}
 
 	nfs := NewPathNodeFs(xfs, nil)
-	state, _, err := nodefs.MountRoot(mountPoint, nfs.Root(), nil)
+	state, _, err := nodefs.MountRoot(mountPoint, nfs.Root(),
+		&nodefs.Options{Debug: VerboseTest()})
 	if err != nil {
 		t.Fatalf("TempDir failed: %v", err)
 	}
-	state.SetDebug(VerboseTest())
 
 	go state.Serve()
 	return mountPoint, func() {

fuse/server.go

@@ -31,9 +31,6 @@ type Server struct {
 	// I/O with kernel and daemon.
 	mountFd int
 
-	// Dump debug info onto stdout.
-	debug bool
-
 	latencies LatencyMap
 
 	opts *MountOptions
@@ -54,8 +51,10 @@ type Server struct {
 	loops        sync.WaitGroup
 }
 
+// SetDebug is deprecated. Use MountOptions.Debug instead.
 func (ms *Server) SetDebug(dbg bool) {
-	ms.debug = dbg
+	// This will typically trigger the race detector.
+	ms.opts.Debug = dbg
 }
 
 // KernelSettings returns the Init message from the kernel, so
@@ -345,7 +344,7 @@ func (ms *Server) handleRequest(req *request) {
 		req.status = ENOSYS
 	}
 
-	if req.status.Ok() && ms.debug {
+	if req.status.Ok() && ms.opts.Debug {
 		log.Println(req.InputDebug())
 	}
 
@@ -385,7 +384,7 @@ func (ms *Server) write(req *request) Status {
 	}
 
 	header := req.serializeHeader(req.flatDataSize())
-	if ms.debug {
+	if ms.opts.Debug {
 		log.Println(req.OutputDebug())
 	}
 
@@ -422,7 +421,7 @@ func (ms *Server) InodeNotify(node uint64, off int64, length int64) Status {
 	result := ms.write(&req)
 	ms.writeMu.Unlock()
 
-	if ms.debug {
+	if ms.opts.Debug {
 		log.Println("Response: INODE_NOTIFY", result)
 	}
 	return result
@@ -464,7 +463,7 @@ func (ms *Server) DeleteNotify(parent uint64, child uint64, name string) Status
 	result := ms.write(&req)
 	ms.writeMu.Unlock()
 
-	if ms.debug {
+	if ms.opts.Debug {
 		log.Printf("Response: DELETE_NOTIFY: %v", result)
 	}
 	return result
@@ -499,7 +498,7 @@ func (ms *Server) EntryNotify(parent uint64, name string) Status {
 	result := ms.write(&req)
 	ms.writeMu.Unlock()
 
-	if ms.debug {
+	if ms.opts.Debug {
 		log.Printf("Response: ENTRY_NOTIFY: %v", result)
 	}
 	return result

fuse/test/cache_test.go

@@ -39,14 +39,14 @@ func setupCacheTest(t *testing.T) (string, *pathfs.PathNodeFs, func()) {
 	fs := &cacheFs{
 		pathfs.NewLoopbackFileSystem(dir + "/orig"),
 	}
-	pfs := pathfs.NewPathNodeFs(fs, nil)
-	state, conn, err := nodefs.MountRoot(dir+"/mnt", pfs.Root(), nil)
+	pfs := pathfs.NewPathNodeFs(fs, &pathfs.PathNodeFsOptions{Debug: VerboseTest()})
+
+	opts := nodefs.NewOptions()
+	opts.Debug = VerboseTest()
+	state, _, err := nodefs.MountRoot(dir+"/mnt", pfs.Root(), opts)
 	if err != nil {
 		t.Fatalf("MountNodeFileSystem failed: %v", err)
 	}
-	state.SetDebug(VerboseTest())
-	conn.SetDebug(VerboseTest())
-	pfs.SetDebug(VerboseTest())
 	go state.Serve()
 
 	return dir, pfs, func() {
@@ -140,11 +140,12 @@ func TestNonseekable(t *testing.T) {
 	}
 	defer os.RemoveAll(dir)
 	nfs := pathfs.NewPathNodeFs(fs, nil)
-	state, _, err := nodefs.MountRoot(dir, nfs.Root(), nil)
+	opts := nodefs.NewOptions()
+	opts.Debug = VerboseTest()
+	state, _, err := nodefs.MountRoot(dir, nfs.Root(), opts)
 	if err != nil {
 		t.Fatalf("failed: %v", err)
 	}
-	state.SetDebug(VerboseTest())
 	defer state.Unmount()
 
 	go state.Serve()
@@ -172,15 +173,12 @@ func TestGetAttrRace(t *testing.T) {
 	os.Mkdir(dir+"/orig", 0755)
 
 	fs := pathfs.NewLoopbackFileSystem(dir + "/orig")
-	pfs := pathfs.NewPathNodeFs(fs, nil)
-	state, conn, err := nodefs.MountRoot(dir+"/mnt", pfs.Root(),
-		&nodefs.Options{})
+	pfs := pathfs.NewPathNodeFs(fs, &pathfs.PathNodeFsOptions{Debug: VerboseTest()})
+	state, _, err := nodefs.MountRoot(dir+"/mnt", pfs.Root(),
+		&nodefs.Options{Debug: VerboseTest()})
 	if err != nil {
 		t.Fatalf("MountNodeFileSystem failed: %v", err)
 	}
-	state.SetDebug(VerboseTest())
-	conn.SetDebug(VerboseTest())
-	pfs.SetDebug(VerboseTest())
 	go state.Serve()
 
 	defer state.Unmount()

fuse/test/defaultread_test.go

@@ -41,11 +41,13 @@ func defaultReadTest(t *testing.T) (root string, cleanup func()) {
 		t.Fatalf("TempDir failed: %v", err)
 	}
 	pathfs := pathfs.NewPathNodeFs(fs, nil)
-	state, _, err := nodefs.MountRoot(dir, pathfs.Root(), nil)
+	opts := nodefs.NewOptions()
+	opts.Debug = VerboseTest()
+
+	state, _, err := nodefs.MountRoot(dir, pathfs.Root(), opts)
 	if err != nil {
 		t.Fatalf("MountNodeFileSystem failed: %v", err)
 	}
-	state.SetDebug(VerboseTest())
 	go state.Serve()
 
 	return dir, func() {

fuse/test/delete_linux_test.go

@@ -43,11 +43,12 @@ func TestDeleteNotify(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	state, err := fuse.NewServer(conn.RawFS(), mnt, nil)
+	state, err := fuse.NewServer(conn.RawFS(), mnt, &fuse.MountOptions{
+		Debug: VerboseTest(),
+	})
 	if err != nil {
 		t.Fatal(err)
 	}
-	state.SetDebug(VerboseTest())
 	go state.Serve()
 	defer state.Unmount()
 

fuse/test/fsetattr_test.go

@@ -144,11 +144,13 @@ func setupFAttrTest(t *testing.T, fs pathfs.FileSystem) (dir string, clean func(
 		t.Fatalf("TempDir failed: %v", err)
 	}
 	nfs := pathfs.NewPathNodeFs(fs, nil)
-	state, _, err := nodefs.MountRoot(dir, nfs.Root(), nil)
+	opts := nodefs.NewOptions()
+	opts.Debug = VerboseTest()
+
+	state, _, err := nodefs.MountRoot(dir, nfs.Root(), opts)
 	if err != nil {
 		t.Fatalf("MountNodeFileSystem failed: %v", err)
 	}
-	state.SetDebug(VerboseTest())
 
 	go state.Serve()
 

fuse/test/loopback_test.go

@@ -96,16 +96,17 @@ func NewTestCase(t *testing.T) *testCase {
 			EntryTimeout:    testTtl,
 			AttrTimeout:     testTtl,
 			NegativeTimeout: 0.0,
+			Debug:           VerboseTest(),
 		})
-	tc.connector.SetDebug(VerboseTest())
 	tc.state, err = fuse.NewServer(
-		fuse.NewRawFileSystem(tc.connector.RawFS()), tc.mnt, &fuse.MountOptions{SingleThreaded: true})
+		fuse.NewRawFileSystem(tc.connector.RawFS()), tc.mnt, &fuse.MountOptions{
+			SingleThreaded: true,
+			Debug:          VerboseTest(),
+		})
 	if err != nil {
 		t.Fatal("NewServer:", err)
 	}
 
-	tc.state.SetDebug(VerboseTest())
-
 	// Unthreaded, but in background.
 	go tc.state.Serve()
 

fuse/test/notify_linux_test.go

@@ -84,6 +84,7 @@ func NewNotifyTest(t *testing.T) *NotifyTest {
 		EntryTimeout:    entryTtl,
 		AttrTimeout:     entryTtl,
 		NegativeTimeout: entryTtl,
+		Debug:           VerboseTest(),
 	}
 
 	me.pathfs = pathfs.NewPathNodeFs(me.fs, nil)
@@ -91,7 +92,6 @@ func NewNotifyTest(t *testing.T) *NotifyTest {
 	if err != nil {
 		t.Fatalf("MountNodeFileSystem failed: %v", err)
 	}
-	me.state.SetDebug(VerboseTest())
 	go me.state.Serve()
 
 	return me

fuse/test/xattr_test.go

@@ -38,11 +38,12 @@ func TestDefaultXAttr(t *testing.T) {
 		Node: nodefs.NewDefaultNode(),
 	}
 
-	s, _, err := nodefs.MountRoot(dir, root, nil)
+	opts := nodefs.NewOptions()
+	opts.Debug = VerboseTest()
+	s, _, err := nodefs.MountRoot(dir, root, opts)
 	if err != nil {
 		t.Fatalf("MountRoot: %v", err)
 	}
-	s.SetDebug(VerboseTest())
 	go s.Serve()
 	defer s.Unmount()
 

unionfs/autounion.go

@@ -61,7 +61,6 @@ const (
 	_STATUS      = "status"
 	_CONFIG      = "config"
 	_DEBUG       = "debug"
-	_DEBUG_SETTING = "debug_setting"
 	_ROOT        = "root"
 	_VERSION     = "gounionfs_version"
 	_SCAN_CONFIG = ".scan_config"
@@ -238,10 +237,6 @@ func (fs *autoUnionFs) Readlink(path string, context *fuse.Context) (out string,
 		return fs.root, fuse.OK
 	}
 
-	if comps[0] == _STATUS && comps[1] == _DEBUG_SETTING && fs.hasDebug() {
-		return "1", fuse.OK
-	}
-
 	if comps[0] != _CONFIG {
 		return "", fuse.ENOENT
 	}
@@ -270,11 +265,6 @@ func (fs *autoUnionFs) Symlink(pointedTo string, linkName string, context *fuse.
 		return fuse.EPERM
 	}
 
-	if comps[0] == _STATUS && comps[1] == _DEBUG_SETTING {
-		fs.SetDebug(true)
-		return fuse.OK
-	}
-
 	if comps[0] == _CONFIG {
 		roots := fs.getRoots(pointedTo)
 		if roots == nil {
@@ -287,31 +277,12 @@ func (fs *autoUnionFs) Symlink(pointedTo string, linkName string, context *fuse.
 	return fuse.EPERM
 }
 
-func (fs *autoUnionFs) SetDebug(b bool) {
-	// TODO(hanwen): this should use locking.
-	fs.debug = b
-	fs.nodeFs.SetDebug(b)
-
-	conn := fs.nodeFs.Connector()
-	conn.SetDebug(b)
-	conn.Server().SetDebug(b)
-}
-
-func (fs *autoUnionFs) hasDebug() bool {
-	return fs.debug
-}
-
 func (fs *autoUnionFs) Unlink(path string, context *fuse.Context) (code fuse.Status) {
 	comps := strings.Split(path, "/")
 	if len(comps) != 2 {
 		return fuse.EPERM
 	}
 
-	if comps[0] == _STATUS && comps[1] == _DEBUG_SETTING {
-		fs.SetDebug(false)
-		return fuse.OK
-	}
-
 	if comps[0] == _CONFIG && comps[1] != _SCAN_CONFIG {
 		code = fs.rmFs(comps[1])
 	} else {
@@ -333,12 +304,6 @@ func (fs *autoUnionFs) GetAttr(path string, context *fuse.Context) (*fuse.Attr,
 		return a, fuse.OK
 	}
 
-	if path == filepath.Join(_STATUS, _DEBUG_SETTING) && fs.hasDebug() {
-		return &fuse.Attr{
-			Mode: fuse.S_IFLNK | 0644,
-		}, fuse.OK
-	}
-
 	if path == filepath.Join(_STATUS, _VERSION) {
 		a := &fuse.Attr{
 			Mode: fuse.S_IFREG | 0644,
@@ -393,9 +358,6 @@ func (fs *autoUnionFs) StatusDir() (stream []fuse.DirEntry, status fuse.Status)
 		{Name: _DEBUG, Mode: fuse.S_IFREG | 0644},
 		{Name: _ROOT, Mode: syscall.S_IFLNK | 0644},
 	}
-	if fs.hasDebug() {
-		stream = append(stream, fuse.DirEntry{Name: _DEBUG_SETTING, Mode: fuse.S_IFLNK | 0644})
-	}
 	return stream, fuse.OK
 }
 

unionfs/autounion_race_test.go

-// +build !race
-
-package unionfs
-
-import (
-	"os"
-	"testing"
-	"time"
-)
-
-// Ideally, this should check inject a logger rather than a boolean,
-// so we can check if the messages are as we expect.  Right now, this
-// test requires visual inspection. When run with -v, the UNLINK reply
-// and SYMLINK request are not printed.
-func TestToggleDebug(t *testing.T) {
-	wd, clean := setup(t)
-	defer clean()
-
-	os.Remove(wd + "/mnt/status/debug_setting")
-	time.Sleep(10 * time.Millisecond)
-
-	if err := os.Symlink("xyz", wd+"/mnt/status/debug_setting"); err != nil {
-		t.Fatalf("Symlink: %v", err)
-	}
-
-	// now we should be in debug mode.
-	link, err := os.Readlink(wd + "/mnt/status/debug_setting")
-	if err != nil {
-		t.Fatalf("Readlink: %v", err)
-	}
-	if link != "1" {
-		t.Errorf("got %q want %q for debug_setting readlink",
-			link, "1")
-	}
-}

unionfs/autounion_test.go

@@ -24,6 +24,10 @@ var testAOpts = AutoUnionFsOptions{
 	Version:      "version",
 }
 
+func init() {
+	testAOpts.Options.Debug = VerboseTest()
+}
+
 func WriteFile(t *testing.T, name string, contents string) {
 	err := ioutil.WriteFile(name, []byte(contents), 0644)
 	if err != nil {
@@ -57,7 +61,6 @@ func setup(t *testing.T) (workdir string, cleanup func()) {
 	if err != nil {
 		t.Fatalf("MountNodeFileSystem failed: %v", err)
 	}
-	fs.SetDebug(VerboseTest())
 	go state.Serve()
 
 	return wd, func() {

unionfs/unionfs_test.go

@@ -90,17 +90,17 @@ func setupUfs(t *testing.T) (wd string, cleanup func()) {
 		AttrTimeout:     entryTtl / 2,
 		NegativeTimeout: entryTtl / 2,
 		PortableInodes:  true,
+		Debug:           VerboseTest(),
 	}
 
 	pathfs := pathfs.NewPathNodeFs(ufs,
-		&pathfs.PathNodeFsOptions{ClientInodes: true})
-	state, conn, err := nodefs.MountRoot(wd+"/mnt", pathfs.Root(), opts)
+		&pathfs.PathNodeFsOptions{ClientInodes: true,
+			Debug: opts.Debug,
+		})
+	state, _, err := nodefs.MountRoot(wd+"/mnt", pathfs.Root(), opts)
 	if err != nil {
 		t.Fatalf("MountNodeFileSystem failed: %v", err)
 	}
-	conn.SetDebug(VerboseTest())
-	state.SetDebug(VerboseTest())
-	pathfs.SetDebug(VerboseTest())
 	go state.Serve()
 
 	return wd, func() {
@@ -1154,6 +1154,7 @@ func TestUnionFsDisappearing(t *testing.T) {
 		EntryTimeout:    entryTtl,
 		AttrTimeout:     entryTtl,
 		NegativeTimeout: entryTtl,
+		Debug:           VerboseTest(),
 	}
 
 	nfs := pathfs.NewPathNodeFs(ufs, nil)
@@ -1162,7 +1163,6 @@ func TestUnionFsDisappearing(t *testing.T) {
 		t.Fatalf("MountNodeFileSystem failed: %v", err)
 	}
 	defer state.Unmount()
-	state.SetDebug(VerboseTest())
 	go state.Serve()
 
 	err = ioutil.WriteFile(wd+"/ro/file", []byte("blabla"), 0644)

unionfs/unionfs_xattr_test.go

@@ -59,18 +59,17 @@ func TestXAttrCaching(t *testing.T) {
 		EntryTimeout:    entryTtl / 2,
 		AttrTimeout:     entryTtl / 2,
 		NegativeTimeout: entryTtl / 2,
+		Debug:           VerboseTest(),
 	}
 
 	pathfs := pathfs.NewPathNodeFs(ufs,
-		&pathfs.PathNodeFsOptions{ClientInodes: true})
+		&pathfs.PathNodeFsOptions{ClientInodes: true,
+			Debug: VerboseTest()})
 
-	server, conn, err := nodefs.MountRoot(wd+"/mnt", pathfs.Root(), opts)
+	server, _, err := nodefs.MountRoot(wd+"/mnt", pathfs.Root(), opts)
 	if err != nil {
 		t.Fatalf("MountNodeFileSystem failed: %v", err)
 	}
-	server.SetDebug(VerboseTest())
-	conn.SetDebug(VerboseTest())
-	pathfs.SetDebug(VerboseTest())
 	defer server.Unmount()
 	go server.Serve()
 

zipfs/memtree.go

@@ -41,9 +41,6 @@ func (fs *MemTreeFs) String() string {
 	return fs.Name
 }
 
-func (fs *MemTreeFs) SetDebug(bool) {
-}
-
 func (fs *MemTreeFs) Root() nodefs.Node {
 	return fs.root
 }

zipfs/multizip_test.go

@@ -27,11 +27,11 @@ func setupMzfs(t *testing.T) (mountPoint string, cleanup func()) {
 		EntryTimeout:    testTtl,
 		AttrTimeout:     testTtl,
 		NegativeTimeout: 0.0,
+		Debug:           VerboseTest(),
 	})
 	if err != nil {
 		t.Fatalf("MountNodeFileSystem failed: %v", err)
 	}
-	state.SetDebug(VerboseTest())
 	go state.Serve()
 
 	return mountPoint, func() {

zipfs/zipfs_test.go

@@ -27,9 +27,10 @@ func setupZipfs(t *testing.T) (mountPoint string, cleanup func()) {
 	}
 
 	mountPoint, _ = ioutil.TempDir("", "")
-	state, _, err := nodefs.MountRoot(mountPoint, root, &nodefs.Options{})
+	state, _, err := nodefs.MountRoot(mountPoint, root, &nodefs.Options{
+		Debug: VerboseTest(),
+	})
 
-	state.SetDebug(VerboseTest())
 	go state.Serve()
 
 	return mountPoint, func() {