From 021a3842dccdfc412c0cd9c21d600cfc63b5b112 Mon Sep 17 00:00:00 2001
From: Thomas Schoebel-Theuer <tst@1und1.de>
Date: Tue, 10 Jul 2018 09:57:48 +0200
Subject: [PATCH] marsadm: new option --ignore-sync

---
 userspace/marsadm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/userspace/marsadm b/userspace/marsadm
index 9c42a5b2..701f4bbd 100755
--- a/userspace/marsadm
+++ b/userspace/marsadm
@@ -114,6 +114,7 @@ check_id($host);
 my $real_host = $host;
 my $backup_dir = "$mars/backups-" . time();
 my $force = 0;
+my $ignore_sync = 0;
 my $cron_mode = 0;
 my $timeout = -1;
 my $ip = "";
@@ -3135,16 +3136,19 @@ sub primary_phase0 {
   lprint "Current designated primary: $old\n";
   if ($cmd eq "primary") {
     if ($host ne $old) {
-      check_sync_finished($res, $host);
+      lprint "Allowing handover in cases of sync: ignore_sync=$ignore_sync\n" if $ignore_sync;
+      check_sync_finished($res, $host, $ignore_sync);
       # also check that other secondaries won't loose their sync primary
       my @names = glob("$mars/resource-$res/data-*");
       # for k <= 2 replicas, the previous check must have been sufficient
       if (scalar(@names) > 2) {
+	my $allow_anyway = ($force || $ignore_sync);
+	lprint "Allowing handover in cases of sync: force=$force ignore_sync=$ignore_sync\n" if $allow_anyway;
 	foreach my $name (@names) {
 	  $name =~ m:/data-(.+):;
 	  my $peer = $1;
 	  next if ($peer eq $old || $peer eq $host);
-	  check_sync_finished($res, $peer, $force);
+	  check_sync_finished($res, $peer, $allow_anyway);
 	}
       }
     }
@@ -6039,6 +6043,10 @@ marsadm [<global_options>] view[-<macroname>] [<resource_name> | all ]
     Use this only when you really know what you are doing!
     Warning! This is dangerous! First try --dry-run.
     Not combinable with 'all'.
+  --ignore-sync
+    Allow primary handover even when some sync is running somewhere.
+    This is less rude than --force because it checks for all else
+    preconditions.
   --dry-run
     Don't modify the symlink tree, but tell what would be done.
     Use this before starting potentially harmful actions such as
@@ -6155,6 +6163,9 @@ foreach my $arg (@ARGV) {
   if ($arg eq "--force" || $arg eq "-f") {
     $force++;
     next;
+  } elsif ($arg eq "--ignore-sync") {
+    $ignore_sync++;
+    next;
   } elsif ($arg eq "--dry-run" || $arg eq "-d") {
     $dry_run++;
     next;