X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2FBootManager.py;h=5270c6ccc555d35ee1d8b3e64a5fbcec52f38403;hb=a583998ec42f6ba8f02bc39471e646ac746ce3c4;hp=e5a448eb73cfc5bafc362eace2b2e7ffca723b1a;hpb=375b5b117f6b72f7bb0179dd5771e386a0c6d47a;p=bootmanager.git diff --git a/source/BootManager.py b/source/BootManager.py index e5a448e..5270c6c 100755 --- a/source/BootManager.py +++ b/source/BootManager.py @@ -1,16 +1,14 @@ #!/usr/bin/python -u # -# $Id$ -# $URL$ -# # Copyright (c) 2003 Intel Corporation # All rights reserved. # # Copyright (c) 2004-2006 The Trustees of Princeton University # All rights reserved. +import sys, os +import traceback import string -import sys, os, traceback import time import gzip @@ -18,6 +16,7 @@ from steps import * from Exceptions import * import notify_messages import BootServerRequest +import utils # all output is written to this file BM_NODE_LOG= "/tmp/bm.log" @@ -111,8 +110,14 @@ class log: """ self.LogEntry( str, 0, 1 ) + def print_stack (self): + """ + dump current stack in log + """ + self.write ( traceback.format_exc() ) + # bm log uploading is available back again, as of nodeconfig-5.0-2 - def Upload( self ): + def Upload( self, extra_file=None ): """ upload the contents of the log to the server """ @@ -144,6 +149,11 @@ class log: FormData = [('log',(pycurl.FORM_FILE, self.OutputFilePath)), ("hostname",hostname), ("type","bm.log")]) + if extra_file is not None: + # NOTE: for code-reuse, evoke the bash function 'upload_logs'; + # by adding --login, bash reads .bash_profile before execution. + # Also, never fail, since this is an optional feature. + utils.sysexec_noerr( """bash --login -c "upload_logs %s" """ % extra_file, self) ############################## @@ -195,7 +205,7 @@ class BootManager: If requriements not met, but tests were succesfull, return 0. for steps that run within the installer, they are expected to either - complete succesfully and return 1, or throw an execption. + complete succesfully and return 1, or throw an exception. For exact return values and expected operations, see the comments at the top of each of the invididual step functions. @@ -226,7 +236,13 @@ class BootManager: InstallInit.Run( self.VARS, self.LOG ) ret = ValidateNodeInstall.Run( self.VARS, self.LOG ) if ret == 1: - WriteModprobeConfig.Run( self.VARS, self.LOG ) +# Thierry - feb. 2013 turning off WriteModprobeConfig for now on lxc +# for one thing this won't work at all with f18, as modules.pcimap +# has disappeared (Daniel suggested modules.aliases could be used instead) +# and second, in any case it's been years now that modprobe.conf was deprecated +# so most likely this code has no actual effect + if self.VARS['virt'] == 'vs': + WriteModprobeConfig.Run( self.VARS, self.LOG ) WriteNetworkConfig.Run( self.VARS, self.LOG ) CheckForNewDisks.Run( self.VARS, self.LOG ) SendHardwareConfigToPLC.Run( self.VARS, self.LOG ) @@ -268,6 +284,7 @@ class BootManager: self.VARS['STATE_CHANGE_NOTIFY']= 1 self.VARS['STATE_CHANGE_NOTIFY_MESSAGE']= \ notify_messages.MSG_INSTALL_FINISHED + AnsibleHook.Run( self.VARS, self.LOG ) UpdateBootStateWithPLC.Run( self.VARS, self.LOG ) _bootRun() @@ -280,13 +297,13 @@ class BootManager: if not ConfirmInstallWithUser.Run( self.VARS, self.LOG ): return 0 self.VARS['BOOT_STATE']= 'reinstall' - UpdateRunLevelWithPLC.Run( self.VARS, self.LOG ) + + AnsibleHook.Run( self.VARS, self.LOG ) _reinstallRun() def _debugRun(state='failboot'): # implements debug logic, which starts the sshd and just waits around self.VARS['RUN_LEVEL']=state - UpdateRunLevelWithPLC.Run( self.VARS, self.LOG ) StartDebug.Run( self.VARS, self.LOG ) # fsck/mount fs if present, and ignore return value if it's not. ValidateNodeInstall.Run( self.VARS, self.LOG ) @@ -307,6 +324,7 @@ class BootManager: InitializeBootManager.Run( self.VARS, self.LOG ) ReadNodeConfiguration.Run( self.VARS, self.LOG ) AuthenticateWithPLC.Run( self.VARS, self.LOG ) + UpdateLastBootOnce.Run( self.VARS, self.LOG ) StartRunlevelAgent.Run( self.VARS, self.LOG ) GetAndUpdateNodeDetails.Run( self.VARS, self.LOG ) @@ -314,7 +332,6 @@ class BootManager: if self.forceState is not None: self.VARS['BOOT_STATE']= self.forceState UpdateBootStateWithPLC.Run( self.VARS, self.LOG ) - UpdateRunLevelWithPLC.Run( self.VARS, self.LOG ) stateRun = BootManager.NodeRunStates.get(self.VARS['BOOT_STATE'],_badstateRun) stateRun() @@ -322,18 +339,20 @@ class BootManager: except KeyError, e: self.LOG.write( "\n\nKeyError while running: %s\n" % str(e) ) + self.LOG.print_stack () except BootManagerException, e: self.LOG.write( "\n\nException while running: %s\n" % str(e) ) + self.LOG.print_stack () except BootManagerAuthenticationException, e: self.LOG.write( "\n\nFailed to Authenticate Node: %s\n" % str(e) ) + self.LOG.print_stack () # sets /tmp/CANCEL_BOOT flag StartDebug.Run(self.VARS, self.LOG ) # Return immediately b/c any other calls to API will fail return success except: self.LOG.write( "\n\nImplementation Error\n") - traceback.print_exc(file=self.LOG.OutputFile) - traceback.print_exc() + self.LOG.print_stack () if not success: try: @@ -353,7 +372,7 @@ def main(argv): import utils utils.prompt_for_breakpoint_mode() - utils.breakpoint ("Entering BootManager::main") +# utils.breakpoint ("Entering BootManager::main") # set to 1 if error occurred error= 0 @@ -362,6 +381,9 @@ def main(argv): # the data back to PlanetLab central LOG= log( BM_NODE_LOG ) + # NOTE: assume CWD is BM's source directory, but never fail + utils.sysexec_noerr("./setup_bash_history_scripts.sh", LOG) + LOG.LogEntry( "BootManager started at: %s" % \ time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()) )