xie xingguo [Tue, 5 Mar 2019 06:28:59 +0000 (14:28 +0800)]
mgr: 'osd df' by specified class or (crush) name
For large clusters, we use device classes to isolate storage pools.
The existing 'osd df' output turns out to be too nosiy, say, if
you care about only single storage pool with osds possibly spanning over
all hosts.
With this change you are now being able to do 'osd df' by class (or by pool,
if you simply use classes to separate different pools), or by a specified
crush bucket name you are currently interested in, which is much more
convenient.
Some examples:
```
$ bin/ceph osd df tree
ID CLASS WEIGHT REWEIGHT SIZE RAW USE DATA OMAP META AVAIL %USE VAR PGS STATUS TYPE NAME
-1 0.05878 - 60 GiB 6.4 GiB 23 MiB 0 B 6 GiB 54 GiB 10.60 1.00 - root default
-3 0.02939 - 30 GiB 3.2 GiB 12 MiB 0 B 3 GiB 27 GiB 10.60 1.00 - host ceph11
3 aaa 0.00980 1.00000 10 GiB 1.1 GiB 3.9 MiB 0 B 1 GiB 9.0 GiB 10.60 1.00 56 up osd.3
4 bbb 0.00980 1.00000 10 GiB 1.1 GiB 3.9 MiB 0 B 1 GiB 9.0 GiB 10.60 1.00 58 up osd.4
5 ccc 0.00980 1.00000 10 GiB 1.1 GiB 3.9 MiB 0 B 1 GiB 9.0 GiB 10.60 1.00 60 up osd.5
-5 0.02939 - 30 GiB 3.2 GiB 12 MiB 0 B 3 GiB 27 GiB 10.60 1.00 - host ceph12
0 aaa 0.00980 1.00000 10 GiB 1.1 GiB 3.9 MiB 0 B 1 GiB 9.0 GiB 10.60 1.00 50 up osd.0
1 bbb 0.00980 1.00000 10 GiB 1.1 GiB 3.9 MiB 0 B 1 GiB 9.0 GiB 10.60 1.00 61 up osd.1
2 ccc 0.00980 1.00000 10 GiB 1.1 GiB 3.9 MiB 0 B 1 GiB 9.0 GiB 10.60 1.00 51 up osd.2
TOTAL 60 GiB 6.4 GiB 23 MiB 0 B 6 GiB 54 GiB 10.60
MIN/MAX VAR: 1.00/1.00 STDDEV: 0
$ bin/ceph osd df tree class aaa
ID CLASS WEIGHT REWEIGHT SIZE RAW USE DATA OMAP META AVAIL %USE VAR PGS STATUS TYPE NAME
-1 0.05878 - 20 GiB 2.1 GiB 7.8 MiB 0 B 2 GiB 18 GiB 10.60 1.00 - root default
-3 0.02939 - 10 GiB 1.1 GiB 3.9 MiB 0 B 1 GiB 9.0 GiB 10.60 1.00 - host ceph11
3 aaa 0.00980 1.00000 10 GiB 1.1 GiB 3.9 MiB 0 B 1 GiB 9.0 GiB 10.60 1.00 56 up osd.3
-5 0.02939 - 10 GiB 1.1 GiB 3.9 MiB 0 B 1 GiB 9.0 GiB 10.60 1.00 - host ceph12
0 aaa 0.00980 1.00000 10 GiB 1.1 GiB 3.9 MiB 0 B 1 GiB 9.0 GiB 10.60 1.00 50 up osd.0
TOTAL 20 GiB 2.1 GiB 7.8 MiB 0 B 2 GiB 18 GiB 10.60
MIN/MAX VAR: 1.00/1.00 STDDEV: 0
$ bin/ceph osd df tree name ceph11
ID CLASS WEIGHT REWEIGHT SIZE RAW USE DATA OMAP META AVAIL %USE VAR PGS STATUS TYPE NAME
-3 0.02939 - 30 GiB 3.2 GiB 12 MiB 0 B 3 GiB 27 GiB 10.60 1.00 - host ceph11
3 aaa 0.00980 1.00000 10 GiB 1.1 GiB 3.9 MiB 0 B 1 GiB 9.0 GiB 10.60 1.00 56 up osd.3
4 bbb 0.00980 1.00000 10 GiB 1.1 GiB 3.9 MiB 0 B 1 GiB 9.0 GiB 10.60 1.00 58 up osd.4
5 ccc 0.00980 1.00000 10 GiB 1.1 GiB 3.9 MiB 0 B 1 GiB 9.0 GiB 10.60 1.00 60 up osd.5
TOTAL 30 GiB 3.2 GiB 12 MiB 0 B 3 GiB 27 GiB 10.60
MIN/MAX VAR: 1.00/1.00 STDDEV: 0
Sage Weil [Fri, 1 Mar 2019 20:36:35 +0000 (14:36 -0600)]
Merge PR #26692 into master
* refs/pull/26692/head:
test/test_ipaddr: added test for pick_address when ipv4 and ipv6 are enabled
common/pick_address: improves log message when no IP is found
pick_address: error out in dual stack mode if both addr types cannot be provided
* refs/pull/26638/head:
doc: update documentation for standby-replay
qa: update discontinous map test to use mds freezing
mon: add freeze MDS command
qa: update testing for standby-replay
mon: add setting for fs to enable standby-replay
ceph-mds: obsolete hot-standby option
fs: obsolete standby_for config options
messages/MMDSBeacon: use inline init
mds: avoid unnecessary copy of entity_addrvec_t
mds: use inline init for mds_info_t
mds: use rank from MDSMap always
mds: remove obsolete comment
qa: use SIGTERM when stopping vstart service
Reviewed-by: Sage Weil <sage@redhat.com> Reviewed-by: Zheng Yan <zyan@redhat.com>
Sage Weil [Fri, 1 Mar 2019 00:07:25 +0000 (18:07 -0600)]
Merge PR #26667 into master
* refs/pull/26667/head:
cmake: link rgw tests with ${rgw_libs}
cmake: link ${rgw_libs} not rgw_a and rabbitmq
cmake: move rgw tests targets down to end
Ricardo Dias [Thu, 28 Feb 2019 11:02:04 +0000 (11:02 +0000)]
pick_address: error out in dual stack mode if both addr types cannot be provided
When ms_bind_ipv4 and ms_bind_ipv6 options are enabled, if the
public_network or cluster_network settings only contain networks of a
single type (either IPv4 or IPv6) then pick_addresses function must
fail.
Fixes: http://tracker.ceph.com/issues/38307 Signed-off-by: Ricardo Dias <rdias@suse.com>
Lenz Grimmer [Thu, 28 Feb 2019 14:10:42 +0000 (15:10 +0100)]
doc: Updated Ceph Dashboard documentation
Renamed "Ceph Manager Dashboard" to "Ceph Dashboard" in
various locations, replaced "plugin" with "module".
Overhauled the feature list, added more references to configuration
instructions and related components.
Fixed capitalization of subchapters.
Added note about mixed content blocking to the Grafana section.
Removed duplicate content from the dashboard's `README.rst`,
moved some parts (supported browser list) into the documentation
instead.
Patrick Donnelly [Sun, 24 Feb 2019 18:52:05 +0000 (10:52 -0800)]
mon: add freeze MDS command
This is a new hidden command that allows us to do certain testing for race
conditions. A frozen MDS cannot change change state or be replaced by a
standby.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Fri, 22 Feb 2019 00:34:07 +0000 (16:34 -0800)]
fs: obsolete standby_for config options
The operator can no longer configure which rank/fscid/name an MDS wants to
follow or standby for. This was an unfortunately confusing set of config
options as ultimately the MDSMonitor (by default) would set a standby to follow
any fscid/rank if no standby is available that explicitly follows the failed
rank. It is suggested that operators instead use the `standby_count_wanted`
setting on each fs to ensure that sufficient standbys are available.
The temporary effect of this commit is that the MDSMonitor no longer assigns
any standby to standby-replay, to be fixed in the following commits.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Fri, 22 Feb 2019 00:05:55 +0000 (16:05 -0800)]
mds: use rank from MDSMap always
This old bit of code was using standby_for_rank to determine what rank it
should follow but, for the last few releases, the Monitor always sets the the
rank to follow.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Sage Weil [Wed, 27 Feb 2019 22:59:47 +0000 (16:59 -0600)]
Merge PR #26595 into master
* refs/pull/26595/head:
osd/PG: log tracked pg refs under debug_refs
osd/PG: include tag in get/put debug lines
osd: clean up oncommit contexts in _process shutdown
Sage Weil [Wed, 27 Feb 2019 22:59:32 +0000 (16:59 -0600)]
Merge PR #26637 into master
* refs/pull/26637/head:
common/ceph_context: experimental kludge for crimson
auth/AuthRegistry: mark 'secure' con mode experimental for now
msg/async: set ms_*_mode to crc only (no secure)
Sage Weil [Wed, 27 Feb 2019 16:25:39 +0000 (10:25 -0600)]
Merge PR #26628 into master
* refs/pull/26628/head:
msg/async: msgr2: expected tags validation
msg/async: msgr2: template specialized write function for frames
msg/async: msgr2: extract frame classes into its own header
Lenz Grimmer [Wed, 27 Feb 2019 12:49:47 +0000 (13:49 +0100)]
doc: Replaced "plugin" with "module" in the Mgr documentation
The documentation currently refers to Ceph Manager Modules as
"plugins" in many places, while the command line interface uses
"module" to enable/disable modules. Replaced all occurences
of "plugin" with "module" in the docs, to avoid confusion and to
be in alignment with the CLI. Also fixed the capitalizations of some
module chapters.
Brad Hubbard [Wed, 27 Feb 2019 06:01:45 +0000 (16:01 +1000)]
tools/ceph_kvstore_tool: Move summary output to print_summary
Post 301a64212f0a38a3b5db4bd1bd0f15e26ff055cf we are still seeing an ICE
in the copy_store_to code. Moving the summary printing to its own
function alleviates the issue.
Changcheng Liu [Wed, 27 Feb 2019 01:24:15 +0000 (09:24 +0800)]
doc: change ruleset to id in crush map file
ruleset is not used after merging below patch
commit f9a095deb1e74642d88bc9015684b0be113cc5f9
crush: s/ruleset/id/ in decompiled output
Moving away from the 'ruleset' terminology.
Signed-off-by: Changcheng Liu <changcheng.liu@intel.com>
projects / ceph.git / log