address review

elastic · Oct 22, 2019 · 2cb7834 · 2cb7834
1 parent 937e132
commit 2cb7834
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java b/server/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java
@@ -63,7 +63,7 @@ public class OperationRouting {
 
     public OperationRouting(Settings settings, ClusterSettings clusterSettings) {
         // whether to ignore awareness attributes when routing requests
-        final boolean ignoreAwarenessAttr = parseBoolean(System.getProperty(IGNORE_AWARENESS_ATTRIBUTES_PROPERTY), false);
+        boolean ignoreAwarenessAttr = parseBoolean(System.getProperty(IGNORE_AWARENESS_ATTRIBUTES_PROPERTY), false);
         if (ignoreAwarenessAttr == false) {
             awarenessAttributes = AwarenessAllocationDecider.CLUSTER_ROUTING_ALLOCATION_AWARENESS_ATTRIBUTE_SETTING.get(settings);
             if (awarenessAttributes.isEmpty() == false) {
@@ -88,10 +88,13 @@ List<String> getAwarenessAttributes() {
     }
 
     private void setAwarenessAttributes(List<String> awarenessAttributes) {
-        if (this.awarenessAttributes.isEmpty() && awarenessAttributes.isEmpty() == false) {
-            deprecationLogger.deprecated(IGNORE_AWARENESS_ATTRIBUTES_DEPRECATION_MESSAGE);
+        boolean ignoreAwarenessAttr = parseBoolean(System.getProperty(IGNORE_AWARENESS_ATTRIBUTES_PROPERTY), false);
+        if (ignoreAwarenessAttr == false) {
+            if (this.awarenessAttributes.isEmpty() && awarenessAttributes.isEmpty() == false) {
+                deprecationLogger.deprecated(IGNORE_AWARENESS_ATTRIBUTES_DEPRECATION_MESSAGE);
+            }
+            this.awarenessAttributes = awarenessAttributes;
         }
-        this.awarenessAttributes = awarenessAttributes;
     }
 
     public ShardIterator indexShards(ClusterState clusterState, String index, String id, @Nullable String routing) {