You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2021/08/28 03:32:13 UTC
[servicecomb-java-chassis] branch master updated (c32a139 ->
30604be)
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git.
from c32a139 #SCB-2320 Add instanceId and serviceId in invocation header. (#2526)
new 9da36ad [SCB-2323]fix CommonHttpEdgeDispatcher request already write problem
new 30604be [SCB-2324]upgrade netty to 4.1.67 and vert.x to 4.1.2
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../servicecomb/demo/CategorizedTestCaseRunner.java | 8 +++++++-
dependencies/default/pom.xml | 4 ++--
.../edge/core/CommonHttpEdgeDispatcher.java | 20 +++++++++-----------
3 files changed, 18 insertions(+), 14 deletions(-)
[servicecomb-java-chassis] 01/02: [SCB-2323]fix
CommonHttpEdgeDispatcher request already write problem
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
commit 9da36ad1f8c136abf1712f3adabd6b46b22a8299
Author: liubao68 <bi...@qq.com>
AuthorDate: Fri Aug 27 17:12:26 2021 +0800
[SCB-2323]fix CommonHttpEdgeDispatcher request already write problem
---
.../edge/core/CommonHttpEdgeDispatcher.java | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/CommonHttpEdgeDispatcher.java b/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/CommonHttpEdgeDispatcher.java
index 2797c69..c3e02f7 100644
--- a/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/CommonHttpEdgeDispatcher.java
+++ b/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/CommonHttpEdgeDispatcher.java
@@ -46,7 +46,6 @@ import io.vertx.core.Future;
import io.vertx.core.Handler;
import io.vertx.core.buffer.Buffer;
import io.vertx.core.http.HttpClient;
-import io.vertx.core.http.HttpClientResponse;
import io.vertx.core.http.RequestOptions;
import io.vertx.ext.web.Router;
import io.vertx.ext.web.RoutingContext;
@@ -159,20 +158,20 @@ public class CommonHttpEdgeDispatcher extends AbstractEdgeDispatcher {
httpClient = HttpClients.getClient(HttpTransportHttpClientOptionsSPI.CLIENT_NAME, false).getHttpClient();
}
+ context.request().pause();
+
httpClient
.request(requestOptions).compose(httpClientRequest -> {
- context.request().headers().forEach((header) -> {
- httpClientRequest.headers().set(header.getKey(), header.getValue());
- });
- context.request().handler(data -> httpClientRequest.write(data));
+ context.request().headers().forEach((header) -> httpClientRequest.headers().set(header.getKey(), header.getValue()));
+
+ context.request().resume();
+ context.request().handler(httpClientRequest::write);
context.request().endHandler((v) -> httpClientRequest.end());
return httpClientRequest.response().compose(httpClientResponse -> {
context.response().setStatusCode(httpClientResponse.statusCode());
- httpClientResponse.headers().forEach((header) -> {
- context.response().headers().set(header.getKey(), header.getValue());
- });
- httpClientResponse.handler(this.responseHandler(context, httpClientResponse));
+ httpClientResponse.headers().forEach((header) -> context.response().headers().set(header.getKey(), header.getValue()));
+ httpClientResponse.handler(this.responseHandler(context));
httpClientResponse.endHandler((v) -> context.response().end());
return Future.succeededFuture();
});
@@ -180,7 +179,6 @@ public class CommonHttpEdgeDispatcher extends AbstractEdgeDispatcher {
LOG.warn("send request to target {}:{} failed, cause {}", endpointObject.getHostOrIp(), endpointObject.getPort(),
failure.getMessage());
serverNotReadyResponse(context);
- return;
});
}
@@ -190,7 +188,7 @@ public class CommonHttpEdgeDispatcher extends AbstractEdgeDispatcher {
context.response().end();
}
- protected Handler<Buffer> responseHandler(RoutingContext routingContext, HttpClientResponse httpClientResponse) {
+ protected Handler<Buffer> responseHandler(RoutingContext routingContext) {
return data -> routingContext.response().write(data);
}
[servicecomb-java-chassis] 02/02: [SCB-2324]upgrade netty to 4.1.67
and vert.x to 4.1.2
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
commit 30604bea5f98a5011cbeed82fbdf6bbecc17e82b
Author: liubao68 <bi...@qq.com>
AuthorDate: Sat Aug 28 09:20:23 2021 +0800
[SCB-2324]upgrade netty to 4.1.67 and vert.x to 4.1.2
---
.../org/apache/servicecomb/demo/CategorizedTestCaseRunner.java | 8 +++++++-
dependencies/default/pom.xml | 4 ++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/CategorizedTestCaseRunner.java b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/CategorizedTestCaseRunner.java
index b79120b..47dd8b9 100644
--- a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/CategorizedTestCaseRunner.java
+++ b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/CategorizedTestCaseRunner.java
@@ -21,8 +21,12 @@ import java.util.Map;
import org.apache.servicecomb.foundation.common.utils.BeanUtils;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class CategorizedTestCaseRunner {
+ private static final Logger LOGGER = LoggerFactory.getLogger(CategorizedTestCaseRunner.class);
+
public static void runCategorizedTestCase(String microserviceName) throws Exception {
Map<String, CategorizedTestCase> tests = BeanUtils.getContext().getBeansOfType(CategorizedTestCase.class);
for (String transport : DemoConst.transports) {
@@ -42,7 +46,9 @@ public class CategorizedTestCaseRunner {
testCase.testHighwayTransport();
}
} catch (Exception e) {
- e.printStackTrace();
+ LOGGER.error("run categorized test case " +
+ testCase.getClass().getName() +
+ " failed.", e);
TestMgr.failed("run categorized test case " +
testCase.getClass().getName() +
" failed, reason " + e.getMessage(),
diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml
index cf4b76f..2760aab 100644
--- a/dependencies/default/pom.xml
+++ b/dependencies/default/pom.xml
@@ -80,7 +80,7 @@
<mock-server.version>3.10.4</mock-server.version>
<narayana.version>5.3.2.Final</narayana.version>
<netflix-commons.version>0.3.0</netflix-commons.version>
- <netty.version>4.1.66.Final</netty.version>
+ <netty.version>4.1.67.Final</netty.version>
<okhttp3.version>3.14.2</okhttp3.version>
<powermock.version>1.6.2</powermock.version>
<prometheus.version>0.6.0</prometheus.version>
@@ -105,7 +105,7 @@
<tcnetty.version>2.0.40.Final</tcnetty.version>
<tec-zkclient.version>0.10</tec-zkclient.version>
<tomakehurst.version>2.6.0</tomakehurst.version>
- <vertx.version>4.1.1</vertx.version>
+ <vertx.version>4.1.2</vertx.version>
<xstream.version>1.4.11.1</xstream.version>
<zipkin.version>2.19.1</zipkin.version>
<zipkin-reporter.version>2.7.13</zipkin-reporter.version>