rgw: set sync_from_all as true when no value is seen #18926
Merged
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
cbodley
reviewed
Nov 14, 2017
src/rgw/rgw_json_enc.cc
Outdated
| @@ -987,7 +987,9 @@ void RGWZone::decode_json(JSONObj *obj) | |||
| JSONDecoder::decode_json("bucket_index_max_shards", bucket_index_max_shards, obj); | |||
| JSONDecoder::decode_json("read_only", read_only, obj); | |||
| JSONDecoder::decode_json("tier_type", tier_type, obj); | |||
| JSONDecoder::decode_json("sync_from_all", sync_from_all, obj); | |||
| if (false == JSONDecoder::decode_json("sync_from_all", sync_from_all, obj)){ | |||
There was a problem hiding this comment.
JSONDecoder has another overload that takes a default_val that looks perfect for this. see https://github.com/ceph/ceph/blob/master/src/common/ceph_json.h#L125
JSONDecoder::decode_json("sync_from_all", sync_from_all, true, obj);(if that doesn't compile, we might need to change the T& default_val arg to const T& default_val in that overload)
In order to support jewel-luminous multisite scenarios where when a jewel cluster is the master, the sync-from-all json field wouldn't be set leading to the secondary not syncing data as this value can't be overriden to true, so defaulting the value of sync_from_all to true when we don't encounter it in the json Fixes: http://tracker.ceph.com/issues/22062 Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
theanalyst
force-pushed
the
wip-mp-jewel-fix
branch
from
2e61fe7
to
e0116fa
Compare
cbodley
approved these changes
Nov 14, 2017
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.
In order to support jewel-luminous multisite scenarios where when a
jewel cluster is the master, the sync-from-all json field wouldn't be
set leading to the secondary not syncing data as this value can't be
overriden to true, so defaulting the value of sync_from_all to true when
we don't encounter it in the json
Fixes: http://tracker.ceph.com/issues/22062
Signed-off-by: Abhishek Lekshmanan abhishek@suse.com