X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FInstallPartitionDisks.py;h=81d100d23f59126e32b146480e57190f76c87e41;hb=c2e73a0cf0a4cf3898014924cff6bb3563691fac;hp=d7c64688eea55fc0ffd22d92f4bbc7d9ff6ffe7a;hpb=ae73c450bffe036dccf37e8d96a4b655c3cd900e;p=bootmanager.git diff --git a/source/steps/InstallPartitionDisks.py b/source/steps/InstallPartitionDisks.py index d7c6468..81d100d 100644 --- a/source/steps/InstallPartitionDisks.py +++ b/source/steps/InstallPartitionDisks.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python # Copyright (c) 2003 Intel Corporation # All rights reserved. @@ -15,7 +15,6 @@ import popen2 from Exceptions import * import utils import BootServerRequest -import compatibility import ModelOptions @@ -28,7 +27,6 @@ def Run( vars, log ): TEMP_PATH somewhere to store what we need to run ROOT_SIZE the size of the root logical volume SWAP_SIZE the size of the swap partition - BOOT_CD_VERSION A tuple of the current bootcd version """ log.write( "\n\nStep: Install: partitioning disks.\n" ) @@ -51,28 +49,27 @@ def Run( vars, log ): if SWAP_SIZE == "" or SWAP_SIZE == 0: raise ValueError, "SWAP_SIZE invalid" - BOOT_CD_VERSION= vars["BOOT_CD_VERSION"] - if BOOT_CD_VERSION == "": - raise ValueError, "BOOT_CD_VERSION" - NODE_MODEL_OPTIONS= vars["NODE_MODEL_OPTIONS"] PARTITIONS= vars["PARTITIONS"] if PARTITIONS == None: raise ValueError, "PARTITIONS" + if NODE_MODEL_OPTIONS & ModelOptions.RAWDISK: + VSERVERS_SIZE= "-1" + if "VSERVERS_SIZE" in vars: + VSERVERS_SIZE= vars["VSERVERS_SIZE"] + if VSERVERS_SIZE == "" or VSERVERS_SIZE == 0: + raise ValueError, "VSERVERS_SIZE" + 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 - bs_request= BootServerRequest.BootServerRequest() + bs_request= BootServerRequest.BootServerRequest(vars) - # old cds need extra utilities to partition disks and setup lvm - if BOOT_CD_VERSION[0] == 2: - compatibility.setup_partdisks_2x_cd( vars, log ) - # disable swap if its on utils.sysexec_noerr( "swapoff %s" % PARTITIONS["swap"], log ) @@ -83,18 +80,23 @@ def Run( vars, log ): utils.sysexec_noerr( "lvremove -f %s" % PARTITIONS["swap"], log ) utils.sysexec_noerr( "lvremove -f %s" % PARTITIONS["vservers"], log ) utils.sysexec_noerr( "vgchange -an", log ) - utils.sysexec_noerr( "vgremove planetlab", log ) + utils.sysexec_noerr( "vgremove -f planetlab", log ) log.write( "Running vgscan for devices\n" ) utils.sysexec_noerr( "vgscan", log ) used_devices= [] + INSTALL_BLOCK_DEVICES.sort() for device in INSTALL_BLOCK_DEVICES: if single_partition_device( device, vars, log ): - used_devices.append( device ) - log.write( "Successfully initialized %s\n" % device ) + if (len(used_devices) > 0 and + (vars['NODE_MODEL_OPTIONS'] & ModelOptions.RAWDISK)): + log.write( "Running in raw disk mode, not using %s.\n" % device ) + else: + used_devices.append( device ) + log.write( "Successfully initialized %s\n" % device ) else: log.write( "Unable to partition %s, not using it.\n" % device ) continue @@ -122,11 +124,16 @@ def Run( vars, log ): # create root logical volume utils.sysexec( "lvcreate -L%s -nroot planetlab" % ROOT_SIZE, log ) - # create vservers logical volume with all remaining space - # first, we need to get the number of remaining extents we can use - remaining_extents= get_remaining_extents_on_vg( vars, log ) - - utils.sysexec( "lvcreate -l%s -nvservers planetlab" % remaining_extents, log ) + if vars['NODE_MODEL_OPTIONS'] & ModelOptions.RAWDISK and VSERVERS_SIZE != "-1": + utils.sysexec( "lvcreate -L%s -nvservers planetlab" % VSERVERS_SIZE, log ) + remaining_extents= get_remaining_extents_on_vg( vars, log ) + utils.sysexec( "lvcreate -l%s -nrawdisk planetlab" % remaining_extents, log ) + else: + # create vservers logical volume with all remaining space + # first, we need to get the number of remaining extents we can use + remaining_extents= get_remaining_extents_on_vg( vars, log ) + + utils.sysexec( "lvcreate -l%s -nvservers planetlab" % remaining_extents, log ) # activate volume group (should already be active) #utils.sysexec( TEMP_PATH + "vgchange -ay planetlab", log ) @@ -153,6 +160,10 @@ def Run( vars, log ): log.write("formatting %s partition (%s)%s.\n" % (fs,devname,txt)) utils.sysexec( "mkfs.ext2 -q %s -m %d -j %s" % (option,rbp,devname), log ) + # disable time/count based filesystems checks + for filesystem in ("root","vservers"): + utils.sysexec_noerr( "tune2fs -c -1 -i 0 %s" % PARTITIONS[filesystem], log) + # save the list of block devices in the log log.write( "Block devices used (in lvm): %s\n" % repr(used_devices)) @@ -162,7 +173,7 @@ def Run( vars, log ): return 1 - +import parted def single_partition_device( device, vars, log ): """ initialize a disk by removing the old partition tables, @@ -171,78 +182,48 @@ def single_partition_device( device, vars, log ): return 1 if sucessful, 0 otherwise """ - BOOT_CD_VERSION= vars["BOOT_CD_VERSION"] - if BOOT_CD_VERSION[0] == 2: - compatibility.setup_partdisks_2x_cd( vars, log ) + # two forms, depending on which version of pyparted we have + try: + version=parted.version() + return single_partition_device_2_x (device, vars, log) + except: + return single_partition_device_1_x (device, vars, log) - import parted + + +def single_partition_device_1_x ( device, vars, log): lvm_flag= parted.partition_flag_get_by_name('lvm') try: + print >>log, "Using pyparted 1.x" # wipe the old partition table utils.sysexec( "dd if=/dev/zero of=%s bs=512 count=1" % device, log ) # get the device dev= parted.PedDevice.get(device) - # 2.x cds have different libparted that 3.x cds, and they have - # different interfaces - if BOOT_CD_VERSION[0] == 3: - - # create a new partition table - disk= dev.disk_new_fresh(parted.disk_type_get("msdos")) - - # create one big partition on each block device - constraint= dev.constraint_any() + # create a new partition table + disk= dev.disk_new_fresh(parted.disk_type_get("msdos")) - new_part= disk.partition_new( - parted.PARTITION_PRIMARY, - parted.file_system_type_get("ext2"), - 0, 1 ) + # create one big partition on each block device + constraint= dev.constraint_any() - # make it an lvm partition - new_part.set_flag(lvm_flag,1) - - # actually add the partition to the disk - disk.add_partition(new_part, constraint) - - disk.maximize_partition(new_part,constraint) - - disk.commit() - del disk - else: - # create a new partition table - dev.disk_create(parted.disk_type_get("msdos")) + new_part= disk.partition_new( + parted.PARTITION_PRIMARY, + parted.file_system_type_get("ext2"), + 0, 1 ) - # get the disk - disk= parted.PedDisk.open(dev) + # make it an lvm partition + new_part.set_flag(lvm_flag,1) - # create one big partition on each block device - part= disk.next_partition() - while part: - if part.type == parted.PARTITION_FREESPACE: - new_part= disk.partition_new( - parted.PARTITION_PRIMARY, - parted.file_system_type_get("ext2"), - part.geom.start, - part.geom.end ) + # actually add the partition to the disk + disk.add_partition(new_part, constraint) - constraint = disk.constraint_any() + disk.maximize_partition(new_part,constraint) - # make it an lvm partition - new_part.set_flag(lvm_flag,1) - - # actually add the partition to the disk - disk.add_partition(new_part, constraint) - - break - - part= disk.next_partition(part) - - disk.write() - disk.close() - del disk + disk.commit() + del disk except BootManagerException, e: log.write( "BootManagerException while running: %s\n" % str(e) ) @@ -256,6 +237,40 @@ def single_partition_device( device, vars, log ): +def single_partition_device_2_x ( device, vars, log): + try: + print >>log, "Using pyparted 2.x" + # wipe the old partition table + utils.sysexec( "dd if=/dev/zero of=%s bs=512 count=1" % device, log ) + # get the device + dev= parted.Device(device) + # create a new partition table + disk= parted.freshDisk(dev,'msdos') + # create one big partition on each block device + constraint= parted.constraint.Constraint (device=dev) + geometry = parted.geometry.Geometry (device=dev, start=0, end=1) + fs = parted.filesystem.FileSystem (type="ext2",geometry=geometry) + new_part= parted.partition.Partition (disk, type=parted.PARTITION_NORMAL, + fs=fs, geometry=geometry) + # make it an lvm partition + new_part.setFlag(parted.PARTITION_LVM) + # actually add the partition to the disk + disk.addPartition(new_part, constraint) + disk.maximizePartition(new_part,constraint) + disk.commit() + print >>log, 'Current disk for %s'%device,disk + print >>log, 'Current dev for %s'%device,dev + del disk + except Exception, e: + log.write( "Exception inside single_partition_device_2_x : %s\n" % str(e) ) + import traceback + traceback.print_exc(file=log) + return 0 + + return 1 + + + def create_lvm_physical_volume( part_path, vars, log ): """ make the specificed partition a lvm physical volume. @@ -283,21 +298,12 @@ def get_partition_path_from_device( device, vars, log ): given a device, return the path of the first partition on the device """ - BOOT_CD_VERSION= vars["BOOT_CD_VERSION"] - # those who wrote the cciss driver just had to make it difficult - if BOOT_CD_VERSION[0] == 3: - cciss_test= "/dev/cciss" - if device[:len(cciss_test)] == cciss_test: - part_path= device + "p1" - else: - part_path= device + "1" + cciss_test= "/dev/cciss" + if device[:len(cciss_test)] == cciss_test: + part_path= device + "p1" else: - # since device ends in /disc, we need to make it end in - # /part1 to indicate the first partition (for devfs based 2.x cds) - dev_parts= string.split(device,"/") - dev_parts[len(dev_parts)-1]= "part1" - part_path= string.join(dev_parts,"/") + part_path= device + "1" return part_path