Adopted FUSE's "rawfi" option set to "True". As a consequence, the file system now (more consistently) opens and

closes files without repoening them for read and write operations.

Author: s-m-e

src/loggedfs/core.py

@@ -72,13 +72,17 @@ def loggedfs_factory(directory, **kwargs):
 			**kwargs
 			),
 		directory,
+		raw_fi = True,
 		nothreads = True,
 		foreground = bool(kwargs['fuse_foreground_bool']) if 'fuse_foreground_bool' in kwargs.keys() else False,
 		allow_other = bool(kwargs['fuse_allowother_bool']) if 'fuse_allowother_bool' in kwargs.keys() else False,
 		default_permissions = bool(kwargs['fuse_allowother_bool']) if 'fuse_allowother_bool' in kwargs.keys() else False,
 		attr_timeout = 0,
 		entry_timeout = 0,
 		negative_timeout = 0,
+		# sync_read = True,
+		# max_readahead = 0,
+		# direct_io = True,
 		nonempty = True, # common options taken from LoggedFS
 		use_ino = True # common options taken from LoggedFS
 		)
@@ -138,10 +142,20 @@ def __get_user_name_from_uid__(uid):
 
 def __log__(
 	format_pattern = '',
-	abs_path_fields = [], length_fields = [], uid_fields = [], gid_fields = [],
+	abs_path_fields = None, length_fields = None,
+	uid_fields = None, gid_fields = None,
 	path_filter_field = 0
 	):
 
+	if abs_path_fields is None:
+		abs_path_fields = []
+	if length_fields is None:
+		length_fields = []
+	if uid_fields is None:
+		uid_fields = []
+	if gid_fields is None:
+		gid_fields = []
+
 	def wrapper(func):
 
 		@wraps(func)
