TrueCloudLab/frostfs-testlib
25
0
Fork 20
Code Issues Pull requests 2 Releases 1 Activity Actions

Use all nodes for s3 creds in load #87

Merged
abereziny merged 1 commit from abereziny/frostfs-testlib:feature-use-all-nodes-for-s3-creds into master 2023-09-20 09:05:14 +00:00
Conversation 0 Commits 1 Files changed 3 +10 -2
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/frostfs_testlib/load/interfaces.py
View file

@ -22,6 +22,7 @@ class ScenarioRunner(ABC):
def prepare( def prepare(
self, self,
load_params: LoadParams, load_params: LoadParams,
cluster_nodes: list[ClusterNode],
nodes_under_load: list[ClusterNode], nodes_under_load: list[ClusterNode],
k6_dir: str, k6_dir: str,
): ):

4
src/frostfs_testlib/load/runners.py
View file

@ -72,6 +72,7 @@ class DefaultRunner(RunnerBase):
def prepare( def prepare(
self, self,
load_params: LoadParams, load_params: LoadParams,
cluster_nodes: list[ClusterNode],
nodes_under_load: list[ClusterNode], nodes_under_load: list[ClusterNode],
k6_dir: str, k6_dir: str,
): ):
@ -81,7 +82,7 @@ class DefaultRunner(RunnerBase):
with reporter.step("Init s3 client on loaders"): with reporter.step("Init s3 client on loaders"):
storage_node = nodes_under_load[0].service(StorageNode) storage_node = nodes_under_load[0].service(StorageNode)
s3_public_keys = [ s3_public_keys = [
node.service(S3Gate).get_wallet_public_key() for node in nodes_under_load node.service(S3Gate).get_wallet_public_key() for node in cluster_nodes
] ]
grpc_peer = storage_node.get_rpc_endpoint() grpc_peer = storage_node.get_rpc_endpoint()
@ -290,6 +291,7 @@ class LocalRunner(RunnerBase):
def prepare( def prepare(
self, self,
load_params: LoadParams, load_params: LoadParams,
cluster_nodes: list[ClusterNode],
nodes_under_load: list[ClusterNode], nodes_under_load: list[ClusterNode],
k6_dir: str, k6_dir: str,
): ):

7
src/frostfs_testlib/storage/controllers/background_load_controller.py
View file

@ -26,6 +26,7 @@ class BackgroundLoadController:
load_params: LoadParams load_params: LoadParams
original_load_params: LoadParams original_load_params: LoadParams
verification_params: LoadParams verification_params: LoadParams
cluster_nodes: list[ClusterNode]
nodes_under_load: list[ClusterNode] nodes_under_load: list[ClusterNode]
load_counter: int load_counter: int
loaders_wallet: WalletInfo loaders_wallet: WalletInfo
@ -39,12 +40,14 @@ class BackgroundLoadController:
k6_dir: str, k6_dir: str,
load_params: LoadParams, load_params: LoadParams,
loaders_wallet: WalletInfo, loaders_wallet: WalletInfo,
cluster_nodes: list[ClusterNode],
nodes_under_load: list[ClusterNode], nodes_under_load: list[ClusterNode],
runner: ScenarioRunner, runner: ScenarioRunner,
) -> None: ) -> None:
self.k6_dir = k6_dir self.k6_dir = k6_dir
self.original_load_params = load_params self.original_load_params = load_params
self.load_params = copy.deepcopy(self.original_load_params) self.load_params = copy.deepcopy(self.original_load_params)
self.cluster_nodes = cluster_nodes
self.nodes_under_load = nodes_under_load self.nodes_under_load = nodes_under_load
self.load_counter = 1 self.load_counter = 1
self.loaders_wallet = loaders_wallet self.loaders_wallet = loaders_wallet
@ -99,7 +102,9 @@ class BackgroundLoadController:
self.endpoints = self._get_endpoints( self.endpoints = self._get_endpoints(
self.load_params.load_type, self.load_params.endpoint_selection_strategy self.load_params.load_type, self.load_params.endpoint_selection_strategy
) )
self.runner.prepare(self.load_params, self.nodes_under_load, self.k6_dir) self.runner.prepare(
self.load_params, self.cluster_nodes, self.nodes_under_load, self.k6_dir
)
self.runner.init_k6_instances(self.load_params, self.endpoints, self.k6_dir) self.runner.init_k6_instances(self.load_params, self.endpoints, self.k6_dir)
@run_optionally(optionals.OPTIONAL_BACKGROUND_LOAD_ENABLED) @run_optionally(optionals.OPTIONAL_BACKGROUND_LOAD_ENABLED)