Przeglądaj źródła

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
Jason Tedor 9 lat temu
rodzic
commit
ef2ff1aeab

+ 1 - 1
core/src/main/java/org/elasticsearch/bootstrap/Security.java

@@ -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");
         }
         }