diff options
| author | Zuul <zuul@review.opendev.org> | 2023-02-08 07:26:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-02-08 07:26:09 +0000 |
| commit | 35a45898853e0b34a94ce7d4a111891f4e10e8db (patch) | |
| tree | 4080e8e1df6f313f7c21e52aac06bd29f6fde102 /glance_store/_drivers | |
| parent | 2379a56546be403d1b3fc62947538c0548899871 (diff) | |
| parent | b1d0feeba4e16046c7840bd4966f31a0e7527e67 (diff) | |
| download | glance_store-35a45898853e0b34a94ce7d4a111891f4e10e8db.tar.gz | |
Merge "Rbd: Deprecate unused rados_connect_timeout"
Diffstat (limited to 'glance_store/_drivers')
| -rw-r--r-- | glance_store/_drivers/rbd.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/glance_store/_drivers/rbd.py b/glance_store/_drivers/rbd.py index b632854..a9409e9 100644 --- a/glance_store/_drivers/rbd.py +++ b/glance_store/_drivers/rbd.py @@ -133,6 +133,13 @@ Related options: """), cfg.IntOpt('rados_connect_timeout', default=0, + deprecated_for_removal=True, + deprecated_since='Zed', + deprecated_reason=""" +This option has not had any effect in years. Users willing to set a timeout for +connecting to the Ceph cluster should use 'client_mount_timeout' in Ceph's +configuration file. +""", help=""" Timeout value for connecting to Ceph cluster. @@ -288,7 +295,7 @@ class Store(driver.Store): client = rados.Rados(conffile=conffile, rados_id=rados_id) try: - client.connect(timeout=self.connect_timeout) + client.connect() except (rados.Error, rados.ObjectNotFound) as e: if self.backend_group and len(self.conf.enabled_backends) > 1: reason = _("Error in store configuration: %s") % e @@ -319,8 +326,6 @@ class Store(driver.Store): user = getattr(self.conf, self.backend_group).rbd_store_user conf_file = getattr(self.conf, self.backend_group).rbd_store_ceph_conf - connect_timeout = getattr( - self.conf, self.backend_group).rados_connect_timeout thin_provisioning = getattr(self.conf, self.backend_group).\ rbd_thin_provisioning @@ -329,7 +334,6 @@ class Store(driver.Store): pool = self.conf.glance_store.rbd_store_pool user = self.conf.glance_store.rbd_store_user conf_file = self.conf.glance_store.rbd_store_ceph_conf - connect_timeout = self.conf.glance_store.rados_connect_timeout thin_provisioning = \ self.conf.glance_store.rbd_thin_provisioning @@ -343,7 +347,6 @@ class Store(driver.Store): self.pool = str(pool) self.user = str(user) self.conf_file = str(conf_file) - self.connect_timeout = connect_timeout except cfg.ConfigFileValueError as e: reason = _("Error in store configuration: %s") % e LOG.error(reason) |