Improve list option, add asm-menu

Author: Bart Sjerps

asmdisks.spec

@@ -1,6 +1,6 @@
 Name:		asmdisks
 Summary:	Replacement for Oracle ASMLib using UDEV
-Version:	1.4.6.0
+Version:	1.4.7.0
 Release:	1%{?dtap}
 BuildArch:	noarch
 License:	GPLv3+
@@ -39,6 +39,7 @@ install -m 0755 -pt %{buildroot}/usr/bin bin/*
 /usr/share/man/man1/*
 %defattr(0755,root,root)
 /usr/bin/asm
+/usr/bin/asm-menu
 /usr/bin/asmstat
 /usr/bin/wipedisk
 /usr/bin/diskheader

src/CHANGELOG

@@ -1,9 +1,6 @@
-* Wed Nov 12 Bart Sjerps <bart@outrun.nl> 1.4.5.2
-- Fix usage/no parameters
-
-* Wed Nov 07 Bart Sjerps <bart@outrun.nl> 1.4.5.1
 - List of changes to asm:
 
+2018-12-24 : Improve list option, add asm-menu
 2018-11-23 : Overhaul: replace /sys/block/ parsing with lsblk, sanitize with shellcheck
 2018-11-07 : Change rpmbuild process, added docs
 2018-08-20 : Embedded manpage, removed DSSD support

src/README

@@ -1,64 +1,4 @@
 Release notes for asmdisks
-Author    : Bart Sjerps
+Author: Bart Sjerps
 
--------------------------------------------------------------------------------
-Updates
-=======
-2016-10-20 - 1.5
-- Added RHEL 7 support
-- Major script overhaul, removed some exotic bugs
-
-2016-09-12 - 1.4
-
-- Changed the package location to outrun-extras
-- Added EMC DSSD support
-- Fixed inconsistencies in the RPMbuild SPEC file
-
-2016-06-28 - 1.3
-
-- Fixed a minor error where UDEV complains during rewrite of the 99-asm.rules file.
-  We now make a temporary file and overwrie the entire rules file at once to stop
-  udev from complaining
-- Experimental EMC PowerPath support
-- Changed the PGP signature of the RPM package
-
-2015-02-14 - 1.2-2 (minor update)
-
-- Added TAB option (for scripting)
-
-2014-11-06 - Update to 1.2
-
-- Added import function - imports all unused disks that have an ASM disk label
-  as vol01, vol02, ...
-- Added rename function and using -h or -? now works properly.
-
-2014-10-24 - Update to 1.1
-
-- Added bash-completion (if you have bash-completion installed)
-
-If you enter "asm createdisk somevol [TAB]", bash will show /dev/sd[b-z] thru
-/dev/sdzz + all symlinks in /dev/mapper.
-"asm deletedisk [TAB]" shows all configured volumes.
-
-- Copyright (GPLv3) notice added.
-
-2014-06-24 - First version (1.0)
-
-Bugfixes
-========
-
-2014-10-27
-
-- Bugfix for wipedisk and added -n option
-
-2014-10-24
-
-- deletedisk option with multiple slashes in volname failed
-- PATH=oracleasm:... now correctly sets non-standard owner/group
-  for /dev/iorate/.. volumes
-
--------------------------------------------------------------------------------
-Known issues & workarounds
-==========================
-
-- no support (yet) for EMC ScaleIO volumes. Planned for a future version.
+See CHANGELOG for a list of changes

src/bin/asm

@@ -269,12 +269,29 @@ scandisks() {
   udevupdate
 }
 
+devtype() {
+  local dev id
+  dev=/dev/"${1#*/dev/}"
+  test -b "$dev" || return 0
+  cmp -s <(dd if="$dev" bs=8k count=1 status=none) <(dd if=/dev/zero bs=8k count=1 status=none) \
+    && echo "blank" && return
+  id=$(blkid -p -o udev "$dev" | awk -F= '/ID_PART_TABLE_TYPE/ || /ID_FS_TYPE/ {print $NF ; exit; }')
+  case $id in
+    dos|gpt|swap)      echo "$id" ;;
+    LVM2_member)       echo "lvm" ;;
+    linux_raid_member) echo "raid" ;;
+    oracleasm)         echo "asm" ;;
+    xfs|ext3|ext4)     echo "$id" ;;
+    *)                 echo "unknown" ;;
+  esac
+}
+
 
 # List functions
 printvol() {
   case $SEPARATOR in
-    T) printf "%s\t%s\t%s\n"       "$@" ;;
-    *) printf "%-20s %11s %-20s\n" "$@" ;;
+    T) printf "%s\t%s\t%s\t%s\n"        "$@" ;;
+    *) printf "%-20s %-11s %-8s %8s\n" "$@" ;;
   esac
 }
 printdisk() {
@@ -291,7 +308,6 @@ mpinfoprint() {
   esac
 }
 
-
 listvol() {
   local vol dev size
   local -i bytes
@@ -301,11 +317,11 @@ listvol() {
     read bytes < <(lsblk -nbdo size "$dev")
     read size < <(bc <<< "scale=1;$bytes/1073741824")
   fi
-  printvol "${vol//oracleasm\//}" "${size:--}" "${dev:--}"
+  printvol "${vol//oracleasm\//}" "${dev:--}" "$(devtype $dev)" "${size:--}"
 }
 
 listvols() {
-  test -z "$NOHEAD" && printvol Volume Size Devname
+  test -z "$NOHEAD" && printvol Volume Device Type Size
   while IFS= read -r vol
   do
     listvol "$vol"
@@ -328,23 +344,7 @@ listdisk() {
             target=$(/sbin/powermt display dev="$dev" 2>/dev/null | awk -F= '/Pseudo name/ {print $2}') ;;
     *)      return ;;
   esac
-  if test -r /dev/"$dev" ; then
-    if cmp -s <(dd if=/dev/"$dev" bs=8k count=1 status=none) <(dd if=/dev/zero bs=8k count=1 status=none); then
-      disktype=blank
-    else
-      id=$(blkid -p -o udev /dev/"$dev" | awk -F= '/ID_PART_TABLE_TYPE/ || /ID_FS_TYPE/ {print $NF ; exit; }')
-      case $id in
-        dos|gpt|swap)      disktype="$id" ;;
-        LVM2_member)       disktype="lvm" ;;
-        linux_raid_member) disktype="raid" ;;
-        oracleasm)         disktype="asm" ;;
-        xfs|ext3|ext4)     disktype="$id" ;;
-        *)                 disktype="unknown" ;;
-      esac
-    fi
-  else
-    disktype="?"
-  fi
+  disktype=$(devtype $dev)
   size=$(lsblk -ndo size /dev/"$dev")
   printdisk "/dev/$dev" "${scsi:-[-]}" "${size}" "${disktype:--}" "${target:--}"
 }
