osd/OSDMonitor: misc. fixes #10491
Merged
osd/OSDMonitor: misc. fixes #10491
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
…grained If the specified osd is not down or doesn't exist, we shall return error instead of success. So caller can abort(if does not exist) or mark osd as down and retry(if not down). Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
|
@tchaikov Can you please help to confirm this one too? Thanks! |
| @@ -628,7 +628,7 @@ COMMAND("osd erasure-code-profile ls", \ | |||
| "list all erasure code profiles", \ | |||
| "osd", "r", "cli,rest") | |||
| COMMAND("osd set " \ | |||
| "name=key,type=CephChoices,strings=full|pause|noup|nodown|noout|noin|nobackfill|norebalance|norecover|noscrub|nodeep-scrub|notieragent|sortbitwise|require_jewel_osds", \ | |||
| "name=key,type=CephChoices,strings=full|pause|noup|nodown|noout|noin|nobackfill|norebalance|norecover|noscrub|nodeep-scrub|notieragent|sortbitwise|require_jewel_osds|require_kraken_osds", \ | |||
There was a problem hiding this comment.
probably you can reference this line: https://github.com/ceph/ceph/blob/9bef6cf/src/mon/OSDMonitor.cc#L6355, in the commit message.
i am not able to identify the piece of code referenced by #9248 (comment) anymore.
There was a problem hiding this comment.
Sorry, I am trying to add a reference for why this change is necessary.
Will remove that later.
For newly created cluster the CEPH_OSDMAP_REQUIRE_KRAKEN will be automatically set, while for existing clusters it will not. This change add "require_jewel_osds" to white list, so user can access it by the "ceph osd set *" command family. Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
We shall check CEPH_FEATURE_SERVER_JEWEL carried by osd_features of MOSDBoot message, as it will be properly filled by every OSD during OSD::_send_boot() process. Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
xiexingguo
force-pushed
the
xxg-wip-osdmon-2016-07-28
branch
from
b0cbcaf
to
2ead847
Compare
|
lgtm. |
|
retest this please |
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.
No description provided.