]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
objecter: append list of returned objects in pool listing
authorYehuda Sadeh <yehuda@redhat.com>
Wed, 8 Feb 2017 23:31:15 +0000 (15:31 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Wed, 15 Feb 2017 23:28:55 +0000 (15:28 -0800)
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>
src/osdc/Objecter.cc

index d83bcf17b50a330b81d20439ba8515e7702ccf4f..9f20843b4ae0ff0766f1a206b8924966ad0ed73c 100644 (file)
@@ -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) {