run fsck prior to mount. should address hanging-mount failures on

[bootmanager.git] / source / steps / ValidateNodeInstall.py

diff --git a/source/steps/ValidateNodeInstall.py b/source/steps/ValidateNodeInstall.py
index 7b7ed8a..278fea6 100644 (file)
--- a/source/steps/ValidateNodeInstall.py
+++ b/source/steps/ValidateNodeInstall.py
@@ -1,8 +1,16 @@
+#!/usr/bin/python2 -u
+
+# Copyright (c) 2003 Intel Corporation
+# All rights reserved.
+#
+# Copyright (c) 2004-2006 The Trustees of Princeton University
+# All rights reserved.
+
 import os
 
 from Exceptions import *
 import utils
-from systeminfo import systeminfo
+import systeminfo
 import compatibility
 import ModelOptions
 
@@ -47,6 +55,10 @@ def Run( vars, log ):
         
         NODE_MODEL_OPTIONS= vars["NODE_MODEL_OPTIONS"]
 
+        PARTITIONS= vars["PARTITIONS"]
+        if PARTITIONS == None:
+            raise ValueError, "PARTITIONS"
+
     except KeyError, var:
         raise BootManagerException, "Missing variable in vars: %s\n" % var
     except ValueError, var:
@@ -68,7 +80,7 @@ def Run( vars, log ):
         # simply creating an instance of this class and listing the system
         # block devices will make them show up so vgscan can find the planetlab
         # volume group
-        systeminfo().get_block_device_list()
+        systeminfo.get_block_device_list(vars, log)
 
         try:
             utils.sysexec( "vgscan", log )
@@ -81,12 +93,29 @@ def Run( vars, log ):
         utils.makedirs( SYSIMG_PATH )
 
         try:
-            utils.sysexec( "mount /dev/planetlab/root %s" % SYSIMG_PATH, log )
-            utils.sysexec( "mount /dev/planetlab/vservers %s/vservers" %
-                           SYSIMG_PATH, log )
+            # first run fsck to prevent fs corruption from hanging mount...
+            log.write( "fsck root file system\n" )
+            utils.sysexec("e2fsck -v -p %s" % (PARTITIONS["root"]),log)
+
+            log.write( "fsck vserver file system\n" )
+            utils.sysexec("e2fsck -v -p %s" % (PARTITIONS["vservers"]),log)
+        except BootManagerException, e:
+            log.write( "BootManagerException during fsck of /root and /vservers : %s\n" %
+                       str(e) )
+
+        try:
+            # then attempt to mount them
+            log.write( "mounting root file system\n" )
+            utils.sysexec("mount -t ext3 %s %s" % (PARTITIONS["root"],SYSIMG_PATH),log)
+
+            log.write( "mounting vserver partition in root file system\n" )
+            utils.sysexec("mount -t ext3 %s %s/vservers" % \
+                          (PARTITIONS["vservers"], SYSIMG_PATH), log)
+
+            log.write( "mounting /proc\n" )
             utils.sysexec( "mount -t proc none %s/proc" % SYSIMG_PATH, log )
         except BootManagerException, e:
-            log.write( "BootManagerException during vgscan/vgchange: %s\n" %
+            log.write( "BootManagerException during mount of /root, /vservers and /proc: %s\n" %
                        str(e) )
             return 0