From 14a9e3a1a70381ff24d7bb57b77e2d6fa1399751 Mon Sep 17 00:00:00 2001 From: Andrew Wong Date: Mon, 24 Jun 2024 18:24:32 -0700 Subject: [PATCH] config: enable remote labels by default With this activated in tests, updates several tests that now need to account for the new paths. --- src/v/config/configuration.cc | 3 +-- tests/rptest/tests/archival_test.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/v/config/configuration.cc b/src/v/config/configuration.cc index 10af041723b67..ed0f508ba4794 100644 --- a/src/v/config/configuration.cc +++ b/src/v/config/configuration.cc @@ -2169,8 +2169,7 @@ configuration::configuration() "naming scheme for new topics. This property exists to simplify testing " "and shouldn't be set in production.", {.needs_restart = needs_restart::no, .visibility = visibility::tunable}, - // TODO(awong): enable once stable - true) + false) , cloud_storage_azure_storage_account( *this, "cloud_storage_azure_storage_account", diff --git a/tests/rptest/tests/archival_test.py b/tests/rptest/tests/archival_test.py index d0ca27661ced2..b7bcacef817be 100644 --- a/tests/rptest/tests/archival_test.py +++ b/tests/rptest/tests/archival_test.py @@ -814,8 +814,8 @@ def _get_redpanda_s3_checksums(self): """Get MD5 checksums of log segments stored in S3 (minio). The paths are normalized (//_/...).""" def normalize(path): - # strip archiver term id from the segment path - path = path[9:] + # strip archiver cluster UUID prefix from the segment path + path = path[37:] match = LOG_EXPRESSION.match(path) if match: return match[1]