Commit 11e13c2e by Kálmán Viktor

Merge branch 'datastore-detail-fixes' into 'master'

Minor datastore detail fixes



See merge request !392
parents 5d0ca600 a479e1d7
...@@ -133,7 +133,6 @@ ...@@ -133,7 +133,6 @@
"readable_data": ["{{stats.template_actual_size|filesize}}", "readable_data": ["{{stats.template_actual_size|filesize}}",
"{{stats.vm_actual_size|filesize}}", "{{stats.vm_actual_size|filesize}}",
"{{stats.dumps|filesize}}", "{{stats.dumps|filesize}}",
"{{stats.dumps|filesize}}",
"{{stats.iso_raw|filesize}}", "{{stats.iso_raw|filesize}}",
"{{stats.trash|filesize}}"], "{{stats.trash|filesize}}"],
"labels": ["{% trans "Templates" %}", "labels": ["{% trans "Templates" %}",
......
...@@ -110,8 +110,8 @@ class DataStore(Model): ...@@ -110,8 +110,8 @@ class DataStore(Model):
disks = Disk.objects.filter(destroyed__isnull=True, is_ready=True) disks = Disk.objects.filter(destroyed__isnull=True, is_ready=True)
return disks.exclude(filename__in=files) return disks.exclude(filename__in=files)
@method_cache(30) @method_cache(120)
def get_file_statistics(self, timeout=15): def get_file_statistics(self, timeout=30):
queue_name = self.get_remote_queue_name('storage', "slow") queue_name = self.get_remote_queue_name('storage', "slow")
data = storage_tasks.get_file_statistics.apply_async( data = storage_tasks.get_file_statistics.apply_async(
args=[self.path], queue=queue_name).get(timeout=timeout) args=[self.path], queue=queue_name).get(timeout=timeout)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment