RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14440 from liewegas/wip-status-flags

Browse Source 
osd/OSDMap: hide require_*_osd and sortbitwise flags


Reviewed-by: Josh Durgin <jdurgin@redhat.com>
This commit is contained in:
Yuri Weinstein 2017-04-17 13:34:37 -07:00 committed by GitHub
commit 287f94d0c0
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/include/rados.h
View File

@ -150,6 +150,12 @@ extern const char *ceph_osd_state_name(int s);
#define CEPH_OSDMAP_REQUIRE_KRAKEN (1<<17) /* require kraken for booting osds */
#define CEPH_OSDMAP_REQUIRE_LUMINOUS (1<<18) /* require l for booting osds */
/* these are hidden in 'ceph status' view */
#define CEPH_OSDMAP_SEMIHIDDEN_FLAGS (CEPH_OSDMAP_REQUIRE_JEWEL| \
CEPH_OSDMAP_REQUIRE_KRAKEN | \
CEPH_OSDMAP_REQUIRE_LUMINOUS | \
CEPH_OSDMAP_SORTBITWISE)
/*
* The error code to return when an OSD can't handle a write
* because it is too large.

5
src/osd/OSDMap.cc
View File

@ -2879,8 +2879,9 @@ void OSDMap::print_summary(Formatter *f, ostream& out) const
if (get_num_pg_temp())
out << "; " << get_num_pg_temp() << " remapped pgs";
out << "\n";
if (flags)
out << " flags " << get_flag_string() << "\n";
uint64_t important_flags = flags & ~CEPH_OSDMAP_SEMIHIDDEN_FLAGS;
if (important_flags)
out << " flags " << get_flag_string(important_flags) << "\n";
}
}