apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

test: improve purge expunged resources b/g task testcase (#9426)

Browse Source 
* test: improve purge expunged resources b/g task testcase

Failures were seen for during purging of expunged resources via
bacground task during different test runs. This PR tries to make sure
b/g task execution is not skipped after MS restrat in a multi-MS
environment. It also updates expunged.resources.purge.interval to allow
running task again in 60s.

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

* new string formatting

---------

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
This commit is contained in:
Abhishek Kumar 2024-07-29 15:49:45 +05:30 committed by GitHub
parent 7f4a6861b3
commit cd8442a42b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/integration/smoke/test_purge_expunged_vms.py
View File

@ -273,6 +273,7 @@ class TestPurgeExpungedVms(cloudstackTestCase):
return False return False
self.debug("Restarting all management server") self.debug("Restarting all management server")
for idx, server_ip in enumerate(server_ips): for idx, server_ip in enumerate(server_ips):
self.debug(f"Restarting management server #{idx} with IP {server_ip}")
sshClient = SshClient( sshClient = SshClient(
server_ip, server_ip,
22, 22,
@ -283,6 +284,9 @@ class TestPurgeExpungedVms(cloudstackTestCase):
sshClient.execute(command) sshClient.execute(command)
command = "service cloudstack-management start" command = "service cloudstack-management start"
sshClient.execute(command) sshClient.execute(command)
if idx == 0:
# Wait before restarting other management servers to make the first as oldest running
time.sleep(10)
# Waits for management to come up in 10 mins, when it's up it will continue # Waits for management to come up in 10 mins, when it's up it will continue
timeout = time.time() + (10 * 60) timeout = time.time() + (10 * 60)
@ -349,15 +353,18 @@ class TestPurgeExpungedVms(cloudstackTestCase):
@skipTestIf("hypervisorIsSimulator") @skipTestIf("hypervisorIsSimulator")
@attr(tags=["advanced"], required_hardware="true") @attr(tags=["advanced"], required_hardware="true")
def test_06_purge_expunged_vm_background_task(self): def test_06_purge_expunged_vm_background_task(self):
purge_task_delay = 60 purge_task_delay = 120
self.changeConfiguration('expunged.resources.purge.enabled', 'true') self.changeConfiguration('expunged.resources.purge.enabled', 'true')
self.changeConfiguration('expunged.resources.purge.delay', purge_task_delay) self.changeConfiguration('expunged.resources.purge.delay', purge_task_delay)
self.changeConfiguration('expunged.resources.purge.interval', int(purge_task_delay/2))
self.changeConfiguration('expunged.resources.purge.keep.past.days', 1) self.changeConfiguration('expunged.resources.purge.keep.past.days', 1)
if len(self.staticConfigurations) > 0: if len(self.staticConfigurations) > 0:
self.restartAllManagementServers() self.restartAllManagementServers()
wait = 2 * purge_task_delay wait_multiple = 2
logging.info("Waiting for 2x%d = %d seconds for background task to execute" % (purge_task_delay, wait)) wait = wait_multiple * purge_task_delay
logging.info(f"Waiting for {wait_multiple}x{purge_task_delay} = {wait} seconds for background task to execute")
time.sleep(wait) time.sleep(wait)
logging.debug("Validating expunged VMs")
self.validatePurgedVmEntriesInDb( self.validatePurgedVmEntriesInDb(
[self.vm_ids[self.timestamps[0]], self.vm_ids[self.timestamps[1]], self.vm_ids[self.timestamps[2]]], [self.vm_ids[self.timestamps[0]], self.vm_ids[self.timestamps[1]], self.vm_ids[self.timestamps[2]]],
None None