|
 |
e95a18 |
From cab9c67d461c65a1138359f9f6d39636466b90e4 Mon Sep 17 00:00:00 2001
|
|
|
e95a18 |
From: Blazej Kucman <blazej.kucman@intel.com>
|
|
|
e95a18 |
Date: Wed, 9 Sep 2020 10:31:19 +0200
|
|
|
e95a18 |
Subject: [PATCH 094/108] mdmonitor: set small delay once
|
|
|
e95a18 |
|
|
|
e95a18 |
If mdmonitor is awakened by event, set small delay once
|
|
|
e95a18 |
to deal with udev and mdadm.
|
|
|
e95a18 |
|
|
|
e95a18 |
Signed-off-by: Blazej Kucman <blazej.kucman@intel.com>
|
|
|
e95a18 |
Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@intel.com>
|
|
|
e95a18 |
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
|
e95a18 |
---
|
|
|
e95a18 |
Monitor.c | 14 +++++++++++++-
|
|
|
e95a18 |
mdadm.h | 2 +-
|
|
|
e95a18 |
mdstat.c | 18 +++++++++++++++---
|
|
|
e95a18 |
3 files changed, 29 insertions(+), 5 deletions(-)
|
|
|
e95a18 |
|
|
|
e95a18 |
diff --git a/Monitor.c b/Monitor.c
|
|
|
e95a18 |
index aed7a69..0fb4f77 100644
|
|
|
e95a18 |
--- a/Monitor.c
|
|
|
e95a18 |
+++ b/Monitor.c
|
|
|
e95a18 |
@@ -128,6 +128,7 @@ int Monitor(struct mddev_dev *devlist,
|
|
|
e95a18 |
char *mailfrom;
|
|
|
e95a18 |
struct alert_info info;
|
|
|
e95a18 |
struct mddev_ident *mdlist;
|
|
|
e95a18 |
+ int delay_for_event = c->delay;
|
|
|
e95a18 |
|
|
|
e95a18 |
if (!mailaddr) {
|
|
|
e95a18 |
mailaddr = conf_get_mailaddr();
|
|
|
e95a18 |
@@ -249,7 +250,18 @@ int Monitor(struct mddev_dev *devlist,
|
|
|
e95a18 |
break;
|
|
|
e95a18 |
}
|
|
|
e95a18 |
else {
|
|
|
e95a18 |
- mdstat_wait(c->delay);
|
|
|
e95a18 |
+ int wait_result = mdstat_wait(delay_for_event);
|
|
|
e95a18 |
+
|
|
|
e95a18 |
+ /*
|
|
|
e95a18 |
+ * If mdmonitor is awaken by event, set small delay once
|
|
|
e95a18 |
+ * to deal with udev and mdadm.
|
|
|
e95a18 |
+ */
|
|
|
e95a18 |
+ if (wait_result != 0) {
|
|
|
e95a18 |
+ if (c->delay > 5)
|
|
|
e95a18 |
+ delay_for_event = 5;
|
|
|
e95a18 |
+ } else
|
|
|
e95a18 |
+ delay_for_event = c->delay;
|
|
|
e95a18 |
+
|
|
|
e95a18 |
mdstat_close();
|
|
|
e95a18 |
}
|
|
|
e95a18 |
}
|
|
|
e95a18 |
diff --git a/mdadm.h b/mdadm.h
|
|
|
e95a18 |
index 399478b..4961c0f 100644
|
|
|
e95a18 |
--- a/mdadm.h
|
|
|
e95a18 |
+++ b/mdadm.h
|
|
|
e95a18 |
@@ -628,7 +628,7 @@ struct mdstat_ent {
|
|
|
e95a18 |
extern struct mdstat_ent *mdstat_read(int hold, int start);
|
|
|
e95a18 |
extern void mdstat_close(void);
|
|
|
e95a18 |
extern void free_mdstat(struct mdstat_ent *ms);
|
|
|
e95a18 |
-extern void mdstat_wait(int seconds);
|
|
|
e95a18 |
+extern int mdstat_wait(int seconds);
|
|
|
e95a18 |
extern void mdstat_wait_fd(int fd, const sigset_t *sigmask);
|
|
|
e95a18 |
extern int mddev_busy(char *devnm);
|
|
|
e95a18 |
extern struct mdstat_ent *mdstat_by_component(char *name);
|
|
|
e95a18 |
diff --git a/mdstat.c b/mdstat.c
|
|
|
e95a18 |
index 48559e6..dd96cca 100644
|
|
|
e95a18 |
--- a/mdstat.c
|
|
|
e95a18 |
+++ b/mdstat.c
|
|
|
e95a18 |
@@ -302,7 +302,17 @@ void mdstat_close(void)
|
|
|
e95a18 |
mdstat_fd = -1;
|
|
|
e95a18 |
}
|
|
|
e95a18 |
|
|
|
e95a18 |
-void mdstat_wait(int seconds)
|
|
|
e95a18 |
+/*
|
|
|
e95a18 |
+ * function: mdstat_wait
|
|
|
e95a18 |
+ * Description: Function waits for event on mdstat.
|
|
|
e95a18 |
+ * Parameters:
|
|
|
e95a18 |
+ * seconds - timeout for waiting
|
|
|
e95a18 |
+ * Returns:
|
|
|
e95a18 |
+ * > 0 - detected event
|
|
|
e95a18 |
+ * 0 - timeout
|
|
|
e95a18 |
+ * < 0 - detected error
|
|
|
e95a18 |
+ */
|
|
|
e95a18 |
+int mdstat_wait(int seconds)
|
|
|
e95a18 |
{
|
|
|
e95a18 |
fd_set fds;
|
|
|
e95a18 |
struct timeval tm;
|
|
|
e95a18 |
@@ -312,10 +322,12 @@ void mdstat_wait(int seconds)
|
|
|
e95a18 |
FD_SET(mdstat_fd, &fds);
|
|
|
e95a18 |
maxfd = mdstat_fd;
|
|
|
e95a18 |
} else
|
|
|
e95a18 |
- return;
|
|
|
e95a18 |
+ return -1;
|
|
|
e95a18 |
+
|
|
|
e95a18 |
tm.tv_sec = seconds;
|
|
|
e95a18 |
tm.tv_usec = 0;
|
|
|
e95a18 |
- select(maxfd + 1, NULL, NULL, &fds, &tm;;
|
|
|
e95a18 |
+
|
|
|
e95a18 |
+ return select(maxfd + 1, NULL, NULL, &fds, &tm;;
|
|
|
e95a18 |
}
|
|
|
e95a18 |
|
|
|
e95a18 |
void mdstat_wait_fd(int fd, const sigset_t *sigmask)
|
|
|
e95a18 |
--
|
|
|
e95a18 |
2.7.5
|
|
|
e95a18 |
|