Periodic device rescanning is always going to be wrong, since the interval
will either be too long and miss an important change, or too short and waste
resources. It's not even needed in the normal case, only when the devices
change during the life of a layout. For now, just rescan when the kernel
asks for a layout. A later patch will re-introduce rescanning during the
life of a layout, but will be triggered by configuration change
notifications from udev, rather than by expiration of an arbitrary time
interval.
Signed-off-by: Jim Rees <rees@xxxxxxxxx>
---
utils/blkmapd/device-discovery.c | 14 ++++++++++----
utils/blkmapd/device-discovery.h | 2 --
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c
index 0fc8fd3..71b4d48 100644
--- a/utils/blkmapd/device-discovery.c
+++ b/utils/blkmapd/device-discovery.c
@@ -308,6 +308,15 @@ int bl_disk_inquiry_process(int fd)
head->status = BL_DEVICE_REQUEST_PROC;
switch (head->type) {
case BL_DEVICE_MOUNT:
+ /*
+ * It shouldn't be necessary to discover devices here, since
+ * process_deviceinfo() will re-discover if it can't find
+ * the devices it needs. But in the case of multipath
+ * devices (ones that appear more than once, for example an
+ * active and a standby LUN), this will re-order them in the
+ * correct priority.
+ */
+ bl_discover_devices();
if (!process_deviceinfo(buf, buflen, &major, &minor)) {
head->status = BL_DEVICE_REQUEST_ERR;
goto out;
@@ -329,7 +338,6 @@ int bl_disk_inquiry_process(int fd)
case BL_DEVICE_UMOUNT:
if (!dm_device_remove_all((uint64_t *) buf))
head->status = BL_DEVICE_REQUEST_ERR;
- bl_discover_devices();
break;
default:
head->status = BL_DEVICE_REQUEST_ERR;
@@ -357,7 +365,6 @@ unsigned int bl_process_stop;
int bl_run_disk_inquiry_process(int fd)
{
fd_set rset;
- struct timeval tv;
int ret;
bl_process_stop = 0;
@@ -368,8 +375,7 @@ int bl_run_disk_inquiry_process(int fd)
FD_ZERO(&rset);
FD_SET(fd, &rset);
ret = 0;
- tv.tv_sec = BL_DEVICE_DISCOVERY_INTERVAL;
- switch (select(fd + 1, &rset, NULL, NULL, &tv)) {
+ switch (select(fd + 1, &rset, NULL, NULL, NULL)) {
case -1:
if (errno == EINTR)
continue;
diff --git a/utils/blkmapd/device-discovery.h b/utils/blkmapd/device-discovery.h
index 71c0748..b8d26a6 100644
--- a/utils/blkmapd/device-discovery.h
+++ b/utils/blkmapd/device-discovery.h
@@ -27,8 +27,6 @@
#ifndef BL_DEVICE_DISCOVERY_H
#define BL_DEVICE_DISCOVERY_H
-#define BL_DEVICE_DISCOVERY_INTERVAL 60
-
#include <stdint.h>
#include <syslog.h>
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
