X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/704dd826a498db11a052fe77a4953b0caa245c10..2c4bc5af8de7fe7a021088c040e4c6cea223bcd1:/services/fuse/arvados_fuse/__init__.py diff --git a/services/fuse/arvados_fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py index f1e49f5afc..dca3d2fd6c 100644 --- a/services/fuse/arvados_fuse/__init__.py +++ b/services/fuse/arvados_fuse/__init__.py @@ -49,6 +49,16 @@ an object that is live in the inode cache, that object is immediately updated. """ +from __future__ import absolute_import +from __future__ import division +from future.utils import viewitems +from future.utils import native +from future.utils import listvalues +from future import standard_library +standard_library.install_aliases() +from builtins import next +from builtins import str +from builtins import object import os import sys import llfuse @@ -71,8 +81,8 @@ import ciso8601 import collections import functools import arvados.keep - -import Queue +from prometheus_client import Summary +import queue # Default _notify_queue has a limit of 1000 items, but it really needs to be # unlimited to avoid deadlocks, see https://arvados.org/issues/3198#note-43 for @@ -80,15 +90,15 @@ import Queue if hasattr(llfuse, 'capi'): # llfuse < 0.42 - llfuse.capi._notify_queue = Queue.Queue() + llfuse.capi._notify_queue = queue.Queue() else: # llfuse >= 0.42 - llfuse._notify_queue = Queue.Queue() + llfuse._notify_queue = queue.Queue() LLFUSE_VERSION_0 = llfuse.__version__.startswith('0') -from fusedir import sanitize_filename, Directory, CollectionDirectory, TmpCollectionDirectory, MagicDirectory, TagsDirectory, ProjectDirectory, SharedDirectory, CollectionDirectoryBase -from fusefile import StringFile, FuseArvadosFile +from .fusedir import sanitize_filename, Directory, CollectionDirectory, TmpCollectionDirectory, MagicDirectory, TagsDirectory, ProjectDirectory, SharedDirectory, CollectionDirectoryBase +from .fusefile import StringFile, FuseArvadosFile _logger = logging.getLogger('arvados.arvados_fuse') @@ -203,7 +213,7 @@ class InodeCache(object): def cap_cache(self): if self._total > self.cap: - for ent in self._entries.values(): + for ent in listvalues(self._entries): if self._total < self.cap or len(self._entries) < self.min_entries: break self._remove(ent, True) @@ -260,7 +270,7 @@ class Inodes(object): self._entries[key] = item def __iter__(self): - return self._entries.iterkeys() + return iter(self._entries.keys()) def items(self): return self._entries.items() @@ -301,12 +311,12 @@ class Inodes(object): if entry.has_ref(False): # Only necessary if the kernel has previously done a lookup on this # inode and hasn't yet forgotten about it. - llfuse.invalidate_entry(entry.inode, name.encode(self.encoding)) + llfuse.invalidate_entry(entry.inode, native(name.encode(self.encoding))) def clear(self): self.inode_cache.clear() - for k,v in self._entries.items(): + for k,v in viewitems(self._entries): try: v.finalize() except Exception as e: @@ -351,6 +361,27 @@ class Operations(llfuse.Operations): """ + fuse_time = Summary('arvmount_fuse_operations_seconds', 'Time spent during FUSE operations', labelnames=['op']) + read_time = fuse_time.labels(op='read') + write_time = fuse_time.labels(op='write') + destroy_time = fuse_time.labels(op='destroy') + on_event_time = fuse_time.labels(op='on_event') + getattr_time = fuse_time.labels(op='getattr') + setattr_time = fuse_time.labels(op='setattr') + lookup_time = fuse_time.labels(op='lookup') + forget_time = fuse_time.labels(op='forget') + open_time = fuse_time.labels(op='open') + release_time = fuse_time.labels(op='release') + opendir_time = fuse_time.labels(op='opendir') + readdir_time = fuse_time.labels(op='readdir') + statfs_time = fuse_time.labels(op='statfs') + create_time = fuse_time.labels(op='create') + mkdir_time = fuse_time.labels(op='mkdir') + unlink_time = fuse_time.labels(op='unlink') + rmdir_time = fuse_time.labels(op='rmdir') + rename_time = fuse_time.labels(op='rename') + flush_time = fuse_time.labels(op='flush') + def __init__(self, uid, gid, api_client, encoding="utf-8", inode_cache=None, num_retries=4, enable_write=False): super(Operations, self).__init__() @@ -391,6 +422,28 @@ class Operations(llfuse.Operations): # initializing to continue self.initlock.set() + def metric_samples(self): + return self.fuse_time.collect()[0].samples + + def metric_op_names(self): + ops = [] + for cur_op in [sample.labels['op'] for sample in self.metric_samples()]: + if cur_op not in ops: + ops.append(cur_op) + return ops + + def metric_value(self, opname, metric): + op_value = [sample.value for sample in self.metric_samples() + if sample.name == metric and sample.labels['op'] == opname] + return op_value[0] if len(op_value) == 1 else None + + def metric_sum_func(self, opname): + return lambda: self.metric_value(opname, "arvmount_fuse_operations_seconds_sum") + + def metric_count_func(self, opname): + return lambda: int(self.metric_value(opname, "arvmount_fuse_operations_seconds_count")) + + @destroy_time.time() @catch_exceptions def destroy(self): self._shutdown_started.set() @@ -417,6 +470,7 @@ class Operations(llfuse.Operations): [["event_type", "in", ["create", "update", "delete"]]], self.on_event) + @on_event_time.time() @catch_exceptions def on_event(self, ev): if 'event_type' not in ev or ev["event_type"] not in ("create", "update", "delete"): @@ -447,6 +501,7 @@ class Operations(llfuse.Operations): self.inodes.inode_cache.find_by_uuid(newowner)): parent.child_event(ev) + @getattr_time.time() @catch_exceptions def getattr(self, inode, ctx=None): if inode not in self.inodes: @@ -479,7 +534,7 @@ class Operations(llfuse.Operations): entry.st_size = e.size() entry.st_blksize = 512 - entry.st_blocks = (entry.st_size/512)+1 + entry.st_blocks = (entry.st_size // 512) + 1 if hasattr(entry, 'st_atime_ns'): # llfuse >= 0.42 entry.st_atime_ns = int(e.atime() * 1000000000) @@ -493,6 +548,7 @@ class Operations(llfuse.Operations): return entry + @setattr_time.time() @catch_exceptions def setattr(self, inode, attr, fields=None, fh=None, ctx=None): entry = self.getattr(inode) @@ -516,9 +572,10 @@ class Operations(llfuse.Operations): return entry + @lookup_time.time() @catch_exceptions def lookup(self, parent_inode, name, ctx=None): - name = unicode(name, self.inodes.encoding) + name = str(name, self.inodes.encoding) inode = None if name == '.': @@ -542,6 +599,7 @@ class Operations(llfuse.Operations): parent_inode, name) raise llfuse.FUSEError(errno.ENOENT) + @forget_time.time() @catch_exceptions def forget(self, inodes): if self._shutdown_started.is_set(): @@ -552,6 +610,7 @@ class Operations(llfuse.Operations): if ent.dec_ref(nlookup) == 0 and ent.dead: self.inodes.del_entry(ent) + @open_time.time() @catch_exceptions def open(self, inode, flags, ctx=None): if inode in self.inodes: @@ -587,6 +646,7 @@ class Operations(llfuse.Operations): return fh + @read_time.time() @catch_exceptions def read(self, fh, off, size): _logger.debug("arv-mount read fh %i off %i size %i", fh, off, size) @@ -604,6 +664,7 @@ class Operations(llfuse.Operations): self.read_counter.add(len(r)) return r + @write_time.time() @catch_exceptions def write(self, fh, off, buf): _logger.debug("arv-mount write %i %i %i", fh, off, len(buf)) @@ -624,6 +685,7 @@ class Operations(llfuse.Operations): self.write_counter.add(w) return w + @release_time.time() @catch_exceptions def release(self, fh): if fh in self._filehandles: @@ -640,6 +702,7 @@ class Operations(llfuse.Operations): def releasedir(self, fh): self.release(fh) + @opendir_time.time() @catch_exceptions def opendir(self, inode, ctx=None): _logger.debug("arv-mount opendir: inode %i", inode) @@ -664,6 +727,7 @@ class Operations(llfuse.Operations): self._filehandles[fh] = DirectoryHandle(fh, p, [('.', p), ('..', parent)] + list(p.items())) return fh + @readdir_time.time() @catch_exceptions def readdir(self, fh, off): _logger.debug("arv-mount readdir: fh %i off %i", fh, off) @@ -679,6 +743,7 @@ class Operations(llfuse.Operations): yield (handle.entries[e][0].encode(self.inodes.encoding), self.getattr(handle.entries[e][1].inode), e+1) e += 1 + @statfs_time.time() @catch_exceptions def statfs(self, ctx=None): st = llfuse.StatvfsData() @@ -712,8 +777,10 @@ class Operations(llfuse.Operations): return p + @create_time.time() @catch_exceptions def create(self, inode_parent, name, mode, flags, ctx=None): + name = name.decode() _logger.debug("arv-mount create: parent_inode %i '%s' %o", inode_parent, name, mode) p = self._check_writable(inode_parent) @@ -728,8 +795,10 @@ class Operations(llfuse.Operations): f.inc_ref() return (fh, self.getattr(f.inode)) + @mkdir_time.time() @catch_exceptions def mkdir(self, inode_parent, name, mode, ctx=None): + name = name.decode() _logger.debug("arv-mount mkdir: parent_inode %i '%s' %o", inode_parent, name, mode) p = self._check_writable(inode_parent) @@ -741,18 +810,21 @@ class Operations(llfuse.Operations): d.inc_ref() return self.getattr(d.inode) + @unlink_time.time() @catch_exceptions def unlink(self, inode_parent, name, ctx=None): _logger.debug("arv-mount unlink: parent_inode %i '%s'", inode_parent, name) p = self._check_writable(inode_parent) - p.unlink(name) + p.unlink(name.decode()) + @rmdir_time.time() @catch_exceptions def rmdir(self, inode_parent, name, ctx=None): _logger.debug("arv-mount rmdir: parent_inode %i '%s'", inode_parent, name) p = self._check_writable(inode_parent) p.rmdir(name) + @rename_time.time() @catch_exceptions def rename(self, inode_parent_old, name_old, inode_parent_new, name_new, ctx=None): _logger.debug("arv-mount rename: old_parent_inode %i '%s' new_parent_inode %i '%s'", inode_parent_old, name_old, inode_parent_new, name_new) @@ -760,6 +832,7 @@ class Operations(llfuse.Operations): dest = self._check_writable(inode_parent_new) dest.rename(name_old, name_new, src) + @flush_time.time() @catch_exceptions def flush(self, fh): if fh in self._filehandles: