From 653e147c16ee5153b5cb63d149fc37329b2cefe8 Mon Sep 17 00:00:00 2001 From: Tom Swanson Date: Mon, 9 Jan 2017 10:58:08 -0600 Subject: [PATCH] Dell SC: Failback timeout extended Some replications stall on failback. Extended the timeout to 6 minutes. Change-Id: I753a2bf99d5bf06b8caabd63cf1d6bff0c720e6a --- .../volume/drivers/dell/dell_storagecenter_common.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cinder/volume/drivers/dell/dell_storagecenter_common.py b/cinder/volume/drivers/dell/dell_storagecenter_common.py index e3c4043f98c..673f12ab8d0 100644 --- a/cinder/volume/drivers/dell/dell_storagecenter_common.py +++ b/cinder/volume/drivers/dell/dell_storagecenter_common.py @@ -92,7 +92,7 @@ class DellCommonDriver(driver.ConsistencyGroupVD, driver.ManageableVD, {'name': self.backend_name, 'state': self.failed_over}) self.storage_protocol = 'iSCSI' - self.failback_timeout = 30 + self.failback_timeout = 60 def _bytes_to_gb(self, spacestring): """Space is returned in a string like ... @@ -1296,8 +1296,10 @@ class DellCommonDriver(driver.ConsistencyGroupVD, driver.ManageableVD, # One chance down. Warn user. deadcount -= 1 LOG.warning(_LW('Waiting for replications to complete. ' - 'No progress for 30 seconds. deadcount = %d'), - deadcount) + 'No progress for %(timeout)d seconds. ' + 'deadcount = %(cnt)d'), + {'timeout': self.failback_timeout, + 'cnt': deadcount}) else: # Reset lastremain = currentremain @@ -1305,7 +1307,8 @@ class DellCommonDriver(driver.ConsistencyGroupVD, driver.ManageableVD, # If we've used up our 5 chances we error and log.. if deadcount == 0: - LOG.error(_LE('Replication progress has stopped.')) + LOG.error(_LE('Replication progress has stopped: ' + '%f remaining.'), currentremain) for item in items: if item['status'] == 'inprogress': LOG.error(_LE('Failback failed for volume: %s. '