X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FInstallBootstrapFS.py;h=d22ed2a7d8b0003ad1300b58b8aa0ce3bd58f7e7;hb=8318a5f089f7dff2d22e31946680fc33dd7da745;hp=d2c42b5e6b0b57192e7fb5761198411a40020128;hpb=38b7fdabf9fe462f585acce3e5eef35d2e7c436d;p=bootmanager.git diff --git a/source/steps/InstallBootstrapFS.py b/source/steps/InstallBootstrapFS.py index d2c42b5..d22ed2a 100644 --- a/source/steps/InstallBootstrapFS.py +++ b/source/steps/InstallBootstrapFS.py @@ -96,6 +96,7 @@ def Run( vars, log ): except: raise BootManagerException ("Could not call GetNodeFlavour - need PLCAPI-5.0") + log.write ("Retrieved 'virt' style %s from GetNodeFlavour\n"%node_flavour['virt']) # the 'plain' option is for tests mostly if plain: download_suffix=".tar" @@ -122,13 +123,16 @@ def Run( vars, log ): source_hash_file= "/boot/%s.sha1sum" % (tarball) dest_hash_file= "%s/%s.sha1sum" % (SYSIMG_PATH, tarball) + time_beg=time.time() + log.write( "downloading %s\n" % source_file ) # 30 is the connect timeout, 14400 is the max transfer time in # seconds (4 hours) - log.write( "downloading %s\n" % source_file ) result = bs_request.DownloadFile( source_file, None, None, 1, 1, dest_file, 30, 14400) - + time_end=time.time() + duration=int(time_end-time_beg) + log.write("Done downloading (%s seconds)\n"%duration) if result: # Download SHA1 checksum file log.write( "downloading sha1sum for %s\n"%source_file) @@ -140,9 +144,13 @@ def Run( vars, log ): if not utils.check_file_hash(dest_file, dest_hash_file): raise BootManagerException, "FATAL: SHA1 checksum does not match between %s and %s" % (source_file, source_hash_file) + + time_beg=time.time() log.write( "extracting %s in %s\n" % (dest_file,SYSIMG_PATH) ) result = utils.sysexec( "tar -C %s -xpf %s %s" % (SYSIMG_PATH,dest_file,uncompress_option), log ) - log.write( "Done\n") + time_end=time.time() + duration=int(time_end-time_beg) + log.write( "Done extracting (%s seconds)\n"%duration) utils.removefile( dest_file ) else: # the main tarball is required