-
Notifications
You must be signed in to change notification settings - Fork 24.6k
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
Remove azure deprecated settings #26099
Remove azure deprecated settings #26099
Conversation
Follow up for elastic#23405. We remove azure deprecated settings in 7.0: * The legacy azure settings which where starting with `cloud.azure.storage.` prefix have been removed. This includes `account`, `key`, `default` and `timeout`. You need to use settings which are starting with `azure.client.` prefix instead. * Global timeout setting `cloud.azure.storage.timeout` has been removed. You must set it per azure client instead. Like `azure.client.default.timeout: 10s` for example.
In master branch (7.0) we only need to have the 7.0 breaking changes. Note that we probably need to adjust the messaging in `index.asciidoc` cluster upgrades between 6.x and 7.x. Follow up for elastic#26099.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, I left a couple minor comments.
this.storageSettings = regularStorageSettings; | ||
this.deprecatedStorageSettings = new HashMap<>(); | ||
if (storageSettings.isEmpty()) { | ||
// If someone did not register any settings or deprecated settings, they |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This comment is wrong now, since there are no longer deprecated settings?
throw new IllegalArgumentException("Can not find primary/secondary client using deprecated settings. " + | ||
"Check your elasticsearch.yml."); | ||
} | ||
throw new IllegalArgumentException("Can not find named azure client [" + account + "]. Check your settings."); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we change the parameter name in this code to clientName
from account
?
# Conflicts: # docs/reference/migration/index.asciidoc # docs/reference/migration/migrate_7_0.asciidoc
…rflow * origin/master: (59 commits) Fix Lucene version of 5.6.1. Remove azure deprecated settings (elastic#26099) Handle the 5.6.0 release Allow plugins to validate cluster-state on join (elastic#26595) Remove index mapper dynamic settings (elastic#25734) update AWS SDK for ECS Task IAM support in discovery-ec2 (elastic#26479) Azure repository: Accelerate the listing of files (used in delete snapshot) (elastic#25710) Build: Remove norelease from forbidden patterns (elastic#26592) Fix reference to painless inside expression engine (elastic#26528) Build: Move javadoc linking to root build.gradle (elastic#26529) Test: Remove leftover static bwc test case (elastic#26584) Docs: Remove remaining references to file and native scripts (elastic#26580) Snapshot fallback should consider build.snapshot elastic#26496: Set the correct bwc version after backport to 6.x Fix the MapperFieldType.rangeQuery API. (elastic#26552) Deduplicate `_field_names`. (elastic#26550) [Docs] Update method setSource(byte[] source) (elastic#26561) [Docs] Fix typo in javadocs (elastic#26556) Allow multiple digits in Vagrant 2.x minor versions Support Vagrant 2.x ...
* master: (21 commits) Ensure module is bundled before installing in tests Add boolean similarity to built in similarity types (elastic#26613) [Tests] Remove skip tests in search/30_limits.yml Let search phases override max concurrent requests Add a soft limit for the number of requested doc-value fields (elastic#26574) Support for accessing Azure repositories through a proxy (elastic#23518) Add beta tag to MSI Windows Installer (elastic#26616) Fix Lucene version of 5.6.1. Remove azure deprecated settings (elastic#26099) Handle the 5.6.0 release Allow plugins to validate cluster-state on join (elastic#26595) Remove index mapper dynamic settings (elastic#25734) update AWS SDK for ECS Task IAM support in discovery-ec2 (elastic#26479) Azure repository: Accelerate the listing of files (used in delete snapshot) (elastic#25710) Build: Remove norelease from forbidden patterns (elastic#26592) Fix reference to painless inside expression engine (elastic#26528) Build: Move javadoc linking to root build.gradle (elastic#26529) Test: Remove leftover static bwc test case (elastic#26584) Docs: Remove remaining references to file and native scripts (elastic#26580) Snapshot fallback should consider build.snapshot ...
Follow up for #23405.
We remove azure deprecated settings in 7.0:
The legacy azure settings which where starting with
cloud.azure.storage.
prefix have been removed.This includes
account
,key
,default
andtimeout
.You need to use settings which are starting with
azure.client.
prefix instead.Global timeout setting
cloud.azure.storage.timeout
has been removed.You must set it per azure client instead. Like
azure.client.default.timeout: 10s
for example.Once this is merged, I'd like to come with a code simplification and put all the classes within the same package, merging some classes...
But I did not want to do it here yet.
Also, I did not remove with this commit all the 6.x breaking changes pages. This should come with another commit (I'm ok doing it).