honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove assertion for cluster name in data path 

This commit removes an assertion regarding removing the support for
cluster name being part of the data path in favor of a tracking issue.

Relates #20391
This commit is contained in:
Jason Tedor 2016-09-08 13:08:44 -04:00
parent 100cdf0ba9
commit ef2ff1aeab
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/elasticsearch/bootstrap/Security.java
View File

@ -258,7 +258,7 @@ final class Security {
addPath(policy, Environment.PATH_DATA_SETTING.getKey(), path, "read,readlink,write,delete"); addPath(policy, Environment.PATH_DATA_SETTING.getKey(), path, "read,readlink,write,delete");
} }
// TODO: this should be removed in ES 6.0! We will no longer support data paths with the cluster as a folder // TODO: this should be removed in ES 6.0! We will no longer support data paths with the cluster as a folder
assert Version.CURRENT.major < 6 : "cluster name is no longer used in data path"; // https://github.com/elastic/elasticsearch/issues/20391
for (Path path : environment.dataWithClusterFiles()) { for (Path path : environment.dataWithClusterFiles()) {
addPathIfExists(policy, Environment.PATH_DATA_SETTING.getKey(), path, "read,readlink,write,delete"); addPathIfExists(policy, Environment.PATH_DATA_SETTING.getKey(), path, "read,readlink,write,delete");
} }