diff options
| author | Yehuda Sadeh <yehuda@inktank.com> | 2013-06-29 20:59:34 -0700 |
|---|---|---|
| committer | Yehuda Sadeh <yehuda@inktank.com> | 2013-06-29 20:59:34 -0700 |
| commit | c4140303b7ed6a5ebb9878d98a31a1b0cbea1854 (patch) | |
| tree | dfdef6c4efd1228d48f3afeac3321e2c06911437 | |
| parent | b21a41ab5880663ccf3d35a939c6b76d1bc7f903 (diff) | |
| download | ceph-c4140303b7ed6a5ebb9878d98a31a1b0cbea1854.tar.gz | |
rgw: relax marker requirements for log apis
Don't require start-time, start-marker.
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| -rw-r--r-- | src/rgw/rgw_rest_log.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/rgw/rgw_rest_log.cc b/src/rgw/rgw_rest_log.cc index 2696940f4ed..cb24251ac24 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; } |