]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cls_journal: permit empty client id string
authorJason Dillaman <dillaman@redhat.com>
Sat, 11 Jul 2015 02:55:21 +0000 (22:55 -0400)
committerJason Dillaman <dillaman@redhat.com>
Fri, 6 Nov 2015 01:42:41 +0000 (20:42 -0500)
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
src/cls/journal/cls_journal.cc

index 512471adcf140d533f712f6fb476d9994a239f77..90f0eaa729e46b491d869ec1d773e99e48a5531a 100644 (file)
@@ -459,7 +459,9 @@ int journal_client_list(cls_method_context_t hctx, bufferlist *in,
   }
 
   std::string last_read;
-  key_from_client_id(start_after, &last_read);
+  if (!start_after.empty()) {
+    key_from_client_id(start_after, &last_read);
+  }
 
   std::map<std::string, bufferlist> vals;
   int r = cls_cxx_map_get_vals(hctx, last_read, HEADER_KEY_CLIENT_PREFIX,