Skip to content

Commit

Permalink
Added 3 zone tests to RoutedStoreTest.java, fixed a small bug in GetA…
Browse files Browse the repository at this point in the history 
…llConfigureNodes
  • Loading branch information
Chinmay Soman committed Jun 20, 2013
1 parent c809fba commit 5f796e8
Show file tree
Hide file tree
Showing 6 changed files with 1,135 additions and 69 deletions.
6 changes: 5 additions & 1 deletion src/java/voldemort/store/routed/action/GetAllConfigureNodes.java
View file
Expand Up @@ -117,7 +117,11 @@ public void execute(Pipeline pipeline) {
}

// Add the rest
nodes.addAll(zoneIdToNode.get(this.clientZone.getId()));
List<Node> zoneIDNodeList = zoneIdToNode.get(this.clientZone.getId());
if(zoneIDNodeList != null) {
nodes.addAll(zoneIDNodeList);
}

for(int index = 0; index < proximityList.size(); index++) {
List<Node> zoneNodes = zoneIdToNode.get(proximityList.get(index));
if(zoneNodes != null)
Expand Down
24 changes: 24 additions & 0 deletions test/common/voldemort/VoldemortTestConstants.java
View file
Expand Up @@ -58,6 +58,10 @@ public static String getTwoNodeClusterXml() {
return readString("config/two-node-cluster.xml");
}

public static String getThreeNodeClusterWith3ZonesXml() {
return readString("config/three-node-cluster-with-3-zones.xml");
}

public static String getStoreWithTwoKeyVersions() {
return readString("config/store-with-two-key-versions.xml");
}
Expand All @@ -66,6 +70,18 @@ public static Cluster getTwoNodeCluster() {
return new ClusterMapper().readCluster(new StringReader(getTwoNodeClusterXml()));
}

public static Cluster getThreeNodeClusterWith3Zones() {
return new ClusterMapper().readCluster(new StringReader(getThreeNodeClusterWith3ZonesXml()));
}

public static String getSixNodeClusterWith3ZonesXml() {
return readString("config/six-node-cluster-with-3-zones.xml");
}

public static Cluster getSixNodeClusterWith3Zones() {
return new ClusterMapper().readCluster(new StringReader(getSixNodeClusterWith3ZonesXml()));
}

public static String getTenNodeClusterXml() {
return readString("config/ten-node-cluster.xml");
}
Expand All @@ -86,6 +102,10 @@ public static String getEightNodeClusterWithZonesXml() {
return readString("config/eight-node-cluster-with-zones.xml");
}

public static String getNineNodeClusterWith3ZonesXml() {
return readString("config/nine-node-cluster-with-3-zones.xml");
}

public static String getSingleStoreWithZonesXml() {
return readString("config/single-store-with-zones.xml");
}
Expand Down Expand Up @@ -114,6 +134,10 @@ public static Cluster getEightNodeClusterWithZones() {
return new ClusterMapper().readCluster(new StringReader(getEightNodeClusterWithZonesXml()));
}

public static Cluster getNineNodeClusterWith3Zones() {
return new ClusterMapper().readCluster(new StringReader(getNineNodeClusterWith3ZonesXml()));
}

private static String readString(String filename) {
try {
return IOUtils.toString(VoldemortTestConstants.class.getResourceAsStream(filename));
Expand Down
97 changes: 97 additions & 0 deletions test/common/voldemort/config/nine-node-cluster-with-3-zones.xml
View file
@@ -0,0 +1,97 @@
<?xml version="1.0"?>
<cluster>
<name>mycluster</name>
<zone>
<zone-id>0</zone-id>
<proximity-list>1,2</proximity-list>
</zone>
<zone>
<zone-id>1</zone-id>
<proximity-list>0,2</proximity-list>
</zone>
<zone>
<zone-id>2</zone-id>
<proximity-list>0,1</proximity-list>
</zone>
<server>
<id>0</id>
<host>localhost</host>
<http-port>8080</http-port>
<socket-port>6666</socket-port>
<admin-port>7666</admin-port>
<partitions>16, 3, 21</partitions>
<zone-id>0</zone-id>
</server>
<server>
<id>1</id>
<host>localhost</host>
<http-port>8081</http-port>
<socket-port>6667</socket-port>
<admin-port>7667</admin-port>
<partitions>23, 18, 13</partitions>
<zone-id>0</zone-id>
</server>
<server>
<id>2</id>
<host>localhost</host>
<http-port>8082</http-port>
<socket-port>6668</socket-port>
<admin-port>7668</admin-port>
<partitions>22, 12</partitions>
<zone-id>0</zone-id>
</server>
<server>
<id>3</id>
<host>localhost</host>
<http-port>8083</http-port>
<socket-port>6669</socket-port>
<admin-port>7669</admin-port>
<partitions>2, 17, 24</partitions>
<zone-id>1</zone-id>
</server>
<server>
<id>4</id>
<host>localhost</host>
<http-port>8084</http-port>
<socket-port>6670</socket-port>
<admin-port>7670</admin-port>
<partitions>11, 25, 10</partitions>
<zone-id>1</zone-id>
</server>
<server>
<id>5</id>
<host>localhost</host>
<http-port>8085</http-port>
<socket-port>6671</socket-port>
<admin-port>7671</admin-port>
<partitions>4, 19, 5</partitions>
<zone-id>1</zone-id>
</server>
<server>
<id>6</id>
<host>localhost</host>
<http-port>8086</http-port>
<socket-port>6672</socket-port>
<admin-port>7672</admin-port>
<partitions>20, 0, 14</partitions>
<zone-id>2</zone-id>
</server>
<server>
<id>7</id>
<host>localhost</host>
<http-port>8087</http-port>
<socket-port>6673</socket-port>
<admin-port>7673</admin-port>
<partitions>1, 9, 6</partitions>
<zone-id>2</zone-id>
</server>
<server>
<id>8</id>
<host>localhost</host>
<http-port>8088</http-port>
<socket-port>6674</socket-port>
<admin-port>7674</admin-port>
<partitions>8, 7, 15</partitions>
<zone-id>2</zone-id>
</server>
</cluster>
70 changes: 70 additions & 0 deletions test/common/voldemort/config/six-node-cluster-with-3-zones.xml
View file
@@ -0,0 +1,70 @@
<?xml version="1.0"?>
<cluster>
<name>mycluster</name>
<zone>
<zone-id>0</zone-id>
<proximity-list>1,2</proximity-list>
</zone>
<zone>
<zone-id>1</zone-id>
<proximity-list>0,2</proximity-list>
</zone>
<zone>
<zone-id>2</zone-id>
<proximity-list>0,1</proximity-list>
</zone>
<server>
<id>0</id>
<host>localhost</host>
<http-port>8080</http-port>
<socket-port>6666</socket-port>
<admin-port>7666</admin-port>
<partitions>16, 3, 7, 20, 21</partitions>
<zone-id>0</zone-id>
</server>
<server>
<id>1</id>
<host>localhost</host>
<http-port>8081</http-port>
<socket-port>6667</socket-port>
<admin-port>7667</admin-port>
<partitions>0, 15, 23, 18, 13</partitions>
<zone-id>0</zone-id>
</server>
<server>
<id>2</id>
<host>localhost</host>
<http-port>8082</http-port>
<socket-port>6668</socket-port>
<admin-port>7668</admin-port>
<partitions>8, 14, 22, 12</partitions>
<zone-id>1</zone-id>
</server>
<server>
<id>3</id>
<host>localhost</host>
<http-port>8083</http-port>
<socket-port>6669</socket-port>
<admin-port>7669</admin-port>
<partitions>1, 2, 17, 24</partitions>
<zone-id>1</zone-id>
</server>
<server>
<id>4</id>
<host>localhost</host>
<http-port>8084</http-port>
<socket-port>6670</socket-port>
<admin-port>7670</admin-port>
<partitions>9, 11, 25, 10</partitions>
<zone-id>2</zone-id>
</server>
<server>
<id>5</id>
<host>localhost</host>
<http-port>8085</http-port>
<socket-port>6671</socket-port>
<admin-port>7671</admin-port>
<partitions>4, 6, 19, 5</partitions>
<zone-id>2</zone-id>
</server>
</cluster>
43 changes: 43 additions & 0 deletions test/common/voldemort/config/three-node-cluster-with-3-zones.xml
View file
@@ -0,0 +1,43 @@
<?xml version="1.0"?>
<cluster>
<name>mycluster</name>
<zone>
<zone-id>0</zone-id>
<proximity-list>1,2</proximity-list>
</zone>
<zone>
<zone-id>1</zone-id>
<proximity-list>0,2</proximity-list>
</zone>
<zone>
<zone-id>2</zone-id>
<proximity-list>0,1</proximity-list>
</zone>
<server>
<id>0</id>
<host>localhost</host>
<http-port>8080</http-port>
<socket-port>6666</socket-port>
<admin-port>7666</admin-port>
<partitions>0, 3</partitions>
<zone-id>0</zone-id>
</server>
<server>
<id>1</id>
<host>localhost</host>
<http-port>8080</http-port>
<socket-port>6667</socket-port>
<admin-port>7667</admin-port>
<partitions>1, 4</partitions>
<zone-id>1</zone-id>
</server>
<server>
<id>2</id>
<host>localhost</host>
<http-port>8080</http-port>
<socket-port>6668</socket-port>
<admin-port>7668</admin-port>
<partitions>2, 5</partitions>
<zone-id>2</zone-id>
</server>
</cluster>

0 comments on commit 5f796e8

Please sign in to comment.