From e351142f00ab7d8c2029f3b915e61e60c24bd409 Mon Sep 17 00:00:00 2001 From: Thomas Schoebel-Theuer Date: Thu, 3 Feb 2022 12:21:20 +0100 Subject: [PATCH] marsadm: improved ping explanations --- userspace/marsadm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/userspace/marsadm b/userspace/marsadm index 447cb809..187251a2 100755 --- a/userspace/marsadm +++ b/userspace/marsadm @@ -2693,11 +2693,19 @@ sub wait_cluster { foreach my $peer (keys(%old_status)) { $progress{$peer} = $non_participating ? 1 : 0; } + my $res_txt = ""; + if ($non_participating) { + $res_txt = "any known or unknown"; + } elsif ($res eq "all") { + $res_txt = "locally mentioned"; + } else { + $res_txt = "resource '$res'"; + } my $count = scalar(keys(%old_status)); if ($count && $count < 10) { - lprint "Wait for answers from " . join(",", sort alphanum_cmp keys(%old_status)) . "\n"; + lprint "Wait for answers from $res_txt peer(s) " . join(",", sort alphanum_cmp keys(%old_status)) . "\n"; } else { - lprint "Wait for answers from $count peers\n"; + lprint "Wait for answers from $count peer(s) ($res_txt)\n"; } my $delta = $window > 0 ? $window / 2 : 30; while (1) {