From 89a0c766927631fd3777d763365070b970f5af4c Mon Sep 17 00:00:00 2001 From: Eric Harney Date: Fri, 19 Apr 2024 11:55:34 -0400 Subject: [PATCH] ceph backup: Only warn about striping opts when necessary Only issue this warning message if the striping options were enabled. Change-Id: I4116412db30602260049a4129cdfbbc5d5c20c73 --- cinder/backup/drivers/ceph.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cinder/backup/drivers/ceph.py b/cinder/backup/drivers/ceph.py index cbe1eef21d4..7d014a05162 100644 --- a/cinder/backup/drivers/ceph.py +++ b/cinder/backup/drivers/ceph.py @@ -185,14 +185,16 @@ class CephBackupDriver(driver.BackupDriver): self.chunk_size = CONF.backup_ceph_chunk_size self._execute = execute or utils.execute + self.rbd_stripe_count = 0 + self.rbd_stripe_unit = 0 + if self._supports_stripingv2: self.rbd_stripe_unit = CONF.backup_ceph_stripe_unit self.rbd_stripe_count = CONF.backup_ceph_stripe_count - else: + elif (CONF.backup_ceph_stripe_unit != 0 or + CONF.backup_ceph_stripe_count != 0): LOG.info("RBD striping not supported - ignoring configuration " "settings for rbd striping.") - self.rbd_stripe_count = 0 - self.rbd_stripe_unit = 0 self._ceph_backup_user = CONF.backup_ceph_user self._ceph_backup_pool = CONF.backup_ceph_pool