Merge "Optimize check_migrated in cinder_helper.py"

2017-10-23 03:53:17 +00:00
parent 2d5db7082b d722b62b97
commit e9c420467e
1 changed files with 2 additions and 1 deletions
--- a/watcher/common/cinder_helper.py
+++ b/watcher/common/cinder_helper.py
@@ -165,7 +165,8 @@ class CinderHelper(object):

    def check_migrated(self, volume, retry_interval=10):
        volume = self.get_volume(volume)
-        while getattr(volume, 'migration_status') == 'migrating':
+        final_status = ('success', 'error')
+        while getattr(volume, 'migration_status') not in final_status:
            volume = self.get_volume(volume.id)
            LOG.debug('Waiting the migration of {0}'.format(volume))
            time.sleep(retry_interval)