X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FValidateNodeInstall.py;h=ea64a29d5fa9f4a092b6ab2e516b16c2c8c20c41;hb=edb128900c2d05b8293c328997d627f270d15e49;hp=7505335efe9f1d37503d570cd3f904ffde0b3745;hpb=8cb139ee4c3a0a184dbbf7c100968e7bcda13308;p=bootmanager.git diff --git a/source/steps/ValidateNodeInstall.py b/source/steps/ValidateNodeInstall.py index 7505335..ea64a29 100644 --- a/source/steps/ValidateNodeInstall.py +++ b/source/steps/ValidateNodeInstall.py @@ -1,5 +1,5 @@ -#!/usr/bin/python2 -u - +#!/usr/bin/python +# # Copyright (c) 2003 Intel Corporation # All rights reserved. # @@ -11,7 +11,6 @@ import os from Exceptions import * import utils import systeminfo -import compatibility import ModelOptions @@ -19,12 +18,11 @@ def Run( vars, log ): """ See if a node installation is valid. More checks should certainly be done in the future, but for now, make sure that the sym links kernel-boot - and initrd-boot exist in /boot + exist in /boot Expect the following variables to be set: SYSIMG_PATH the path where the system image will be mounted (always starts with TEMP_PATH) - BOOT_CD_VERSION A tuple of the current bootcd version ROOT_MOUNTED the node root file system is mounted NODE_ID The db node_id for this machine PLCONF_DIR The directory to store the configuration file in @@ -37,10 +35,6 @@ def Run( vars, log ): # make sure we have the variables we need try: - BOOT_CD_VERSION= vars["BOOT_CD_VERSION"] - if BOOT_CD_VERSION == "": - raise ValueError, "BOOT_CD_VERSION" - SYSIMG_PATH= vars["SYSIMG_PATH"] if SYSIMG_PATH == "": raise ValueError, "SYSIMG_PATH" @@ -66,16 +60,13 @@ def Run( vars, log ): ROOT_MOUNTED= 0 - if 'ROOT_MOUNTED' in vars.keys(): + if vars.has_key('ROOT_MOUNTED'): ROOT_MOUNTED= vars['ROOT_MOUNTED'] # mount the root system image if we haven't already. # capture BootManagerExceptions during the vgscan/change and mount # calls, so we can return 0 instead if ROOT_MOUNTED == 0: - # old cds need extra utilities to run lvm - if BOOT_CD_VERSION[0] == 2: - compatibility.setup_lvm_2x_cd( 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 @@ -92,32 +83,79 @@ def Run( vars, log ): utils.makedirs( SYSIMG_PATH ) + # xxx - TODO - need to fsck the btrfs partition + if vars['virt'] == 'vs': + filesystems_tocheck = ['root', 'vservers'] + else: + filesystems_tocheck = ['root'] + + for filesystem in filesystems_tocheck: + try: + # first run fsck to prevent fs corruption from hanging mount... + log.write( "fsck %s file system\n" % filesystem ) + utils.sysexec("e2fsck -v -p %s" % (PARTITIONS[filesystem]), log, fsck=True) + except BootManagerException, e: + log.write( "BootManagerException during fsck of %s (%s) filesystem : %s\n" % + (filesystem, PARTITIONS[filesystem], str(e)) ) + try: + log.write( "Trying to recover filesystem errors on %s\n" % filesystem ) + utils.sysexec("e2fsck -v -y %s" % (PARTITIONS[filesystem]),log, fsck=True) + except BootManagerException, e: + log.write( "BootManagerException during trying to recover filesystem errors on %s (%s) filesystem : %s\n" % + (filesystem, PARTITIONS[filesystem], str(e)) ) + return -1 + else: + # disable time/count based filesystems checks + utils.sysexec_noerr( "tune2fs -c -1 -i 0 %s" % PARTITIONS[filesystem], log) + 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) - + except BootManagerException, e: + log.write( "BootManagerException during mount of /root: %s\n" % str(e) ) + return -2 + + try: + PROC_PATH = "%s/proc" % SYSIMG_PATH + utils.makedirs(PROC_PATH) log.write( "mounting /proc\n" ) - utils.sysexec( "mount -t proc none %s/proc" % SYSIMG_PATH, log ) + utils.sysexec( "mount -t proc none %s" % PROC_PATH, log ) except BootManagerException, e: - log.write( "BootManagerException during mount of /root, /vservers and /proc: %s\n" % - str(e) ) - return 0 + log.write( "BootManagerException during mount of /proc: %s\n" % str(e) ) + return -2 + + + + one_partition = (ROOT_SIZE == "-1") + if (not one_partition): + try: + VSERVERS_PATH = "%s/vservers" % SYSIMG_PATH + utils.makedirs(VSERVERS_PATH) + log.write( "mounting vservers partition in root file system\n" ) + if vars['virt']=='vs': + utils.sysexec("mount -t ext3 %s %s" % (PARTITIONS["vservers"], VSERVERS_PATH), log) + else: + utils.sysexec("mount -t btrfs %s %s" % (PARTITIONS["vservers"], VSERVERS_PATH), log) + except BootManagerException, e: + log.write( "BootManagerException during mount of /vservers: %s\n" % str(e) ) + return -2 ROOT_MOUNTED= 1 vars['ROOT_MOUNTED']= 1 - - # check if the base kernel is installed + # check if the base kernel is installed + # these 2 links are created by our kernel's post-install scriplet + log.write("Checking for a custom kernel\n") try: - os.stat("%s/boot/kernel-boot" % SYSIMG_PATH) - os.stat("%s/boot/initrd-boot" % SYSIMG_PATH) + if vars['virt'] == 'vs': + os.stat("%s/boot/kernel-boot" % SYSIMG_PATH) + else: + kversion = os.popen("chroot %s rpm -qa kernel | tail -1 | cut -c 8-" % SYSIMG_PATH).read().rstrip() + os.stat("%s/boot/vmlinuz-%s" % (SYSIMG_PATH,kversion)) except OSError, e: - log.write( "FATAL: Couldn't locate base kernel.\n") - return 0 + log.write( "Couldn't locate base kernel (you might be using the stock kernel).\n") + return -3 # check if the model specified kernel is installed option = '' @@ -125,7 +163,6 @@ def Run( vars, log ): option = 'smp' try: os.stat("%s/boot/kernel-boot%s" % (SYSIMG_PATH,option)) - os.stat("%s/boot/initrd-boot%s" % (SYSIMG_PATH,option)) except OSError, e: # smp kernel is not there; remove option from modeloptions # such that the rest of the code base thinks we are just @@ -147,6 +184,6 @@ def Run( vars, log ): log.write( "Unable to write out /etc/planetlab/node_id\n" ) return 0 - log.write( "Everything appears to be ok\n" ) + log.write( "Node installation appears to be ok\n" ) return 1