Permalink
Browse files

Merge branch 'release-070' into trunk-master

  • Loading branch information...
2 parents d5ad745 + d2caede commit 4e90bb1586ba1a173ceda58b79b9cc0fc073cc6f @afeinberg afeinberg committed Feb 2, 2010
Showing with 31 additions and 27 deletions.
  1. +1 −1 build.properties
  2. +8 −0 release_notes.txt
  3. +22 −26 test/unit/voldemort/server/gossip/GossiperTest.java
View
@@ -33,4 +33,4 @@ tomcat.manager.password=tomcat
tomcat.context=/voldemort
## Release
-curr.release=0.70
+curr.release=0.70.1
View
@@ -1,3 +1,11 @@
+Release 0.70.1 on 2/1/2010
+
+Changes made since 0.70:
+
+* Fixed issue 205: if no keys passed to getAll() were in partitions
+ undergoing rebalancing, proxyGetAll() would be called with an
+ empty list even if rebalancing wasn't happening
+
Release 0.70 on 1/27/2010
Changes made since 0.60.1:
@@ -29,27 +29,40 @@
private List<VoldemortServer> servers = new ArrayList<VoldemortServer>();
private Cluster cluster;
+ private Properties props = new Properties();
private static String testStoreName = "test-replication-memory";
private static String storesXmlfile = "test/common/voldemort/config/stores.xml";
+
+
@Override
public void setUp() throws IOException {
+ props.put("enable.gossip", "true");
+ props.put("gossip.interval.ms", "250");
+
cluster = ServerTestUtils.getLocalCluster(3, new int[][] { { 0, 1, 2, 3 }, { 4, 5, 6, 7 },
- { 8, 9, 10, 11 } });
+ { 8, 9, 10, 11 } });
servers.add(ServerTestUtils.startVoldemortServer(ServerTestUtils.createServerConfig(0,
TestUtils.createTempDir()
.getAbsolutePath(),
null,
storesXmlfile,
- new Properties()),
+ props),
cluster));
servers.add(ServerTestUtils.startVoldemortServer(ServerTestUtils.createServerConfig(1,
TestUtils.createTempDir()
.getAbsolutePath(),
null,
storesXmlfile,
- new Properties()),
+ props),
+ cluster));
+ servers.add(ServerTestUtils.startVoldemortServer(ServerTestUtils.createServerConfig(2,
+ TestUtils.createTempDir()
+ .getAbsolutePath(),
+ null,
+ storesXmlfile,
+ props),
cluster));
}
@@ -77,18 +90,18 @@ public void testGossiper() throws Exception {
// Create a new partitioning scheme with room for a new server
final Cluster newCluster = ServerTestUtils.getLocalCluster(cluster.getNumberOfNodes() + 1,
ports,
- new int[][] { { 0, 1, 2 },
- { 3, 4, 5 },
- { 6, 7, 8 },
- { 9, 10, 11 } });
-
+ new int[][] {{ 0, 4, 8 },
+ { 1, 5, 9 },
+ { 2, 6, 10 },
+ { 3, 7, 11 }});
+
// Start the new server
VoldemortServer newServer = ServerTestUtils.startVoldemortServer(ServerTestUtils.createServerConfig(3,
TestUtils.createTempDir()
.getAbsolutePath(),
null,
storesXmlfile,
- new Properties()),
+ props),
newCluster);
servers.add(newServer);
@@ -121,20 +134,6 @@ public void testGossiper() throws Exception {
Thread.currentThread().interrupt();
}
- // Start a thread pool for gossipers and start gossiping
- ExecutorService executorService = Executors.newFixedThreadPool(newCluster.getNumberOfNodes() + 1);
-
- List<Gossiper> gossipers = new ArrayList<Gossiper>(newCluster.getNumberOfNodes());
- for(VoldemortServer server: servers) {
- Gossiper gossiper = new Gossiper(server.getMetadataStore(),
- getAdminClient(server.getMetadataStore().getCluster(),
- server.getVoldemortConfig()),
- 50);
- gossiper.start();
- executorService.submit(gossiper);
- gossipers.add(gossiper);
- }
-
// Wait up to a second for gossip to spread
try {
TestUtils.assertWithBackoff(1000, new Attempt() {
@@ -160,9 +159,6 @@ public void checkCondition() {
});
} catch(InterruptedException e) {
Thread.currentThread().interrupt();
- } finally {
- for(Gossiper gossiper: gossipers)
- gossiper.stop();
}
}
}

0 comments on commit 4e90bb1

Please sign in to comment.