Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

optimize the random logic in HA

Browse Source
This commit is contained in:
DigitalSonic
2019-05-21 15:04:11 +08:00
parent a2e5d01826
commit 007c5acb71
2 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelector.java
+39 -15
View File
@@ -86,21 +86,10 @@ public class RandomDataSourceSelector implements DataSourceSelector {
return null;
}
Collection<DataSource> targetDataSourceSet;
if (blacklist == null || blacklist.isEmpty() || blacklist.size() >= dataSourceMap.size()) {
targetDataSourceSet = dataSourceMap.values();
} else {
targetDataSourceSet = new HashSet<DataSource>(dataSourceMap.values());
for (DataSource b : blacklist) {
targetDataSourceSet.remove(b);
}
}
DataSource[] dataSources = targetDataSourceSet.toArray(new DataSource[] {});
if (dataSources != null && dataSources.length > 0) {
return dataSources[random.nextInt(targetDataSourceSet.size())];
}
return null;
Collection<DataSource> targetDataSourceSet = removeBlackList(dataSourceMap);
removeBusyDataSource(targetDataSourceSet);
DataSource dataSource = getRandomDataSource(targetDataSourceSet);
return dataSource;
}
@Override
@@ -182,6 +171,41 @@ public class RandomDataSourceSelector implements DataSourceSelector {
new Thread(recoverThread, "RandomDataSourceSelector-recover-thread").start();
}
private Collection<DataSource> removeBlackList(Map<String, DataSource> dataSourceMap) {
Collection<DataSource> dataSourceSet;
if (blacklist == null || blacklist.isEmpty() || blacklist.size() >= dataSourceMap.size()) {
dataSourceSet = dataSourceMap.values();
} else {
dataSourceSet = new HashSet<DataSource>(dataSourceMap.values());
for (DataSource b : blacklist) {
dataSourceSet.remove(b);
}
}
return dataSourceSet;
}
private void removeBusyDataSource(Collection<DataSource> dataSourceSet) {
Collection<DataSource> busyDataSourceSet = new HashSet<DataSource>();
for (DataSource ds : dataSourceSet) {
if (ds instanceof DruidDataSource && ((DruidDataSource) ds).getPoolingCount() <= 0) {
busyDataSourceSet.add(ds);
}
}
if (!busyDataSourceSet.isEmpty() && busyDataSourceSet.size() < dataSourceSet.size()) {
for (DataSource ds : busyDataSourceSet) {
dataSourceSet.remove(ds);
}
}
}
private DataSource getRandomDataSource(Collection<DataSource> dataSourceSet) {
DataSource[] dataSources = dataSourceSet.toArray(new DataSource[] {});
if (dataSources != null && dataSources.length > 0) {
return dataSources[random.nextInt(dataSourceSet.size())];
}
return null;
}
public HighAvailableDataSource getHighAvailableDataSource() {
return highAvailableDataSource;
}
src/main/java/com/alibaba/druid/pool/ha/selector/StickyRandomDataSourceSelector.java
+9 -1
View File
@@ -48,7 +48,7 @@ public class StickyRandomDataSourceSelector extends RandomDataSourceSelector {
@Override
public DataSource get() {
StickyDataSourceHolder holder = holders.get();
if (holder != null && isValid(holder) && !isExpired(holder)) {
if (holder != null && isAvailable(holder)) {
LOG.debug("Return the sticky DataSource " + holder.getDataSource().toString() + " directly.");
return holder.getDataSource();
}
@@ -60,6 +60,14 @@ public class StickyRandomDataSourceSelector extends RandomDataSourceSelector {
return dataSource;
}
private boolean isAvailable(StickyDataSourceHolder holder) {
boolean flag = isValid(holder) && !isExpired(holder);
if (flag && holder.getDataSource() instanceof DruidDataSource) {
flag = ((DruidDataSource) holder.getDataSource()).getPoolingCount() > 0;
}
return flag;
}
private boolean isValid(StickyDataSourceHolder holder) {
boolean flag = holder.isValid() && !getBlacklist().contains(holder.getDataSource());
if (!(holder.getDataSource() instanceof DruidDataSource) || !flag) {