You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2023/02/20 08:42:32 UTC
[shardingsphere] branch master updated: Optimize agent IT test environment preparation (#24255)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 98f79dd3690 Optimize agent IT test environment preparation (#24255)
98f79dd3690 is described below
commit 98f79dd36902c15b38f29114ea19502b0f0f6df8
Author: jiangML <10...@qq.com>
AuthorDate: Mon Feb 20 16:42:18 2023 +0800
Optimize agent IT test environment preparation (#24255)
* optimzie agent IT test
* remove log
* optmize code
* optimize code
* optimize code
* set connectTimeout
---
.../test/e2e/agent/common/BasePluginE2EIT.java | 3 +++
.../e2e/agent/common/env/E2ETestEnvironment.java | 21 +++++++++++++++++----
.../src/test/resources/env/engine-env.properties | 2 +-
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/BasePluginE2EIT.java b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/BasePluginE2EIT.java
index 0344e59aefd..2a206f01fc0 100644
--- a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/BasePluginE2EIT.java
+++ b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/BasePluginE2EIT.java
@@ -31,6 +31,7 @@ import java.util.ArrayList;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertNotNull;
/**
* Basic integration test.
@@ -41,7 +42,9 @@ public abstract class BasePluginE2EIT {
@Before
public void check() {
Assume.assumeThat(E2ETestEnvironment.getInstance().isEnvironmentPrepared(), is(true));
+ Assume.assumeThat(E2ETestEnvironment.getInstance().isInitializationFailed(), is(false));
E2ETestEnvironment.getInstance().createDataSource();
+ assertNotNull(E2ETestEnvironment.getInstance().getDataSource());
}
@Test
diff --git a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/E2ETestEnvironment.java b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/E2ETestEnvironment.java
index c51b522ac17..6e716a98736 100644
--- a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/E2ETestEnvironment.java
+++ b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/E2ETestEnvironment.java
@@ -22,6 +22,7 @@ import com.zaxxer.hikari.HikariDataSource;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.awaitility.Awaitility;
+import org.awaitility.core.ConditionTimeoutException;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -43,6 +44,8 @@ public final class E2ETestEnvironment {
private DataSource dataSource;
+ private boolean initializationFailed;
+
private E2ETestEnvironment() {
props = EnvironmentProperties.loadProperties("env/engine-env.properties");
isEnvironmentPrepared = props.getProperty("it.env.value").equals(props.getProperty("it.env.type"));
@@ -62,17 +65,27 @@ public final class E2ETestEnvironment {
*/
public void createDataSource() {
if (isEnvironmentPrepared && null == dataSource) {
- waitForEnvironmentReady(props);
- dataSource = createHikariCP(props);
+ if (waitForEnvironmentReady(props)) {
+ dataSource = createHikariCP(props);
+ } else {
+ initializationFailed = true;
+ }
}
}
- private void waitForEnvironmentReady(final Properties props) {
+ private boolean waitForEnvironmentReady(final Properties props) {
log.info("Proxy with agent environment initializing ...");
- Awaitility.await().atMost(120, TimeUnit.SECONDS).pollInterval(200, TimeUnit.MILLISECONDS).until(() -> isProxyReady(props));
+ try {
+ Awaitility.await().atMost(4, TimeUnit.MINUTES).pollInterval(2, TimeUnit.SECONDS).until(() -> isProxyReady(props));
+ } catch (final ConditionTimeoutException ignored) {
+ log.info("Proxy with agent environment initialization failed ...");
+ return false;
+ }
+ return true;
}
private boolean isProxyReady(final Properties props) {
+ log.info("try to connect proxy ...");
String url = props.getProperty("proxy.url");
String username = props.getProperty("proxy.username", "root");
String password = props.getProperty("proxy.password", "root");
diff --git a/test/e2e/agent/plugins/metrics/prometheus/src/test/resources/env/engine-env.properties b/test/e2e/agent/plugins/metrics/prometheus/src/test/resources/env/engine-env.properties
index 04279a021eb..efb364216b2 100644
--- a/test/e2e/agent/plugins/metrics/prometheus/src/test/resources/env/engine-env.properties
+++ b/test/e2e/agent/plugins/metrics/prometheus/src/test/resources/env/engine-env.properties
@@ -18,7 +18,7 @@
it.env.type=${it.env}
it.env.value=prometheus
-proxy.url=jdbc:mysql://127.0.0.1:43070/agent-metrics-db?serverTimezone=UTC&useSSL=false&useLocalSessionState=true&characterEncoding=utf-8
+proxy.url=jdbc:mysql://127.0.0.1:43070/agent-metrics-db?serverTimezone=UTC&useSSL=false&useLocalSessionState=true&characterEncoding=utf-8&connectTimeout=3000
proxy.username=root
proxy.password=root