Keep at least one DataSource in the pool when update by events.

This commit is contained in:
DigitalSonic
2020-05-05 22:21:00 +08:00
parent 75391df4ad
commit 99270819ee
5 changed files with 65 additions and 6 deletions
@@ -55,11 +55,11 @@ public class FileNodeListenerTest {
DruidDataSource foo = (DruidDataSource) dataSource.getAvailableDataSourceMap().get("foo");
assertEquals("jdbc:derby:memory:foo;create=true", foo.getUrl());
// Remove all
// try to emove all but we have to keep one left
writePropertiesFile(file, new Properties());
Thread.sleep(6000);
assertTrue(dataSource.getAvailableDataSourceMap().isEmpty());
assertEquals(1, dataSource.getAvailableDataSourceMap().size());
dataSource.destroy();
}
@@ -39,6 +39,7 @@ public class PoolUpdaterTest {
@Test
public void testUpdate() {
haDataSource.getDataSourceMap().put("foo", new MockDataSource("foo"));
haDataSource.getDataSourceMap().put("bar", new MockDataSource("bar"));
NodeEvent event = new NodeEvent();
event.setNodeName("foo");
@@ -91,6 +92,18 @@ public class PoolUpdaterTest {
assertTrue(haDataSource.getDataSourceMap().isEmpty());
}
@Test
public void testUpdate_onlyOneLeftToRemove() {
haDataSource.getDataSourceMap().put("foo", new MockDataSource("foo"));
NodeEvent event = new NodeEvent();
event.setNodeName("foo");
event.setType(NodeEventTypeEnum.DELETE);
updater.update(new FileNodeListener(), new NodeEvent[] { event });
assertTrue(haDataSource.getDataSourceMap().containsKey("foo"));
}
@Test
public void testAddNode() {
String url = "jdbc:derby:memory:foo;create=true";
@@ -127,6 +140,7 @@ public class PoolUpdaterTest {
@Test
public void testDeleteNode() {
haDataSource.getDataSourceMap().put("foo", new MockDataSource("foo"));
haDataSource.getDataSourceMap().put("bar", new MockDataSource("bar"));
NodeEvent event = new NodeEvent();
event.setNodeName("foo");
@@ -56,10 +56,11 @@ public class ZookeeperNodeListenerTest {
// 2. Register one Node
ZookeeperNodeRegister register = registerNodeAndReturnRegister();
ZookeeperNodeRegister register2 = registerAnotherNodeAndReturnRegister();
Thread.sleep(3000); // Wait for the Node to be created.
assertFalse(dataSource.getDataSourceMap().isEmpty());
assertEquals(1, dataSource.getAvailableDataSourceMap().size());
assertEquals(2, dataSource.getAvailableDataSourceMap().size());
DruidDataSource ds = (DruidDataSource) dataSource.getAvailableDataSourceMap().get("foo.test-foo");
assertEquals("jdbc:derby:memory:foo;create=true", ds.getUrl());
assertNotNull(dataSource.getConnection());
@@ -70,15 +71,16 @@ public class ZookeeperNodeListenerTest {
for (int i = 0; i < 10; i++) {
Thread.sleep(500);
if (dataSource.isInBlackList("foo.test-foo")) {
assertTrue(dataSource.getAvailableDataSourceMap().isEmpty());
assertEquals(1, dataSource.getAvailableDataSourceMap().size());
assertFalse(dataSource.getDataSourceMap().isEmpty());
assertNull(dataSource.getConnection());
assertNotNull(dataSource.getConnection());
checkBlackList = true;
break;
}
}
assertTrue(checkBlackList);
register2.destroy();
Thread.sleep(3000); // Wait for the destory to be finished
dataSource.destroy();
}
@@ -187,6 +189,25 @@ public class ZookeeperNodeListenerTest {
return register;
}
private ZookeeperNodeRegister registerAnotherNodeAndReturnRegister() {
ZookeeperNodeRegister register = new ZookeeperNodeRegister();
register.setZkConnectString(server.getConnectString());
register.setPath(PATH);
register.init();
List<ZookeeperNodeInfo> payload = new ArrayList<ZookeeperNodeInfo>();
ZookeeperNodeInfo node = new ZookeeperNodeInfo();
node.setPrefix("bar");
node.setHost("127.0.0.1");
node.setPort(5678);
node.setDatabase("bar");
node.setUsername("sa");
node.setPassword("");
payload.add(node);
register.register("test-bar", payload);
return register;
}
@Test
public void testInitFailure() {
ZookeeperNodeListener listener = new ZookeeperNodeListener();