improve ns load

Author: JojiiOfficial

dmfs/data.go

@@ -2,6 +2,7 @@ package dmfs
 
 import (
 	"os"
+	"time"
 
 	"github.com/DataManager-Go/libdatamanager"
 	libdm "github.com/DataManager-Go/libdatamanager"
@@ -16,8 +17,10 @@ type dataStruct struct {
 	config  *dmConfig.Config
 	libdm   *libdatamanager.LibDM
 
-	userAttributes *libdm.UserAttributeDataResponse
-	gid, uid       uint32
+	userAttributes   *libdm.UserAttributeDataResponse
+	lastUserAttrLoad int64
+
+	gid, uid uint32
 }
 
 func initData() {
@@ -27,10 +30,17 @@ func initData() {
 
 // load user attributes (namespaces, groups)
 func (data *dataStruct) loadUserAttributes() error {
-	var err error
-	data.userAttributes, err = data.libdm.GetUserAttributeData()
-	if err != nil {
-		return err
+	// TODO make cachhe time configureable or even create
+	// a genuius way to calculate a reasonable cachetime
+
+	if time.Now().Unix()-10 > data.lastUserAttrLoad {
+		var err error
+		data.userAttributes, err = data.libdm.GetUserAttributeData()
+		if err != nil {
+			return err
+		}
+
+		data.lastUserAttrLoad = time.Now().Unix()
 	}
 
 	return nil

dmfs/dmfsRoot.go

@@ -7,50 +7,81 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/DataManager-Go/libdatamanager"
 	"github.com/hanwen/go-fuse/v2/fs"
+	"github.com/hanwen/go-fuse/v2/fuse"
 )
 
 type rootNode struct {
 	fs.Inode
+
+	nsMap map[string][]string
 }
 
 // implement the interfaces
-var _ = (fs.NodeOnAdder)((*rootNode)(nil))
+var _ = (fs.NodeReaddirer)((*rootNode)(nil))
 var _ = (fs.NodeRenamer)((*rootNode)(nil))
 var _ = (fs.NodeRmdirer)((*rootNode)(nil))
+var _ = (fs.NodeLookuper)((*rootNode)(nil))
 
 // OnAdd is called on mounting the file system. Use it to populate
 // the file system tree.
-func (root *rootNode) OnAdd(ctx context.Context) {
-	root.debug("Init files")
+func (root *rootNode) Readdir(ctx context.Context) (fs.DirStream, syscall.Errno) {
+	r := make([]fuse.DirEntry, 0)
 
 	err := data.loadUserAttributes()
 	if err != nil {
 		log.Fatal(err)
-		return
+		return nil, syscall.EPERM
+	}
+
+	if root.nsMap == nil {
+		root.nsMap = make(map[string][]string, 0)
 	}
 
 	// Loop Namespaces and add childs in as folders
 	for _, namespace := range data.userAttributes.Namespace {
 		nsName := removeNSName(namespace.Name)
 
-		// reuse child
-		nsp := root.Inode.GetChild(nsName)
+		_, has := root.nsMap[namespace.Name]
+		if !has {
+			root.nsMap[namespace.Name] = namespace.Groups
+		}
 
-		// Create namespace folder
-		if nsp == nil {
-			nsp = root.Inode.NewInode(ctx, &namespaceNode{
-				namespace: nsName,
-				groups:    namespace.Groups,
-			}, fs.StableAttr{
-				Mode: syscall.S_IFDIR,
-			})
+		r = append(r, fuse.DirEntry{
+			Name: nsName,
+			Mode: syscall.S_IFDIR,
+		})
+	}
 
-			root.AddChild(nsName, nsp, true)
-		}
+	return fs.NewListDirStream(r), 0
+}
+
+func (root *rootNode) Lookup(ctx context.Context, name string, out *fuse.EntryOut) (*fs.Inode, syscall.Errno) {
+	fullNS := addNSName(name, data.mounter.Libdm.Config)
+
+	// Get cached namespaceInfo from map
+	val, has := root.nsMap[fullNS]
+	if !has {
+		return nil, syscall.ENOENT
+	}
+
+	// Try to reuse child
+	child := root.GetChild(name)
+
+	// Create new child if not found
+	if child == nil {
+		child = root.NewInode(ctx, &namespaceNode{
+			nsInfo: &libdatamanager.Namespaceinfo{
+				Name:   fullNS,
+				Groups: val,
+			},
+		}, fs.StableAttr{
+			Mode: syscall.S_IFDIR,
+		})
 	}
 
-	root.debug("Init files success")
+	return child, 0
 }
 
 // Delete Namespace if virtual file was unlinked

dmfs/fsNamespace.go

@@ -6,16 +6,15 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/DataManager-Go/libdatamanager"
+	libdm "github.com/DataManager-Go/libdatamanager"
 	"github.com/hanwen/go-fuse/v2/fs"
 	"github.com/hanwen/go-fuse/v2/fuse"
 )
 
 type namespaceNode struct {
 	fs.Inode
 
-	namespace string
-	groups    []string
+	nsInfo *libdm.Namespaceinfo
 }
 
 var _ = (fs.NodeOnAdder)((*namespaceNode)(nil))
@@ -26,17 +25,17 @@ var _ = (fs.NodeRenamer)((*namespaceNode)(nil))
 func (nsNode *namespaceNode) OnAdd(ctx context.Context) {
 	// Use a no_group folder for files
 	// not associated to a groud
-	if len(nsNode.groups) == 0 {
-		nsNode.groups = []string{"no_group"}
+	if len(nsNode.nsInfo.Groups) == 0 {
+		nsNode.nsInfo.Groups = []string{"no_group"}
 	}
 
 	// Add groups to namespace
-	for _, group := range nsNode.groups {
+	for _, group := range nsNode.nsInfo.Groups {
 		gp := nsNode.GetChild(group)
 		if gp == nil {
 			gp = nsNode.NewInode(ctx, &groupInode{
 				group:     group,
-				namespace: nsNode.namespace,
+				namespace: nsNode.nsInfo.Name,
 			}, fs.StableAttr{
 				Mode: syscall.S_IFDIR,
 			})
@@ -56,7 +55,7 @@ func (nsNode *namespaceNode) Rmdir(ctx context.Context, name string) syscall.Err
 	}
 
 	// Do http delete request
-	_, err := data.libdm.DeleteAttribute(libdatamanager.GroupAttribute, nsNode.namespace, name)
+	_, err := data.libdm.DeleteAttribute(libdm.GroupAttribute, nsNode.nsInfo.Name, name)
 	if err != nil {
 		fmt.Println(err)
 		return syscall.ENOENT
@@ -72,7 +71,7 @@ func (nsNode *namespaceNode) Rename(ctx context.Context, name string, newParent
 		return 0
 	}
 
-	_, err := data.libdm.UpdateAttribute(libdatamanager.GroupAttribute, nsNode.namespace, name, newName)
+	_, err := data.libdm.UpdateAttribute(libdm.GroupAttribute, nsNode.nsInfo.Name, name, newName)
 	if err != nil {
 		return syscall.ENOENT
 	}
@@ -84,7 +83,7 @@ func (nsNode *namespaceNode) Rename(ctx context.Context, name string, newParent
 func (nsNode *namespaceNode) Mkdir(ctx context.Context, name string, mode uint32, out *fuse.EntryOut) (*fs.Inode, syscall.Errno) {
 	node := nsNode.NewInode(ctx, &groupInode{
 		group:     name,
-		namespace: nsNode.namespace,
+		namespace: nsNode.nsInfo.Name,
 	}, fs.StableAttr{
 		Mode: syscall.S_IFDIR,
 	})

dmfs/mount.go

@@ -3,6 +3,7 @@ package dmfs
 import (
 	"fmt"
 	"log"
+	"math/rand"
 	"os"
 	"os/signal"
 	"path/filepath"
@@ -36,6 +37,8 @@ func (mounter *Mounter) Mount() {
 		log.Fatal(err)
 	}
 
+	rand.Seed(time.Now().Unix())
+
 	// Test server availability
 	if !mounter.testServer() {
 		return
@@ -122,13 +125,17 @@ func (mounter *Mounter) testServer() bool {
 
 // Get the mountoptions for the mount operation
 func (mounter *Mounter) getMountOptions() *fs.Options {
+	sec := time.Second
+
 	return &fs.Options{
 		MountOptions: fuse.MountOptions{
 			Debug:      mounter.DebugFS,
 			AllowOther: false,
 			FsName:     "Datamanager mount",
 			Name:       "dmanager",
 		},
+		EntryTimeout: &sec,
+		AttrTimeout:  &sec,
 	}
 }