From 45f462026f277def89b491c6e16fb822f3b2ed4d Mon Sep 17 00:00:00 2001
From: Thomas Schoebel-Theuer <schoebel@bell.site>
Date: Thu, 27 Jun 2013 12:05:25 +0200
Subject: [PATCH] marsadm: fix leave-resource cleanup

Now the sequence leave-resource ; join-resource should work.

When the last member of the resource has gone and create-resource is
tried anew, there is a new saftey measure: the old resource directory
is left over deliberately, thus the new create-resource will deny creation
because some unreachable cluster node may have existed, such that we
didn't even know of its resource membership. This very special
case requires --force and some handwork cleanup.
---
 userspace/marsadm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/userspace/marsadm b/userspace/marsadm
index af9f0df0..76a50fe2 100755
--- a/userspace/marsadm
+++ b/userspace/marsadm
@@ -799,7 +799,8 @@ sub create_res {
 
   my $resdir = "$mars/resource-$res";
   if ($create) {
-    ldie "resource '$res' already exists\n" if -d $resdir;
+    ldie "resource directory '$res' already exists; you may override this via --force\n" if (!$force && -d $resdir);
+    ldie "resource directory '$res' has some contents -- remove by hand if you are sure that you really know what you are doing.\n" if glob("$resdir/*.status");
     lprint "creating new resource '$res'\n";
   } else {
     if ( -e "$resdir/connect-$host" || -e "$resdir/data-$host") {
@@ -949,7 +950,7 @@ sub leave_res_phase0 {
   my ($cmd, $res) = @_;
   check_not_primary(@_);
   foreach my $tmp (glob("$mars/resource-$res/todo-$host/*")) {
-    my $status = get_link($tmp);
+    my $status = get_link($tmp, 2);
     ldie "switch '$tmp' is not off\n" if $status;
   }
   check_status($cmd, $res, "is-attached", 0, 0, 1);
@@ -978,6 +979,13 @@ sub leave_res_phase1 {
   _create_delete("$mars/resource-$res/data-$host");
   _create_delete("$mars/resource-$res/syncstatus-$host");
   _create_delete("$mars/resource-$res/device-$host");
+  _create_delete("$mars/resource-$res/actsize-$host");
+  foreach my $dir (glob("$mars/resource-$res/*-$host/")) {
+    foreach my $tmp (glob("${dir}*")) {
+      _create_delete($tmp);
+    }
+    _create_delete($dir);
+  }
   cleanup_res($cmd, $res, 9999999999);
 }