]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #32132 into master
authorSage Weil <sage@redhat.com>
Tue, 10 Dec 2019 14:49:52 +0000 (08:49 -0600)
committerSage Weil <sage@redhat.com>
Tue, 10 Dec 2019 14:49:52 +0000 (08:49 -0600)
* refs/pull/32132/head:
osd/OSDMap: rename old calc_pg_role -> calc_pg_role_broken
osd/OSDMap: remove dead osd_is_valid_op_target
osd/OSDMap: fix get_pg_acting_role()
osd: use spg_t for pending_creates_from_osd
osd/OSDMap: drop unused get_pg_acting_role()
osd/OSDMap: fix+simplify is_up_acting_osd_shard
osd: use new and improved calc_pg_role()
osd/OSDMap: new calc_pg_role() that takes a pg_shard_t
osd/OSDMap: calc_pg_rank -> calc_pg_role
osd/PeeringState: debug lines for upacting_features, proc_lease
osd/PeeringState: use pg_vector_string for operator<<

Reviewed-by: Samuel Just <sjust@redhat.com>
1  2 
src/osd/OSD.cc
src/osd/OSD.h

diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge