add dc suffix to resolved dc

apache · Jul 13, 2023 · c66e655 · c66e655
1 parent 2e092b4
commit c66e655
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/java/org/apache/cassandra/locator/AzureSnitch.java b/src/java/org/apache/cassandra/locator/AzureSnitch.java
@@ -42,10 +42,10 @@ public AzureSnitch(SnitchProperties properties) throws IOException
 
     public AzureSnitch(AzureCloudConnector connector, SnitchProperties properties) throws IOException
     {
-        super(connector, properties, resolveDcAndRack(connector));
+        super(connector, properties, resolveDcAndRack(connector, properties));
     }
 
-    private static Pair<String, String> resolveDcAndRack(AzureCloudConnector connector) throws IOException
+    private static Pair<String, String> resolveDcAndRack(AzureCloudConnector connector, SnitchProperties properties) throws IOException
     {
         String response = connector.getResponse();
         JsonNode jsonNode = JsonUtils.JSON_OBJECT_MAPPER.readTree(response);
@@ -60,7 +60,9 @@ private static Pair<String, String> resolveDcAndRack(AzureCloudConnector connect
         if (location == null || location.isNull() || location.asText().isEmpty())
             datacenter = DEFAULT_DC;
         else
+        {
             datacenter = location.asText();
+        }
 
         if (zone == null || zone.isNull() || zone.asText().isEmpty())
         {
@@ -78,7 +80,7 @@ private static Pair<String, String> resolveDcAndRack(AzureCloudConnector connect
             rack = zone.asText();
         }
 
-        return Pair.create(datacenter, "rack-" + rack);
+        return Pair.create(datacenter + properties.getDcSuffix(), "rack-" + rack);
     }
 
     static class AzureCloudConnector extends AbstractCloudMetadataServiceConnector