Integrated PFSAgent with package fission

NVIDIA · Dec 27, 2019 · b90abcf · b90abcf
1 parent aebbbd6
commit b90abcf
Show file tree

Hide file tree

Showing 32 changed files with 8,709 additions and 1,697 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -4,6 +4,8 @@ import:
   version: 1.1.0
 - package: github.com/swiftstack/sortedmap
   version: 1.6.1
+- package: github.com/swiftstack/fission
+  version: 1.0.3
 - package: bazil.org/fuse
   version: 371fbbdaa8987b715bdd21d6adc4c9b20155f748
   subpackages:

diff --git a/jrpcfs/api.go b/jrpcfs/api.go
@@ -345,6 +345,26 @@ type LookupRequest struct {
 	Basename string
 }
 
+// LookupPlusRequest is the request object for RpcLookupPlus.
+type LookupPlusRequest struct {
+	InodeHandle
+	Basename string
+}
+
+// LookupPlusReply is the reply object for RpcLookupPlus.
+type LookupPlusReply struct {
+	InodeNumber int64
+	StatStruct
+}
+
+// AccessRequest is the request object for RpcAccess.
+type AccessRequest struct {
+	InodeHandle
+	UserID     int32
+	GroupID    int32
+	AccessMode uint32
+}
+
 // MkdirRequest is the request object for RpcMkdir.
 type MkdirRequest struct {
 	InodeHandle

diff --git a/jrpcfs/filesystem.go b/jrpcfs/filesystem.go
@@ -1338,6 +1338,58 @@ func (s *Server) RpcLookup(in *LookupRequest, reply *InodeReply) (err error) {
 	return
 }
 
+func (s *Server) RpcLookupPlus(in *LookupPlusRequest, reply *LookupPlusReply) (err error) {
+	enterGate()
+	defer leaveGate()
+
+	flog := logger.TraceEnter("in.", in)
+	defer func() { flog.TraceExitErr("reply.", err, reply) }()
+	defer func() { rpcEncodeError(&err) }() // Encode error for return by RPC
+
+	mountHandle, err := lookupMountHandleByMountIDAsString(in.MountID)
+	if nil != err {
+		return
+	}
+
+	ino, err := mountHandle.Lookup(inode.InodeRootUserID, inode.InodeGroupID(0), nil, inode.InodeNumber(in.InodeNumber), in.Basename)
+	if nil != err {
+		return
+	}
+
+	stat, err := mountHandle.Getstat(inode.InodeRootUserID, inode.InodeGroupID(0), nil, ino)
+	if nil != err {
+		return
+	}
+
+	reply.InodeNumber = int64(uint64(ino))
+	reply.StatStruct.fsStatToStatStruct(stat)
+
+	return
+}
+
+func (s *Server) RpcAccess(in *AccessRequest, reply *InodeReply) (err error) {
+	enterGate()
+	defer leaveGate()
+
+	flog := logger.TraceEnter("in.", in)
+	defer func() { flog.TraceExitErr("reply.", err, reply) }()
+	defer func() { rpcEncodeError(&err) }() // Encode error for return by RPC
+
+	mountHandle, err := lookupMountHandleByMountIDAsString(in.MountID)
+	if nil != err {
+		return
+	}
+
+	ok := mountHandle.Access(inode.InodeUserID(in.UserID), inode.InodeGroupID(in.GroupID), nil, inode.InodeNumber(in.InodeNumber), inode.InodeMode(in.AccessMode))
+	if ok {
+		err = nil
+	} else {
+		err = blunder.NewError(blunder.PermDeniedError, "EACCES")
+	}
+
+	return
+}
+
 func (s *Server) RpcMkdir(in *MkdirRequest, reply *InodeReply) (err error) {
 	enterGate()
 	defer leaveGate()
@@ -1929,7 +1981,7 @@ func (s *Server) RpcStatVFS(in *StatVFSRequest, reply *StatVFS) (err error) {
 	return
 }
 
-func (s *Server) RpcSymlink(in *SymlinkRequest, reply *Reply) (err error) {
+func (s *Server) RpcSymlink(in *SymlinkRequest, reply *InodeReply) (err error) {
 	enterGate()
 	defer leaveGate()
 
@@ -1942,7 +1994,8 @@ func (s *Server) RpcSymlink(in *SymlinkRequest, reply *Reply) (err error) {
 		return
 	}
 
-	_, err = mountHandle.Symlink(inode.InodeUserID(in.UserID), inode.InodeGroupID(in.GroupID), nil, inode.InodeNumber(in.InodeNumber), in.Basename, in.Target)
+	ino, err := mountHandle.Symlink(inode.InodeUserID(in.UserID), inode.InodeGroupID(in.GroupID), nil, inode.InodeNumber(in.InodeNumber), in.Basename, in.Target)
+	reply.InodeNumber = int64(uint64(ino))
 	return
 }
 

diff --git a/pfs_middleware/pfs_middleware/rpc.py b/pfs_middleware/pfs_middleware/rpc.py
@@ -24,6 +24,7 @@
 import uuid
 
 allow_read_only = {
+    "Server.RpcAccess",
     "Server.RpcFetchExtentMapChunk",
     "Server.RpcGetAccount",
     "Server.RpcGetContainer",
@@ -32,6 +33,7 @@
     "Server.RpcGetXAttr",
     "Server.RpcListXAttr",
     "Server.RpcLookup",
+    "Server.RpcLookupPlus",
     "Server.RpcMountByAccountName",
     "Server.RpcMountByVolumeName",
     "Server.RpcPing",
@@ -45,6 +47,7 @@
 }
 
 allow_read_write = {
+    "Server.RpcAccess",
     "Server.RpcChmod",
     "Server.RpcChown",
     "Server.RpcCreate",
@@ -61,6 +64,7 @@
     "Server.RpcListXAttr",
     "Server.RpcLog",
     "Server.RpcLookup",
+    "Server.RpcLookupPlus",
     "Server.RpcMiddlewareMkdir",
     "Server.RpcMiddlewarePost",
     "Server.RpcMkdir",

diff --git a/pfsagentd/README.md b/pfsagentd/README.md
@@ -52,16 +52,20 @@ ExclusiveFileLimit:                                         100
 DirtyFileLimit:                                              50
 MaxFlushSize:                                          10485760
 MaxFlushTime:                                               10s
-ReadOnly:                                                 false
 LogFilePath:                                                    # Unless starting with '/', relative to $CWD; Blank to disable
 LogToConsole:                                              true
 TraceEnabled:                                             false
 HTTPServerIPAddr:                                     127.0.0.1
 HTTPServerTCPPort:                                         9090
+ReadDirPlusEnabled:                                       false
+XAttrEnabled:                                             false
+EntryDuration:                                              10s
 AttrDuration:                                               10s
 AttrBlockSize:                                            65536
-LookupEntryDuration:                                        10s
 ReaddirMaxEntries:                                         1024
+FUSEMaxBackground:                                          100
+FUSECongestionThreshhold:                                     0
+FUSEMaxWrite:                                            131072 # Linux max is 128KiB
 ```
 
 In the above example, some important fields are as follows: