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 121525206e..25db173583 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/HighAvailableDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/ha/HighAvailableDataSource.java @@ -137,6 +137,9 @@ public class HighAvailableDataSource extends WrapperAdapter implements DataSourc if (poolUpdater != null) { poolUpdater.destroy(); } + if (selector != null) { + selector.destroy(); + } if (dataSourceMap == null || dataSourceMap.isEmpty()) { return; } diff --git a/src/main/java/com/alibaba/druid/pool/ha/selector/DataSourceSelector.java b/src/main/java/com/alibaba/druid/pool/ha/selector/DataSourceSelector.java index 6f1eeab2c9..9bebbb0cbc 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/selector/DataSourceSelector.java +++ b/src/main/java/com/alibaba/druid/pool/ha/selector/DataSourceSelector.java @@ -24,8 +24,30 @@ import javax.sql.DataSource; * @author DigitalSonic */ public interface DataSourceSelector { + /** + * Return a DataSource according to the implemention. + */ DataSource get(); + + /** + * Set the target DataSource name to return. + * Wether to use this or not, it's decided by the implemention. + */ void setTarget(String name); + + /** + * Return the name of this DataSourceSelector. + * e.g. byName + */ String getName(); + + /** + * Init the DataSourceSelector before use it. + */ void init(); + + /** + * Destroy the DataSourceSelector, maybe interrupt the Thread. + */ + void destroy(); } 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 6ce54f801c..ca26857e15 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 @@ -40,6 +40,10 @@ public class NamedDataSourceSelector implements DataSourceSelector { public void init() { } + @Override + public void destroy() { + } + @Override public String getName() { return DataSourceSelectorEnum.BY_NAME.getName(); diff --git a/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceRecoverThread.java b/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceRecoverThread.java index 79047017f0..e21aed791f 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceRecoverThread.java +++ b/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceRecoverThread.java @@ -30,9 +30,11 @@ import com.alibaba.druid.util.JdbcUtils; * @author DigitalSonic */ public class RandomDataSourceRecoverThread implements Runnable { + public static final int DEFAULT_RECOVER_INTERVAL_SECONDS = 120; private final static Log LOG = LogFactory.getLog(RandomDataSourceRecoverThread.class); + private RandomDataSourceSelector selector; - private int sleepSeconds = 120; + private int recoverIntervalSeconds = DEFAULT_RECOVER_INTERVAL_SECONDS; private int validationSleepSeconds = 0; public RandomDataSourceRecoverThread(RandomDataSourceSelector selector) { @@ -51,6 +53,8 @@ public class RandomDataSourceRecoverThread implements Runnable { } tryOneDataSource((DruidDataSource) dataSource); } + } else if (selector == null) { + break; } sleep(); } @@ -88,18 +92,18 @@ public class RandomDataSourceRecoverThread implements Runnable { private void sleep() { try { - Thread.sleep(sleepSeconds * 1000); + Thread.sleep(recoverIntervalSeconds * 1000); } catch (InterruptedException e) { // ignore } } - public int getSleepSeconds() { - return sleepSeconds; + public int getRecoverIntervalSeconds() { + return recoverIntervalSeconds; } - public void setSleepSeconds(int sleepSeconds) { - this.sleepSeconds = sleepSeconds; + public void setRecoverIntervalSeconds(int recoverIntervalSeconds) { + this.recoverIntervalSeconds = recoverIntervalSeconds; } public int getValidationSleepSeconds() { @@ -109,4 +113,12 @@ public class RandomDataSourceRecoverThread implements Runnable { public void setValidationSleepSeconds(int validationSleepSeconds) { this.validationSleepSeconds = validationSleepSeconds; } + + public RandomDataSourceSelector getSelector() { + return selector; + } + + public void setSelector(RandomDataSourceSelector selector) { + this.selector = selector; + } } 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 c213acdd81..2b91301a9c 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 @@ -53,10 +53,10 @@ public class RandomDataSourceSelector implements DataSourceSelector { private Thread runningValidateThread; private Thread runningRecoverThread; - private int checkingIntervalSeconds = 15; - private int recoveryIntervalSeconds = 120; + private int checkingIntervalSeconds = RandomDataSourceValidateThread.DEFAULT_CHECKING_INTERVAL_SECONDS; + private int recoveryIntervalSeconds = RandomDataSourceRecoverThread.DEFAULT_RECOVER_INTERVAL_SECONDS; private int validationSleepSeconds = 0; - private int blacklistThreshold = 3; + private int blacklistThreshold = RandomDataSourceValidateThread.DEFAULT_BLACKLIST_THRESHOLD; public RandomDataSourceSelector(HighAvailableDataSource highAvailableDataSource) { this.highAvailableDataSource = highAvailableDataSource; @@ -76,6 +76,21 @@ public class RandomDataSourceSelector implements DataSourceSelector { } } + /** + * Interrupt Threads if needed. + */ + @Override + public void destroy() { + if (runningValidateThread != null) { + runningValidateThread.interrupt(); + validateThread.setSelector(null); + } + if (runningRecoverThread != null) { + runningRecoverThread.interrupt(); + recoverThread.setSelector(null); + } + } + @Override public String getName() { return DataSourceSelectorEnum.RANDOM.getName(); @@ -169,6 +184,8 @@ public class RandomDataSourceSelector implements DataSourceSelector { validateThread.setCheckingIntervalSeconds(checkingIntervalSeconds); validateThread.setValidationSleepSeconds(validationSleepSeconds); validateThread.setBlacklistThreshold(blacklistThreshold); + } else { + validateThread.setSelector(this); } if (runningValidateThread != null) { runningValidateThread.interrupt(); @@ -178,8 +195,10 @@ public class RandomDataSourceSelector implements DataSourceSelector { if (recoverThread == null) { recoverThread = new RandomDataSourceRecoverThread(this); - recoverThread.setSleepSeconds(recoveryIntervalSeconds); + recoverThread.setRecoverIntervalSeconds(recoveryIntervalSeconds); recoverThread.setValidationSleepSeconds(validationSleepSeconds); + } else { + recoverThread.setSelector(this); } if (runningRecoverThread != null) { runningRecoverThread.interrupt(); 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 beb9c4341e..e6bb1f1b47 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 @@ -44,12 +44,15 @@ import com.alibaba.druid.util.StringUtils; * @author DigitalSonic */ public class RandomDataSourceValidateThread implements Runnable { - private final static Log LOG = LogFactory.getLog(RandomDataSourceValidateThread.class); - private final static Map SUCCESS_TIMES = new ConcurrentHashMap(); + public static final int DEFAULT_CHECKING_INTERVAL_SECONDS = 10; + public static final int DEFAULT_BLACKLIST_THRESHOLD = 3; - private int checkingIntervalSeconds = 10; // This value should NOT be too small. + private final static Log LOG = LogFactory.getLog(RandomDataSourceValidateThread.class); + private static Map successTimes = new ConcurrentHashMap(); + + private int checkingIntervalSeconds = DEFAULT_CHECKING_INTERVAL_SECONDS; // This value should NOT be too small. private int validationSleepSeconds = 0; - private int blacklistThreshold = 3; + private int blacklistThreshold = DEFAULT_BLACKLIST_THRESHOLD; private RandomDataSourceSelector selector; private ExecutorService checkExecutor = Executors.newFixedThreadPool(5); private Map errorCounts = new ConcurrentHashMap(); @@ -63,11 +66,12 @@ public class RandomDataSourceValidateThread implements Runnable { String name = dataSource.getName(); long time = System.currentTimeMillis(); LOG.debug("Log successTime [" + time + "] for " + name); - SUCCESS_TIMES.put(name, time); + successTimes.put(name, time); } } public RandomDataSourceValidateThread(RandomDataSourceSelector selector) { + LOG.debug("Create a RandomDataSourceValidateThread, hashCode=" + this.hashCode()); this.selector = selector; } @@ -78,6 +82,8 @@ public class RandomDataSourceValidateThread implements Runnable { checkAllDataSources(); maintainBlacklist(); cleanup(); + } else { + break; } sleepForNextValidation(); } @@ -97,7 +103,8 @@ public class RandomDataSourceValidateThread implements Runnable { newSleepSeconds = 1; } try { - LOG.debug("Sleep " + newSleepSeconds + " second(s) until next checking."); + LOG.debug("[RandomDataSourceValidateThread@" + hashCode() + "] Sleep " + newSleepSeconds + + " second(s) until next checking."); Thread.sleep(newSleepSeconds * 1000); } catch (InterruptedException e) { // ignore @@ -112,7 +119,7 @@ public class RandomDataSourceValidateThread implements Runnable { dataSources.add(((DruidDataSource) ds).getName()); } } - cleanupMap(SUCCESS_TIMES, dataSources); + cleanupMap(successTimes, dataSources); cleanupMap(errorCounts, dataSources); cleanupMap(lastCheckTimes, dataSources); } @@ -205,7 +212,7 @@ public class RandomDataSourceValidateThread implements Runnable { private boolean isSkipChecking(DruidDataSource dataSource) { String name = dataSource.getName(); - Long lastSuccessTime = SUCCESS_TIMES.get(dataSource.getName()); + Long lastSuccessTime = successTimes.get(dataSource.getName()); Long lastCheckTime = lastCheckTimes.get(dataSource.getName()); long currentTime = System.currentTimeMillis(); LOG.debug("DataSource=" + name + ", lastSuccessTime=" + lastSuccessTime @@ -283,4 +290,12 @@ public class RandomDataSourceValidateThread implements Runnable { public void setBlacklistThreshold(int blacklistThreshold) { this.blacklistThreshold = blacklistThreshold; } + + public RandomDataSourceSelector getSelector() { + return selector; + } + + public void setSelector(RandomDataSourceSelector selector) { + this.selector = selector; + } } diff --git a/src/test/java/com/alibaba/druid/pool/ha/HighAvailableDataSourceTest.java b/src/test/java/com/alibaba/druid/pool/ha/HighAvailableDataSourceTest.java index 28291352c8..dd99356c22 100644 --- a/src/test/java/com/alibaba/druid/pool/ha/HighAvailableDataSourceTest.java +++ b/src/test/java/com/alibaba/druid/pool/ha/HighAvailableDataSourceTest.java @@ -22,6 +22,7 @@ public class HighAvailableDataSourceTest { haDataSource.init(); haDataSource.setTargetDataSource("foo"); assertNotNull(haDataSource.getConnection()); + haDataSource.destroy(); } @Test @@ -43,5 +44,6 @@ public class HighAvailableDataSourceTest { } assertTrue(count[0] > 0); assertTrue(count[1] > 0); + haDataSource.destroy(); } } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/pool/ha/node/PoolUpdaterTest.java b/src/test/java/com/alibaba/druid/pool/ha/node/PoolUpdaterTest.java index 66695819c1..ac1adcf4c3 100644 --- a/src/test/java/com/alibaba/druid/pool/ha/node/PoolUpdaterTest.java +++ b/src/test/java/com/alibaba/druid/pool/ha/node/PoolUpdaterTest.java @@ -31,6 +31,7 @@ public class PoolUpdaterTest { @After public void tearDown() throws Exception { + haDataSource.destroy(); haDataSource = null; updater = null; } diff --git a/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorTest.java b/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorTest.java index a2b88d7468..4ff7958c72 100644 --- a/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorTest.java +++ b/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorTest.java @@ -36,7 +36,7 @@ public class RandomDataSourceSelectorTest extends BaseRandomDataSourceSelectorTe assertEquals(60, selector.getValidateThread().getCheckingIntervalSeconds()); assertEquals(120, selector.getRecoveryIntervalSeconds()); - assertEquals(120, selector.getRecoverThread().getSleepSeconds()); + assertEquals(120, selector.getRecoverThread().getRecoverIntervalSeconds()); assertEquals(10, selector.getValidationSleepSeconds()); assertEquals(10, selector.getValidateThread().getValidationSleepSeconds()); 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 694c277d96..8e15c3b9a9 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 @@ -65,7 +65,7 @@ public class RandomDataSourceSelectorWithFilterTest { Thread.sleep(1000); assertEquals(initValue, checker.getCountValue(url)); - Thread.sleep(2500); + Thread.sleep(3000); int value = checker.getCountValue(url); LOG.info("URL: " + url + " Value: " + value + " Init: " + initValue); assertEquals(initValue + 1, value); 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 9367973879..285cdea41d 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 @@ -20,6 +20,7 @@ public class RandomDataSourceSelectorWithValidationTest { highAvailableDataSource = new HighAvailableDataSource(); String file = "/com/alibaba/druid/pool/ha/ha-datasource.properties"; highAvailableDataSource.setDataSourceFile(file); + initSelector(highAvailableDataSource); highAvailableDataSource.init(); } @@ -31,7 +32,7 @@ public class RandomDataSourceSelectorWithValidationTest { @Test public void testOneDataSourceFailAndRecover() throws Exception { - RandomDataSourceSelector selector = initSelector(); + RandomDataSourceSelector selector = (RandomDataSourceSelector) highAvailableDataSource.getDataSourceSelector(); DruidDataSource dataSource = (DruidDataSource) highAvailableDataSource.getAvailableDataSourceMap().get("foo"); dataSource.setValidationQuery("select xxx from yyy"); @@ -40,7 +41,6 @@ public class RandomDataSourceSelectorWithValidationTest { for (int i = 0; i < 100; i++) { assertNotEquals(dataSource, selector.get()); } - dataSource.setValidationQuery(null); Thread.sleep(4 * 1000); assertFalse(dataSource.isTestOnReturn()); @@ -55,8 +55,7 @@ public class RandomDataSourceSelectorWithValidationTest { @Test public void testAllDataSourceFail() throws Exception { - initSelector(); - RandomDataSourceSelector selector = ((RandomDataSourceSelector) highAvailableDataSource.getDataSourceSelector()); + RandomDataSourceSelector selector = (RandomDataSourceSelector) highAvailableDataSource.getDataSourceSelector(); DruidDataSource foo = (DruidDataSource) highAvailableDataSource.getAvailableDataSourceMap().get("foo"); DruidDataSource bar = (DruidDataSource) highAvailableDataSource.getAvailableDataSourceMap().get("bar"); @@ -80,15 +79,16 @@ public class RandomDataSourceSelectorWithValidationTest { assertTrue(count[1] > 0); } - private RandomDataSourceSelector initSelector() { - RandomDataSourceSelector selector = ((RandomDataSourceSelector) highAvailableDataSource.getDataSourceSelector()); + private RandomDataSourceSelector initSelector(HighAvailableDataSource dataSource) { + RandomDataSourceSelector selector = new RandomDataSourceSelector(dataSource); RandomDataSourceValidateThread validateThread = new RandomDataSourceValidateThread(selector); RandomDataSourceRecoverThread recoverThread = new RandomDataSourceRecoverThread(selector); validateThread.setCheckingIntervalSeconds(3); - recoverThread.setSleepSeconds(3); + recoverThread.setRecoverIntervalSeconds(3); selector.setValidateThread(validateThread); selector.setRecoverThread(recoverThread); selector.init(); + dataSource.setDataSourceSelector(selector); return selector; } }