RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-20 17:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28461 from tchaikov/wip-cmake-pg-meta-set

Browse Source 
crimson/osd/pg_meta: use initializer list for passing set<>

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
This commit is contained in:
Kefu Chai 2019-06-09 19:46:41 +08:00 committed by GitHub
commit 2394f0cc38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/crimson/osd/pg_meta.cc
View File

@ -32,11 +32,10 @@ namespace {
seastar::future<epoch_t> PGMeta::get_epoch()
{
auto ch = store->open_collection(coll_t{pgid});
std::set<std::string> keys{infover_key.data(),
epoch_key.data()};
return store->omap_get_values(ch,
pgid.make_pgmeta_oid(),
keys).then(
{string{infover_key},
string{epoch_key}}).then(
[](auto&& values) {
{
// sanity check
@ -57,13 +56,12 @@ seastar::future<epoch_t> PGMeta::get_epoch()
seastar::future<pg_info_t, PastIntervals> PGMeta::load()
{
auto ch = store->open_collection(coll_t{pgid});
std::set<std::string> keys{infover_key.data(),
info_key.data(),
biginfo_key.data(),
fastinfo_key.data()};
return store->omap_get_values(ch,
pgid.make_pgmeta_oid(),
keys).then(
{string{infover_key},
string{info_key},
string{biginfo_key},
string{fastinfo_key}}).then(
[this](auto&& values) {
{
// sanity check