This is an automated email from the ASF dual-hosted git repository.
jianglongtao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 2a4ecb0ed6c Adjustment discovery awaitility time (#24787)
2a4ecb0ed6c is described below
commit 2a4ecb0ed6c16c49fdf8e1c1add054d0f29b34ae
Author: zhaojinchao <[email protected]>
AuthorDate: Thu Mar 23 22:56:08 2023 +0800
Adjustment discovery awaitility time (#24787)
---
.../test/e2e/discovery/build/DiscoveryRuleBuilder.java | 8 ++++----
.../test/e2e/discovery/cases/DiscoveryTestAction.java | 10 +++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/build/DiscoveryRuleBuilder.java
b/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/build/DiscoveryRuleBuilder.java
index 1b7c330c8d3..0f8a26e95a4 100644
---
a/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/build/DiscoveryRuleBuilder.java
+++
b/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/build/DiscoveryRuleBuilder.java
@@ -56,7 +56,7 @@ public final class DiscoveryRuleBuilder {
private void createDatabase(final Statement statement) throws SQLException
{
statement.execute(discoveryDistSQL.getCreateDatabase().getExecuteSQL());
- Awaitility.await().atMost(Durations.ONE_SECOND).until(() ->
getCreateDatabaseResult(statement,
discoveryDistSQL.getCreateDatabase().getAssertionSQL()));
+ Awaitility.await().atMost(Durations.FIVE_SECONDS).until(() ->
getCreateDatabaseResult(statement,
discoveryDistSQL.getCreateDatabase().getAssertionSQL()));
}
private boolean getCreateDatabaseResult(final Statement statement, final
String assertionSQL) {
@@ -69,17 +69,17 @@ public final class DiscoveryRuleBuilder {
private void registerStorageUnits(final Statement statement) throws
SQLException {
statement.execute(discoveryDistSQL.getRegisterStorageUnits().getExecuteSQL());
- Awaitility.await().atMost(Durations.TWO_SECONDS).until(() ->
getExecuteResult(statement,
discoveryDistSQL.getRegisterStorageUnits().getAssertionSQL()));
+ Awaitility.await().atMost(Durations.ONE_MINUTE).until(() ->
getExecuteResult(statement,
discoveryDistSQL.getRegisterStorageUnits().getAssertionSQL()));
}
private void createDiscoveryRule(final Statement statement) throws
SQLException {
statement.execute(discoveryDistSQL.getCreateDiscoveryRule().getExecuteSQL());
- Awaitility.await().atMost(Durations.TWO_SECONDS).until(() ->
getExecuteResult(statement,
discoveryDistSQL.getCreateDiscoveryRule().getAssertionSQL()));
+ Awaitility.await().atMost(Durations.ONE_MINUTE).until(() ->
getExecuteResult(statement,
discoveryDistSQL.getCreateDiscoveryRule().getAssertionSQL()));
}
private void createReadwriteSplittingRule(final Statement statement)
throws SQLException {
statement.execute(discoveryDistSQL.getCreateReadwriteSplittingRule().getExecuteSQL());
- Awaitility.await().atMost(Durations.FIVE_SECONDS).until(() ->
getExecuteResult(statement,
discoveryDistSQL.getCreateReadwriteSplittingRule().getAssertionSQL()));
+ Awaitility.await().atMost(Durations.ONE_MINUTE).until(() ->
getExecuteResult(statement,
discoveryDistSQL.getCreateReadwriteSplittingRule().getAssertionSQL()));
}
private boolean getExecuteResult(final Statement statement, final String
assertionSQL) {
diff --git
a/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/DiscoveryTestAction.java
b/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/DiscoveryTestAction.java
index 88689fce4f5..07bf0a3999c 100644
---
a/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/DiscoveryTestAction.java
+++
b/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/cases/DiscoveryTestAction.java
@@ -74,7 +74,7 @@ public final class DiscoveryTestAction {
private void assertClosePrimaryDataSource() throws SQLException {
String oldPrimaryDataSourceName = getPrimaryDataSourceName();
closeDataSource(databaseClusterEnv.getDataSources().get(oldPrimaryDataSourceName));
- Awaitility.await().atMost(Durations.ONE_MINUTE).until(() ->
!oldPrimaryDataSourceName.equals(getPrimaryDataSourceName()));
+ Awaitility.await().atMost(Durations.TWO_MINUTES).until(() ->
!oldPrimaryDataSourceName.equals(getPrimaryDataSourceName()));
databaseClusterEnv.getDataSources().remove(oldPrimaryDataSourceName);
}
@@ -117,7 +117,7 @@ public final class DiscoveryTestAction {
databaseClusterEnv.getDataSources().remove(getPrimaryDataSourceName());
String closedRoutingDataSourceName =
getCloseReplicationDataSourceName(databaseClusterEnv);
databaseClusterEnv.getDataSources().remove(closedRoutingDataSourceName);
- Awaitility.await().atMost(Durations.TWO_MINUTES)
+ Awaitility.await().atMost(Durations.FIVE_MINUTES)
.until(() ->
getRouteDataSourceName().equals(Objects.requireNonNull(databaseClusterEnv.getDataSources().entrySet().stream().findFirst().orElse(null)).getKey()));
}
@@ -148,7 +148,7 @@ public final class DiscoveryTestAction {
Connection connection =
composer.getProxyDataSource().getConnection();
Statement statement = connection.createStatement()) {
statement.execute(discoveryDistSQL.getDropDatabase().getExecuteSQL());
- Awaitility.await().atMost(Durations.FIVE_SECONDS).until(() ->
assertDropSQL(statement, discoveryDistSQL.getDropDatabase().getAssertionSQL()));
+ Awaitility.await().atMost(Durations.ONE_MINUTE).until(() ->
assertDropSQL(statement, discoveryDistSQL.getDropDatabase().getAssertionSQL()));
}
}
@@ -165,7 +165,7 @@ public final class DiscoveryTestAction {
Connection connection =
composer.getProxyDataSource().getConnection();
Statement statement = connection.createStatement()) {
statement.execute(discoveryDistSQL.getCreateReadwriteSplittingDatabase().getExecuteSQL());
- Awaitility.await().atMost(Durations.FIVE_SECONDS).until(() ->
assertCreateSQL(statement,
discoveryDistSQL.getCreateReadwriteSplittingDatabase().getAssertionSQL()));
+ Awaitility.await().atMost(Durations.ONE_MINUTE).until(() ->
assertCreateSQL(statement,
discoveryDistSQL.getCreateReadwriteSplittingDatabase().getAssertionSQL()));
}
}
@@ -182,7 +182,7 @@ public final class DiscoveryTestAction {
Connection connection =
composer.getProxyDataSource().getConnection();
Statement statement = connection.createStatement()) {
statement.execute(discoveryDistSQL.getRegisterSingleStorageUnit().getExecuteSQL());
- Awaitility.await().atMost(Durations.FIVE_SECONDS).until(() ->
assertRDL(statement,
discoveryDistSQL.getRegisterSingleStorageUnit().getAssertionSQL()));
+ Awaitility.await().atMost(Durations.ONE_MINUTE).until(() ->
assertRDL(statement,
discoveryDistSQL.getRegisterSingleStorageUnit().getAssertionSQL()));
}
}
