SF.net SVN: safekeep: [573] safekeep/trunk/safekeep

[<di...@us...>]

Revision: 573
          http://safekeep.svn.sourceforge.net/safekeep/?rev=573&view=rev
Author:   dimi
Date:     2008-02-24 08:42:27 -0800 (Sun, 24 Feb 2008)

Log Message:
-----------
Frank Crawford <fr...@cr...>

  * Fixed failure when mount table has extra options.
  * Tear down FS snapshots in reverse order to the setup order.
  * Load the LVM snapshot module, in case it is not already loaded.
  * Fixed a minor spelling mistake in an assert message.

Modified Paths:
--------------
    safekeep/trunk/safekeep

Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep	2007-11-07 15:35:15 UTC (rev 572)
+++ safekeep/trunk/safekeep	2008-02-24 16:42:27 UTC (rev 573)
@@ -402,7 +402,7 @@
     cout.close()
     cin.close()
     for line in lines:
-        (device, blah1, mountpoint, blah2, mounttype) = line.split(' ')
+        (device, blah1, mountpoint, blah2, mounttype, blah3) = line.split(' ', 5)
         if line.startswith('/dev/mapper/' + group + '-' + volume + ' '):
             return (group, volume, mountpoint, mounttype)
         elif line.startswith('/dev/' + group + '/' + volume + ' '):
@@ -446,7 +446,9 @@
 def do_client_snap_teardown(cfg, bdir):
     assert is_temp_root(bdir)
     debug('Tear down FS snapshots dumps')
-    for snap in cfg['snaps']:
+    snaps = list(cfg['snaps'])
+    snaps.reverse()
+    for snap in snaps:
         device = snap['device']
         (lvmdev, snapdev, snapmnt, snaptyp) = gather_snap_information(device, bdir)
         if not snapmnt:
@@ -484,6 +486,9 @@
     do_client_dbdump(cfg)
 
     if len(cfg['snaps']) > 0:
+        ret = spawn(['modprobe', 'dm-snapshot'])
+        if ret:
+            warn('modprobe dm-snapshot failed, continuing')
         bdir = tempfile.mkdtemp("-rbind", "safekeep-", "/mnt")
         ret = spawn(['mount', '--rbind', '/', bdir])
         if ret:
@@ -1022,7 +1027,7 @@
                 keys_status = True
             do_keys(cfgs, args, identity, keys_status, keys_print, keys_deploy)
         else:
-            assert False, 'Unkown mode: ' + mode
+            assert False, 'Unknown mode: ' + mode
     except Exception, ex:
         traceback.print_exc(file=sys.stdout)
         error('ERROR: %s' % ex)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.