summaryrefslogtreecommitdiffstats
path: root/mdadm.c
diff options
context:
space:
mode:
authorMariusz Tkaczyk <mariusz.tkaczyk@intel.com>2017-11-21 11:30:20 +0100
committerJes Sorensen <jsorensen@fb.com>2017-11-21 13:26:09 -0500
commit1ea0462990c466d9ffd25d149fa6e983b8834b30 (patch)
treee6a6d350ffdac79794064a43f9ee07d4b7647894 /mdadm.c
parentfe05dc43d81e0c91cc84498e7229008748986b71 (diff)
downloadmdadm-1ea0462990c466d9ffd25d149fa6e983b8834b30.tar.gz
Monitor/msg: Don't print error message if mdmon doesn't run
Commit 4515fb28a53a ("Add detail information when can not connect monitor") was added to warn about failed connection to monitor in WaitClean function (see link below). Mdmon runs for IMSM containers when they have array with redundancy so if mdmon doesn't run, mdadm prints this error. This is misleading and unnecessary. Just print it in WaitClean function. The sock in WaitClean is deprecated so it is removed. Link: https://bugzilla.redhat.com/show_bug.cgi?id=1375002 Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@intel.com> Signed-off-by: Jes Sorensen <jsorensen@fb.com>
Diffstat (limited to 'mdadm.c')
-rw-r--r--mdadm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mdadm.c b/mdadm.c
index 87cb33f8..62d7ec34 100644
--- a/mdadm.c
+++ b/mdadm.c
@@ -1863,7 +1863,7 @@ static int misc_scan(char devmode, struct context *c)
if (devmode == 'D')
rv |= Detail(name, c);
else
- rv |= WaitClean(name, -1, c->verbose);
+ rv |= WaitClean(name, c->verbose);
put_md_name(name);
}
}
@@ -1954,7 +1954,7 @@ static int misc_list(struct mddev_dev *devlist,
rv |= Wait(dv->devname);
continue;
case Waitclean:
- rv |= WaitClean(dv->devname, -1, c->verbose);
+ rv |= WaitClean(dv->devname, c->verbose);
continue;
case KillSubarray:
rv |= Kill_subarray(dv->devname, c->subarray, c->verbose);