From 9c5d2ab6bd5519bdc20afbec3adbb113ddf413c5 Mon Sep 17 00:00:00 2001 From: Shilpa Jagannath Date: Wed, 4 Oct 2023 15:22:41 -0400 Subject: [PATCH] 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 (cherry picked from commit a0491a4f63885be9ea14a15c67cabd8903f19641) --- src/rgw/rgw_admin.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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; -- 2.39.5