cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [01/13] git commit: Add Cloudstack snitch
Date Sat, 03 May 2014 18:57:34 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-1.2 837bded79 -> 6f4853e78
  refs/heads/cassandra-2.0 02e0eb637 -> 3047ab638
  refs/heads/cassandra-2.1 341153526 -> b53442b20
  refs/heads/trunk 53c91426e -> 2b674656e


Add Cloudstack snitch

Patch by Pierre-Yves Ritschard, reviewed by brandonwilliams for
CASSANDRA-7147


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6f4853e7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f4853e7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f4853e7

Branch: refs/heads/cassandra-1.2
Commit: 6f4853e78a289c5fd55c523290309b6e87f2014b
Parents: 837bded
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Sat May 3 13:43:40 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Sat May 3 13:43:40 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../cassandra/locator/CloudstackSnitch.java     | 187 +++++++++++++++++++
 .../cassandra/locator/CloudstackSnitchTest.java | 111 +++++++++++
 3 files changed, 299 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f4853e7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1c67331..484f4bd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 1.2.17
+ * Add Cloudstack snitch (CASSANDRA-7147)
  * Update system.peers correctly when relocating tokens (CASSANDRA-7126)
  * Add Google Compute Engine snitch (CASSANDRA-7132)
  * Fix nodetool display with vnodes (CASSANDRA-7082)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f4853e7/src/java/org/apache/cassandra/locator/CloudstackSnitch.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/CloudstackSnitch.java b/src/java/org/apache/cassandra/locator/CloudstackSnitch.java
