Merge branch 'storage-fixes'

circle/storage/tasks/local_tasks.py

@@ -48,3 +48,9 @@ class create_from_url(AbortableTask):
                              task_uuid=create_from_url.request.id,
                              abortable_task=self,
                              user=user)
+
+
+@celery.task
+def create_empty(Disk, instance, params, user):
+    Disk.create_empty(instance, params, user,
+                      task_uuid=create_empty.request.id)

circle/storage/tasks/periodic_tasks.py

 from storage.models import DataStore
 import os
-from django.utils import timezone
-from datetime import timedelta
 from manager.mancelery import celery
 import logging
 from storage.tasks import remote_tasks
@@ -21,10 +19,8 @@ def garbage_collector(timeout=15):
     :type timeoit: int
     """
     for ds in DataStore.objects.all():
-        time_before = timezone.now() - timedelta(days=1)
         file_list = os.listdir(ds.path)
-        disk_list = [disk.filename for disk in
-                     ds.disk_set.filter(destroyed__lt=time_before)]
+        disk_list = ds.get_deletable_disks()
         queue_name = ds.get_remote_queue_name('storage')
         for i in set(file_list).intersection(disk_list):
             logger.info("Image: %s at Datastore: %s moved to trash folder." %

circle/storage/tests.py

-"""
-This file demonstrates writing tests using the unittest module. These will pass
-when you run "manage.py test".
-
-Replace this with more appropriate tests for your application.
-"""
-
-from django.test import TestCase
-
-
-class SimpleTest(TestCase):
-    def test_basic_addition(self):
-        """
-        Tests that 1 + 1 always equals 2.
-        """
-        self.assertEqual(1 + 1, 2)

circle/storage/tests/test_models.py

+from datetime import timedelta
+
+from django.test import TestCase
+from django.utils import timezone
+
+from ..models import Disk, DataStore
+
+old = timezone.now() - timedelta(days=2)
+new = timezone.now() - timedelta(hours=2)
+
+
+class DiskTestCase(TestCase):
+
+    n = 0
+
+    def setUp(self):
+        self.ds = DataStore.objects.create(path="/datastore",
+                                           hostname="devenv", name="default")
+
+    def _disk(self, destroyed=None, base=None):
+        self.n += 1
+        n = "d%d" % self.n
+        return Disk.objects.create(name=n, filename=n, base=base, size=1,
+                                   destroyed=destroyed, datastore=self.ds)
+
+    def test_deletable_not_destroyed(self):
+        d = self._disk()
+        assert not d.is_deletable()
+
+    def test_deletable_newly_destroyed(self):
+        d = self._disk(destroyed=new)
+        assert not d.is_deletable()
+
+    def test_deletable_no_child(self):
+        d = self._disk(destroyed=old)
+        assert d.is_deletable()
+
+    def test_deletable_child_not_destroyed(self):
+        d = self._disk()
+        self._disk(base=d, destroyed=old)
+        self._disk(base=d)
+        assert not d.is_deletable()
+
+    def test_deletable_child_newly_destroyed(self):
+        d = self._disk(destroyed=old)
+        self._disk(base=d, destroyed=new)
+        self._disk(base=d)
+        assert not d.is_deletable()