Skip to content

/ceph

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mimic: osd: report omap/data/metadata usage #28852

Merged
merged 11 commits into from Jul 15, 2019

Conversation

@jdurgin
Copy link
Member

jdurgin commented Jul 3, 2019

Fixes: http://tracker.ceph.com/issues/40639
liewegas added 11 commits Apr 9, 2018
@liewegas @jdurgin
osd: re-add get_num_pgs()
7f6bfb2 
We removed this but it's a useful accessor.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit b116d21)
@liewegas @jdurgin
osd/osd_types: separate accounting for data, omap, and metadata
b1e0ffb 
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit fa120ce)

Conflicts:
	src/os/bluestore/BlueStore.cc
	src/test/objectstore/store_test.cc

Trivial - gconf and ceph_assert
@liewegas @jdurgin
osd: drop useless OSDService::update_osd_stat()
9d32ae4 
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit a66f8bf)
@liewegas @jdurgin
osd: decouple statfs update from hb peers, pg count
47a7c4d 
These don't need to be updated in synchrony.  (In fact, the statfs update
could be much more infrequent.)

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 71d8fe7)
@liewegas @jdurgin
kv: add per-prefix space estimation
4137ecb 
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit c6da00b)
@liewegas @jdurgin
os/bluestore/BlueFS: drop get_fs_usage(); add get_used()
d842563 
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 52cfc50)
@liewegas @jdurgin
os/bluestore: report omap and internal metadata usage
6920dc4 
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit fc5561e)
@liewegas @jdurgin
osd/OSDMap: include data, omap in 'osd df' output
8259cab 
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 13295a3)
@liewegas @jdurgin
os/ObjectMap: add get_db() accessor
8e95904 
This is just to let us get at the underlying KeyValueDB for DBObjectMap.
It is not really better or worse than adding accessors for things like
GetEstimatedSize() to ObjectMap.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 6c82e66)
@liewegas @jdurgin
os/filestore: estimate omap_allocated
99fb4a0 
Assume all of leveldb/rocksdb is omap.  This is an overestimate, but
better than nothing.

We don't populate the metadata overhead (no easy way to calculate this
that comes to mind).  And we don't populate the compression-related
fields.  It's possible we could make something up here in the VDO
case...

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 186edca)
@liewegas @jdurgin
os/bluestore: factor VDO into bluestore's 'allocated' value
Loading status checks…
fed965c 
If we are on VDO, report the *raw* storage we've allocated, as reported
by VDO.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 04b4793)
@jdurgin jdurgin added the core label Jul 3, 2019
@jdurgin jdurgin added this to the mimic milestone Jul 3, 2019
@jdurgin jdurgin requested a review from liewegas Jul 3, 2019
@yuriw

This comment has been minimized.

Sign in to view
Copy link
Contributor

yuriw commented Jul 11, 2019

wip-yuri2-testing-2019-07-11-1516-mimic
@neha-ojha
neha-ojha approved these changes Jul 15, 2019
View changes
@yuriw yuriw merged commit 33c1f15 into ceph:mimic Jul 15, 2019
4 checks passed
4 checks passed
Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neha-ojha neha-ojha

@liewegas liewegas

Assignees
No one assigned
Labels
core mimic-batch-1 needs-qa wip-yuri2-testing
Projects
None yet
Milestone
  mimic
5 participants
@jdurgin @yuriw @neha-ojha @smithfarm @liewegas
You can’t perform that action at this time.