girder 3.2.15.dev2__tar.gz → 3.2.15.dev3__tar.gz

{girder-3.2.15.dev2/girder.egg-info → girder-3.2.15.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder
-Version: 3.2.15.dev2
+Version: 3.2.15.dev3
 Summary: Web-based data management platform
 Home-page: https://girder.readthedocs.org
 Author: Kitware, Inc.

{girder-3.2.15.dev2 → girder-3.2.15.dev3}/girder/utility/abstract_assetstore_adapter.py

@@ -47,6 +47,10 @@ class FileHandle:
     def __exit__(self, exc_type, exc_val, exc_tb):
         self.close()
 
+    @property
+    def unavailable(self) -> bool:
+        return False
+
     def read(self, size=None):
         """
         Read *size* bytes from the file data.

{girder-3.2.15.dev2 → girder-3.2.15.dev3}/girder/utility/filesystem_assetstore_adapter.py

@@ -92,17 +92,30 @@ class FilesystemAssetstoreAdapter(AbstractAssetstoreAdapter):
         # happens to existing assetstores that no longer can access their temp
         # directories.
         self.tempDir = os.path.join(self.assetstore['root'], 'temp')
+        self._unavailable = False
         try:
             mkdir(self.tempDir)
         except OSError:
-            self.unavailable = True
+            self._unavailable = True
             logger.exception('Failed to create filesystem assetstore '
                              'directories %s' % self.tempDir)
         if not os.access(self.assetstore['root'], os.W_OK):
-            self.unavailable = True
+            self._unavailable = True
             logger.error('Could not write to assetstore root: %s',
                          self.assetstore['root'])
 
+    @property
+    def unavailable(self) -> bool:
+        if self._unavailable:
+            return True
+        try:
+            free = self.capacityInfo()['free']
+            if free is not None and free <= 0:
+                return True
+        except Exception:
+            pass
+        return False
+
     def capacityInfo(self):
         """
         For filesystem assetstores, we just need to report the free and total
@@ -110,7 +123,18 @@ class FilesystemAssetstoreAdapter(AbstractAssetstoreAdapter):
         """
         try:
             usage = psutil.disk_usage(self.assetstore['root'])
-            return {'free': usage.free, 'total': usage.total}
+            reserved = -1
+            try:
+                reserved = float(os.environ.get('GIRDER_FILESYSTEMASSETSTORE_RESERVED_MBYTES'))
+            except Exception:
+                pass
+            if reserved <= 0:
+                reserved = 10 * 1024
+            reserved *= 1024 ** 2
+            return {
+                'free': max(0, usage.free - reserved),
+                'reserved': reserved,
+                'total': usage.total}
         except OSError:
             logger.exception(
                 'Failed to get disk usage of %s' % self.assetstore['root'])
@@ -126,6 +150,9 @@ class FilesystemAssetstoreAdapter(AbstractAssetstoreAdapter):
         Generates a temporary file and sets its location in the upload document
         as tempFile. This is the file that the chunks will be appended to.
         """
+        if self.unavailable:
+            msg = 'Assetstore is unavailable or has insufficient free space.'
+            raise ValidationException(msg)
         fd, path = tempfile.mkstemp(dir=self.tempDir)
         os.close(fd)  # Must close this file descriptor or it will leak
         upload['tempFile'] = path
@@ -136,6 +163,9 @@ class FilesystemAssetstoreAdapter(AbstractAssetstoreAdapter):
         """
         Appends the chunk into the temporary file.
         """
+        if self.unavailable:
+            msg = 'Assetstore is unavailable or has insufficient free space.'
+            raise ValidationException(msg)
         # If we know the chunk size is too large or small, fail early.
         self.checkUploadSize(upload, self.getChunkSize(chunk))
 

{girder-3.2.15.dev2 → girder-3.2.15.dev3}/girder/web_client/src/views/body/AssetstoresView.js

@@ -112,10 +112,16 @@ var AssetstoresView = View.extend({
         var assetstore = this.collection.get($(el).attr('cid'));
         var capacity = assetstore.get('capacity');
         var used = capacity.total - capacity.free;
+        if (capacity.reserved) {
+            used -= capacity.reserved;
+        }
         var data = [
             ['Used (' + formatSize(used) + ')', used],
             ['Free (' + formatSize(capacity.free) + ')', capacity.free]
         ];
+        if (capacity.reserved) {
+            data.push(['Reserved (' + formatSize(capacity.reserved) + ')', capacity.reserved]);
+        }
         var plot = $(el).jqplot([data], {
             seriesDefaults: {
                 renderer: $.jqplot.PieRenderer,

{girder-3.2.15.dev2 → girder-3.2.15.dev3/girder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder
-Version: 3.2.15.dev2
+Version: 3.2.15.dev3
 Summary: Web-based data management platform
 Home-page: https://girder.readthedocs.org
 Author: Kitware, Inc.

{girder-3.2.15.dev2 → girder-3.2.15.dev3}/scripts/publicNames.txt

@@ -801,6 +801,7 @@ girder
                 seek
                 seekable
                 tell
+                unavailable
         acl_mixin
             AccessControlMixin
                 filterResultsByPermission
@@ -843,6 +844,7 @@ girder
                 importFile
                 initUpload
                 requestOffset
+                unavailable
                 uploadChunk
                 validateInfo
         genToken