From: Yuval Lifshitz <ylifshit@redhat.com>
Date: Sun, 4 Apr 2021 14:19:03 +0000 (+0300)
Subject: rgw/multisite: handle case when empty marker is provided
X-Git-Tag: v17.1.0~2373^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=fccf75eee3750a3654d2a2b1e3aa379edcfd8c8d;p=ceph.git

rgw/multisite: handle case when empty marker is provided

marker is potional, however, it may also be provided empty

Fixes: https://tracker.ceph.com/issues/50135

Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
---

diff --git a/src/rgw/rgw_log_backing.h b/src/rgw/rgw_log_backing.h
index d5996049e5873..6f755efb46389 100644
--- a/src/rgw/rgw_log_backing.h
+++ b/src/rgw/rgw_log_backing.h
@@ -251,7 +251,7 @@ cursorgen(std::string_view cursor_) {
 
 inline std::pair<uint64_t, std::string_view>
 cursorgeno(std::optional<std::string_view> cursor) {
-  if (cursor) {
+  if (cursor && !cursor->empty()) {
     return cursorgen(*cursor);
   } else {
     return { 0, ""s };