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 0946c1bcc8..c69ea02f2e 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/HighAvailableDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/ha/HighAvailableDataSource.java @@ -145,12 +145,20 @@ public class HighAvailableDataSource extends WrapperAdapter implements DataSourc } DataSourceSelector selector = DataSourceSelectorFactory.getSelector(name, this); if (selector != null) { - this.selector = selector; + setDataSourceSelector(selector); } } - public DataSourceSelector getSelector() { - return selector; + public String getSelector() { + return selector == null ? null : selector.getName(); + } + + public DataSourceSelector getDataSourceSelector() { + return this.selector; + } + + public void setDataSourceSelector(DataSourceSelector dataSourceSelector) { + this.selector = dataSourceSelector; } @Override 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 d8497e3f84..d6646a2cd2 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 @@ -28,4 +28,5 @@ public interface DataSourceSelector { DataSource get(); void setTarget(String name); boolean isSame(String name); + String getName(); } 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 b53e7caa5a..11cbf293bf 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 @@ -37,7 +37,12 @@ public class NamedDataSourceSelector implements DataSourceSelector { @Override public boolean isSame(String name) { - return "byName".equalsIgnoreCase(name); + return getName().equalsIgnoreCase(name); + } + + @Override + public String getName() { + return "byName"; } @Override 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 b9f0d5c717..f5434d391a 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 @@ -57,7 +57,12 @@ public class RandomDataSourceSelector implements DataSourceSelector { @Override public boolean isSame(String name) { - return "random".equalsIgnoreCase(name); + return getName().equalsIgnoreCase(name); + } + + @Override + public String getName() { + return "random"; } @Override 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 6a10653abb..a38cf40f4b 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 @@ -30,8 +30,8 @@ public class RandomDataSourceSelectorWithValidationTest { @Test public void testOneDataSourceFailAndRecover() throws Exception { - ((RandomDataSourceSelector) highAvailableDataSource.getSelector()).getValidateThread().setSleepSeconds(3); - ((RandomDataSourceSelector) highAvailableDataSource.getSelector()).getRecoverThread().setSleepSeconds(3); + ((RandomDataSourceSelector) highAvailableDataSource.getDataSourceSelector()).getValidateThread().setSleepSeconds(3); + ((RandomDataSourceSelector) highAvailableDataSource.getDataSourceSelector()).getRecoverThread().setSleepSeconds(3); Thread.sleep(30 * 1000); @@ -40,7 +40,7 @@ public class RandomDataSourceSelectorWithValidationTest { Thread.sleep(10 * 1000); assertTrue(dataSource.isTestOnReturn()); for (int i = 0; i < 100; i++) { - assertNotEquals(dataSource, highAvailableDataSource.getSelector().get()); + assertNotEquals(dataSource, highAvailableDataSource.getDataSourceSelector().get()); } dataSource.setValidationQuery(null); @@ -48,7 +48,7 @@ public class RandomDataSourceSelectorWithValidationTest { assertFalse(dataSource.isTestOnReturn()); int count = 0; for (int i = 0; i < 100; i++) { - if (dataSource == highAvailableDataSource.getSelector().get()) { + if (dataSource == highAvailableDataSource.getDataSourceSelector().get()) { count++; } } @@ -57,8 +57,8 @@ public class RandomDataSourceSelectorWithValidationTest { @Test public void testAllDataSourceFail() throws Exception { - ((RandomDataSourceSelector) highAvailableDataSource.getSelector()).getValidateThread().setSleepSeconds(3); - ((RandomDataSourceSelector) highAvailableDataSource.getSelector()).getRecoverThread().setSleepSeconds(3); + ((RandomDataSourceSelector) highAvailableDataSource.getDataSourceSelector()).getValidateThread().setSleepSeconds(3); + ((RandomDataSourceSelector) highAvailableDataSource.getDataSourceSelector()).getRecoverThread().setSleepSeconds(3); Thread.sleep(30 * 1000); @@ -73,7 +73,7 @@ public class RandomDataSourceSelectorWithValidationTest { int[] count = new int[2]; for (int i = 0; i < 100; i++) { - DataSource dataSource = highAvailableDataSource.getSelector().get(); + DataSource dataSource = highAvailableDataSource.getDataSourceSelector().get(); if (foo == dataSource) { count[0]++; } else if (bar == dataSource) {