[#364] Fixed epoch adn object metrics tests
All checks were successful
DCO check / DCO (pull_request) Successful in 28s

Signed-off-by: Ilyas Niyazov <i.niyazov@yadro.com>
This commit is contained in:
Ilyas Niyazov 2025-01-30 12:50:30 +03:00
parent 35f60af47d
commit 3b120643ad
2 changed files with 14 additions and 7 deletions

View file

@ -3,11 +3,11 @@ from frostfs_testlib.testing import parallel
import pytest
from frostfs_testlib import reporter
from frostfs_testlib.steps.metrics import get_metrics_value
from frostfs_testlib.storage.cluster import ClusterNode
from frostfs_testlib.storage.cluster import ClusterNode, Cluster
from frostfs_testlib.testing.cluster_test_base import ClusterTestBase
@pytest.mark.order(-11)
@pytest.mark.order(-7)
@pytest.mark.nightly
@pytest.mark.metrics
class TestEpochMetrics(ClusterTestBase):
@ -19,21 +19,21 @@ class TestEpochMetrics(ClusterTestBase):
return None
@allure.title("Check changes in metric frostfs_node_ir_epoch value")
def test_check_increase_epoch_metric(self):
def test_check_increase_epoch_metric(self, cluster: Cluster):
metric_name = "frostfs_node_ir_epoch"
with reporter.step("Get current value of metric: {metric_name} from each nodes"):
futures = parallel(self.get_metrics_search_by_greps_parallel, self.cluster.cluster_nodes, command=metric_name)
futures = parallel(self.get_metrics_search_by_greps_parallel, cluster.cluster_nodes, command=metric_name)
metrics_results = [future.result() for future in futures if future.result() is not None]
with reporter.step("Check that the metric values are the same in all nodes"):
assert len(set(metrics_results)) == 1, f"Metric {metric_name} values aren't same in all nodes"
assert len(metrics_results) == len(self.cluster.cluster_nodes), "Metrics are not available in some nodes"
assert len(metrics_results) == len(cluster.cluster_nodes), "Metrics are not available in some nodes"
with reporter.step("Tick epoch"):
self.tick_epoch(wait_block=2)
with reporter.step('Check that metric value increase'):
futures = parallel(self.get_metrics_search_by_greps_parallel, self.cluster.cluster_nodes, command=metric_name)
futures = parallel(self.get_metrics_search_by_greps_parallel, cluster.cluster_nodes, command=metric_name)
new_metrics_results = [future.result() for future in futures if future.result() is not None]
assert len(set(new_metrics_results)) == 1, f"Metric {metric_name} values aren't same in all nodes"

View file

@ -17,7 +17,7 @@ from frostfs_testlib.utils.file_utils import TestFile
from ...helpers.container_request import PUBLIC_WITH_POLICY, ContainerRequest, requires_container
@pytest.mark.order(-7)
@pytest.mark.order(-11)
@pytest.mark.nightly
@pytest.mark.metrics
class TestObjectMetrics(ClusterTestBase):
@ -89,6 +89,7 @@ class TestObjectMetrics(ClusterTestBase):
objects_metric_counter += metric_step
check_metrics_counter(
container_nodes,
operator=">=",
counter_exp=objects_metric_counter,
command="frostfs_node_engine_objects_total",
type="user",
@ -108,6 +109,7 @@ class TestObjectMetrics(ClusterTestBase):
objects_metric_counter -= metric_step
check_metrics_counter(
container_nodes,
operator=">=",
counter_exp=objects_metric_counter,
command="frostfs_node_engine_objects_total",
type="user",
@ -136,6 +138,7 @@ class TestObjectMetrics(ClusterTestBase):
objects_metric_counter += metric_step
check_metrics_counter(
container_nodes,
operator=">=",
counter_exp=objects_metric_counter,
command="frostfs_node_engine_objects_total",
type="user",
@ -152,6 +155,7 @@ class TestObjectMetrics(ClusterTestBase):
self.tick_epochs(epochs_to_tick=2)
check_metrics_counter(
container_nodes,
operator=">=",
counter_exp=objects_metric_counter,
command="frostfs_node_engine_objects_total",
type="user",
@ -164,6 +168,7 @@ class TestObjectMetrics(ClusterTestBase):
objects_metric_counter -= metric_step
check_metrics_counter(
container_nodes,
operator=">=",
counter_exp=objects_metric_counter,
command="frostfs_node_engine_objects_total",
type="user",
@ -191,6 +196,7 @@ class TestObjectMetrics(ClusterTestBase):
objects_metric_counter += metric_step
check_metrics_counter(
container_nodes,
operator=">=",
counter_exp=objects_metric_counter,
command="frostfs_node_engine_objects_total",
type="user",
@ -210,6 +216,7 @@ class TestObjectMetrics(ClusterTestBase):
objects_metric_counter -= metric_step
check_metrics_counter(
container_nodes,
operator=">=",
counter_exp=objects_metric_counter,
command="frostfs_node_engine_objects_total",
type="user",