mgr: fix "osd status" command exception if OSD not in pgmap stats #18173
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@jcsp pls help review. thanks! |
|
before: after:
|
jcsp
suggested changes
Oct 26, 2017
src/pybind/mgr/status/module.py
Outdated
| stats = osd_stats[osd_id] | ||
|
|
||
| osd_table.add_row([osd_id, metadata['hostname'], | ||
| self.format_bytes(stats['kb_used'] * 1024, 5), |
There was a problem hiding this comment.
it would be nicer to have a couple of variables for the kb_used/kb_avail columns, so that the overall add_row call could just be there once instead of duplicating the whole thing
| @@ -252,7 +252,7 @@ def handle_fs_status(self, cmd): | |||
| return 0, "", output | |||
|
|
|||
| def handle_osd_status(self, cmd): | |||
| osd_table = PrettyTable(['id', 'host', 'used', 'avail', 'wr ops', 'wr data', 'rd ops', 'rd data']) | |||
| osd_table = PrettyTable(['id', 'host', 'used', 'avail', 'wr ops', 'wr data', 'rd ops', 'rd data', 'state']) | |||
There was a problem hiding this comment.
I don't mind adding state, but please put it in a separate commit to the bug fix. Also, please output the state as something like ",".join(osd['state'])
There was a problem hiding this comment.
like this?
+----+--------+-------+-------+--------+---------+--------+---------+------------+
| id | host | used | avail | wr ops | wr data | rd ops | rd data | state |
+----+--------+-------+-------+--------+---------+--------+---------+------------+
| 0 | ceph14 | 1092M | 9211M | 0 | 0 | 0 | 0 | exists,up |
| 1 | ceph14 | 1092M | 9211M | 0 | 0 | 0 | 0 | exists,up |
| 2 | ceph14 | 1092M | 9211M | 0 | 0 | 0 | 0 | exists,up |
| 3 | | 0 | 0 | 0 | 0 | 0 | 0 | exists,new |
+----+--------+-------+-------+--------+---------+--------+---------+------------+Fixes: http://tracker.ceph.com/issues/21707 Signed-off-by: Yanhu Cao <gmayyyha@gmail.com>
gmayyyha
force-pushed
the
osd-status-21707
branch
from
5da12a7
to
8d5845e
Compare
jcsp
suggested changes
Nov 1, 2017
src/pybind/mgr/status/module.py
Outdated
| kb_used = stats['kb_used'] * 1024 | ||
| kb_avail = stats['kb_avail'] * 1024 | ||
|
|
||
| state = "" |
There was a problem hiding this comment.
This is the right format, but we don't need to write out a for loop like this: you can do it in one line with ",".join(osd['state'])
Signed-off-by: Yanhu Cao <gmayyyha@gmail.com>
gmayyyha
force-pushed
the
osd-status-21707
branch
from
8d5845e
to
f3475c9
Compare
|
@jcsp ping |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: http://tracker.ceph.com/issues/21707
Signed-off-by: Yanhu Cao gmayyyha@gmail.com