new file mode 100644
index 0000000..6d06556
--- /dev/null
+++ b/src/java/org/apache/cassandra/locator/CloudstackSnitch.java
@@ -0,0 +1,187 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cassandra.locator;
+
+import java.io.InputStream;
+import java.io.BufferedInputStream;
+import java.io.FilterInputStream;
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.File;
+import java.net.HttpURLConnection;
+import java.net.InetAddress;
+import java.net.URL;
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.apache.cassandra.db.SystemTable;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.gms.ApplicationState;
+import org.apache.cassandra.gms.EndpointState;
+import org.apache.cassandra.gms.Gossiper;
+import org.apache.cassandra.io.util.FileUtils;
+import org.apache.cassandra.utils.FBUtilities;
+
+/**
+ * A snitch that assumes a Cloudstack Zone follows the typical convention
+ * <country>-<location>-<availability zone> and uses the country/location
+ * tuple as a datacenter and the availability zone as a rack
+ */
+
+public class CloudstackSnitch extends AbstractNetworkTopologySnitch
+{
+    protected static final Logger logger = LoggerFactory.getLogger(CloudstackSnitch.class);
+    protected static final String ZONE_NAME_QUERY_URI = "/latest/meta-data/availability-zone";
+
+    private Map<InetAddress, Map<String, String>> savedEndpoints;
+
+    private static final String DEFAULT_DC = "UNKNOWN-DC";
+    private static final String DEFAULT_RACK = "UNKNOWN-RACK";
+    private static final String[] LEASE_FILES = {
+        "file:///var/lib/dhcp/dhclient.eth0.leases",
+        "file:///var/lib/dhclient/dhclient.eth0.leases"
+    };
+
+    protected String csZoneDc;
+    protected String csZoneRack;
+
+    public CloudstackSnitch() throws IOException, ConfigurationException
+    {
+        String endpoint = csMetadataEndpoint();
+        String zone = csQueryMetadata(endpoint + ZONE_NAME_QUERY_URI);
+        String zone_parts[] = zone.split("-");
+
+        if (zone_parts.length != 3) {
+            throw new ConfigurationException("CloudstackSnitch cannot handle invalid zone
format: " + zone);
+        }
+        csZoneDc = zone_parts[0] + "-" + zone_parts[1];
+        csZoneRack = zone_parts[2];
+    }
+
+    public String getRack(InetAddress endpoint)
+    {
+        if (endpoint.equals(FBUtilities.getBroadcastAddress()))
+            return csZoneRack;
+        EndpointState state = Gossiper.instance.getEndpointStateForEndpoint(endpoint);
+        if (state == null || state.getApplicationState(ApplicationState.RACK) == null) {
+            if (savedEndpoints == null)
+                savedEndpoints = SystemTable.loadDcRackInfo();
+            if (savedEndpoints.containsKey(endpoint))
+                return savedEndpoints.get(endpoint).get("rack");
+            return DEFAULT_RACK;
+        }
+        return state.getApplicationState(ApplicationState.RACK).value;
+    }
+
+    public String getDatacenter(InetAddress endpoint)
+    {
+        if (endpoint.equals(FBUtilities.getBroadcastAddress()))
+            return csZoneDc;
+        EndpointState state = Gossiper.instance.getEndpointStateForEndpoint(endpoint);
+        if (state == null || state.getApplicationState(ApplicationState.DC) == null) {
+            if (savedEndpoints == null)
+                savedEndpoints = SystemTable.loadDcRackInfo();
+            if (savedEndpoints.containsKey(endpoint))
+                return savedEndpoints.get(endpoint).get("data_center");
+            return DEFAULT_DC;
+        }
+        return state.getApplicationState(ApplicationState.DC).value;
+    }
+
+    String csQueryMetadata(String url) throws ConfigurationException, IOException
+    {
+        HttpURLConnection conn = null;
+        BufferedInputStream is = null;
+
+        try {
+            conn = (HttpURLConnection) new URL(url).openConnection();
+        } catch (Exception e) {
+            throw new ConfigurationException("CloudstackSnitch cannot query wrong metadata
URL: " + url);
+        }
+        try {
+            conn.setRequestMethod("GET");
+            if (conn.getResponseCode() != 200) {
+                throw new ConfigurationException("CloudstackSnitch was unable to query metadata.");
+            }
+
+            int cl = conn.getContentLength();
+            byte[] b = new byte[cl];
+            is = new BufferedInputStream(conn.getInputStream());
+            is.read(b, 0, cl);
+            return new String(b, StandardCharsets.UTF_8);
+        } finally {
+            FileUtils.close(is);
+            conn.disconnect();
+        }
+
+    }
+
+    String csMetadataEndpoint() throws ConfigurationException
+    {
+        for (String lease_uri: LEASE_FILES) {
+            try {
+                File lease_file = new File(new URI(lease_uri));
+                if (lease_file.exists()) {
+                    return csEndpointFromLease(lease_file);
+                }
+
+            } catch (Exception e) {
+                continue;
+            }
+
+
+        }
+
+        throw new ConfigurationException("No valid DHCP lease file could be found.");
+    }
+
+    String csEndpointFromLease(File lease) throws ConfigurationException, IOException
+    {
+        BufferedReader reader = null;
+
+        String line = null;
+        String endpoint = null;
+        Pattern identifierPattern = Pattern.compile("^[ \t]*option dhcp-server-identifier
(.*);$");
+
+        try {
+            reader = new BufferedReader(new FileReader(lease));
+        } catch (Exception e) {
+            throw new ConfigurationException("CloudstackSnitch cannot access lease file.");
+        }
+
+        while ((line = reader.readLine()) != null) {
+            Matcher matcher = identifierPattern.matcher(line);
+
+            if (matcher.find()) {
+                endpoint = matcher.group(1);
+            }
+        }
+
+        if (endpoint == null) {
+            throw new ConfigurationException("No metadata server could be found in lease
file.");
+        }
+
+        return "http://" + endpoint;
+    }
+}

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f4853e7/test/unit/org/apache/cassandra/locator/CloudstackSnitchTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/locator/CloudstackSnitchTest.java b/test/unit/org/apache/cassandra/locator/CloudstackSnitchTest.java
new file mode 100644
index 0000000..7e483a9
--- /dev/null
+++ b/test/unit/org/apache/cassandra/locator/CloudstackSnitchTest.java
@@ -0,0 +1,111 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cassandra.locator;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Map;
+
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import org.apache.cassandra.SchemaLoader;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.gms.ApplicationState;
+import org.apache.cassandra.gms.Gossiper;
+import org.apache.cassandra.gms.VersionedValue;
+import org.apache.cassandra.net.MessagingService;
+import org.apache.cassandra.net.OutboundTcpConnectionPool;
+import org.apache.cassandra.service.StorageService;
+
+import static org.junit.Assert.assertEquals;
+
+public class CloudstackSnitchTest
+{
+    private static String az;
+
+    @BeforeClass
+    public static void setup() throws Exception
+    {
+        SchemaLoader.mkdirs();
+        SchemaLoader.cleanup();
+        StorageService.instance.initServer(0);
+
+    }
+
+    private class TestCloudstackSnitch extends CloudstackSnitch
+    {
+        public TestCloudstackSnitch() throws IOException, ConfigurationException
+        {
+            super();
+        }
+
+        @Override
+        String csMetadataEndpoint() throws ConfigurationException
+        {
+            return "";
+        }
+
+        @Override
+        String csQueryMetadata(String endpoint) throws IOException, ConfigurationException
+        {
+            return az;
+        }
+    }
+
+    @Test
+    public void testRacks() throws IOException, ConfigurationException
+    {
+        az = "ch-gva-1";
+        CloudstackSnitch snitch = new TestCloudstackSnitch();
+        InetAddress local = InetAddress.getByName("127.0.0.1");
+        InetAddress nonlocal = InetAddress.getByName("127.0.0.7");
+
+        Gossiper.instance.addSavedEndpoint(nonlocal);
+        Map<ApplicationState,VersionedValue> stateMap = Gossiper.instance.getEndpointStateForEndpoint(nonlocal).getApplicationStateMap();
+        stateMap.put(ApplicationState.DC, StorageService.instance.valueFactory.datacenter("ch-zrh"));
+        stateMap.put(ApplicationState.RACK, StorageService.instance.valueFactory.rack("2"));
+
+        assertEquals("ch-zrh", snitch.getDatacenter(nonlocal));
+        assertEquals("2", snitch.getRack(nonlocal));
+
+        assertEquals("ch-gva", snitch.getDatacenter(local));
+        assertEquals("1", snitch.getRack(local));
+
+    }
+
+    @Test
+    public void testNewRegions() throws IOException, ConfigurationException
+    {
+        az = "ch-gva-1";
+        CloudstackSnitch snitch = new TestCloudstackSnitch();
+        InetAddress local = InetAddress.getByName("127.0.0.1");
+
+        assertEquals("ch-gva", snitch.getDatacenter(local));
+        assertEquals("1", snitch.getRack(local));
+    }
+
+    @AfterClass
+    public static void tearDown()
+    {
+        StorageService.instance.stopClient();
+    }
+}


Mime
View raw message