From: Yehuda Sadeh <yehuda@inktank.com>
Date: Sun, 30 Jun 2013 03:59:34 +0000 (-0700)
Subject: rgw: relax marker requirements for log apis
X-Git-Tag: v0.67-rc1~128^2~18^2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c4140303b7ed6a5ebb9878d98a31a1b0cbea1854;p=ceph.git

rgw: relax marker requirements for log apis

Don't require start-time, start-marker.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
---

diff --git a/src/rgw/rgw_rest_log.cc b/src/rgw/rgw_rest_log.cc
index 2696940f4ed1..cb24251ac241 100644
--- a/src/rgw/rgw_rest_log.cc
+++ b/src/rgw/rgw_rest_log.cc
@@ -144,9 +144,7 @@ void RGWOp_MDLog_Delete::execute() {
     http_ret = -EINVAL;
     return;
   }
-  if ((st.empty() || et.empty()) && (start_marker.empty() || end_marker.empty())) {
-    /* need to have at least one pair, either start-time && end-time, or start-marker && end-marker
-     * */
+  if (et.empty() && end_marker.empty()) { /* bounding end */
     http_ret = -EINVAL;
     return;
   }
@@ -332,9 +330,8 @@ void RGWOp_BILog_Delete::execute() {
 
   http_ret = 0;
   if ((bucket_name.empty() && bucket_instance.empty()) ||
-      start_marker.empty() ||
       end_marker.empty()) {
-    dout(5) << "ERROR: one of bucket and bucket instance, and also start-marker, end-marker are mandatory" << dendl;
+    dout(5) << "ERROR: one of bucket and bucket instance, and also end-marker is mandatory" << dendl;
     http_ret = -EINVAL;
     return;
   }
@@ -531,9 +528,7 @@ void RGWOp_DATALog_Delete::execute() {
     http_ret = -EINVAL;
     return;
   }
-  if ((st.empty() || et.empty()) && (start_marker.empty() || end_marker.empty())) {
-    /* need to have at least one pair, either start-time && end-time, or start-marker && end-marker
-     * */
+  if (et.empty() && end_marker.empty()) { /* bounding end */
     http_ret = -EINVAL;
     return;
   }