X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FValidateNodeInstall.py;h=c70aad940a3b6eb1bd05bb36847aedff3191cf4a;hb=f319a8525c96631ec3e679994fc7cea5c935a209;hp=db4680c4e8b91fd8662ab021f35123ad9e7223c2;hpb=7ab7e9dd797333a9fdc8604554e16e192a32144d;p=bootmanager.git diff --git a/source/steps/ValidateNodeInstall.py b/source/steps/ValidateNodeInstall.py index db4680c..c70aad9 100644 --- a/source/steps/ValidateNodeInstall.py +++ b/source/steps/ValidateNodeInstall.py @@ -1,22 +1,31 @@ +#!/usr/bin/python + +# 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 compatibility +import systeminfo +import ModelOptions 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 Set the following variables upon successfully running: ROOT_MOUNTED the node root file system is mounted @@ -26,14 +35,24 @@ 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" + NODE_ID= vars["NODE_ID"] + if NODE_ID == "": + raise ValueError, "NODE_ID" + + PLCONF_DIR= vars["PLCONF_DIR"] + if PLCONF_DIR == "": + raise ValueError, "PLCONF_DIR" + + 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: @@ -41,22 +60,19 @@ def Run( vars, log ): ROOT_MOUNTED= 0 - if 'ROOT_MOUNTED' in vars.keys(): + if vars.has_key('ROOT_MOUNTED'): ROOT_MOUNTED= vars['ROOT_MOUNTED'] - # 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 - # volume group - systeminfo().get_block_device_list() - # 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: + + # 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(vars, log) + try: utils.sysexec( "vgscan", log ) utils.sysexec( "vgchange -ay planetlab", log ) @@ -68,26 +84,76 @@ 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 vgscan/vgchange: %s\n" % + log.write( "BootManagerException during fsck of /root and /vservers : %s\n" % str(e) ) - return 0 + return -1 + + 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) + + VSERVERS_PATH = "%s/vservers" % SYSIMG_PATH + utils.makedirs(VSERVERS_PATH) + log.write( "mounting vserver partition in root file system\n" ) + utils.sysexec("mount -t ext3 %s %s" % (PARTITIONS["vservers"], VSERVERS_PATH), log) + + PROC_PATH = "%s/proc" % SYSIMG_PATH + utils.makedirs(PROC_PATH) + log.write( "mounting /proc\n" ) + 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 -2 ROOT_MOUNTED= 1 vars['ROOT_MOUNTED']= 1 - valid= 0 - if os.access("%s/boot/kernel-boot" % SYSIMG_PATH, os.F_OK | os.R_OK) and \ - os.access("%s/boot/initrd-boot" % SYSIMG_PATH, os.F_OK | os.R_OK): - valid= 1 + # 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) + except OSError, e: + log.write( "Couldn't locate base kernel (you might be using the stock kernel).\n") + return -3 - if not valid: - log.write( "Node does not appear to be installed correctly:\n" ) - log.write( "missing file /boot/ initrd-boot or kernel-boot\n" ) + # check if the model specified kernel is installed + option = '' + if NODE_MODEL_OPTIONS & ModelOptions.SMP: + option = 'smp' + try: + os.stat("%s/boot/kernel-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 + # using the base kernel. + NODE_MODEL_OPTIONS = NODE_MODEL_OPTIONS & ~ModelOptions.SMP + vars["NODE_MODEL_OPTIONS"] = NODE_MODEL_OPTIONS + log.write( "WARNING: Couldn't locate smp kernel.\n") + + # write out the node id to /etc/planetlab/node_id. if this fails, return + # 0, indicating the node isn't a valid install. + try: + node_id_file_path= "%s/%s/node_id" % (SYSIMG_PATH,PLCONF_DIR) + node_id_file= file( node_id_file_path, "w" ) + node_id_file.write( str(NODE_ID) ) + node_id_file.close() + node_id_file= None + log.write( "Updated /etc/planetlab/node_id\n" ) + except IOError, e: + log.write( "Unable to write out /etc/planetlab/node_id\n" ) return 0 + + log.write( "Node installation appears to be ok\n" ) return 1