From 75a094c41e384941a5e3646ddaefc544b6b00df6 Mon Sep 17 00:00:00 2001 From: DigitalSonic Date: Tue, 21 Jan 2020 14:58:19 +0800 Subject: [PATCH] add a blacklist in HighAvailableDataSource Filter the DataSourceMap with the blacklist before returning --- .../druid/pool/ha/DataSourceCreator.java | 2 +- .../pool/ha/HighAvailableDataSource.java | 31 ++++++++++++++++++- .../ha/selector/NamedDataSourceSelector.java | 2 +- .../ha/selector/RandomDataSourceSelector.java | 9 +++++- .../RandomDataSourceValidateThread.java | 2 +- ...andomDataSourceSelectorWithFilterTest.java | 2 +- ...mDataSourceSelectorWithValidationTest.java | 6 ++-- 7 files changed, 45 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/ha/DataSourceCreator.java b/src/main/java/com/alibaba/druid/pool/ha/DataSourceCreator.java index bfcaa1f73a..90a4206fa6 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/DataSourceCreator.java +++ b/src/main/java/com/alibaba/druid/pool/ha/DataSourceCreator.java @@ -79,7 +79,7 @@ public class DataSourceCreator { return map; } - protected DruidDataSource create(String name, String url, String username, String password, + public static DruidDataSource create(String name, String url, String username, String password, HighAvailableDataSource haDataSource) throws SQLException { DruidDataSource dataSource = new DruidDataSource(); diff --git a/src/main/java/com/alibaba/druid/pool/ha/HighAvailableDataSource.java b/src/main/java/com/alibaba/druid/pool/ha/HighAvailableDataSource.java index 380501e030..8b443a4ce7 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/HighAvailableDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/ha/HighAvailableDataSource.java @@ -23,8 +23,10 @@ import java.sql.SQLFeatureNotSupportedException; import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.CopyOnWriteArraySet; import java.util.logging.Logger; import javax.sql.DataSource; @@ -87,13 +89,14 @@ public class HighAvailableDataSource extends WrapperAdapter implements DataSourc // Properties copied from DruidAbstractDataSource END private Map dataSourceMap = new ConcurrentHashMap(); + private Set blacklist = new CopyOnWriteArraySet(); private DataSourceSelector selector; private String dataSourceFile = DEFAULT_DATA_SOURCE_FILE; private String propertyPrefix = ""; private volatile boolean inited = false; - public void init() throws SQLException { + public void init() { if (inited) { return; } @@ -114,6 +117,10 @@ public class HighAvailableDataSource extends WrapperAdapter implements DataSourc } } + public void close() { + destroy(); + } + public void destroy() { if (dataSourceMap == null || dataSourceMap.isEmpty()) { return; @@ -166,6 +173,28 @@ public class HighAvailableDataSource extends WrapperAdapter implements DataSourc return dataSourceMap; } + public Map getAvailableDataSourceMap() { + Map map = new ConcurrentHashMap(this.dataSourceMap); + for (String n : blacklist) { + if (map.containsKey(n)) { + map.remove(n); + } + } + return map; + } + + public void addBlackList(String name) { + if (dataSourceMap.containsKey(name)) { + blacklist.add(name); + } else { + LOG.info("Key " + name + " is NOT existed, ignore it."); + } + } + + public void removeBlackList(String name) { + blacklist.remove(name); + } + public void setSelector(String name) { DataSourceSelector selector = DataSourceSelectorFactory.getSelector(name, this); if (selector != null) { diff --git a/src/main/java/com/alibaba/druid/pool/ha/selector/NamedDataSourceSelector.java b/src/main/java/com/alibaba/druid/pool/ha/selector/NamedDataSourceSelector.java index 9c485c2118..6ce54f801c 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/selector/NamedDataSourceSelector.java +++ b/src/main/java/com/alibaba/druid/pool/ha/selector/NamedDataSourceSelector.java @@ -51,7 +51,7 @@ public class NamedDataSourceSelector implements DataSourceSelector { return null; } - Map dataSourceMap = highAvailableDataSource.getDataSourceMap(); + Map dataSourceMap = highAvailableDataSource.getAvailableDataSourceMap(); if (dataSourceMap == null || dataSourceMap.isEmpty()) { return null; } diff --git a/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelector.java b/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelector.java index fdf60993b4..c213acdd81 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelector.java +++ b/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelector.java @@ -99,13 +99,20 @@ public class RandomDataSourceSelector implements DataSourceSelector { // do nothing } - public Map getDataSourceMap() { + public Map getFullDataSourceMap() { if (highAvailableDataSource != null) { return highAvailableDataSource.getDataSourceMap(); } return new HashMap(); } + public Map getDataSourceMap() { + if (highAvailableDataSource != null) { + return highAvailableDataSource.getAvailableDataSourceMap(); + } + return new HashMap(); + } + public List getBlacklist() { return blacklist; } diff --git a/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceValidateThread.java b/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceValidateThread.java index 64b55ce50c..088b7a24a5 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceValidateThread.java +++ b/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceValidateThread.java @@ -116,7 +116,7 @@ public class RandomDataSourceValidateThread implements Runnable { } private void checkAllDataSources() { - Map dataSourceMap = selector.getDataSourceMap(); + Map dataSourceMap = selector.getFullDataSourceMap(); List> tasks = new ArrayList>(); LOG.debug("Checking all DataSource."); for (final Map.Entry e : dataSourceMap.entrySet()) { diff --git a/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorWithFilterTest.java b/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorWithFilterTest.java index 7b42b8337a..0b05b61d9c 100644 --- a/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorWithFilterTest.java +++ b/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorWithFilterTest.java @@ -128,7 +128,7 @@ public class RandomDataSourceSelectorWithFilterTest { } private void initChecker() { - Map map = highAvailableDataSource.getDataSourceMap(); + Map map = highAvailableDataSource.getAvailableDataSourceMap(); for (DataSource ds : map.values()) { DruidDataSource dds = (DruidDataSource) ds; dds.setValidConnectionChecker(checker); diff --git a/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorWithValidationTest.java b/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorWithValidationTest.java index 2e919b20bb..4059600723 100644 --- a/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorWithValidationTest.java +++ b/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorWithValidationTest.java @@ -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");