From: Shilpa Jagannath <smanjara@redhat.com>
Date: Wed, 4 Oct 2023 19:22:41 +0000 (-0400)
Subject: rgw/multisite: fix sync_error_trim command.
X-Git-Tag: v17.2.8~140^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9c5d2ab6bd5519bdc20afbec3adbb113ddf413c5;p=ceph.git

rgw/multisite: fix sync_error_trim command.
without --marker option, we trim everthing.
if --marker option is passed in, we trim upto that marker.

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
(cherry picked from commit a0491a4f63885be9ea14a15c67cabd8903f19641)
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index a8dfce96e4e61..823fc65dbdf15 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -8978,13 +8978,16 @@ next:
       return -EINVAL;
     }
     if (!start_marker.empty()) {
-      std::cerr << "end-date not allowed." << std::endl;
+      std::cerr << "start-marker not allowed." << std::endl;
       return -EINVAL;
     }
     if (!end_marker.empty()) {
-      std::cerr << "end-date not allowed." << std::endl;
+      std::cerr << "end_marker not allowed." << std::endl;
       return -EINVAL;
     }
+    if (marker.empty()) {
+      marker = "9"; // trims everything
+    }
 
     if (shard_id < 0) {
       shard_id = 0;