Skip to content

[WIP] Fix Apollo integration test instability #2885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kezhenxu94 wants to merge 18 commits into from
Closed

[WIP] Fix Apollo integration test instability #2885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b4c1f95
Expose more logs of failure
kezhenxu94 Jun 17, 2019
8751f0f
Trigger multiple Job
kezhenxu94 Jun 17, 2019
e64c99d
Trigger multiple Jobs
kezhenxu94 Jun 17, 2019
4574a86
Correctify healthy check log
kezhenxu94 Jun 17, 2019
0ff40fb
Correctify healthy check log
kezhenxu94 Jun 17, 2019
d143188
Merge branch 'master' into test/apollo
kezhenxu94 Jun 17, 2019
3272fd9
Merge branch 'master' into test/apollo
wu-sheng Jun 17, 2019
8057cf6
Expose raw response
kezhenxu94 Jun 17, 2019
de66aa9
Trigger multiple jobs
kezhenxu94 Jun 17, 2019
17d889c
Remove unused import
kezhenxu94 Jun 17, 2019
666e65d
Trigger multiple jobs
kezhenxu94 Jun 17, 2019
9f64166
Trigger multiple jobs
kezhenxu94 Jun 17, 2019
e809d8b
Map ports
kezhenxu94 Jun 17, 2019
81ed89d
Use latest version for debugging
kezhenxu94 Jun 17, 2019
0f8f7ed
Always pull for debugging
kezhenxu94 Jun 17, 2019
645992d
Link to container
kezhenxu94 Jun 17, 2019
187b312
Remove deprecated tag
kezhenxu94 Jun 17, 2019
2e6fb2a
Add binding host
kezhenxu94 Jun 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 22 additions & 21 deletions oap-server/server-configuration/configuration-apollo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,18 @@
</dependency>
</dependencies>

<properties>
<apollo.docker.name>kezhenxu94/apollo:latest</apollo.docker.name>
<apollo.docker.env.MYSQL_HOST>${mysql.host}</apollo.docker.env.MYSQL_HOST>
<apollo.docker.env.MYSQL_PORT>${mysql.port}</apollo.docker.env.MYSQL_PORT>
<apollo.docker.wait.log>Portal started. You can visit</apollo.docker.wait.log>
<apollo.docker.wait.time>240000</apollo.docker.wait.time>
<apollo.docker.dependsOn.container>apollo-db</apollo.docker.dependsOn.container>
<apollo.docker.links.1>apollo-db</apollo.docker.links.1>
<apollo.docker.ports.1>+apollo.portal.host:apollo.portal.port:8070</apollo.docker.ports.1>
<apollo.docker.ports.2>+apollo.meta.host:apollo.meta.port:8080</apollo.docker.ports.2>
</properties>

<profiles>
<profile>
<id>CI-with-IT</id>
Expand All @@ -71,17 +83,20 @@
<showLogs>true</showLogs>
<logDate>default</logDate>
<verbose>true</verbose>
<imagePullPolicy>IfNotPresent</imagePullPolicy>
<imagePullPolicy>Always</imagePullPolicy>
<images>
<image>
<name>mysql:5.7</name>
<alias>apollo-db</alias>
<run>
<env>
<TZ>Asia/Shanghai</TZ>
<MYSQL_MASTER_SERVICE_HOST>127.0.0.1</MYSQL_MASTER_SERVICE_HOST>
<MYSQL_ALLOW_EMPTY_PASSWORD>yes</MYSQL_ALLOW_EMPTY_PASSWORD>
</env>
<namingStrategy>none</namingStrategy>
<ports>
<port>+mysql.host:mysql.port:3306</port>
</ports>
<volumes>
<bind>
<volume>
Expand All @@ -90,31 +105,17 @@
</bind>
</volumes>
<wait>
<log>ready for connections</log>
<log>socket: '/var/run/mysqld/mysqld.sock' port: 3306</log>
<time>600000</time>
</wait>
</run>
</image>
<image>
<name>kezhenxu94/apollo:1.2</name>
<alias>apollo-config-and-portal</alias>
<run>
<namingStrategy>none</namingStrategy>
<dependsOn>
<container>apollo-db</container>
</dependsOn>
<links>
<link>apollo-db</link>
</links>
<ports>
<port>+apollo.portal.host:apollo.portal.port:8070</port>
<port>+apollo.meta.host:apollo.meta.port:8080</port>
</ports>
<wait>
<log>Portal started. You can visit</log>
<time>2400000</time>
</wait>
</run>
<external>
<type>properties</type>
<prefix>apollo.docker</prefix>
</external>
</image>
</images>
</configuration>
Expand Down
21 changes: 12 additions & 9 deletions ...java/org/apache/skywalking/oap/server/configuration/apollo/ITApolloConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@

