diff options
| author | Yehuda Sadeh <yehuda@redhat.com> | 2014-12-03 23:40:13 +0100 |
|---|---|---|
| committer | Yehuda Sadeh <yehuda@redhat.com> | 2015-01-14 04:21:26 +0100 |
| commit | a2c3680bd1fb6fef903689e4b06ab4249406009c (patch) | |
| tree | 59eb8a5b60cb1d12c59e00b7b70d690983bbde60 /src/cls | |
| parent | rgw: bucket_index_shard_hash_type fixes (diff) | |
| download | ceph-a2c3680bd1fb6fef903689e4b06ab4249406009c.tar.xz ceph-a2c3680bd1fb6fef903689e4b06ab4249406009c.zip | |
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>
Diffstat (limited to 'src/cls')
| -rw-r--r-- | src/cls/rgw/cls_rgw.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/cls/rgw/cls_rgw.cc b/src/cls/rgw/cls_rgw.cc index eb4a4232d18..6198d62810b 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; |