X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fganeti2%2Ffiles%2Fganeti-reboot-cluster;h=45c9fa80094deefb519387ec47a4ad025c90f432;hb=6b4cdc62b58751da3d0389be86ff7a40f8386f3b;hp=28f945b3e85009af4ce9b90cb7da2c98ddf9f09b;hpb=804bf56bec0b237c2bd91758b198e773cf75f631;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ganeti2/files/ganeti-reboot-cluster b/modules/ganeti2/files/ganeti-reboot-cluster
index 28f945b3e..45c9fa800 100755
--- a/modules/ganeti2/files/ganeti-reboot-cluster
+++ b/modules/ganeti2/files/ganeti-reboot-cluster
@@ -1,5 +1,29 @@
 #!/bin/bash
 
+# reboot a ganeti cluster, making sure instances are moved around before and after
+
+# Copyright 2018, 2019 Peter Palfrader
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
 set -e
 set -o pipefail
 set -u
@@ -211,6 +235,15 @@ crossmigrate() {
     fi
   done
 
+  if [ -e /proc/drbd ]; then
+    echo "Waiting for drbd to be consistent."
+    sleep 5
+    while egrep -C2 --color -i 'iconsistent|finish' /proc/drbd || ! /usr/lib/nagios/plugins/dsa-check-drbd -d All ; do
+      echo "Still waiting.."
+      sleep 5
+    done
+  fi
+
   echo "Migrating from $me to $them."
   if ! gnt-node migrate -f -n "$them" "$me"; then
     echo >&2 "gnt-node migrate exited with an error.  Bailing out."