From: Yehuda Sadeh <yehuda@redhat.com>
Date: Wed, 8 Feb 2017 23:31:15 +0000 (-0800)
Subject: objecter: append list of returned objects in pool listing
X-Git-Tag: v12.0.1~154^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dcbf0036a6e6285d6f51733389f566733e1fb800;p=ceph.git

objecter: append list of returned objects in pool listing

Instead of merging it. The returned list is in the correct order,
whereas merging it breaks this order.

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

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index d83bcf17b50a..9f20843b4ae0 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -3626,7 +3626,7 @@ void Objecter::_nlist_reply(NListContext *list_context, int r,
 		 << ", tentative new pos " << list_context->pos << dendl;
   list_context->extra_info.append(extra_info);
   if (response_size) {
-    list_context->list.merge(response.entries);
+    list_context->list.splice(list_context->list.end(), response.entries);
   }
 
   if (list_context->list.size() >= list_context->max_entries) {