RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 11:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #58995 from rhcs-dashboard/fix-66844-main

Browse Source 
qa/mgr/dashboard: fix test race condition

Reviewed-by: Nizamudeen A <nia@redhat.com>
This commit is contained in:
Nizamudeen A 2024-08-19 11:19:52 +05:30 committed by GitHub
commit 60be38e077
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
qa/tasks/mgr/dashboard/helper.py
View File

@ -9,7 +9,8 @@ import re
import string
import time
from collections import namedtuple
from typing import List
from functools import wraps
from typing import List, Optional, Tuple, Type, Union
import requests
from tasks.mgr.mgr_test_case import MgrTestCase
@ -343,16 +344,16 @@ class DashboardTestCase(MgrTestCase):
@classmethod
def _view_cache_get(cls, url, retries=5):
retry = True
while retry and retries > 0:
retry = False
_retry = True
while _retry and retries > 0:
_retry = False
res = cls._get(url, version=DEFAULT_API_VERSION)
if isinstance(res, dict):
res = [res]
for view in res:
assert 'value' in view
if not view['value']:
retry = True
_retry = True
retries -= 1
if retries == 0:
raise Exception("{} view cache exceeded number of retries={}"
@ -722,3 +723,25 @@ def _validate_json(val, schema, path=[]):
return _validate_json(val, JLeaf(schema), path)
assert False, str(path)
def retry(
on_exception: Union[Type[Exception], Tuple[Type[Exception], ...]],
tries=3,
delay=0,
logger: Optional[logging.Logger] = None,
):
def decorator(func):
@wraps(func)
def wrapper(*args, **kwargs):
for i in range(tries):
try:
return func(*args, **kwargs)
except on_exception as e:
err = e
if logger:
logger.warn(f"Retried #{i+1}/{tries}: '{func.__name__}' raised '{e}'")
time.sleep(delay)
raise err
return wrapper
return decorator

21
qa/tasks/mgr/dashboard/test_osd.py
View File

@ -5,7 +5,7 @@ from __future__ import absolute_import
import json
from .helper import (DashboardTestCase, JAny, JLeaf, JList, JObj, JTuple,
devices_schema)
devices_schema, log, retry)
class OsdTest(DashboardTestCase):
@ -283,13 +283,18 @@ class OsdFlagsTest(DashboardTestCase):
if osd['osd'] == osd_initial['osd']:
self.assertGreater(len(osd['flags']), len(osd_initial['flags']))
self._ceph_cmd(['osd', 'unset-group', 'noout,noin', 'osd.0', 'osd.1', 'osd.2'])
flags_removed = self._get('/api/osd/flags/individual')
self.assertStatus(200)
for osd in flags_removed:
if osd['osd'] in [0, 1, 2]:
self.assertNotIn('noout', osd['flags'])
self.assertNotIn('noin', osd['flags'])
ret = self._ceph_cmd_result(['osd', 'unset-group', 'noout,noin', 'osd.0', 'osd.1', 'osd.2'])
self.assertEqual(ret, 0)
@retry(on_exception=AssertionError, tries=2, delay=0.5, logger=log)
def check_osd_flags():
flags_removed = self._get('/api/osd/flags/individual')
self.assertStatus(200)
for osd in flags_removed:
if osd['osd'] in [0, 1, 2]:
self.assertNotIn('noout', osd['flags'])
self.assertNotIn('noin', osd['flags'])
check_osd_flags()
def test_add_indiv_flag(self):
flags_update = {'noup': None, 'nodown': None, 'noin': None, 'noout': True}