cst/inv: Minor fixes for issues found during scrubber integration #23240
Conversation
| @@ -35,7 +35,7 @@ namespace views = std::views; | |||
|
|
|||
| namespace { | |||
| // hash-string/ns/tp/partition_rev/.* | |||
There was a problem hiding this comment.
comment is outdated now, it doesn't mention uuid as a possible option
| @@ -43,6 +43,8 @@ TEST(Consumer, ParseNTPFromPath) { | |||
| std::vector<p> test_data{ | |||
| {"a0a6eeb8/kafka/topic-x/999_24/178-188-1574137-1-v1.log.1", | |||
| std::make_optional(make_ntp("kafka", "topic-x", 999))}, | |||
| {"d10492a6-2408-418e-9b6b-051697c5255b/k/t/1_24/---", | |||
There was a problem hiding this comment.
is this how the real path looks? i suppose this is the cluster uuid? don't we still include the hash prefix too?
There was a problem hiding this comment.
Yes, I discovered similar paths while running ducktape test:
d10492a6-2408-418e-9b6b-051697c5255b/kafka/topic-kppbtczbbq/2_22/429-500-1153657-1-v1.log.1
and looking at the code leads to https://github.com/redpanda-data/redpanda/blob/dev/src/v/cloud_storage/remote_path_provider.cc#L143 and https://github.com/redpanda-data/redpanda/blob/dev/src/v/cloud_storage/segment_path_utils.cc#L20
If there is a label it looks like we use the cluster uuid, otherwise a hash prefix
Since the segment prefix has been changed recently to either contain cluster uuid or the regular hash, the path matching expression is adjusted to also accept UUID.
abhijat
force-pushed
the
feat/inv-scrub/misc-fixes
branch
from
bb95b26 to
d709a8f
Compare
|
ducktape was retried in https://buildkite.com/redpanda/redpanda/builds/54183#0191d6d5-83a1-498f-93dc-2e8fa115c286 |
|
/backport v24.2.x |
This PR contains two minor fixes for issues found during scrubber integration:
Backports Required
Release Notes