yadro-vavdeev/frostfs-testcases
1
0
Fork 0
forked from TrueCloudLab/frostfs-testcases
Code Pull requests Activity

Rename variable for GC waiting

Browse source 
We need just an aggregate variable that allows to wait until GC pass occurs on
a storage node, rather than a variable for specific shard. Also, we need to account
for a time that GC session itself takes.

Signed-off-by: Vladimir Domnich <v.domnich@yadro.com>
This commit is contained in:
Vladimir Domnich 2022-08-15 11:21:23 -04:00 committed by Vladimir Domnich
parent b270f39387
commit 0ca45d1ba8
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pytest_tests/helpers/utility.py
View file

@ -4,7 +4,7 @@ import uuid
import allure import allure
from common import ASSETS_DIR, SIMPLE_OBJ_SIZE, SHARD_0_GC_SLEEP from common import ASSETS_DIR, SIMPLE_OBJ_SIZE, STORAGE_GC_TIME
def create_file_with_content(file_path: str = None, content: str = None) -> str: def create_file_with_content(file_path: str = None, content: str = None) -> str:
@ -90,6 +90,6 @@ def placement_policy_from_container(container_info: str) -> str:
def wait_for_gc_pass_on_storage_nodes() -> None: def wait_for_gc_pass_on_storage_nodes() -> None:
# We add 15 seconds to allow some time for GC process itself # We add 15 seconds to allow some time for GC process itself
wait_time = robot_time_to_int(SHARD_0_GC_SLEEP) + 15 wait_time = robot_time_to_int(STORAGE_GC_TIME)
with allure.step(f'Wait {wait_time}s until GC completes on storage nodes'): with allure.step(f'Wait {wait_time}s until GC completes on storage nodes'):
time.sleep(wait_time) time.sleep(wait_time)

4
pytest_tests/testsuites/network/test_node_management.py
View file

@ -79,9 +79,9 @@ def return_nodes(alive_node: str = None):
with allure.step(f'Start node {node}'): with allure.step(f'Start node {node}'):
helper.start_node(node) helper.start_node(node)
# Wait for node to receive notifications from morph-chain # We need to wait for node to establish notifications from morph-chain
# Otherwise it will hang up when we will try to set status
sleep(robot_time_to_int(MAINNET_BLOCK_TIME)) sleep(robot_time_to_int(MAINNET_BLOCK_TIME))
tick_epoch()
with allure.step(f'Move node {node} to online state'): with allure.step(f'Move node {node} to online state'):
node_set_status(node, status='online', retries=2) node_set_status(node, status='online', retries=2)

6
robot/variables/common.py
View file

@ -13,9 +13,9 @@ MAINNET_TIMEOUT = os.getenv('MAINNET_TIMEOUT', "1min")
MORPH_BLOCK_TIME = os.getenv("MORPH_BLOCK_TIME", '1s') MORPH_BLOCK_TIME = os.getenv("MORPH_BLOCK_TIME", '1s')
NEOFS_CONTRACT_CACHE_TIMEOUT = os.getenv("NEOFS_CONTRACT_CACHE_TIMEOUT", "30s") NEOFS_CONTRACT_CACHE_TIMEOUT = os.getenv("NEOFS_CONTRACT_CACHE_TIMEOUT", "30s")
# TODO: change to NEOFS_STORAGE_DEFAULT_GC_REMOVER_SLEEP_INTERVAL # Time interval that allows a GC pass on storage node (this includes GC sleep interval
# of 1min plus 15 seconds for GC pass itself)
SHARD_0_GC_SLEEP = os.getenv("NEOFS_STORAGE_SHARD_0_GC_REMOVER_SLEEP_INTERVAL", "1m") STORAGE_GC_TIME = os.getenv("STORAGE_GC_TIME", "75s")
NEOFS_ENDPOINT = os.getenv("NEOFS_ENDPOINT", "s01.neofs.devenv:8080") NEOFS_ENDPOINT = os.getenv("NEOFS_ENDPOINT", "s01.neofs.devenv:8080")