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 45c7a3a4d0..9f5430f1de 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 @@ -24,8 +24,14 @@ import javax.sql.DataSource; import java.sql.Connection; import java.sql.Driver; import java.sql.SQLException; -import java.util.*; -import java.util.concurrent.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; /** * A Thread trying to test all DataSource provided by HADataSource. @@ -40,7 +46,7 @@ public class RandomDataSourceValidateThread implements Runnable { private int blacklistThreshold = 3; private RandomDataSourceSelector selector; private ExecutorService checkExecutor = Executors.newFixedThreadPool(5); - private Map errorCounts = new HashMap(); + private Map errorCounts = new ConcurrentHashMap(); public RandomDataSourceValidateThread(RandomDataSourceSelector selector) { this.selector = selector; diff --git a/src/main/java/com/alibaba/druid/pool/ha/selector/StickyRandomDataSourceSelector.java b/src/main/java/com/alibaba/druid/pool/ha/selector/StickyRandomDataSourceSelector.java index bd871a9a3b..ccc4153e40 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/selector/StickyRandomDataSourceSelector.java +++ b/src/main/java/com/alibaba/druid/pool/ha/selector/StickyRandomDataSourceSelector.java @@ -2,6 +2,8 @@ package com.alibaba.druid.pool.ha.selector; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.ha.HighAvailableDataSource; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; import javax.sql.DataSource; @@ -13,6 +15,8 @@ import javax.sql.DataSource; * @see StickyDataSourceHolder */ public class StickyRandomDataSourceSelector extends RandomDataSourceSelector { + private final static Log LOG = LogFactory.getLog(StickyRandomDataSourceSelector.class); + private ThreadLocal holders = new ThreadLocal(); private int expireSeconds = 5; @@ -25,8 +29,10 @@ public class StickyRandomDataSourceSelector extends RandomDataSourceSelector { public DataSource get() { StickyDataSourceHolder holder = holders.get(); if (holder != null && isValid(holder) && !isExpired(holder)) { + LOG.debug("Return the sticky DataSource " + holder.getDataSource().toString() + " directly."); return holder.getDataSource(); } + LOG.debug("Return a random DataSource."); DataSource dataSource = super.get(); holder = new StickyDataSourceHolder(dataSource); holders.remove(); diff --git a/src/test/java/com/alibaba/druid/pool/ha/selector/BaseRandomDataSourceSelectorTest.java b/src/test/java/com/alibaba/druid/pool/ha/selector/BaseRandomDataSourceSelectorTest.java new file mode 100644 index 0000000000..78a6ae9e38 --- /dev/null +++ b/src/test/java/com/alibaba/druid/pool/ha/selector/BaseRandomDataSourceSelectorTest.java @@ -0,0 +1,31 @@ +package com.alibaba.druid.pool.ha.selector; + +import com.alibaba.druid.pool.ha.HighAvailableDataSource; +import com.alibaba.druid.pool.ha.MockDataSource; +import org.junit.After; +import org.junit.Before; + +import javax.sql.DataSource; +import java.util.HashMap; +import java.util.Map; + +public class BaseRandomDataSourceSelectorTest { + protected Map dataSourceMap; + protected HighAvailableDataSource dataSource; + + @Before + public void setUp() { + dataSourceMap = new HashMap(); + for (int i = 0; i < 10; i++) { + dataSourceMap.put(Integer.toString(i), new MockDataSource(Integer.toString(i))); + } + dataSource = new HighAvailableDataSource(); + dataSource.setDataSourceMap(dataSourceMap); + } + + @After + public void tearDown() { + dataSourceMap = null; + dataSource = 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 0421ef3c40..cad11e45da 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 @@ -1,39 +1,13 @@ package com.alibaba.druid.pool.ha.selector; -import com.alibaba.druid.pool.ha.HighAvailableDataSource; import com.alibaba.druid.pool.ha.MockDataSource; -import org.junit.After; -import org.junit.Before; import org.junit.Test; -import javax.sql.DataSource; -import java.util.HashMap; -import java.util.Map; - import static org.junit.Assert.assertTrue; -public class RandomDataSourceSelectorTest { - private Map dataSourceMap; - private HighAvailableDataSource dataSource; - - @Before - public void setUp() { - dataSourceMap = new HashMap(); - for (int i = 0; i < 10; i++) { - dataSourceMap.put(Integer.toString(i), new MockDataSource(Integer.toString(i))); - } - dataSource = new HighAvailableDataSource(); - dataSource.setDataSourceMap(dataSourceMap); - } - - @After - public void tearDown() { - dataSourceMap = null; - dataSource = null; - } - +public class RandomDataSourceSelectorTest extends BaseRandomDataSourceSelectorTest { @Test - public void testRandomGet() throws Exception { + public void testRandomGet() { RandomDataSourceSelector selector = new RandomDataSourceSelector(dataSource); int[] count = new int[10]; @@ -46,10 +20,4 @@ public class RandomDataSourceSelectorTest { assertTrue(i > 0); } } - - @Test - public void testOneDataSourceFail() { - - } - } \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/pool/ha/selector/StickyRandomDataSourceSelectorTest.java b/src/test/java/com/alibaba/druid/pool/ha/selector/StickyRandomDataSourceSelectorTest.java new file mode 100644 index 0000000000..b58b1d9578 --- /dev/null +++ b/src/test/java/com/alibaba/druid/pool/ha/selector/StickyRandomDataSourceSelectorTest.java @@ -0,0 +1,51 @@ +package com.alibaba.druid.pool.ha.selector; + +import com.alibaba.druid.pool.ha.MockDataSource; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; + +public class StickyRandomDataSourceSelectorTest extends BaseRandomDataSourceSelectorTest { + @Test + public void testGetSameDataSourceInFiveSeconds() throws InterruptedException { + StickyRandomDataSourceSelector selector = new StickyRandomDataSourceSelector(dataSource); + int lastHashCode = selector.get().hashCode(); + for (int i = 0; i < 4; i++) { + assertEquals(lastHashCode, selector.get().hashCode()); + Thread.sleep(1000); + } + } + + @Test + public void testGetDifferentDataSource() throws InterruptedException { + StickyRandomDataSourceSelector selector = new StickyRandomDataSourceSelector(dataSource); + selector.setExpireSeconds(1); + int lastHashCode = selector.get().hashCode(); + boolean hasDifferentDataSource = false; + for (int i = 0; i < 20; i++) { + hasDifferentDataSource = selector.get().hashCode() != lastHashCode; + Thread.sleep(500); + } + assertTrue(hasDifferentDataSource); + } + + @Test + public void testIgnoreForbiddenDataSource() throws InterruptedException { + MockDataSource normal = new MockDataSource("Normal"); + MockDataSource forbidden = new MockDataSource("Forbidden"); + dataSourceMap.put("N", normal); + dataSourceMap.put("F", forbidden); + dataSource.setDataSourceMap(dataSourceMap); + + StickyRandomDataSourceSelector selector = new StickyRandomDataSourceSelector(dataSource); + selector.setExpireSeconds(1); + selector.getBlacklist().add(forbidden); + + for (int i = 0; i < 20; i++) { + assertNotEquals(forbidden, selector.get()); + Thread.sleep(500); + } + } +}