slightly modify

Use ConcurrentHashMap instead of HashMap in RandomDataSourceValidateThread.
Add some Log in StickyRandomDataSourceSelector.
Add some test cases for StickyRandomDataSourceSelect.
This commit is contained in:
DigitalSonic
2019-02-02 16:12:23 +08:00
parent c7715b7ec3
commit 851eb96673
5 changed files with 99 additions and 37 deletions
@@ -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<String, Integer> errorCounts = new HashMap<String, Integer>();
private Map<String, Integer> errorCounts = new ConcurrentHashMap<String, Integer>();
public RandomDataSourceValidateThread(RandomDataSourceSelector selector) {
this.selector = selector;
@@ -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<StickyDataSourceHolder> holders = new ThreadLocal<StickyDataSourceHolder>();
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();