storage: reworked garbage collector

Move 1 day old deleted disks to trash folder.
Automatically delete oldest images (from trash folder)
when ithere is no sufficent free space.

circle/storage/tasks/periodic_tasks.py

@@ -4,40 +4,63 @@ from django.utils import timezone
 from datetime import timedelta
 from datetime import timedelta
 from manager.mancelery import celery
 from manager.mancelery import celery
 import logging
 import logging
+from storage.tasks import remote_tasks
 
 
 logger = logging.getLogger(__name__)
 logger = logging.getLogger(__name__)
 
 
 
 
 @celery.task
 @celery.task
-def garbage_collector():
-    logging.warning("Deletable disks:")
+def garbage_collector(timeout=15):
+    """ Garbage collector for disk images.
+
+        Moves 1 day old deleted images to trash folder.
+        If there is not enough free space on datastore (default 10%)
+        deletes oldest images from trash.
+    """
     for ds in DataStore.objects.all():
     for ds in DataStore.objects.all():
-        one_week_before = timezone.now() - timedelta(days=7)
+        time_before = timezone.now() - timedelta(days=1)
         file_list = os.listdir(ds.path)
         file_list = os.listdir(ds.path)
         disk_list = [disk.filename for disk in
         disk_list = [disk.filename for disk in
-                     ds.disk_set.filter(destroyed__lt=one_week_before)]
+                     ds.disk_set.filter(destroyed__lt=time_before)]
+        queue_name = ds.get_remote_queue_name('storage')
         for i in set(file_list).intersection(disk_list):
         for i in set(file_list).intersection(disk_list):
-            abs_path = ds.path + "/" + i
-            logging.warning(i + " - " +
-                            str(os.path.getsize(abs_path) / 1024 / 1024))
-            #os.unlink(abs_path)
+            logger.info("Image: %s at Datastore: %s moved to trash folder." %
+                        (i, ds.path))
+            remote_tasks.move_to_trash.apply_async(
+                args=[ds.path, i], queue=queue_name).get(timeout=timeout)
+        try:
+            remote_tasks.make_free_space.apply_async(
+                args=[ds.path], queue=queue_name).get(timeout=timeout)
+        except Exception as e:
+            logger.warning(str(e))
+
 
 
-    logging.warning("Orphan disks:")
+@celery.task
+def list_orphan_disks(timeout=15):
+    """ List disk image files without Disk object in the database.
+        Exclude cloud-xxxxxxxx.dump format images.
+    """
+    import re
     for ds in DataStore.objects.all():
     for ds in DataStore.objects.all():
-        one_week_before = timezone.now() - timedelta(days=7)
-        file_list = os.listdir(ds.path)
+        queue_name = ds.get_remote_queue_name('storage')
+        file_list = remote_tasks.list_files.apply_async(
+            args=[ds.path], queue=queue_name).get(timeout=timeout)
         disk_list = [disk.filename for disk in ds.disk_set.all()]
         disk_list = [disk.filename for disk in ds.disk_set.all()]
         for i in set(file_list).difference(disk_list):
         for i in set(file_list).difference(disk_list):
-            if "dump" not in i:
-                abs_path = ds.path + "/" + i
-                logging.warning(i + " - " +
-                                str(os.path.getsize(abs_path) / 1024 / 1024))
+            if not re.match('cloud-[0-9]*\.dump', i):
+                logging.warning("Orphan disk: %s" % i)
 
 
-    logging.warning("Missing disks:")
+
+@celery.task
+def list_missing_disks(timeout=15):
+    """ List Disk objects without disk image files.
+    """
     for ds in DataStore.objects.all():
     for ds in DataStore.objects.all():
-        one_week_before = timezone.now() - timedelta(days=7)
-        file_list = os.listdir(ds.path)
+        queue_name = ds.get_remote_queue_name('storage')
+        file_list = remote_tasks.list_files.apply_async(
+            args=[ds.path], queue=queue_name).get(timeout=timeout)
         disk_list = [disk.filename for disk in
         disk_list = [disk.filename for disk in
-                     ds.disk_set.filter(destroyed__isnull=False)]
+                     ds.disk_set.filter(destroyed__isnull=True)]
         for i in set(disk_list).difference(file_list):
         for i in set(disk_list).difference(file_list):
-            logging.warning(i)
+            logging.critical("Image: %s is missing from %s datastore."
+                             % (i, ds.path))