From: Daira Hopwood Date: Fri, 16 Oct 2015 15:21:50 +0000 (+0100) Subject: Watch for IN_CREATE events but filter them out for non-directories. X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=58388bebf18bf40abd88948b5695e93ee095b2b5;p=tahoe-lafs%2Ftahoe-lafs.git Watch for IN_CREATE events but filter them out for non-directories. Signed-off-by: Daira Hopwood --- diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index c33f8a77..a53cd375 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/src/allmydata/frontends/magic_folder.py @@ -184,12 +184,10 @@ class Uploader(QueueMixin): if hasattr(self._notifier, 'set_pending_delay'): self._notifier.set_pending_delay(pending_delay) - # We don't watch for IN_CREATE, because that would cause us to read and upload a - # possibly-incomplete file before the application has closed it. There should always - # be an IN_CLOSE_WRITE after an IN_CREATE (I think). # TODO: what about IN_MOVE_SELF, IN_MOVED_FROM, or IN_UNMOUNT? # - self.mask = ( self._inotify.IN_CLOSE_WRITE + self.mask = ( self._inotify.IN_CREATE + | self._inotify.IN_CLOSE_WRITE | self._inotify.IN_MOVED_TO | self._inotify.IN_MOVED_FROM | self._inotify.IN_DELETE @@ -266,6 +264,19 @@ class Uploader(QueueMixin): def _notify(self, opaque, path, events_mask): self._log("inotify event %r, %r, %r\n" % (opaque, path, ', '.join(self._inotify.humanReadableMask(events_mask)))) + + # We filter out IN_CREATE events not associated with a directory. + # Acting on IN_CREATE for files could cause us to read and upload + # a possibly-incomplete file before the application has closed it. + # There should always be an IN_CLOSE_WRITE after an IN_CREATE, I think. + # It isn't possible to avoid watching for IN_CREATE at all, because + # it is the only event notified for a directory creation. + + if ((events_mask & self._inotify.IN_CREATE) != 0 and + (events_mask & self._inotify.IN_ISDIR) == 0): + self._log("ignoring inotify event for creation of file %r\n" % (path,)) + return + relpath_u = self._get_relpath(path) self._append_to_deque(relpath_u)