From 88d7456c792f62025ae1ddb02116e7cf470fafb0 Mon Sep 17 00:00:00 2001
From: Thomas Schoebel-Theuer <mars@asus>
Date: Sat, 2 Apr 2022 18:52:50 +0200
Subject: [PATCH] marsadm: guard leave-resource against complicated races

---
 userspace/marsadm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/userspace/marsadm b/userspace/marsadm
index 2657b821..3151d973 100755
--- a/userspace/marsadm
+++ b/userspace/marsadm
@@ -5802,6 +5802,12 @@ my $old_nr_replicas = 0;
 
 sub leave_res_phase0 {
   my ($cmd, $res) = @_;
+  # guard against complicated distributed races
+  my $nr_replicas = get_nr_replicas(@_);
+  if ($nr_replicas > 2) {
+    update_cluster($cmd, $res);
+  }
+  # check preconditions
   check_not_primary($cmd, $res, 1);
   my $errors = 0;
   foreach my $tmp (lamport_glob("$mars/resource-$res/todo-$host/*")) {