@@ -356,24 +356,11 @@ listdisks() {
 }
 
 mpinfo() {
-  local device=$1 dev size realpath fstype disktype mpvol
+  local device=$1 dev size realpath disktype mpvol
   dev=$(dmsetup ls -o blkdevname | awk -v MP="$device" '$1==MP {print $2}'|tr -d '()')
   mpvol=$(multipath -ll -v 1 /dev/mapper/"$device")
   size=$(lsblk -ndo size /dev/"$dev")
-  ptable=$(blkid -p -o udev /dev/"$dev" | awk -F= '$1=="ID_PART_TABLE_TYPE" {print $2}'|head -1)
-  fstype=$(blkid -p -o udev /dev/"$dev" | awk -F= '$1=="ID_FS_TYPE" {print $2}'|head -1)
-  if [ "$ptable" == "dos" ]; then disktype="dos"
-  elif [ "$ptable" == "gpt" ]; then disktype="gpt"
-  else
-    case $fstype in
-      LVM2_member)       disktype="lvm" ;;
-      linux_raid_member) disktype="raid" ;;
-      oracleasm)         disktype="asm" ;;
-      xfs|ext*)          disktype="$fstype" ;;
-      "")                disktype="blank" ;;
-      *)                 disktype="unknown" ;;
-    esac
-  fi
+  disktype=$(devtype "$dev")
   realpath=$(getlink "$dev")
   mpinfoprint "$dev" "[$mpvol]" "${size}" "${disktype:-blank}" "${realpath:--}"
 }
@@ -402,10 +389,10 @@ shift $((OPTIND - 1))
 ACTION=${1:-none}; shift
 
 case $ACTION in
-  none)             listdisks ; exit $? ;;
-  listdisks|disks)  listdisks ; exit $? ;;
-  list)		        listvols ; exit $? ;;
-  dump)             cat $rulesfile ; exit $? ;;
+  none)            listdisks ; exit $? ;;
+  listdisks|disks) listdisks ; exit $? ;;
+  list)            listvols ; exit $? ;;
+  dump)            cat $rulesfile ; exit $? ;;
 esac
 
 (($(id -u)==0)) || die "Run as root"

src/bin/asm-menu

