Merge branch 'wip-11786'

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Joao Eduardo Luis 2015-07-16 16:44:22 +01:00
commit f735a9905c

View File

@ -448,12 +448,14 @@ class MonitorDBStore
virtual pair<string,string> get_next_key() { virtual pair<string,string> get_next_key() {
assert(iter->valid()); assert(iter->valid());
for (; iter->valid(); iter->next()) {
pair<string,string> r = iter->raw_key(); pair<string,string> r = iter->raw_key();
do { if (sync_prefixes.count(r.first) > 0)
iter->next();
} while (iter->valid() && sync_prefixes.count(iter->raw_key().first) == 0);
return r; return r;
} }
return pair<string,string>();
}
virtual bool _is_valid() { virtual bool _is_valid() {
return iter->valid(); return iter->valid();