From dfcc16107ac83181be99d848704d5a7110a3fb35 Mon Sep 17 00:00:00 2001 From: DigitalSonic Date: Sat, 2 Feb 2019 16:46:32 +0800 Subject: [PATCH] fix failed testcase --- .../pool/ha/HighAvailableDataSource.java | 4 ++-- ...mDataSourceSelectorWithValidationTest.java | 20 +++++++++---------- 2 files changed, 11 insertions(+), 13 deletions(-) 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 0c34795751..e6e45879d8 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/HighAvailableDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/ha/HighAvailableDataSource.java @@ -86,11 +86,11 @@ public class HighAvailableDataSource extends WrapperAdapter implements DataSourc // Properties copied from DruidAbstractDataSource END private Map dataSourceMap = new ConcurrentHashMap(); - private DataSourceSelector selector = new RandomDataSourceSelector(this); + private DataSourceSelector selector; private String dataSourceFile = DEFAULT_DATA_SOURCE_FILE; private String propertyPrefix = ""; - private boolean inited = false; + private volatile boolean inited = false; public void init() throws SQLException { if (inited) { 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 f082f8d7f2..13a7a5421c 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 @@ -35,14 +35,12 @@ public class RandomDataSourceSelectorWithValidationTest { selector.getRecoverThread().setSleepSeconds(3); selector.init(); - Thread.sleep(30 * 1000); - DruidDataSource dataSource = (DruidDataSource) highAvailableDataSource.getDataSourceMap().get("foo"); dataSource.setValidationQuery("select xxx from yyy"); - Thread.sleep(10 * 1000); + Thread.sleep(6 * 1000); assertTrue(dataSource.isTestOnReturn()); for (int i = 0; i < 100; i++) { - assertNotEquals(dataSource, highAvailableDataSource.getDataSourceSelector().get()); + assertNotEquals(dataSource, selector.get()); } dataSource.setValidationQuery(null); @@ -50,7 +48,7 @@ public class RandomDataSourceSelectorWithValidationTest { assertFalse(dataSource.isTestOnReturn()); int count = 0; for (int i = 0; i < 100; i++) { - if (dataSource == highAvailableDataSource.getDataSourceSelector().get()) { + if (dataSource == selector.get()) { count++; } } @@ -59,23 +57,23 @@ public class RandomDataSourceSelectorWithValidationTest { @Test public void testAllDataSourceFail() throws Exception { - ((RandomDataSourceSelector) highAvailableDataSource.getDataSourceSelector()).getValidateThread().setCheckingIntervalSeconds(3); - ((RandomDataSourceSelector) highAvailableDataSource.getDataSourceSelector()).getRecoverThread().setSleepSeconds(3); - - Thread.sleep(30 * 1000); + RandomDataSourceSelector selector = (RandomDataSourceSelector) highAvailableDataSource.getDataSourceSelector(); + selector.setCheckingIntervalSeconds(3); + selector.setRecoveryIntervalSeconds(3); + selector.init(); DruidDataSource foo = (DruidDataSource) highAvailableDataSource.getDataSourceMap().get("foo"); DruidDataSource bar = (DruidDataSource) highAvailableDataSource.getDataSourceMap().get("bar"); foo.setValidationQuery("select xxx from yyy"); bar.setValidationQuery("select xxx from yyy"); - Thread.sleep(10 * 1000); + Thread.sleep(6 * 1000); assertTrue(foo.isTestOnReturn()); assertTrue(bar.isTestOnReturn()); int[] count = new int[2]; for (int i = 0; i < 100; i++) { - DataSource dataSource = highAvailableDataSource.getDataSourceSelector().get(); + DataSource dataSource = selector.get(); if (foo == dataSource) { count[0]++; } else if (bar == dataSource) {