From: Jason Dillaman <dillaman@redhat.com>
Date: Sat, 11 Jul 2015 02:55:21 +0000 (-0400)
Subject: cls_journal: permit empty client id string
X-Git-Tag: v10.0.1~102^2~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e7d4f7b394c86beeda6adbf036782fade712c1dd;p=ceph.git

cls_journal: permit empty client id string

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/cls/journal/cls_journal.cc b/src/cls/journal/cls_journal.cc
index 512471adcf140..90f0eaa729e46 100644
--- a/src/cls/journal/cls_journal.cc
+++ b/src/cls/journal/cls_journal.cc
@@ -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,