From 08f57bf73419021de4e6dedd5eb81dc532fef33f Mon Sep 17 00:00:00 2001 From: Roman Gershman Date: Wed, 3 Jul 2024 22:28:07 +0300 Subject: [PATCH] chore: upload all the logs from /tmp Signed-off-by: Roman Gershman --- .github/workflows/regression-tests.yml | 2 +- tests/dragonfly/conftest.py | 4 +++- tests/dragonfly/tiering_test.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/regression-tests.yml b/.github/workflows/regression-tests.yml index bdfd74bb6fcf..cda48c723a91 100644 --- a/.github/workflows/regression-tests.yml +++ b/.github/workflows/regression-tests.yml @@ -53,7 +53,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: logs - path: /tmp/failed/* + path: /tmp/dragonfly.* lint-test-chart: runs-on: ubuntu-latest diff --git a/tests/dragonfly/conftest.py b/tests/dragonfly/conftest.py index 963d4669aa5e..926dd50734ab 100644 --- a/tests/dragonfly/conftest.py +++ b/tests/dragonfly/conftest.py @@ -19,7 +19,7 @@ from copy import deepcopy from pathlib import Path -from tempfile import TemporaryDirectory +from tempfile import TemporaryDirectory, gettempdir from .instance import DflyInstance, DflyParams, DflyInstanceFactory, RedisServer from . import PortPicker, dfly_args @@ -82,6 +82,7 @@ def df_factory(request, tmp_dir, test_env) -> DflyInstanceFactory: """ Create an instance factory with supplied params. """ + os.makedirs(os.path.join(gettempdir(), "tiered"), exist_ok=True) scripts_dir = os.path.dirname(os.path.abspath(__file__)) path = os.environ.get("DRAGONFLY_PATH", os.path.join(scripts_dir, "../../build-dbg/dragonfly")) @@ -327,6 +328,7 @@ def with_ca_tls_client_args(with_tls_client_args, with_tls_ca_cert_args): def copy_failed_logs_and_clean_tmp_folder(report): + return # TODO: to fix it first and then enable it. failed_path = "/tmp/failed" path_exists = os.path.exists(failed_path) if not path_exists: diff --git a/tests/dragonfly/tiering_test.py b/tests/dragonfly/tiering_test.py index 211b801e2714..ada9628cc7ec 100644 --- a/tests/dragonfly/tiering_test.py +++ b/tests/dragonfly/tiering_test.py @@ -10,7 +10,7 @@ from .utility import info_tick_timer -BASIC_ARGS = {"port": 6379, "proactor_threads": 4, "tiered_prefix": "/tmp/tiering_test_backing"} +BASIC_ARGS = {"port": 6379, "proactor_threads": 4, "tiered_prefix": "/tmp/tiered/backing"} @pytest.mark.skip("Requires evaluating runner performance first") @@ -43,6 +43,7 @@ async def test_basic_memory_usage(async_client: aioredis.Redis): assert ( info["used_memory_rss"] < 500 * 1024 * 1024 ) # the grown table itself takes up lots of space + assert False @pytest.mark.opt_only