Browse Source

Merge "Update shrink scenario tests"

tags/1.0.0^0
Zuul 3 months ago
committed by Gerrit Code Review
parent
commit
ce66f004c8
3 changed files with 41 additions and 25 deletions
  1. +2
    -1
      manila_tempest_tests/common/constants.py
  2. +6
    -5
      manila_tempest_tests/services/share/v2/json/shares_client.py
  3. +33
    -19
      manila_tempest_tests/tests/scenario/test_share_shrink.py

+ 2
- 1
manila_tempest_tests/common/constants.py View File

@@ -20,7 +20,8 @@ STATUS_MIGRATING_TO = 'migrating_to'
STATUS_CREATING = 'creating'
STATUS_DELETING = 'deleting'
STATUS_SHRINKING = 'shrinking'

STATUS_SHRINKING_POSSIBLE_DATA_LOSS_ERROR = (
'shrinking_possible_data_loss_error')
TEMPEST_MANILA_PREFIX = 'tempest-manila'

# Replication


+ 6
- 5
manila_tempest_tests/services/share/v2/json/shares_client.py View File

@@ -403,20 +403,21 @@ class SharesV2Client(shares_client.SharesClient):
share_status = body[status_attr]
start = int(time.time())

while share_status != status:
exp_status = status if isinstance(status, list) else [status]
while share_status not in exp_status:
time.sleep(self.build_interval)
body = self.get_share(share_id, version=version)
share_status = body[status_attr]
if share_status == status:
if share_status in exp_status:
return
elif 'error' in share_status.lower():
raise share_exceptions.ShareBuildErrorException(
share_id=share_id)

if int(time.time()) - start >= self.build_timeout:
message = ("Share's %(status_attr)s failed to transition to "
"%(status)s within the required time %(seconds)s." %
{"status_attr": status_attr, "status": status,
"%(status)s within the required "
"time %(seconds)s." %
{"status_attr": status_attr, "status": exp_status,
"seconds": self.build_timeout})
raise exceptions.TimeoutException(message)



+ 33
- 19
manila_tempest_tests/tests/scenario/test_share_shrink.py View File

@@ -91,7 +91,16 @@ class ShareShrinkBase(manager.ShareScenarioTest):
self.shares_v2_client.shrink_share(share['id'],
new_size=default_share_size)
self.shares_v2_client.wait_for_share_status(
share['id'], 'shrinking_possible_data_loss_error')
share['id'], ['shrinking_possible_data_loss_error', 'available'])

share = self.shares_v2_client.get_share(share["id"])

if share["status"] == constants.STATUS_AVAILABLE:
params = {'resource_id': share['id']}
messages = self.shares_v2_client.list_messages(params=params)
self.assertIn('009',
[message['action_id'] for message in messages])
self.assertEqual(share_size, int(share["size"]))

LOG.debug('Step 9 - delete data')
remote_client.exec_command("sudo rm /mnt/t1")
@@ -99,9 +108,12 @@ class ShareShrinkBase(manager.ShareScenarioTest):
ls_result = remote_client.exec_command("sudo ls -lAh /mnt/")
LOG.debug(ls_result)

# Deletion of files can be an asynchronous activity on the backend.
# Thus we need to wait until timeout for the space to be released
# and repeating the shrink request until success
LOG.debug('Step 10 - reset and shrink')
self.share_shrink_retry_until_success(share["id"],
share_size=default_share_size)
new_size=default_share_size)

share = self.shares_v2_client.get_share(share["id"])
self.assertEqual(default_share_size, int(share["size"]))
@@ -115,37 +127,39 @@ class ShareShrinkBase(manager.ShareScenarioTest):
LOG.debug('Step 12 - unmount')
self.unmount_share(remote_client)

def share_shrink_retry_until_success(self, share_id, share_size,
def share_shrink_retry_until_success(self, share_id, new_size,
status_attr='status'):
"""Try share reset, followed by shrink, until timeout"""

check_interval = CONF.share.build_interval * 2
body = self.shares_v2_client.get_share(share_id)
share_status = body[status_attr]
share = self.shares_v2_client.get_share(share_id)
share_current_size = share["size"]
share_status = share[status_attr]
start = int(time.time())
while share_status != constants.STATUS_AVAILABLE:
if share_status != constants.STATUS_SHRINKING:
while share_current_size != new_size:
if (share_status ==
constants.STATUS_SHRINKING_POSSIBLE_DATA_LOSS_ERROR):
self.shares_admin_v2_client.reset_state(
share_id, status=constants.STATUS_AVAILABLE)
elif share_status != constants.STATUS_SHRINKING:
try:
self.shares_v2_client.shrink_share(share_id,
new_size=share_size)
new_size=new_size)
except exceptions.BadRequest as e:
if ('New size for shrink must be less '
'than current size') in six.text_type(e):
if ('New size for shrink must be less than current size'
in six.text_type(e)):
break

time.sleep(check_interval)
body = self.shares_v2_client.get_share(share_id)
share_status = body[status_attr]
if share_status == constants.STATUS_AVAILABLE:
share = self.shares_v2_client.get_share(share_id)
share_status = share[status_attr]
share_current_size = share["size"]
if share_current_size == new_size:
return

if int(time.time()) - start >= CONF.share.build_timeout:
message = ("Share's %(status_attr)s failed to transition to "
"%(status)s within the required time %(seconds)s." %
{"status_attr": status_attr,
"status": constants.STATUS_AVAILABLE,
message = ("Share %(share_id)s failed to shrink within the "
"required time %(seconds)s." %
{"share_id": share["id"],
"seconds": CONF.share.build_timeout})
raise exceptions.TimeoutException(message)



Loading…
Cancel
Save