@@ -0,0 +1,137 @@
+#!/bin/bash
+#============================================================================
+# Title       : menu-asm
+# Description : Menu frontend for ASMdisks
+# Author      : Bart Sjerps <bart@outrun.nl>
+# License     : GPLv3+
+# ---------------------------------------------------------------------------
+
+set -u
+
+die()    { echo "$(basename $0): [die] $@" >&2 ; exit 10 ; }
+quit()   { echo "$(basename $0): [quit] $@"    ; exit 0 ; }
+msg()    { echo "$(basename $0): [msg] $@" ; }
+err()    { echo "$(basename $0): [err] $@" >&2 ; }
+
+source /usr/lib/lightmenu.bash &>/dev/null || die "lightmenu not installed"
+
+export BACKTITLE="ASMdisks menu on $(hostname)"
+
+#============================================================================
+# Actions
+# ---------------------------------------------------------------------------
+
+view_asmdisks() {
+  messagebox -fresize --margin 2 --height2 0 --hline "Use \Z1PgUP PgDOWN\Zn to scroll" \
+    --title "ASM disks" "$(asm -t disks | expand -t 10,20,28)"
+}
+
+view_asmlist() {
+  messagebox --margin 5 -fresize --hline "Use \Z1PgUP PgDOWN\Zn to scroll" \
+    --title "ASM list" "$(asm list | expand -t 10,20,30,40)"
+}
+
+view_asmavailable() {
+  messagebox --margin 5 -fresize --hline "Use \Z1PgUP PgDOWN\Zn to scroll" \
+    --title "ASM candidates" "$(asm -t disks | awk '$5=="-" && $4 == "blank" {print $0}')"
+}
+
+view_asmadd() {
+  local -a volname disks
+  local NAME=
+
+  for c in $(seq 1 100); do
+    NAME=$(printf "vol%s" $c)  
+    if [ ! -b /dev/oracleasm/$NAME ] ; then break ; fi  
+  done
+  append volname "Volume /dev/oracleasm/" "$NAME"
+
+  for line in $(asm -t disks | awk '$5=="-" && ( $4=="blank" || $4=="asm" ) {print $1","$4"-"$3}'); do
+    append disks "${line%%,*}" "${line#*,}" DEVICE
+  done
+  result=$(ldialog formlist --height2 12 --formx 24 --title "Add ASM volume" --title2 "Select device" volname disks) || return $?
+
+  volname=$(awk -F'\t' 'NR==1 && NF==1 {print $1}' <<< "$result")
+  devname=$(awk -F'\t' 'NR==2 && NF==2 {print $2}' <<< "$result")
+
+  runcommand asm createdisk $volname $devname
+}
+
+# TBD: update lightmenu.bash first to do listform
+view_asmrename() {
+  local vol desc
+  local -a disks
+  status="Be careful when deleting ASM volumes still in use!"
+
+  IFS=$'\n' ; for disk in $(asm -t list | asm -t list | awk -F'\t' '{print $1":"$2"-"$3"-"$4"G"}')
+  do
+    vol=$(echo $disk | cut -d: -f1)
+    desc=$(echo $disk | cut -d: -f2- | tr '-' ' ')
+    append disks "$vol" "$desc" VOLNAME
+  done
+  unset IFS
+  result=$(ldialog list --title "Rename ASM volume" --status "$status" disks) || return $?
+  # runcommand asm deletedisk $result
+}
+
+view_asmdel() {
+  local vol desc
+  local -a disks
+  status="Be careful when deleting ASM volumes still in use!"
+
+  IFS=$'\n' ; for disk in $(asm -t list | asm -t list | awk -F'\t' '{print $1":"$2"-"$3"-"$4"G"}')
+  do
+    vol=$(echo $disk | cut -d: -f1)
+    desc=$(echo $disk | cut -d: -f2- | tr '-' ' ')
+    append disks "$vol" "$desc" VOLNAME
+  done
+  unset IFS
+  result=$(ldialog list --title "Delete ASM volume" --status "$status" disks) || return $?
+  runcommand asm deletedisk $result
+}
+
+view_asmwipe() {
+  local -a disks
+  local dev disklist d
+  status="\Z1WARNING WARNING WARNING\Zn\n"
+  status+="Wiping a disk may lead to data loss! Make sure the disk you wipe has no important data on it!"
+
+  disklist="$(asm -t disks)"
+
+  for line in $(ls -d /sys/block/sd* )
+  do
+    dev=/dev/${line##*/}
+    # TBD: UPDATE for detected bootdisk
+    [[ "$dev" == "/dev/sda" ]] && continue
+    d=$(awk -F'\t' -v DEV=$dev '$1==DEV {print $2,$4,$3}' <<< "$disklist")
+    append disks  "${dev:-x}" "$d"
+  done
+  result=$(ldialog list --height2 6 --title "Wipe disk label" --title2 "\Z1Warning\Zn" --status "$status" disks)
+  runcommand wipedisk -f $result
+}
+#============================================================================
+# Menus
+# ---------------------------------------------------------------------------
+storagemenu() {
+  local -a items
+
+  [[ "$(scsi_id --whitelisted /dev/sda)" == "" ]] && SCSI=MISSING || SCSI=OK
+  status="$(printf 'UUID:    %s' $SCSI)"
+  append items   Disks     "Show all disks"                  view_asmdisks
+  append items   Volumes   "Show ASM volumes"                view_asmlist
+  append items   Available "Show available disks"            view_asmavailable
+  append items   Rescan    "Rescan SCSI stack for new disks" runcommand asm rescan
+  append items   Add       "Add volume"                      view_asmadd
+  append items   Delete    "Delete volume"                   view_asmdel
+  append items   Import    "Import ASM volumes"              runcommand asm import
+  append items   Wipe      "Wipe disk label"                 view_asmwipe
+
+  lightmenu --title "ASM Storage configuration" --cancel Quit items
+  rc=$?
+  case $rc in
+    253) ;;
+    *)   return $rc ;;
+  esac
+}
+
+lightmenu storagemenu