Merge pull request #24439 from andrwng/abs-list-filter

[CORE-6992] cloud_storage_clients/abs_client: use item filter in list_objects
redpanda-data · Dec 5, 2024 · 8143737 · 8143737
2 parents d9b8df8 + f92108b
commit 8143737
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/v/cloud_storage_clients/abs_client.cc b/src/v/cloud_storage_clients/abs_client.cc
@@ -858,7 +858,7 @@ ss::future<abs_client::list_bucket_result> abs_client::do_list_objects(
   std::optional<ss::sstring> marker,
   ss::lowres_clock::duration timeout,
   std::optional<char> delimiter,
-  std::optional<item_filter>) {
+  std::optional<item_filter> collect_item_if) {
     auto header = _requestor.make_list_blobs_request(
       name,
       _adls_client.has_value(),
@@ -891,8 +891,9 @@ ss::future<abs_client::list_bucket_result> abs_client::do_list_objects(
     co_return co_await ss::do_with(
       response_stream->as_input_stream(),
       xml_sax_parser{},
-      [](ss::input_stream<char>& stream, xml_sax_parser& p) mutable {
-          p.start_parse(std::make_unique<abs_parse_impl>());
+      [pred = std::move(collect_item_if)](
+        ss::input_stream<char>& stream, xml_sax_parser& p) mutable {
+          p.start_parse(std::make_unique<abs_parse_impl>(std::move(pred)));
           return ss::do_until(
                    [&stream] { return stream.eof(); },
                    [&stream, &p] {

diff --git a/tests/rptest/tests/remote_label_test.py b/tests/rptest/tests/remote_label_test.py
@@ -11,11 +11,12 @@
 from rptest.clients.types import TopicSpec
 from rptest.services.cluster import cluster
 from rptest.clients.rpk import RpkTool
-from rptest.services.redpanda import RedpandaService, SISettings, make_redpanda_service
+from rptest.services.redpanda import RedpandaService, SISettings, get_cloud_storage_type, make_redpanda_service
 from rptest.services.kgo_verifier_services import KgoVerifierProducer
 from rptest.tests.redpanda_test import RedpandaTest
 from rptest.tests.read_replica_e2e_test import hwms_are_identical, create_read_replica_topic
 from rptest.util import wait_until
+from ducktape.mark import matrix
 from ducktape.tests.test import TestContext
 from rptest.utils.si_utils import BucketView, NT, quiesce_uploads
 
@@ -90,7 +91,8 @@ def produce(self, cluster: RedpandaService, topic_name: str,
         producer.free()
 
     @cluster(num_nodes=3)
-    def test_clusters_share_bucket(self) -> None:
+    @matrix(cloud_storage_type=get_cloud_storage_type())
+    def test_clusters_share_bucket(self, cloud_storage_type) -> None:
         """
         cluster 1 creates topic_a
         cluster 2 creates topic_a