Nir Soffer has uploaded a new change for review.

Change subject: config: Rename irs:scsi_settle_timeout option
......................................................................

config: Rename irs:scsi_settle_timeout option

This option is not about SCSI but about udev events. We use the same
option also after mounting and unmounting filesystems.

Change-Id: I645bada21a95bd911ef47ce0358f467d064520a2
Signed-off-by: Nir Soffer <nsof...@redhat.com>
---
M lib/vdsm/config.py.in
M lib/vdsm/storage/mount.py
M vdsm/storage/multipath.py
M vdsm/storage/storageServer.py
4 files changed, 8 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/64/64064/1

diff --git a/lib/vdsm/config.py.in b/lib/vdsm/config.py.in
index 50282e3..695e790 100644
--- a/lib/vdsm/config.py.in
+++ b/lib/vdsm/config.py.in
@@ -315,9 +315,11 @@
         ('scsi_rescan_maximal_timeout', '30',
             'The maximal number of seconds to wait for scsi scan to return.'),
 
-        ('scsi_settle_timeout', '5',
-            'Maximum number of seconds to wait until udev events are handled '
-            'after modifying scsi interconnects.'),
+        ('udev_settle_timeout', '5',
+            'Maximum number of seconds to wait until udev events are '
+            'processed. Used after rescanning iSCSI and FC connections, '
+            'after connecting to iSCSI target, and after mounting and '
+            'umounting file systems.'),
 
         ('sd_health_check_delay', '10',
             'Storage domain health check delay, the amount of seconds to '
diff --git a/lib/vdsm/storage/mount.py b/lib/vdsm/storage/mount.py
index b132ccd..9d4072b 100644
--- a/lib/vdsm/storage/mount.py
+++ b/lib/vdsm/storage/mount.py
@@ -209,7 +209,7 @@
         TODO: find a way to wait for the specific event.
         """
         with utils.stopwatch("Waiting for udev mount events", log=self.log):
-            timeout = config.getint('irs', 'scsi_settle_timeout')
+            timeout = config.getint('irs', 'udev_settle_timeout')
             udevadm.settle(timeout)
 
     def isMounted(self):
diff --git a/vdsm/storage/multipath.py b/vdsm/storage/multipath.py
index 1373cb9..e1e0d17 100644
--- a/vdsm/storage/multipath.py
+++ b/vdsm/storage/multipath.py
@@ -78,7 +78,7 @@
     # Scanning SCSI interconnects starts a storm of udev events. Wait until all
     # events are processed, ensuring detection of new devices and creation or
     # update of multipath devices.
-    timeout = config.getint('irs', 'scsi_settle_timeout')
+    timeout = config.getint('irs', 'udev_settle_timeout')
     udevadm.settle(timeout)
 
 
diff --git a/vdsm/storage/storageServer.py b/vdsm/storage/storageServer.py
index f8764e4..1c2bc11 100644
--- a/vdsm/storage/storageServer.py
+++ b/vdsm/storage/storageServer.py
@@ -495,7 +495,7 @@
 
     def connect(self):
         iscsi.addIscsiNode(self._iface, self._target, self._cred)
-        timeout = config.getint("irs", "scsi_settle_timeout")
+        timeout = config.getint("irs", "udev_settle_timeout")
         udevadm.settle(timeout)
 
     def _match(self, session):


-- 
To view, visit https://gerrit.ovirt.org/64064
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I645bada21a95bd911ef47ce0358f467d064520a2
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsof...@redhat.com>
_______________________________________________
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Reply via email to