@@ -281,8 +295,8 @@ class loggedfs(Operations):
 
 	def __init__(self,
 		directory,
-		log_includes = [],
-		log_excludes = [],
+		log_includes = None,
+		log_excludes = None,
 		log_file = None,
 		log_syslog = False,
 		log_enabled = True,
@@ -292,6 +306,11 @@ def __init__(self,
 		fuse_allowother_bool = None
 		):
 
+		if log_includes is None:
+			log_includes = []
+		if log_excludes is None:
+			log_excludes = []
+
 		self._init_logger(log_enabled, log_file, log_syslog, log_printprocessname)
 
 		if bool(fuse_foreground_bool):
@@ -443,24 +462,39 @@ def destroy(self, path):
 
 
 	@__log__(format_pattern = '{0}', abs_path_fields = [0])
-	def getattr(self, path, fh = None):
+	def getattr(self, path, fip):
 
-		try:
+		if not fip:
+			try:
+				st = os.lstat(self._rel_path(path), dir_fd = self.root_path_fd)
+			except FileNotFoundError:
+				raise FuseOSError(errno.ENOENT)
+		else:
+			st = os.fstat(fip.fh)
 
-			st = os.lstat(self._rel_path(path), dir_fd = self.root_path_fd)
-			ret_dict = {key: getattr(st, key) for key in self.st_fields}
+		ret_dict = {key: getattr(st, key) for key in self.st_fields}
 
-			for key in ['st_atime', 'st_ctime', 'st_mtime']:
-				if self.flag_nanosecond_int:
-					ret_dict[key] = ret_dict.pop(key + '_ns')
-				else:
-					ret_dict.pop(key + '_ns')
+		for key in ['st_atime', 'st_ctime', 'st_mtime']:
+			if self.flag_nanosecond_int:
+				ret_dict[key] = ret_dict.pop(key + '_ns')
+			else:
+				ret_dict.pop(key + '_ns')
+
+		return ret_dict
 
-			return ret_dict
 
-		except FileNotFoundError:
+	# @__log__(format_pattern = '{0} (fh={1})')
+	# Ugly HACK, addressing https://github.com/fusepy/fusepy/issues/81 ????????
+	def flush(self, path, fip):
+
+		# os.fsync(fip.fh)
+		raise FuseOSError(errno.ENOSYS)
 
-			raise FuseOSError(errno.ENOENT)
+
+	# Ugly HACK, addressing https://github.com/fusepy/fusepy/issues/81 ????????
+	def fsync(self, path, datasync, fip):
+
+		raise FuseOSError(errno.ENOSYS)
 
 
 	@__log__(format_pattern = '{0}')
@@ -469,6 +503,12 @@ def init(self, path):
 		os.fchdir(self.root_path_fd)
 
 
+	# Ugly HACK, addressing https://github.com/fusepy/fusepy/issues/81 ????????
+	def ioctl(self, path, cmd, arg, fh, flags, data):
+
+		raise FuseOSError(errno.ENOSYS)
+
+
 	@__log__(format_pattern = '{1} to {0}', abs_path_fields = [0, 1])
 	def link(self, target_path, source_path):
 
@@ -483,6 +523,12 @@ def link(self, target_path, source_path):
 		os.lchown(target_rel_path, uid, gid)
 
 
+	# Ugly HACK, addressing https://github.com/fusepy/fusepy/issues/81
+	def lock(self, path, fh, cmd, lock):
+
+		raise FuseOSError(errno.ENOSYS)
+
+
 	@__log__(format_pattern = '{0} {1}', abs_path_fields = [0])
 	def mkdir(self, path, mode):
 
@@ -518,22 +564,19 @@ def mknod(self, path, mode, dev):
 
 
 	@__log__(format_pattern = '({1}) {0}', abs_path_fields = [0])
-	def open(self, path, flags):
+	def open(self, path, fip):
 
-		res = os.open(self._rel_path(path), flags, dir_fd = self.root_path_fd)
-		os.close(res)
+		fip.fh = os.open(self._rel_path(path), fip.flags, dir_fd = self.root_path_fd)
 
-		return 0 # Must return handle or zero
+		return 0 # Must return handle or zero # TODO ?
 
 
 	@__log__(format_pattern = '{1} bytes from {0} at offset {2}', abs_path_fields = [0])
-	def read(self, path, length, offset, fh):
+	def read(self, path, length, offset, fip):
 
 		# ret is a bytestring!
 
-		fh_loc = os.open(self._rel_path(path), os.O_RDONLY, dir_fd = self.root_path_fd)
-		ret = os.pread(fh_loc, length, offset)
-		os.close(fh_loc)
+		ret = os.pread(fip.fh, length, offset)
 
 		return ret
 
@@ -563,6 +606,12 @@ def readlink(self, path):
 			return pathname
 
 
+	# Ugly HACK, addressing https://github.com/fusepy/fusepy/issues/81
+	def release(self, path, fip):
+
+		raise FuseOSError(errno.ENOSYS)
+
+
 	@__log__(format_pattern = '{0} to {1}', abs_path_fields = [0, 1])
 	def rename(self, old, new):
 
@@ -600,11 +649,27 @@ def symlink(self, target_path, source_path):
 
 
 	@__log__(format_pattern = '{0} to {1} bytes', abs_path_fields = [0])
-	def truncate(self, path, length, fh = None):
+	def truncate(self, path, length, fip = None):
 
-		fd = os.open(self._rel_path(path), os.O_WRONLY | os.O_TRUNC, dir_fd = self.root_path_fd)
-		os.truncate(fd, length)
-		os.close(fd)
+		if fip is None:
+
+			try:
+				fh = os.open(
+					self._rel_path(path),
+					flags = os.O_WRONLY | os.O_TRUNC,
+					dir_fd = self.root_path_fd
+					)
+			except FileNotFoundError:
+				raise FuseOSError(errno.ENOENT)
+
+			ret = os.ftruncate(fh, length)
+			os.close(fh)
+
+			return ret
+
+		else:
+
+			return os.ftruncate(fip.fh, length)
 
 
 	@__log__(format_pattern = '{0}', abs_path_fields = [0])
@@ -640,12 +705,14 @@ def _fix_time_(atime, mtime):
 
 
 	@__log__(format_pattern = '{1} bytes to {0} at offset {2}', abs_path_fields = [0], length_fields = [1])
-	def write(self, path, buf, offset, fh):
+	def write(self, path, buf, offset, fip):
 
 		# buf is a bytestring!
 
-		fh_loc = os.open(self._rel_path(path), os.O_WRONLY, dir_fd = self.root_path_fd)
-		res = os.pwrite(fh_loc, buf, offset)
-		os.close(fh_loc)
+		res = os.pwrite(fip.fh, buf, offset)
+
+		#os.fdatasync(fip.fh)
+		#os.fdopen(fip.fh).flush()
+		#os.fsync(fip.fh)
 
 		return res