projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use logging module instead of "if DEBUG:"
[arvados.git]
/
services
/
fuse
/
arvados_fuse
/
__init__.py
diff --git
a/services/fuse/arvados_fuse/__init__.py
b/services/fuse/arvados_fuse/__init__.py
index 62af6c0c7cc31beaedaba9a066808395f5249838..6e2bf2896dd0481004eec41e44b5c3cc29810080 100644
(file)
--- a/
services/fuse/arvados_fuse/__init__.py
+++ b/
services/fuse/arvados_fuse/__init__.py
@@
-2,6
+2,7
@@
# FUSE driver for Arvados Keep
#
# FUSE driver for Arvados Keep
#
+from __future__ import print_function
import os
import sys
import os
import sys
@@
-15,6
+16,7
@@
import arvados.events
import re
import apiclient
import json
import re
import apiclient
import json
+import logging
from time import time
from llfuse import FUSEError
from time import time
from llfuse import FUSEError
@@
-123,7
+125,7
@@
class Directory(FreshBase):
try:
self.update()
except apiclient.errors.HttpError as e:
try:
self.update()
except apiclient.errors.HttpError as e:
- print e
+ logging.debug(e)
def __getitem__(self, item):
self.checkupdate()
def __getitem__(self, item):
self.checkupdate()
@@
-193,10
+195,11
@@
class CollectionDirectory(Directory):
cwd = cwd._entries[part]
for k, v in s.files().items():
cwd._entries[k] = self.inodes.add_entry(StreamReaderFile(cwd.inode, v))
cwd = cwd._entries[part]
for k, v in s.files().items():
cwd._entries[k] = self.inodes.add_entry(StreamReaderFile(cwd.inode, v))
- print "found"
self.fresh()
self.fresh()
+ return True
except Exception as detail:
except Exception as detail:
- print("%s: error: %s" % (self.collection_locator,detail) )
+ logging.debug("arv-mount %s: error: %s" % (self.collection_locator,detail))
+ return False
class MagicDirectory(Directory):
'''A special directory that logically contains the set of all extant keep
class MagicDirectory(Directory):
'''A special directory that logically contains the set of all extant keep
@@
-216,19
+219,21
@@
class MagicDirectory(Directory):
if k in self._entries:
return True
try:
if k in self._entries:
return True
try:
- if arvados.Keep.get(k):
+ e = self.inodes.add_entry(CollectionDirectory(self.inode, self.inodes, k))
+ if e.update():
+ self._entries[k] = e
return True
else:
return False
except Exception as e:
return True
else:
return False
except Exception as e:
- #print 'exception keep', e
+ logging.debug('arv-mount exception keep', e)
return False
def __getitem__(self, item):
return False
def __getitem__(self, item):
- if item
not in self._entries
:
- self._entries[item] = self.inodes.add_entry(CollectionDirectory(self.inode, self.inodes, item))
- return self._entries[item]
-
+ if item
in self
:
+ return self._entries[item]
+ else:
+ raise KeyError("No collection with id " + item)
class TagsDirectory(Directory):
'''A special directory that contains as subdirectories all tags visible to the user.'''
class TagsDirectory(Directory):
'''A special directory that contains as subdirectories all tags visible to the user.'''
@@
-411,9
+416,13
@@
class Operations(llfuse.Operations):
so request handlers do not run concurrently unless the lock is explicitly released
with llfuse.lock_released.'''
so request handlers do not run concurrently unless the lock is explicitly released
with llfuse.lock_released.'''
- def __init__(self, uid, gid):
+ def __init__(self, uid, gid
, debug
):
super(Operations, self).__init__()
super(Operations, self).__init__()
+ if debug:
+ logging.setLevel(logging.DEBUG)
+ logging.info("arv-mount debug enabled")
+
self.inodes = Inodes()
self.uid = uid
self.gid = gid
self.inodes = Inodes()
self.uid = uid
self.gid = gid
@@
-470,7
+479,7
@@
class Operations(llfuse.Operations):
return entry
def lookup(self, parent_inode, name):
return entry
def lookup(self, parent_inode, name):
- #print "lookup: parent_inode", parent_inode, "name", name
+ logging.debug("arv-mount lookup: parent_inode", parent_inode, "name", name)
inode = None
if name == '.':
inode = None
if name == '.':
@@
-506,7
+515,7
@@
class Operations(llfuse.Operations):
return fh
def read(self, fh, off, size):
return fh
def read(self, fh, off, size):
- #print "read", fh, off, size
+ logging.debug("arv-mount read", fh, off, size)
if fh in self._filehandles:
handle = self._filehandles[fh]
else:
if fh in self._filehandles:
handle = self._filehandles[fh]
else:
@@
-523,7
+532,7
@@
class Operations(llfuse.Operations):
del self._filehandles[fh]
def opendir(self, inode):
del self._filehandles[fh]
def opendir(self, inode):
- #print "opendir: inode", inode
+ logging.debug("arv-mount opendir: inode", inode)
if inode in self.inodes:
p = self.inodes[inode]
if inode in self.inodes:
p = self.inodes[inode]
@@
-544,14
+553,14
@@
class Operations(llfuse.Operations):
return fh
def readdir(self, fh, off):
return fh
def readdir(self, fh, off):
- #print "readdir: fh", fh, "off", off
+ logging.debug("arv-mount readdir: fh", fh, "off", off)
if fh in self._filehandles:
handle = self._filehandles[fh]
else:
raise llfuse.FUSEError(errno.EBADF)
if fh in self._filehandles:
handle = self._filehandles[fh]
else:
raise llfuse.FUSEError(errno.EBADF)
- #print "handle.entry", handle.entry
+ logging.debug("arv-mount handle.entry", handle.entry)
e = off
while e < len(handle.entry):
e = off
while e < len(handle.entry):