Browse Source

Fix leftover node attributes usage

Previously node attributes could be set via node.* but this now requires
using node.attr.*. This commit fixes some leftover usages of the old
way.
Jason Tedor 9 years ago
parent
commit
b456823434

+ 1 - 1
core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java

@@ -49,7 +49,7 @@ import org.elasticsearch.common.settings.Settings;
  * To enable allocation awareness in this example nodes should contain a value
  * for the <tt>rack_id</tt> key like:
  * <pre>
- * node.rack_id:1
+ * node.attr.rack_id:1
  * </pre>
  * <p>
  * Awareness can also be used to prevent over-allocation in the case of node or

+ 1 - 1
distribution/src/main/resources/config/elasticsearch.yml

@@ -24,7 +24,7 @@
 #
 # Add custom attributes to the node:
 #
-#node.rack: r1
+#node.attr.rack: r1
 #
 # ----------------------------------- Paths ------------------------------------
 #

+ 1 - 1
docs/reference/cluster.asciidoc

@@ -22,7 +22,7 @@ curl localhost:9200/_nodes/10.0.0.*
 # Names
 curl localhost:9200/_nodes/node_name_goes_here
 curl localhost:9200/_nodes/node_name_goes_*
-# Attributes (set something like node.rack: 2 in the config)
+# Attributes (set something like node.attr.rack: 2 in the config)
 curl localhost:9200/_nodes/rack:2
 curl localhost:9200/_nodes/ra*:2
 curl localhost:9200/_nodes/ra*:2*

+ 1 - 1
rest-api-spec/src/main/resources/rest-api-spec/test/README.asciidoc

@@ -10,7 +10,7 @@ Elasticsearch as follows:
 
 [source,sh]
 ---------------------
-bin/elasticsearch --script.inline true --node.testattr test --path.repo /tmp --repositories.url.allowed_urls 'http://snapshot.*'
+bin/elasticsearch --script.inline true --node.attr.testattr test --path.repo /tmp --repositories.url.allowed_urls 'http://snapshot.*'
 ---------------------
 
 =======================================