package org.apache.skywalking.oap.server.configuration.apollo;

import org.apache.http.client.ResponseHandler;
import org.apache.http.client.HttpResponseException;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpDelete;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.BasicResponseHandler;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.skywalking.apm.util.PropertyPlaceholderHelper;
Expand Down Expand Up @@ -57,15 +57,14 @@ public class ITApolloConfigurationTest {
private final Yaml yaml = new Yaml();
private final String token = "f71f002a4ff9845639ef655ee7019759e31449de";
private final CloseableHttpClient httpClient = HttpClients.createDefault();
private final ResponseHandler responseHandler = new BasicResponseHandler();

private String baseUrl;
private ApolloConfigurationTestProvider provider;

@Before
public void setUp() throws Exception {
String host = System.getProperty("apollo.portal.host");
String port = System.getProperty("apollo.portal.port");
String host = "localhost"; // System.getProperty("apollo.portal.host");
String port = "8070"; //System.getProperty("apollo.portal.port");

baseUrl = "http://" + host + ":" + port;
LOGGER.info("baseUrl: {}", baseUrl);
Expand Down Expand Up @@ -107,7 +106,7 @@ public void shouldReadUpdated() {
" \"dataChangeCreatedBy\":\"apollo\"\n" +
"}");
createConfigPost.setEntity(entity);
final String createResponse = (String) httpClient.execute(createConfigPost, responseHandler);
final CloseableHttpResponse createResponse = httpClient.execute(createConfigPost);
LOGGER.info("createResponse: {}", createResponse);

final HttpPost releaseConfigRequest =
Expand All @@ -129,7 +128,7 @@ public void shouldReadUpdated() {
);
releaseConfigRequest.setHeader("Authorization", token);
releaseConfigRequest.setHeader("Content-Type", "application/json;charset=UTF-8");
final String releaseCreateResponse = (String) httpClient.execute(releaseConfigRequest, responseHandler);
final CloseableHttpResponse releaseCreateResponse = httpClient.execute(releaseConfigRequest);
LOGGER.info("releaseCreateResponse: {}", releaseCreateResponse);

for (String v = provider.watcher.value(); v == null; v = provider.watcher.value()) {
Expand All @@ -150,13 +149,17 @@ public void shouldReadUpdated() {
deleteConfigRequest.setHeader("Authorization", token);
deleteConfigRequest.setHeader("Content-Type", "application/json;charset=UTF-8");
httpClient.execute(deleteConfigRequest);
final String releaseDeleteResponse = (String) httpClient.execute(releaseConfigRequest, responseHandler);
final CloseableHttpResponse releaseDeleteResponse = httpClient.execute(releaseConfigRequest);
LOGGER.info("releaseDeleteResponse: {}", releaseDeleteResponse);

for (String v = provider.watcher.value(); v != null; v = provider.watcher.value()) {
}

assertNull(provider.watcher.value());
} catch (HttpResponseException e) {
LOGGER.error(e.getMessage(), e);
LOGGER.error("status: {}", e.getStatusCode());
fail(e.getMessage());
} catch (IOException e) {
LOGGER.error(e.getMessage(), e);
fail(e.getMessage());
Expand Down Expand Up @@ -226,7 +229,7 @@ public void cleanUp() throws IOException {
);
releaseConfigRequest.setHeader("Authorization", token);
releaseConfigRequest.setHeader("Content-Type", "application/json;charset=UTF-8");
httpClient.execute(releaseConfigRequest, responseHandler);
httpClient.execute(releaseConfigRequest);
} catch (Exception e) {
LOGGER.error(e.getMessage(), e);
}
Expand Down
2 changes: 1 addition & 1 deletion oap-server/server-configuration/configuration-apollo/src/test/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ test-module:

configuration:
apollo:
apolloMeta: http://${apollo.meta.host}:${apollo.meta.port}
apolloMeta: http://127.0.0.1:8080 #${apollo.meta.host}:${apollo.meta.port}
apolloCluster: default
apolloEnv: DEV
appId: SampleApp
Expand Down