summaryrefslogtreecommitdiffstats
path: root/cmd/zpool/zpool_vdev.c
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2013-10-11 14:24:18 -0700
committerBrian Behlendorf <[email protected]>2013-10-22 10:25:51 -0700
commit11cb9d773f48830cf3ff718861c070a8937c6a03 (patch)
treeee708094741cf8959364d63262655d02f18f97ae /cmd/zpool/zpool_vdev.c
parentb3c49d3df82466646bde9beebce7bbf0b3c41853 (diff)
Increase default udev wait time
When creating a new pool, or adding/replacing a disk in an existing pool, partition tables will be automatically created on the devices. Under normal circumstances it will take less than a second for udev to create the expected device files under /dev/. However, it has been observed that if the system is doing heavy IO concurrently udev may take far longer. If you also throw in some cheap dodgy hardware it may take even longer. To prevent zpool commands from failing due to this the default wait time for udev is being increased to 30 seconds. This will have no impact on normal usage, the increase timeout should only be noticed if your udev rules are incorrectly configured. Signed-off-by: Brian Behlendorf <[email protected]> Closes #1646
Diffstat (limited to 'cmd/zpool/zpool_vdev.c')
-rw-r--r--cmd/zpool/zpool_vdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/zpool/zpool_vdev.c b/cmd/zpool/zpool_vdev.c
index 5309323b2..60d05565c 100644
--- a/cmd/zpool/zpool_vdev.c
+++ b/cmd/zpool/zpool_vdev.c
@@ -1207,7 +1207,7 @@ make_disks(zpool_handle_t *zhp, nvlist_t *nv)
strrchr(devpath, '/') + 1) == -1)
return (-1);
- ret = zpool_label_disk_wait(udevpath, 1000);
+ ret = zpool_label_disk_wait(udevpath, DISK_LABEL_WAIT);
if (ret) {
(void) fprintf(stderr, gettext("cannot "
"resolve path '%s': %d\n"), udevpath, ret);