[ARVADOS] updated: 2403cd9fd5a508252fe4570d6eed9c9c4efa366a

git at public.curoverse.com git at public.curoverse.com
Thu May 14 16:20:09 EDT 2015


Summary of changes:
 .../app/views/layouts/application.html.erb         |  16 +
 doc/install/install-sso.html.textile.liquid        | 176 +++++++---
 docker/sso/Dockerfile                              |   2 +-
 docker/sso/application.yml.in                      |   4 +
 docker/sso/secret_token.rb.in                      |   7 -
 services/{nodemanager => dockercleaner}/.gitignore |   0
 .../arvados_docker}/__init__.py                    |   0
 services/dockercleaner/arvados_docker/cleaner.py   | 260 +++++++++++++++
 .../{nodemanager => dockercleaner}/gittaggers.py   |   0
 services/dockercleaner/setup.py                    |  33 ++
 services/dockercleaner/tests/__init__.py           |   4 +
 services/dockercleaner/tests/test_cleaner.py       | 356 +++++++++++++++++++++
 services/fuse/arvados_fuse/__init__.py             |  13 +
 services/fuse/arvados_fuse/fusedir.py              |  10 +-
 services/keepstore/bufferpool.go                   |   6 +-
 services/keepstore/handlers.go                     |   4 +
 .../arvnodeman/computenode/dispatch/__init__.py    |  62 ++--
 .../arvnodeman/computenode/dispatch/slurm.py       |   2 +-
 services/nodemanager/arvnodeman/daemon.py          |   1 +
 services/nodemanager/tests/__init__.py             |   2 +-
 .../nodemanager/tests/test_computenode_dispatch.py |  29 +-
 .../tests/test_computenode_dispatch_slurm.py       |   5 +
 22 files changed, 914 insertions(+), 78 deletions(-)
 delete mode 100644 docker/sso/secret_token.rb.in
 copy services/{nodemanager => dockercleaner}/.gitignore (100%)
 copy services/{fuse/tests => dockercleaner/arvados_docker}/__init__.py (100%)
 create mode 100755 services/dockercleaner/arvados_docker/cleaner.py
 copy services/{nodemanager => dockercleaner}/gittaggers.py (100%)
 create mode 100644 services/dockercleaner/setup.py
 create mode 100644 services/dockercleaner/tests/__init__.py
 create mode 100644 services/dockercleaner/tests/test_cleaner.py

       via  2403cd9fd5a508252fe4570d6eed9c9c4efa366a (commit)
       via  ae34fb3db3c082d529a3e9a75698094409d70321 (commit)
       via  3809452aef74876da9d2644fe6c824a22527d6ac (commit)
       via  3d1d497b23a53370417385eb75a5ba7207364ff7 (commit)
       via  01574a902d99cba21ed53e62cef6bef683bed2a2 (commit)
       via  ad73066c03b640dfe710e4b9eef1ea56cee30629 (commit)
       via  1be4d2818c9e81b47887e33f8dfba347851fd88f (commit)
       via  cfb0f7874504563836442522be33c53e6fd586de (commit)
       via  ea7da293b0a10baef18cfc6e107c87a9c3b09546 (commit)
       via  d2e7d7e1a7d1de592ea98c661be41429d7b6160b (commit)
       via  2b43d35b7f1bc94d658203086cb5bd1e6415bc52 (commit)
       via  d2f2463930bd8c0178982221d0f9f3d5b3075670 (commit)
       via  e6e3ecfd0e264cf91d1dc3d4d2f843f1c7cab579 (commit)
       via  4799a403b984cefe2d1bc1a70374ed6b4b0c64fd (commit)
       via  f116df2ef0439328044ccc46a90d7fc86541ace8 (commit)
       via  b5d3c559df7250ab7106adc2ded7f38dc666cf9c (commit)
       via  44684242aba028470311a4991dcd1456df5c84fd (commit)
       via  7e80f468042fd4caa78f69fb66efce1b89035d45 (commit)
       via  4d3b8d2eff10995295b12fdc39aa60af95ae7ef7 (commit)
      from  a04932c206425f4eb2f46e36f0acf4b7b194b865 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 2403cd9fd5a508252fe4570d6eed9c9c4efa366a
Merge: 3809452 ae34fb3
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu May 14 16:24:03 2015 -0400

    Merge branch '5748-max-buffers-leak' into 3198-writable-fuse


commit 3809452aef74876da9d2644fe6c824a22527d6ac
Merge: 3d1d497 01574a9
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu May 14 15:26:40 2015 -0400

    Merge branch 'master' into 3198-writable-fuse


commit 3d1d497b23a53370417385eb75a5ba7207364ff7
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu May 14 15:21:27 2015 -0400

    3198: Support setattr().

diff --git a/services/fuse/arvados_fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py
index 0d5ecb4..9df9429 100644
--- a/services/fuse/arvados_fuse/__init__.py
+++ b/services/fuse/arvados_fuse/__init__.py
@@ -292,6 +292,19 @@ class Operations(llfuse.Operations):
         return entry
 
     @catch_exceptions
+    def setattr(self, inode, attr):
+        entry = self.getattr(inode)
+
+        e = self.inodes[inode]
+
+        if attr.st_size is not None and isinstance(e, FuseArvadosFile):
+            with llfuse.lock_released:
+                e.arvfile.truncate(attr.st_size)
+                entry.st_size = e.arvfile.size()
+
+        return entry
+
+    @catch_exceptions
     def lookup(self, parent_inode, name):
         name = unicode(name, self.encoding)
         inode = None
diff --git a/services/fuse/arvados_fuse/fusedir.py b/services/fuse/arvados_fuse/fusedir.py
index 9b93187..17709df 100644
--- a/services/fuse/arvados_fuse/fusedir.py
+++ b/services/fuse/arvados_fuse/fusedir.py
@@ -258,10 +258,12 @@ class CollectionDirectoryBase(Directory):
     def unlink(self, name):
         with llfuse.lock_released:
             self.collection.remove(name)
+        self.flush()
 
     def rmdir(self, name):
         with llfuse.lock_released:
             self.collection.remove(name)
+        self.flush()
 
     def rename(self, name_old, name_new, src):
         if not isinstance(src, CollectionDirectoryBase):
@@ -270,14 +272,14 @@ class CollectionDirectoryBase(Directory):
         if name_new in self:
             ent = src[name_old]
             tgt = self[name_new]
-            if isinstance(FuseArvadosFile, ent) and isinstance(FuseArvadosFile, tgt):
+            if isinstance(ent, FuseArvadosFile) and isinstance(tgt, FuseArvadosFile):
                 pass
-            elif isinstance(CollectionDirectoryBase, ent) and isinstance(CollectionDirectoryBase, tgt):
+            elif isinstance(ent, CollectionDirectoryBase) and isinstance(tgt, CollectionDirectoryBase):
                 if len(tgt) > 0:
                     raise llfuse.FUSEError(errno.ENOTEMPTY)
-            elif isinstance(CollectionDirectoryBase, ent) and isinstance(FuseArvadosFile, tgt):
+            elif isinstance(ent, CollectionDirectoryBase) and isinstance(tgt, FuseArvadosFile):
                 raise llfuse.FUSEError(errno.ENOTDIR)
-            elif isinstance(FuseArvadosFile, ent) and isinstance(CollectionDirectoryBase, tgt):
+            elif isinstance(ent, FuseArvadosFile) and isinstance(tgt, CollectionDirectoryBase):
                 raise llfuse.FUSEError(errno.EISDIR)
 
         with llfuse.lock_released:

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list