X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FCheckForNewDisks.py;h=1c171a36f11d0d557ef59217b9cdd2dd2089ba51;hb=6dbdbad233ca8770d2f9913c161a3da3f7b8130d;hp=e5af3f15de2d335ced9bb4c7257f5cdd74fc9207;hpb=c3eafadd34e5f6a00c7fbd6811ff47fe1c3988c0;p=bootmanager.git diff --git a/source/steps/CheckForNewDisks.py b/source/steps/CheckForNewDisks.py index e5af3f1..1c171a3 100644 --- a/source/steps/CheckForNewDisks.py +++ b/source/steps/CheckForNewDisks.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # # Copyright (c) 2003 Intel Corporation # All rights reserved. @@ -17,7 +17,7 @@ import os import ModelOptions -def Run( vars, log ): +def Run(vars, log): """ Find any new large block devices we can add to the vservers volume group @@ -30,173 +30,181 @@ def Run( vars, log ): ROOT_MOUNTED the node root file system is mounted """ - log.write( "\n\nStep: Checking for unused disks to add to LVM.\n" ) + log.write("\n\nStep: Checking for unused disks to add to LVM.\n") # make sure we have the variables we need try: - SYSIMG_PATH= vars["SYSIMG_PATH"] + SYSIMG_PATH = vars["SYSIMG_PATH"] if SYSIMG_PATH == "": - raise ValueError, "SYSIMG_PATH" + raise ValueError("SYSIMG_PATH") - MINIMUM_DISK_SIZE= int(vars["MINIMUM_DISK_SIZE"]) + MINIMUM_DISK_SIZE = int(vars["MINIMUM_DISK_SIZE"]) - PARTITIONS= vars["PARTITIONS"] + PARTITIONS = vars["PARTITIONS"] if PARTITIONS == None: - raise ValueError, "PARTITIONS" + raise ValueError("PARTITIONS") - NODE_MODEL_OPTIONS= vars["NODE_MODEL_OPTIONS"] - except KeyError, var: - raise BootManagerException, "Missing variable in vars: %s\n" % var - except ValueError, var: - raise BootManagerException, "Variable in vars, shouldn't be: %s\n" % var + NODE_MODEL_OPTIONS = vars["NODE_MODEL_OPTIONS"] + except KeyError as var: + raise BootManagerException("Missing variable in vars: {}\n".format(var)) + except ValueError as var: + raise BootManagerException("Variable in vars, shouldn't be: {}\n".format(var)) - all_devices= systeminfo.get_block_device_list(vars, log) + devices_dict = systeminfo.get_block_devices_dict(vars, log) # will contain the new devices to add to the volume group - new_devices= [] + new_devices = [] # total amount of new space in gb - extended_gb_size= 0 + extended_gb_size = 0 - for device in all_devices.keys(): + utils.display_disks_status(PARTITIONS, "In CheckForNewDisks", log) - (major,minor,blocks,gb_size,readonly)= all_devices[device] + for device, details in devices_dict.items(): + + (major, minor, blocks, gb_size, readonly) = details if device[:14] == "/dev/planetlab": - log.write( "Skipping device %s in volume group.\n" % device ) + log.write("Skipping device {} in volume group.\n".format(device)) continue if readonly: - log.write( "Skipping read only device %s\n" % device ) + log.write("Skipping read only device {}\n".format(device)) continue if gb_size < MINIMUM_DISK_SIZE: - log.write( "Skipping too small device %s (%4.2f)\n" % - (device,gb_size) ) + log.write("Skipping too small device {} ({:4.2f}) Gb\n"\ + .format(device, gb_size)) continue - log.write( "Checking device %s to see if it is part " \ - "of the volume group.\n" % device ) - - # this is the lvm partition, if it exists on that device - lvm_partition= InstallPartitionDisks.get_partition_path_from_device( device, vars, log ) - cmd = "pvdisplay %s | grep -q 'planetlab'" % lvm_partition - already_added = utils.sysexec_noerr(cmd, log, shell=True) + log.write("Checking device {} to see if it is part " \ + "of the volume group.\n".format(device)) + + # Thierry - June 2015 + # when introducing the 'upgrade' verb, we ran into the situation + # where 'pvdisplay' at this point displays e.g. /dev/sda, instead + # of /dev/sda1 + # we thus consider that if either of these is known, then + # the disk is already part of LVM + first_partition = InstallPartitionDisks.get_partition_path_from_device(device, vars, log) + probe_first_part = "pvdisplay {} | grep -q planetlab".format(first_partition) + probe_device = "pvdisplay {} | grep -q planetlab".format(device) + already_added = utils.sysexec_noerr(probe_first_part, log, shell=True) \ + or utils.sysexec_noerr(probe_device, log, shell=True) if already_added: - log.write( "It appears %s is part of the volume group, continuing.\n" % - device ) + log.write("It appears {} is part of the volume group, continuing.\n"\ + .format(device)) continue # just to be extra paranoid, ignore the device if it already has # an lvm partition on it (new disks won't have this, and that is # what this code is for, so it should be ok). - cmd = "sfdisk -l %s | grep -q 'Linux LVM'" % device - has_lvm= utils.sysexec_noerr(cmd, log) + cmd = "parted --script --list {} | grep -q lvm$".format(device) + has_lvm = utils.sysexec_noerr(cmd, log, shell=True) if has_lvm: - log.write( "It appears %s has lvm already setup on it.\n" % device) + log.write("It appears {} has lvm already setup on it.\n".format(device)) paranoid = False if paranoid: - log.write("To paranoid to add %s to vservers lvm.\n" % device) + log.write("Too paranoid to add {} to vservers lvm.\n".format(device)) continue - if not InstallPartitionDisks.single_partition_device( device, vars, log ): - log.write( "Unable to partition %s, not using it.\n" % device ) + if not InstallPartitionDisks.single_partition_device(device, vars, log): + log.write("Unable to partition {}, not using it.\n".format(device)) continue - log.write( "Successfully partitioned %s\n" % device ) + log.write("Successfully partitioned {}\n".format(device)) if NODE_MODEL_OPTIONS & ModelOptions.RAWDISK: - log.write( "Running on a raw disk node, not using it.\n" ) + log.write("Running on a raw disk node, not using it.\n") continue - part_path= InstallPartitionDisks.get_partition_path_from_device( device, - vars, log ) + part_path = InstallPartitionDisks.get_partition_path_from_device(device, + vars, log) - log.write( "Attempting to add %s to the volume group\n" % device ) + log.write("Attempting to add {} to the volume group\n".format(device)) - if not InstallPartitionDisks.create_lvm_physical_volume( part_path, - vars, log ): - log.write( "Unable to create lvm physical volume %s, not using it.\n" % - part_path ) + if not InstallPartitionDisks.create_lvm_physical_volume(part_path, + vars, log): + log.write("Unable to create lvm physical volume {}, not using it.\n"\ + .format(part_path)) continue - log.write( "Adding %s to list of devices to add to " \ - "planetlab volume group.\n" % device ) + log.write("Adding {} to list of devices to add to " + "planetlab volume group.\n".format(device)) - extended_gb_size= extended_gb_size + gb_size - new_devices.append( part_path ) + extended_gb_size = extended_gb_size + gb_size + new_devices.append(part_path) if len(new_devices) > 0: - log.write( "Extending planetlab volume group.\n" ) + log.write("Extending planetlab volume group.\n") - log.write( "Unmounting disks.\n" ) + log.write("Unmounting disks.\n") try: # backwards compat, though, we should never hit this case post PL 3.2 - os.stat("%s/rcfs/taskclass"%SYSIMG_PATH) - utils.sysexec_chroot_noerr( SYSIMG_PATH, "umount /rcfs", log ) - except OSError, e: + os.stat("{}/rcfs/taskclass".format(SYSIMG_PATH)) + utils.sysexec_chroot_noerr(SYSIMG_PATH, "umount /rcfs", log) + except OSError as e: pass # umount in order to extend disk size - utils.sysexec_noerr( "umount %s/proc" % SYSIMG_PATH, log ) - utils.sysexec_noerr( "umount %s/vservers" % SYSIMG_PATH, log ) - utils.sysexec_noerr( "umount %s" % SYSIMG_PATH, log ) - utils.sysexec( "vgchange -an", log ) + utils.sysexec_noerr("umount {}/proc".format(SYSIMG_PATH), log) + utils.sysexec_noerr("umount {}/vservers".format(SYSIMG_PATH), log) + utils.sysexec_noerr("umount {}".format(SYSIMG_PATH), log) + utils.sysexec("vgchange -an", log) - vars['ROOT_MOUNTED']= 0 + vars['ROOT_MOUNTED'] = 0 while True: - cmd = "vgextend planetlab %s" % string.join(new_devices," ") - if not utils.sysexec_noerr( cmd, log ): - log.write( "Failed to add physical volumes %s to " \ - "volume group, continuing.\n" % string.join(new_devices," ")) + cmd = "vgextend planetlab {}".format(" ".join(new_devices)) + if not utils.sysexec_noerr(cmd, log): + log.write("Failed to add physical volumes {} to "\ + "volume group, continuing.\n".format(" ".join(new_devices))) res = 1 break # now, get the number of unused extents, and extend the vserver # logical volume by that much. - remaining_extents= \ - InstallPartitionDisks.get_remaining_extents_on_vg( vars, log ) + remaining_extents = \ + InstallPartitionDisks.get_remaining_extents_on_vg(vars, log) - log.write( "Extending vservers logical volume.\n" ) - utils.sysexec( "vgchange -ay", log ) - cmd = "lvextend -l +%s %s" % (remaining_extents, PARTITIONS["vservers"]) + log.write("Extending vservers logical volume.\n") + utils.sysexec("vgchange -ay", log) + cmd = "lvextend -l +{} {}".format(remaining_extents, PARTITIONS["vservers"]) if not utils.sysexec_noerr(cmd, log): - log.write( "Failed to extend vservers logical volume, continuing\n" ) + log.write("Failed to extend vservers logical volume, continuing\n") res = 1 break - log.write( "making the ext filesystem match new logical volume size.\n" ) + log.write("making the ext filesystem match new logical volume size.\n") - vars['ROOT_MOUNTED']= 1 - cmd = "mount %s %s" % (PARTITIONS["root"],SYSIMG_PATH) - utils.sysexec_noerr( cmd, log ) - cmd = "mount %s %s/vservers" % \ - (PARTITIONS["vservers"],SYSIMG_PATH) - utils.sysexec_noerr( cmd, log ) - cmd = "resize2fs %s" % PARTITIONS["vservers"] + vars['ROOT_MOUNTED'] = 1 + cmd = "mount {} {}".format(PARTITIONS["root"], SYSIMG_PATH) + utils.sysexec_noerr(cmd, log) + cmd = "mount {} {}/vservers".format(PARTITIONS["vservers"], SYSIMG_PATH) + utils.sysexec_noerr(cmd, log) + cmd = "resize2fs {}".format(PARTITIONS["vservers"]) resize = utils.sysexec_noerr(cmd,log) - utils.sysexec_noerr( "umount %s/vservers" % SYSIMG_PATH, log ) - utils.sysexec_noerr( "umount %s" % SYSIMG_PATH, log ) - vars['ROOT_MOUNTED']= 0 + utils.sysexec_noerr("umount {}/vservers".format(SYSIMG_PATH), log) + utils.sysexec_noerr("umount {}".format(SYSIMG_PATH), log) + vars['ROOT_MOUNTED'] = 0 - utils.sysexec( "vgchange -an", log ) + utils.sysexec("vgchange -an", log) if not resize: - log.write( "Failed to resize vservers partition, continuing.\n" ) + log.write("Failed to resize vservers partition, continuing.\n") res = 1 break else: - log.write( "Extended vservers partition by %4.2f GB\n" % - extended_gb_size ) + log.write("Extended vservers partition by {:4.2f} Gb\n"\ + .format(extended_gb_size)) res = 1 break else: - log.write( "No new disk devices to add to volume group.\n" ) + log.write("No new disk devices to add to volume group.\n") res = 1 return res