From 0bbd7bba42560378d1720ee50bd7e4f6470e2601 Mon Sep 17 00:00:00 2001 From: Itzhak Kave Date: Wed, 25 Oct 2023 13:35:58 +0300 Subject: [PATCH 1/4] Remove the try and except from the function 'get_mds_cache_memory_limit', Remove the redundent line in the test 'test_check_mds_cache_memory_limit', update the 'retry' clause (#8719) Signed-off-by: Itzhak Kave --- ocs_ci/ocs/cluster.py | 12 ++++-------- .../z_cluster/test_ceph_default_values_check.py | 5 +++-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/ocs_ci/ocs/cluster.py b/ocs_ci/ocs/cluster.py index 3b0cee83722..dfd5ed8b50d 100644 --- a/ocs_ci/ocs/cluster.py +++ b/ocs_ci/ocs/cluster.py @@ -2027,14 +2027,10 @@ def get_mds_cache_memory_limit(): """ pod_obj = pod.get_ceph_tools_pod() - try: - ceph_cmd = "ceph config show mds.ocs-storagecluster-cephfilesystem-a mds_cache_memory_limit" - mds_a_cache_memory_limit = pod_obj.exec_ceph_cmd(ceph_cmd=ceph_cmd) - ceph_cmd = "ceph config show mds.ocs-storagecluster-cephfilesystem-b mds_cache_memory_limit" - mds_b_cache_memory_limit = pod_obj.exec_ceph_cmd(ceph_cmd=ceph_cmd) - except IOError as ioe: - if "ENOENT" not in ioe: - raise ioe + ceph_cmd = "ceph config show mds.ocs-storagecluster-cephfilesystem-a mds_cache_memory_limit" + mds_a_cache_memory_limit = pod_obj.exec_ceph_cmd(ceph_cmd=ceph_cmd) + ceph_cmd = "ceph config show mds.ocs-storagecluster-cephfilesystem-b mds_cache_memory_limit" + mds_b_cache_memory_limit = pod_obj.exec_ceph_cmd(ceph_cmd=ceph_cmd) if mds_a_cache_memory_limit != mds_b_cache_memory_limit: raise UnexpectedBehaviour( diff --git a/tests/manage/z_cluster/test_ceph_default_values_check.py b/tests/manage/z_cluster/test_ceph_default_values_check.py index 70c532350c8..80e5d4c3439 100644 --- a/tests/manage/z_cluster/test_ceph_default_values_check.py +++ b/tests/manage/z_cluster/test_ceph_default_values_check.py @@ -24,6 +24,7 @@ from ocs_ci.ocs.cluster import get_mds_cache_memory_limit from ocs_ci.utility import version from ocs_ci.utility.retry import retry +from ocs_ci.ocs.exceptions import CommandFailed log = logging.getLogger(__name__) @@ -155,12 +156,12 @@ def test_check_mds_cache_memory_limit(self): Testcase to check mds cache memory limit post ocs upgrade """ - mds_cache_memory_limit = get_mds_cache_memory_limit() mds_cache_memory_limit = retry( - (IOError), + (IOError, CommandFailed), tries=6, delay=20, backoff=1, + text_in_exception="ENOENT", )(get_mds_cache_memory_limit)() expected_mds_value = 4294967296 expected_mds_value_in_GB = int(expected_mds_value / 1073741274) From 2c075af9af3a501b66c1365a0275876db901311b Mon Sep 17 00:00:00 2001 From: Yulia Persky Date: Wed, 25 Oct 2023 14:26:24 +0300 Subject: [PATCH 2/4] test_pvc_snapshot_performance.py fix - increasing get_fio_results timeout (#8673) * increasing get_fio_results timeout * increasing fio timeout for 100gb rbd test case Signed-off-by: Yulia Persky --- .../e2e/performance/csi_tests/test_pvc_snapshot_performance.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/e2e/performance/csi_tests/test_pvc_snapshot_performance.py b/tests/e2e/performance/csi_tests/test_pvc_snapshot_performance.py index a08658eae0d..4b1f5e2061a 100644 --- a/tests/e2e/performance/csi_tests/test_pvc_snapshot_performance.py +++ b/tests/e2e/performance/csi_tests/test_pvc_snapshot_performance.py @@ -250,7 +250,7 @@ def test_pvc_snapshot_performance(self, pvc_size): self.pod_object.fillup_fs(size=file_size, fio_filename=file_name) # Wait for fio to finish - fio_result = self.pod_object.get_fio_results() + fio_result = self.pod_object.get_fio_results(timeout=3600) err_count = fio_result.get("jobs")[0].get("error") assert ( err_count == 0 @@ -606,7 +606,6 @@ def test_pvc_snapshot_performance_multiple_files( self.full_results.add_key("threads", threads) self.full_results.add_key("interface", interface) for test_num in range(self.tests_numbers): - test_results = {"creation_time": None, "csi_creation_time": None} # deploy the smallfile workload From 798553a224b1b92765332bab5327b497536f02ec Mon Sep 17 00:00:00 2001 From: vavuthu Date: Thu, 26 Oct 2023 10:55:43 +0530 Subject: [PATCH 3/4] update cryptography to latest version Signed-off-by: vavuthu --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8c8f9ee208c..e36e2680cb5 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ license="MIT", install_requires=[ "apache-libcloud==3.1.0", - "cryptography==39.0.1", + "cryptography==41.0.5", "docopt==0.6.2", # https://pypi.org/project/gevent/ the latest version resolves problem for Mac M1 chips # This issue is caused by a program attempting to load an x86_64-only library from a native arm64 process. From 7070c7d42a43ed94111f56f6725726c7bd1eacaa Mon Sep 17 00:00:00 2001 From: Vishakha Kathole Date: Thu, 26 Oct 2023 15:15:10 +0530 Subject: [PATCH 4/4] Change test ownership back to magenta squad (#8739) Signed-off-by: Vishakha Kathole --- .../ocp/monitoring/test_monitoring_on_negative_scenarios.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/e2e/workloads/ocp/monitoring/test_monitoring_on_negative_scenarios.py b/tests/e2e/workloads/ocp/monitoring/test_monitoring_on_negative_scenarios.py index e50ce5eb9bc..cfa3337e8e5 100644 --- a/tests/e2e/workloads/ocp/monitoring/test_monitoring_on_negative_scenarios.py +++ b/tests/e2e/workloads/ocp/monitoring/test_monitoring_on_negative_scenarios.py @@ -36,7 +36,7 @@ skipif_aws_i3, skipif_vsphere_ipi, skipif_ibm_cloud, - blue_squad, + magenta_squad, ) log = logging.getLogger(__name__) @@ -111,7 +111,7 @@ def wait_for_nodes_status_and_prometheus_health_check(pods, threading_lock): assert prometheus_health_check(), "Prometheus health is degraded" -@blue_squad +@magenta_squad @ignore_leftovers @workloads @skipif_vsphere_ipi