add a blacklist in HighAvailableDataSource

Filter the DataSourceMap with the blacklist before returning
This commit is contained in:
DigitalSonic
2020-01-21 14:58:19 +08:00
parent 781fd69ce6
commit 75a094c41e
7 changed files with 45 additions and 9 deletions
@@ -128,7 +128,7 @@ public class RandomDataSourceSelectorWithFilterTest {
}
private void initChecker() {
Map<String, DataSource> map = highAvailableDataSource.getDataSourceMap();
Map<String, DataSource> map = highAvailableDataSource.getAvailableDataSourceMap();
for (DataSource ds : map.values()) {
DruidDataSource dds = (DruidDataSource) ds;
dds.setValidConnectionChecker(checker);
@@ -32,7 +32,7 @@ public class RandomDataSourceSelectorWithValidationTest {
public void testOneDataSourceFailAndRecover() throws Exception {
RandomDataSourceSelector selector = initSelector();
DruidDataSource dataSource = (DruidDataSource) highAvailableDataSource.getDataSourceMap().get("foo");
DruidDataSource dataSource = (DruidDataSource) highAvailableDataSource.getAvailableDataSourceMap().get("foo");
dataSource.setValidationQuery("select xxx from yyy");
Thread.sleep(10 * 1000);
assertTrue(dataSource.isTestOnReturn());
@@ -57,8 +57,8 @@ public class RandomDataSourceSelectorWithValidationTest {
initSelector();
RandomDataSourceSelector selector = ((RandomDataSourceSelector) highAvailableDataSource.getDataSourceSelector());
DruidDataSource foo = (DruidDataSource) highAvailableDataSource.getDataSourceMap().get("foo");
DruidDataSource bar = (DruidDataSource) highAvailableDataSource.getDataSourceMap().get("bar");
DruidDataSource foo = (DruidDataSource) highAvailableDataSource.getAvailableDataSourceMap().get("foo");
DruidDataSource bar = (DruidDataSource) highAvailableDataSource.getAvailableDataSourceMap().get("bar");
foo.setValidationQuery("select xxx from yyy");
bar.setValidationQuery("select xxx from yyy");