From: Yehuda Sadeh <yehuda@redhat.com>
Date: Wed, 3 Dec 2014 22:40:13 +0000 (-0800)
Subject: cls_rgw: list bi log should not return marker entry
X-Git-Tag: v0.92~12^2~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a2c3680bd1fb6fef903689e4b06ab4249406009c;p=ceph.git

cls_rgw: list bi log should not return marker entry

The marker should be served as a lower bound, but should not be
returned.

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

diff --git a/src/cls/rgw/cls_rgw.cc b/src/cls/rgw/cls_rgw.cc
index eb4a4232d189..6198d62810ba 100644
--- a/src/cls/rgw/cls_rgw.cc
+++ b/src/cls/rgw/cls_rgw.cc
@@ -814,8 +814,6 @@ static int bi_log_iterate_entries(cls_method_context_t hctx, const string& marke
 
   map<string, bufferlist> keys;
   string filter_prefix, end_key;
-  bufferlist start_bl;
-  bool start_key_added = false;
   uint32_t i = 0;
   string key;
 
@@ -829,10 +827,6 @@ static int bi_log_iterate_entries(cls_method_context_t hctx, const string& marke
     key.append(marker);
 
     start_key = key;
-    int ret = cls_cxx_map_get_val(hctx, start_key, &start_bl);
-    if ((ret < 0) && (ret != -ENOENT)) {
-        return ret;
-    } 
   } else {
     start_key = key_iter;
   }
@@ -856,10 +850,6 @@ static int bi_log_iterate_entries(cls_method_context_t hctx, const string& marke
     if (ret < 0)
       return ret;
 
-    if ((start_bl.length() > 0) && (!start_key_added)) {
-      keys[start_key] = start_bl;
-      start_key_added = true;
-    }
     map<string, bufferlist>::iterator iter = keys.begin();
     if (iter == keys.end())
       break;