X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FChainBootNode.py;h=cccd37f7f9eb188a73a67c9b7a7c4c07c8b6f0f9;hb=c1c1a718941bd83dec7e0257ce2c58127a866fca;hp=a83474aed6b4ba2d350d15c24db76a7b345af7a1;hpb=b89eca454fae5106b3c9f9185ec6e4e0920d4c57;p=bootmanager.git diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py index a83474a..cccd37f 100644 --- a/source/steps/ChainBootNode.py +++ b/source/steps/ChainBootNode.py @@ -1,24 +1,43 @@ +#!/usr/bin/python2 + +# Copyright (c) 2003 Intel Corporation +# All rights reserved. +# +# Copyright (c) 2004-2006 The Trustees of Princeton University +# All rights reserved. + + import string import re +import os +import UpdateBootStateWithPLC from Exceptions import * import utils import compatibility -from systeminfo import systeminfo +import systeminfo import BootAPI +import notify_messages +import time +import ModelOptions def Run( vars, log ): """ Load the kernel off of a node and boot to it. This step assumes the disks are mounted on SYSIMG_PATH. + If successful, this function will not return. If it returns, no chain + booting has occurred. Expect the following variables: BOOT_CD_VERSION A tuple of the current bootcd version SYSIMG_PATH the path where the system image will be mounted (always starts with TEMP_PATH) ROOT_MOUNTED the node root file system is mounted - + NODE_SESSION the unique session val set when we requested + the current boot state + PLCONF_DIR The directory to store PL configuration files in + Sets the following variables: ROOT_MOUNTED the node root file system is mounted """ @@ -34,7 +53,20 @@ def Run( vars, log ): SYSIMG_PATH= vars["SYSIMG_PATH"] if SYSIMG_PATH == "": raise ValueError, "SYSIMG_PATH" - + + PLCONF_DIR= vars["PLCONF_DIR"] + if PLCONF_DIR == "": + raise ValueError, "PLCONF_DIR" + + # its ok if this is blank + NODE_SESSION= vars["NODE_SESSION"] + + 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: @@ -54,25 +86,51 @@ 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) utils.sysexec( "vgscan", log ) utils.sysexec( "vgchange -ay planetlab", log ) utils.makedirs( SYSIMG_PATH ) - utils.sysexec( "mount /dev/planetlab/root %s" % SYSIMG_PATH, log ) - utils.sysexec( "mount /dev/planetlab/vservers %s/vservers" % - SYSIMG_PATH, log ) + cmd = "mount %s %s" % (PARTITIONS["root"],SYSIMG_PATH) + utils.sysexec( cmd, log ) + cmd = "mount %s %s/vservers" % (PARTITIONS["vservers"],SYSIMG_PATH) + utils.sysexec( cmd, log ) + cmd = "mount -t proc none %s/proc" % SYSIMG_PATH + utils.sysexec( cmd, log ) ROOT_MOUNTED= 1 vars['ROOT_MOUNTED']= 1 - node_update_cmd= "/usr/local/planetlab/bin/NodeUpdate.py start noreboot" + # write out the session value /etc/planetlab/session + try: + session_file_path= "%s/%s/session" % (SYSIMG_PATH,PLCONF_DIR) + session_file= file( session_file_path, "w" ) + session_file.write( str(NODE_SESSION) ) + session_file.close() + session_file= None + log.write( "Updated /etc/planetlab/session\n" ) + except IOError, e: + log.write( "Unable to write out /etc/planetlab/session, continuing anyway\n" ) + # update configuration files + log.write( "Updating configuration files.\n" ) + if os.path.exists( SYSIMG_PATH + "/etc/init.d/conf_files" ): + cmd = "/etc/init.d/conf_files start --noscripts" + else: + cmd = "/usr/bin/PlanetLabConf.py noscripts" + utils.sysexec( "chroot %s %s" % (SYSIMG_PATH, cmd), log ) + + # update node packages log.write( "Running node update.\n" ) - utils.sysexec( "chroot %s %s" % (SYSIMG_PATH,node_update_cmd), log ) + if os.path.exists( SYSIMG_PATH + "/usr/bin/NodeUpdate.py" ): + cmd = "chroot %s /usr/bin/NodeUpdate.py start noreboot" % SYSIMG_PATH + else: + # for backwards compatibility + cmd = "chroot %s /usr/local/planetlab/bin/NodeUpdate.py start noreboot" % SYSIMG_PATH + utils.sysexec( cmd, log ) log.write( "Updating ssh public host key with PLC.\n" ) ssh_host_key= "" @@ -83,20 +141,33 @@ def Run( vars, log ): ssh_host_key_file= None except IOError, e: pass - + update_vals= {} update_vals['ssh_host_key']= ssh_host_key BootAPI.call_api_function( vars, "BootUpdateNode", (update_vals,) ) + # get the kernel version + option = '' + if NODE_MODEL_OPTIONS & ModelOptions.SMP: + option = 'smp' log.write( "Copying kernel and initrd for booting.\n" ) - utils.sysexec( "cp %s/boot/kernel-boot /tmp/kernel" % SYSIMG_PATH, log ) - utils.sysexec( "cp %s/boot/initrd-boot /tmp/initrd" % SYSIMG_PATH, log ) + utils.sysexec( "cp %s/boot/kernel-boot%s /tmp/kernel" % (SYSIMG_PATH,option), log ) + utils.sysexec( "cp %s/boot/initrd-boot%s /tmp/initrd" % (SYSIMG_PATH,option), log ) + + BootAPI.save(vars) log.write( "Unmounting disks.\n" ) - utils.sysexec_noerr( "chroot %s umount /rcfs" % SYSIMG_PATH, log ) - utils.sysexec_noerr( "umount -r /dev/planetlab/vservers", log ) - utils.sysexec_noerr( "umount -r /dev/planetlab/root", log ) + try: + # backwards compat, though, we should never hit this case post PL 3.2 + os.stat("%s/rcfs/taskclass"%SYSIMG_PATH) + utils.sysexec_noerr( "chroot %s umount /rcfs" % SYSIMG_PATH, log ) + except OSError, e: + pass + + utils.sysexec_noerr( "umount %s/proc" % SYSIMG_PATH, log ) + utils.sysexec_noerr( "umount -r %s/vservers" % SYSIMG_PATH, log ) + utils.sysexec_noerr( "umount -r %s" % SYSIMG_PATH, log ) utils.sysexec_noerr( "vgchange -an", log ) ROOT_MOUNTED= 0 @@ -135,6 +206,9 @@ def Run( vars, log ): if module != "": log.write( "Unloading %s\n" % module ) utils.sysexec_noerr( "modprobe -r %s" % module, log ) + if module == "e1000": + log.write("Unloading e1000 driver; sleeping 4 seconds...\n") + time.sleep(4) modules.close() except IOError: @@ -169,7 +243,7 @@ def Run( vars, log ): # problems during chain boot, such as USB host # controller drivers (HCDs) (PL6577). # if int(parts[2]) == 0: - if re.search('_hcd$', parts[0]): + if False and re.search('_hcd$', parts[0]): if usb_usage > 0: log.write( "NOT unloading %s since USB may be in use\n" % parts[0] ) else: @@ -181,7 +255,9 @@ def Run( vars, log ): log.write( "Couldn't read /proc/modules, continuing.\n" ) - kargs = "ramdisk_size=8192" + kargs = "root=%s ramdisk_size=8192" % PARTITIONS["mapper-root"] + if NODE_MODEL_OPTIONS & ModelOptions.SMP: + kargs = kargs + " " + "acpi=off" try: kargsfb = open("/kargs.txt","r") moreargs = kargsfb.readline()