Catch error if fetch_image fails

[invirt/packages/invirt-images.git] / invirt-images

diff --git a/invirt-images b/invirt-images
index 1566cc6..2175ead 100755 (executable)
--- a/invirt-images
+++ b/invirt-images
@@ -2,6 +2,7 @@
 
 from invirt import database
 import os
 
 from invirt import database
 import os

+import sys

 import subprocess
 import random
 import string
 import subprocess
 import random
 import string

@@ -109,6 +110,8 @@ def fetch_image(cdrom):
     """
     full_uri = os.path.join(cdrom.mirror.uri_prefix, cdrom.uri_suffix)
     temp_file = tempfile.mkstemp()[1]
     """
     full_uri = os.path.join(cdrom.mirror.uri_prefix, cdrom.uri_suffix)
     temp_file = tempfile.mkstemp()[1]

+    if verbosity > 0:
+        print >>sys.stderr, "Fetching image %s from %s to %s" % (cdrom.cdrom_id, full_uri, temp_file)

     try:
         if full_uri.startswith('rsync://'):
             if subprocess.call(['rsync', '--no-motd', '-tLP', full_uri, temp_file],
     try:
         if full_uri.startswith('rsync://'):
             if subprocess.call(['rsync', '--no-motd', '-tLP', full_uri, temp_file],

@@ -139,9 +142,18 @@ def load_image(cdrom):
     """
     if cdrom.mirror_id is None:
         return
     """
     if cdrom.mirror_id is None:
         return

-    temp_file = fetch_image(cdrom)

     try:
     try:

-        cdrom_size = '%sM' % math.ceil((float(os.stat(temp_file).st_size) / (1024 * 1024)))
+        temp_file = fetch_image(cdrom)
+    except InvirtImageException, e:
+        print >>sys.stderr, 'ERROR: %s.  Skipping.' % e
+        return
+
+    try:
+        st_size = os.stat(temp_file).st_size
+        if not st_size:
+            print >>sys.stderr, "Failed to fetch %s" % cdrom.cdrom_id
+            return
+        cdrom_size = '%sM' % math.ceil((float(st_size) / (1024 * 1024)))

         new_lv = lvcreate_random('image-new_%s_%%s' % cdrom.cdrom_id, cdrom_size)
         copy_file(temp_file, '/dev/xenvg/%s' % new_lv)
         lvrename_random('image_%s' % cdrom.cdrom_id, 'image-old_%s_%%s' % cdrom.cdrom_id)
         new_lv = lvcreate_random('image-new_%s_%%s' % cdrom.cdrom_id, cdrom_size)
         copy_file(temp_file, '/dev/xenvg/%s' % new_lv)
         lvrename_random('image_%s' % cdrom.cdrom_id, 'image-old_%s_%%s' % cdrom.cdrom_id)