X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fganeti2%2Ffiles%2Fganeti-reboot-cluster;h=bc95de3346ce3d5073cbd16162d84f7febf7423c;hb=1ef022b649ef0ae744e18df2b2794c200cbd4f4c;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..bc95de334 100755
--- a/modules/ganeti2/files/ganeti-reboot-cluster
+++ b/modules/ganeti2/files/ganeti-reboot-cluster
@@ -211,6 +211,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."