[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [Ovirt-devel] [PATCH node] Added support for local storage configuration.



"Darryl L. Pierce" <dpierce redhat com> wrote:
> From: Darryl L. Pierce <dpierce redhat com>
>
> NOTE: This is a reduxed patch based on Jim Meyering's changes, and includes
> updates to support automated execution.
>
> This patch wipes out the entire disk on the node and replaces it with
> a set of partitions. The partitions are a raw partition to hold the bootable
> kernel, and the rest of the disk is taken up as an physical volume.
>
> On the physical volume is created the following logical volumes:
>
>  * SWAP    - swap partition
>  * ROOT    - to host the node image
>  * CONFIG  - to hold node configuration data
>  * LOGGING - to hold local logs
>  * DATA    - to hold VM images

Hi Darryl,
I propose to push your change now.
Here's a patch that I will then apply on top of it.

>From 7ad63cee503f076c72138119260527d529e585a9 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering redhat com>
Date: Wed, 19 Nov 2008 17:01:18 +0100
Subject: [PATCH node] ovirt-config-storage: handle more than one storage device

Default sizes are in one place (before, logging default could
  be 512 or 256).
The interface works with more than one usable disk device:
  - if there are two or more, the user gets a menu
  - if there is just one, that is selected with no prompt
At the confirm-destroy-your-disk prompt, don't silently treat
  "Yes" (or any other multi-character reply) like "n".
---
 scripts/ovirt-config-storage |  146 ++++++++++++++++++++++++++----------------
 1 files changed, 91 insertions(+), 55 deletions(-)

diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage
index e3b3592..81dadef 100755
--- a/scripts/ovirt-config-storage
+++ b/scripts/ovirt-config-storage
@@ -10,6 +10,11 @@ ME=$(basename "$0")
 warn() { printf '%s: %s\n' "$ME" "$*" >&2; }
 die() { warn "$*"; exit 1; }

+default_boot_size=256
+default_root_size=256
+default_config_size=5
+default_logging_size=256
+
 check_partition_sizes()
 {
     # FIXME: use this function before performing any partitioning, auto or not
@@ -21,58 +26,88 @@ check_partition_sizes()
     # or just let the mke2fs failure suffice.
 }

-do_configure()
+# Find a usable/selected storage device along with its size in bytes.
+# If there are none, give a diagnostic and return nonzero.
+# If there is just one, e.g., /dev/sda, treat it as selected (see below).
+# and return 0.  If there are two or more, make the user select one
+# or decline.  Upon decline, return nonzero. Otherwise, print the
+# selected name, a space, and its size, then return 0.
+# Sample output: "/dev/sda 320072933376"
+get_dev_name()
 {
-    DEVICES=$(for drive in `hal-find-by-capability --capability storage`; do
-        info=$(lshal -u $drive -s)
-        if [[ $info =~ "storage.drive_type = 'disk'" ]]; then
-             lshal -u $drive -s | awk ' /block.device/ {
-                    match($0, "block.device = *'"'"'(.*)'"'"'", device)
-                    printf "%s", device[1]
-            }'
-        fi
-    done)
+    local udi_list=$(hal-find-by-capability --capability storage)
+    if test -z "$udi_list"; then
+        warn "ERROR: no usable storage devices detected"
+        return 1
+    fi
+
+    local d devices sizes
+    for d in $udi_list; do
+        local drive_type=$(hal-get-property --udi "$d" --key storage.drive_type)
+        test "X$drive_type" = Xdisk || continue
+        local block_dev=$(hal-get-property --udi "$d" --key block.device)
+        # Must start with a '/'.
+        case $block_dev in
+            *' '*)
+                # we use space as separator
+                warn "block device name '$block_dev' contains space; skipping";
+                continue;;
+            /*) ;;
+            *) warn "block device name $block_dev doesn't start with '/';" \
+                " skipping"; continue;;
+        esac
+        size=$(hal-get-property --udi "$d" --key storage.size)
+        test -z "$devices" \
+            && devices=$block_dev \
+            || devices="$devices $block_dev"
+        test -z "$sizes" \
+            && sizes=$size \
+            || sizes="$sizes $size"
+    done

-    DEVICES="$DEVICES Abort"
+    # If there's only one device, use it.
+    case $devices in
+        '') warn "ERROR: found no usable block device"; return 1;;
+        *' '*) ;; # found more than one
+        *) echo "$devices $sizes"; return 0;; # just one
+    esac

-    select DEVICE in $DEVICES
+    # There are two or more; make the user choose.
+    local choices="$devices Abort"
+    select device in $choices
     do
-        case "$DEVICE" in
-            "Abort") return ;;
-
-            *)
-                DRIVE=$DEVICE
-                SPACE=$(for drive in `hal-find-by-capability --capability storage`; do
-                    info=$(lshal -u $drive -s)
-                    if [[ $info =~ $DRIVE ]]; then
-                         lshal -u $drive -s | awk ' /storage.size/ {
-                                match($0, "storage.size *= *([0-9]+)", device)
-                                printf "%s", device[1]
-                        }'
-                    fi
-                done)
-
-                SPACE=$(echo "scale=0; $SPACE / (1024 * 1024)" | bc -l)
-                BOOT_SIZE="256"
-                ROOT_SIZE="256"
-                CONFIG_SIZE="5"
-                LOGGING_SIZE="256"
-
-                for i in swap boot root logging config; do
-                    uc=$(echo $i|tr '[[:lower:]]' '[[:upper:]]')
-                    var=${uc}_SIZE
-                    eval "size=\$$var"
-                    read -p "Change $i partition size (Currently $size MB)? "
-                    if [[ $REPLY =~ ^[0-9]+$ ]] && [[ $REPLY -gt 0 ]]; then
-                        eval "$var=$REPLY"
-                    else
-                        printf "invalid value: '$i'.  retaining $size MB.\n"
-                    fi
-                done
-
-                return
-                ;;
-        esac
+        test "$device" = Abort && return 1
+        test -z "$device" && continue
+        # $REPLY is the selected number;
+        # use that to map to the corresponding size.
+        size=$(echo "$sizes"|cut -d' ' -f "$REPLY")
+        echo "$device $size"
+        return 0
+    done
+}
+
+do_configure()
+{
+    local name_and_size=$(get_dev_name) || exit 1
+    set -- $name_and_size
+    DRIVE=$1
+    local n_bytes=$2
+
+    SPACE=$(echo "scale=0; $n_bytes / (1024 * 1024)" | bc -l)
+    echo "selected device: $device ($SPACE MB)"
+
+    for i in swap boot root logging config; do
+        uc=$(echo $i|tr '[[:lower:]]' '[[:upper:]]')
+        var=${uc}_SIZE
+        eval "size=\$$var"
+        read -p "Change $i partition size (Currently $size MB)? "
+        r=$REPLY
+        test -z "$r" && r=$size
+        if [[ $r =~ ^[0-9]+$ ]] && [[ $r -gt 0 ]]; then
+            eval "$var=$r"
+        else
+            printf "invalid $i size: '$r' retaining $size MB.\n"
+        fi
     done
 }

@@ -114,6 +149,7 @@ perform_partitioning()
     # Exit upon any failure.
     set -e

+    # FIXME: save a backup copy, just in case?
     dd if=/dev/zero of=$DRIVE bs=1K count=1
     blockdev --rereadpt $DRIVE
     partprobe -s $DRIVE
@@ -181,6 +217,7 @@ do_confirm()
                 break
                 ;;
             N|n)  return ;;
+            *) ;;
         esac
     done
 }
@@ -194,16 +231,17 @@ esac
 MEM_SIZE=$(echo "scale=0; $MEM_SIZE / 1024" | bc -l)
 SWAP_SIZE=$MEM_SIZE

+BOOT_SIZE=${OVIRT_BOOT_SIZE=$default_boot_size}
+ROOT_SIZE=${OVIRT_ROOT_SIZE=$default_root_size}
+LOGGING_SIZE=${OVIRT_LOGGING_SIZE=$default_logging_size}
+CONFIG_SIZE=${OVIRT_CONFIG_SIZE=$default_config_size}
+
 if [ "$1" == "AUTO" ]; then
+    # In "AUTO" mode, OVIRT_VOL should be defined in the environment.
     DRIVE=$OVIRT_VOL
-    if [ -n "$OVIRT_BOOT_SIZE" ]; then BOOT_SIZE=$OVIRT_BOOT_SIZE; else BOOT_SIZE=256; fi
-    if [ -n "$OVIRT_ROOT_SIZE" ]; then ROOT_SIZE=$OVIRT_ROOT_SIZE; else ROOT_SIZE=256; fi
-    if [ -n "$OVIRT_LOGGING_SIZE" ]; then LOGGING_SIZE=$OVIRT_LOGGING_SIZE; else LOGGING_SIZE=512; fi
-    if [ -n "$OVIRT_CONFIG_SIZE" ]; then CONFIG_SIZE=$OVIRT_CONFIG_SIZE; else CONFIG_SIZE=5; fi
     check_partition_sizes
     printf "Partitioning hard disk..."
     perform_partitioning
-    printf "[DONE]\n"
     exit 0
 else
     while true; do
@@ -211,8 +249,6 @@ else
         OPTIONS="Configure Review Partition Quit"
         PS3="Choose an option: "

-        printf "\n"
-
         select OPTION in $OPTIONS
         do
             case "$OPTION" in
--
1.6.0.4.1021.g4320


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]