Bugfixes for settings-related API calls. #5
Merged
Conversation
This file contains hidden or 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
Starting with Elasticsearch 1.0 (probably), the previously
flat settings dictionaries returned by the /_settings and
/_cluster/settings endpoints became nested, i.e. instead of
getting back
{
"transient": {
"cluster.routing.allocation.disable_allocation": "false"
}
}
we get
{
"transient": {
"cluster": {
"routing": {
"allocation": {
"disable_allocation": "false"
}
}
}
}
}
which causes us to not recognize what settings we have, leading to
a failing assertion. We now try both ways of accessing the settings
dictionaries to remain compatible with both Elasticsearch 0.x and 1.x.
Closes bug anchor#4.
Previously, if no indexes had the disable_flush option set to any value at all (i.e. get_index_translog_disable_flush() only returned 'unknown' values), flushing_disabled() would return 'enabled' instead of 'unknown' because of the fallback when there was only one unique state value. This commit rewrites that logic so that it's easier to follow, if a bit less efficient.
|
Wasn't sure if you preferred this as one or two PRs. Would be happy to split them up. |
|
Thanks. One PR is fine - the important thing is that the commits are separate. |
olorin
added a commit
that referenced
this pull request
May 18, 2015
Bugfixes for settings-related API calls.
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.