From b9d2de5f30716fc9f0e207ae3bc80d3c39a1fd00 Mon Sep 17 00:00:00 2001
From: Lingxian Kong <anlin.kong@gmail.com>
Date: Sun, 30 May 2021 22:35:06 +1200
Subject: Wait for volume status before resize_fs

Story: 2008916
Task: 42507
Change-Id: I7d29cf71d03174a439124fb3cf52c24e375d1f49
---
 trove/taskmanager/models.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/trove/taskmanager/models.py b/trove/taskmanager/models.py
index 4acb9203..a918073e 100755
--- a/trove/taskmanager/models.py
+++ b/trove/taskmanager/models.py
@@ -1730,9 +1730,14 @@ class ResizeVolumeAction(object):
             def volume_is_new_size():
                 volume = self.instance.volume_client.volumes.get(
                     self.instance.volume_id)
-                return volume.size == self.new_size
+                LOG.debug(f'Waiting for volume available, '
+                          f'id: {volume.id}, status: {volume.status}, '
+                          f'size: {volume.size}')
+                return (volume.size == self.new_size and
+                        volume.status in ['available', 'in-use'])
 
             utils.poll_until(volume_is_new_size,
+                             initial_delay=5,
                              sleep_time=5,
                              time_out=CONF.volume_time_out)
 
-- 
cgit v1.2.1