From acd0265f8d806341672ede5597441967edd5c5d2 Mon Sep 17 00:00:00 2001 From: Eric Harney Date: Mon, 6 Feb 2023 15:49:31 -0500 Subject: [PATCH] linuxrbd: Remove rados_connect_timeout parameter This parameter doesn't do anything, we should skip it here. https://docs.ceph.com/en/latest/rados/api/python/#rados.Rados.connect https://github.com/ceph/ceph/blob/974339d1f/src/pybind/rados/rados.pyx#L674 Change-Id: I819e32f807bcba4c9d6f928f2ad04c4dd27f22c2 --- os_brick/initiator/linuxrbd.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/os_brick/initiator/linuxrbd.py b/os_brick/initiator/linuxrbd.py index d162cce0e..3ced0ba33 100644 --- a/os_brick/initiator/linuxrbd.py +++ b/os_brick/initiator/linuxrbd.py @@ -61,8 +61,6 @@ class RBDClient(object): self.rbd_conf: str = kwargs.get('conffile', '/etc/ceph/ceph.conf') self.rbd_cluster_name: str = kwargs.get('rbd_cluster_name', 'ceph') - self.rados_connect_timeout: int = kwargs.get('rados_connect_timeout', - -1) self.client, self.ioctx = self.connect() @@ -73,18 +71,13 @@ class RBDClient(object): self.disconnect() def connect(self) -> tuple['rados.Rados', 'rados.Ioctx']: - LOG.debug("opening connection to ceph cluster (timeout=%s).", - self.rados_connect_timeout) + LOG.debug("opening connection to ceph cluster") client = self.rados.Rados(rados_id=self.rbd_user, clustername=self.rbd_cluster_name, conffile=self.rbd_conf) try: - if self.rados_connect_timeout >= 0: - client.connect( - timeout=self.rados_connect_timeout) - else: - client.connect() + client.connect() ioctx = client.open_ioctx(self.rbd_pool) return client, ioctx except self.rados.Error: