[servicecomb-java-chassis] branch SCB-1218 updated (2cda71f -> 57c53dc)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-1218 in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git. discard 2cda71f SCB-1218 Added the reactive-stream discard 6f2022b SCB-1218 Clean up the license of java-chassis new 6d53ef2 [SCB-1226] there are problems when request rejected by thread pool queue full new 89c0628 [SCB-1232] make GroupExecutor configuration compatible to old version new 09eac45 Updated the year information of the NOTICE files new 07aad87 SCB-1218 Clean up the license of java-chassis new 57c53dc SCB-1218 Added the reactive-stream This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2cda71f) \ N -- N -- N refs/heads/SCB-1218 (57c53dc) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 2187 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: NOTICE | 2 +- .../common/rest/AbstractRestInvocation.java| 49 +- .../common/rest/TestAbstractRestInvocation.java| 32 +- .../org/apache/servicecomb/core/SCBEngine.java | 8 +- .../servicecomb/core/executor/GroupExecutor.java | 38 +--- .../core/executor/TestGroupExecutor.java | 108 + java-chassis-distribution/src/release/NOTICE | 4 +- .../transport/highway/HighwayServerInvoke.java | 6 +- 8 files changed, 161 insertions(+), 86 deletions(-)
[servicecomb-java-chassis] branch master updated: Updated the year information of the NOTICE files
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git The following commit(s) were added to refs/heads/master by this push: new 09eac45 Updated the year information of the NOTICE files 09eac45 is described below commit 09eac45260cde46ec14692af492a3cc271a53ea1 Author: Willem Jiang AuthorDate: Tue Apr 2 11:19:05 2019 +0800 Updated the year information of the NOTICE files --- NOTICE | 2 +- java-chassis-distribution/src/release/NOTICE | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NOTICE b/NOTICE index 03549d5..370b949 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache ServiceComb Java Chassis -Copyright 2017-2018 The Apache Software Foundation +Copyright 2017-2019 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/java-chassis-distribution/src/release/NOTICE b/java-chassis-distribution/src/release/NOTICE index 6daa152..c77148b 100644 --- a/java-chassis-distribution/src/release/NOTICE +++ b/java-chassis-distribution/src/release/NOTICE @@ -1,5 +1,5 @@ Apache ServiceComb Java Chassis -Copyright 2017-2018 The Apache Software Foundation +Copyright 2017-2019 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). @@ -17,7 +17,7 @@ Copyright 2001-2014 The Apache Software Foundation This product includes software from the Spring Framework, under the Apache License 2.0 (see: StringUtils.containsWhitespace()) - + Notice for Netty
[GitHub] [servicecomb-java-chassis] WillemJiang edited a comment on issue #1158: [SCB-1229] update the version of dependency
WillemJiang edited a comment on issue #1158: [SCB-1229] update the version of dependency URL: https://github.com/apache/servicecomb-java-chassis/pull/1158#issuecomment-478826689 If we don't plan to merge it before the java-chassis 1.2.0 release. I will merge the License fix #1163 shortly. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-java-chassis] WillemJiang commented on issue #1158: [SCB-1229] update the version of dependency
WillemJiang commented on issue #1158: [SCB-1229] update the version of dependency URL: https://github.com/apache/servicecomb-java-chassis/pull/1158#issuecomment-478826689 If we don't plan to merge it before the java-chassis 1.2.0 release. I will merge the License fix shortly. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[servicecomb-pack] branch master updated: Updated the NOTICE file year infor
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git The following commit(s) were added to refs/heads/master by this push: new 49470d0 Updated the NOTICE file year infor 49470d0 is described below commit 49470d0a072fb7c965a50071b1306aea7c56e161 Author: Willem Jiang AuthorDate: Tue Apr 2 11:03:59 2019 +0800 Updated the NOTICE file year infor --- NOTICE | 2 +- distribution/src/release/NOTICE | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NOTICE b/NOTICE index 8a5dba2..a4187f9 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache ServiceComb Saga -Copyright 2017-2018 The Apache Software Foundation +Copyright 2017-2019 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/distribution/src/release/NOTICE b/distribution/src/release/NOTICE index 19bc823..b138d67 100644 --- a/distribution/src/release/NOTICE +++ b/distribution/src/release/NOTICE @@ -1,5 +1,5 @@ Apache ServiceComb Saga -Copyright 2017-2018 The Apache Software Foundation +Copyright 2017-2019 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). @@ -50,8 +50,8 @@ See licenses/NOTICE-tomcat Notice for Netty tcnative -See licenses/NOTICE-netty-tcnative +See licenses/NOTICE-netty-tcnative Notice for akveo ngx-admin -See licenses/LICENSE-ngxadmin \ No newline at end of file +See licenses/LICENSE-ngxadmin
[servicecomb-service-center] branch master updated: Updated the year information in NOTICE file
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git The following commit(s) were added to refs/heads/master by this push: new c6821d1 Updated the year information in NOTICE file c6821d1 is described below commit c6821d1d8fec4998c15b330bc3eca24d6ac8dd21 Author: Willem Jiang AuthorDate: Tue Apr 2 10:52:19 2019 +0800 Updated the year information in NOTICE file --- NOTICE | 2 +- scripts/release/NOTICE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NOTICE b/NOTICE index a0bdca5..19e8f90 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache ServiceComb Service Center -Copyright 2017-2018 The Apache Software Foundation +Copyright 2017-2019 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/scripts/release/NOTICE b/scripts/release/NOTICE index 80caf98..e586daf 100644 --- a/scripts/release/NOTICE +++ b/scripts/release/NOTICE @@ -1,5 +1,5 @@ Apache ServiceComb Service Center -Copyright 2017-2018 The Apache Software Foundation +Copyright 2017-2019 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
svn commit: r33391 - /dev/servicecomb/servicecomb-pack/0.4.0/rc-02/
Author: asifdxtreme Date: Mon Apr 1 22:11:57 2019 New Revision: 33391 Log: Add ServiceComb-Pack 0.4.0 RC-02 Release Added: dev/servicecomb/servicecomb-pack/0.4.0/rc-02/ dev/servicecomb/servicecomb-pack/0.4.0/rc-02/apache-servicecomb-pack-distribution-0.4.0-bin.zip (with props) dev/servicecomb/servicecomb-pack/0.4.0/rc-02/apache-servicecomb-pack-distribution-0.4.0-bin.zip.asc (with props) dev/servicecomb/servicecomb-pack/0.4.0/rc-02/apache-servicecomb-pack-distribution-0.4.0-bin.zip.sha512 (with props) dev/servicecomb/servicecomb-pack/0.4.0/rc-02/apache-servicecomb-pack-distribution-0.4.0-src.zip (with props) dev/servicecomb/servicecomb-pack/0.4.0/rc-02/apache-servicecomb-pack-distribution-0.4.0-src.zip.asc (with props) dev/servicecomb/servicecomb-pack/0.4.0/rc-02/apache-servicecomb-pack-distribution-0.4.0-src.zip.sha512 (with props) Added: dev/servicecomb/servicecomb-pack/0.4.0/rc-02/apache-servicecomb-pack-distribution-0.4.0-bin.zip == Binary file - no diff available. Propchange: dev/servicecomb/servicecomb-pack/0.4.0/rc-02/apache-servicecomb-pack-distribution-0.4.0-bin.zip -- svn:mime-type = application/octet-stream Added: dev/servicecomb/servicecomb-pack/0.4.0/rc-02/apache-servicecomb-pack-distribution-0.4.0-bin.zip.asc == --- dev/servicecomb/servicecomb-pack/0.4.0/rc-02/apache-servicecomb-pack-distribution-0.4.0-bin.zip.asc (added) +++ dev/servicecomb/servicecomb-pack/0.4.0/rc-02/apache-servicecomb-pack-distribution-0.4.0-bin.zip.asc Mon Apr 1 22:11:57 2019 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEQsDXlA/N5eYw5Krj3JP2lr16TWkFAlyiisYACgkQ3JP2lr16 +TWlA+xAAu6g8EtkCQ5jO6k/Z5kg30OshYo4jW2iZSkuCwsRRv9UuSNlMezTYkku7 +CNwvAPbpfgnhDUWvYebz6Qe3Ui2ebRQXpwshDGDaOqp/JW8NhDLahcAJcq1EJCs7 +PSkE9YUgv70gZbNuPDpy2cv6mnzY/yccK+ctYEDbCA5Eqz4CMI4YYK/Ed6j8xXMS +GyyrqKeAo35Z0KHxz7LEgwj6OWqRcTG5m8+MXC7pXKeLCiftUmMHkfxQkrfR7d+i +6ohJ62jZ3Zo6hZcXuTznz9NHSuHAgulBRZvQKPXmfi6xLgvOmTr7/LrUmQ8wdJnT +v1FuVc7IErBG/FJzIRbcylqlfb3wp1ULwCAok6APmbSft1imsH3+Bctytok5VWvh +IQ8BbNqFZ7R9ygf1k8DERk1kRrkFMYKRyz70UQR3z+GEvJMBY0kqTBblV8FV/2DT +AXiR+ng8bhK3S1uCkl1Z6X5UIx5sDvFc9jNYXcY/pESSqJP4BzmNN7jDrEoaHwUl +NqTlPI1OmSbmDyU8l+4yQgqZidpsPlUSInvDAYzh7sKHYdynyJIMI/51nPuo8AAL +kv6f8X0k/wS2drrSLYgSxqUZdEa6UFG/px+YvTw7pEOgIjTVnSmhezT82yWVuh+w +L65YhPrK/mBU4Bybg188Od+yoq9QiLTjwk7CDh30mCV9WXSwuvQ= +=2nhz +-END PGP SIGNATURE- Propchange: dev/servicecomb/servicecomb-pack/0.4.0/rc-02/apache-servicecomb-pack-distribution-0.4.0-bin.zip.asc -- svn:eol-style = native Added: dev/servicecomb/servicecomb-pack/0.4.0/rc-02/apache-servicecomb-pack-distribution-0.4.0-bin.zip.sha512 == --- dev/servicecomb/servicecomb-pack/0.4.0/rc-02/apache-servicecomb-pack-distribution-0.4.0-bin.zip.sha512 (added) +++ dev/servicecomb/servicecomb-pack/0.4.0/rc-02/apache-servicecomb-pack-distribution-0.4.0-bin.zip.sha512 Mon Apr 1 22:11:57 2019 @@ -0,0 +1 @@ +cb4c84639bb528e2ba39891dc092e6f12da7eb5405ce02b4fb95e0bda2eebeb836c47474fe256a4df69c60dc5b73c3041cc7660b83cf0eaceea3b09f2969f378 apache-servicecomb-pack-distribution-0.4.0-bin.zip Propchange: dev/servicecomb/servicecomb-pack/0.4.0/rc-02/apache-servicecomb-pack-distribution-0.4.0-bin.zip.sha512 -- svn:eol-style = native Added: dev/servicecomb/servicecomb-pack/0.4.0/rc-02/apache-servicecomb-pack-distribution-0.4.0-src.zip == Binary file - no diff available. Propchange: dev/servicecomb/servicecomb-pack/0.4.0/rc-02/apache-servicecomb-pack-distribution-0.4.0-src.zip -- svn:mime-type = application/octet-stream Added: dev/servicecomb/servicecomb-pack/0.4.0/rc-02/apache-servicecomb-pack-distribution-0.4.0-src.zip.asc == --- dev/servicecomb/servicecomb-pack/0.4.0/rc-02/apache-servicecomb-pack-distribution-0.4.0-src.zip.asc (added) +++ dev/servicecomb/servicecomb-pack/0.4.0/rc-02/apache-servicecomb-pack-distribution-0.4.0-src.zip.asc Mon Apr 1 22:11:57 2019 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEQsDXlA/N5eYw5Krj3JP2lr16TWkFAlyiir0ACgkQ3JP2lr16 +TWluaQ//ZWsMy6geSGmmEBk2dFPZ5av1iVyAWjDGffX6CRa6XNGGmSHFaKEgHWDT +/OXiQxxkBa8L/FHmohd8hNImb5hA7ruq26MmCw21RXQt1xZKJQEbsgS1YAVZARUT +IOnFAK7KmqwYNwdlKBuvI7ubC0GAIH6AhzCrhkcazt9ljaoXV2Fm/lShy7XgeViY +PAOqB7H3HHTwNFSoiVvRr+EjfcudiuoR0ng/yajgEpYgGZCdcVQLGXl1x30UPY3Q
[servicecomb-pack] annotated tag 0.4.0 updated (c2b1a6d -> 02c08c3)
This is an automated email from the ASF dual-hosted git repository. asifdxtreme pushed a change to annotated tag 0.4.0 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. *** WARNING: tag 0.4.0 was modified! *** from c2b1a6d (commit) to 02c08c3 (tag) tagging c2b1a6d603b0fb3d658a495da29d6f864995b538 (commit) replaces 0.1.0 by asifdxtreme on Tue Apr 2 05:18:04 2019 +0800 - Log - ServiceComb-Pack 0.4.0 Release --- No new revisions were added by this update. Summary of changes:
[servicecomb-pack] 01/01: Cut 0.4.0 Release
This is an automated email from the ASF dual-hosted git repository. asifdxtreme pushed a commit to branch 0.4.x in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git commit c2b1a6d603b0fb3d658a495da29d6f864995b538 Author: asifdxtreme AuthorDate: Tue Apr 2 05:17:11 2019 +0800 Cut 0.4.0 Release --- .../acceptance-pack-cluster-spring-demo/pom.xml| 2 +- .../acceptance-pack-dubbo-demo/pom.xml | 2 +- .../pom.xml| 2 +- .../acceptance-pack-spring-demo/pom.xml| 2 +- .../acceptance-pack-tcc-spring-demo/pom.xml| 2 +- acceptance-tests/pom.xml | 2 +- alpha/alpha-core/pom.xml | 2 +- alpha/alpha-server/pom.xml | 2 +- .../alpha-spring-boot-1-starter/pom.xml| 2 +- .../alpha-spring-boot-2-starter/pom.xml| 2 +- alpha/alpha-spring-boot-compatibility/pom.xml | 2 +- alpha/alpha-spring-cloud-starter-consul/pom.xml| 2 +- alpha/alpha-spring-cloud-starter-eureka/pom.xml| 2 +- alpha/pom.xml | 2 +- demo/pom.xml | 2 +- demo/saga-dubbo-demo/pom.xml | 4 +- demo/saga-dubbo-demo/service-api/pom.xml | 4 +- demo/saga-dubbo-demo/service-pub/pom.xml | 2 +- demo/saga-dubbo-demo/servicea/pom.xml | 2 +- demo/saga-dubbo-demo/serviceb/pom.xml | 4 +- demo/saga-dubbo-demo/servicec/pom.xml | 4 +- demo/saga-servicecomb-demo/pom.xml | 2 +- demo/saga-servicecomb-demo/scb-booking/pom.xml | 2 +- demo/saga-servicecomb-demo/scb-car/pom.xml | 2 +- demo/saga-servicecomb-demo/scb-hotel/pom.xml | 2 +- demo/saga-spring-demo/booking/pom.xml | 2 +- demo/saga-spring-demo/car/pom.xml | 2 +- demo/saga-spring-demo/hotel/pom.xml| 2 +- demo/saga-spring-demo/pom.xml | 2 +- demo/tcc-spring-demo/inventory/pom.xml | 2 +- demo/tcc-spring-demo/ordering/pom.xml | 2 +- demo/tcc-spring-demo/payment/pom.xml | 2 +- demo/tcc-spring-demo/pom.xml | 2 +- distribution/pom.xml | 2 +- docker-build-config/pom.xml| 2 +- integration-tests/coverage-aggregate/pom.xml | 4 +- integration-tests/pack-tests/pom.xml | 2 +- integration-tests/pom.xml | 2 +- omega/omega-connector/omega-connector-grpc/pom.xml | 2 +- omega/omega-connector/pom.xml | 2 +- omega/omega-context/pom.xml| 2 +- omega/omega-format/pom.xml | 2 +- omega/omega-spring-cloud-consul-starter/pom.xml| 2 +- omega/omega-spring-cloud-eureka-starter/pom.xml| 2 +- omega/omega-spring-starter/pom.xml | 2 +- omega/omega-spring-tx/pom.xml | 2 +- omega/omega-transaction/pom.xml| 2 +- .../omega-transport/omega-transport-dubbo/pom.xml | 2 +- .../omega-transport/omega-transport-feign/pom.xml | 2 +- .../omega-transport-resttemplate/pom.xml | 2 +- .../omega-transport-servicecomb/pom.xml| 2 +- omega/omega-transport/pom.xml | 2 +- omega/pom.xml | 6 +-- pack-common/pom.xml| 2 +- pack-contracts/pack-contract-grpc/pom.xml | 2 +- pack-contracts/pom.xml | 2 +- persistence/persistence-jpa/pom.xml| 2 +- persistence/pom.xml| 2 +- pom.xml| 44 +++--- web/pom.xml| 2 +- 60 files changed, 88 insertions(+), 88 deletions(-) diff --git a/acceptance-tests/acceptance-pack-cluster-spring-demo/pom.xml b/acceptance-tests/acceptance-pack-cluster-spring-demo/pom.xml index 675a265..6b74dc8 100644 --- a/acceptance-tests/acceptance-pack-cluster-spring-demo/pom.xml +++ b/acceptance-tests/acceptance-pack-cluster-spring-demo/pom.xml @@ -22,7 +22,7 @@ acceptance-tests org.apache.servicecomb.pack -0.4.0-SNAPSHOT +0.4.0 4.0.0 diff --git a/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml b/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml index ed99630..2fb8d11 100644 --- a/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml +++ b/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml @@ -22,7 +22,7 @@ acceptance-tests org.apache.servicecomb.pack -0.4.0-SNAPSHOT +0.4.0 4.0.0 Pack:Acceptance Tests::Dubbo diff --git a/acceptance-tests/acceptance-pack-spring-demo-with-consul/pom.xml b/acceptance-tests/acceptance-pack-spring-demo-with-consul/pom.xml index
[servicecomb-pack] branch 0.4.x created (now c2b1a6d)
This is an automated email from the ASF dual-hosted git repository. asifdxtreme pushed a change to branch 0.4.x in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. at c2b1a6d Cut 0.4.0 Release This branch includes the following new commits: new c2b1a6d Cut 0.4.0 Release The 1 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.
[servicecomb-pack] branch 0.4.x deleted (was 32588a3)
This is an automated email from the ASF dual-hosted git repository. asifdxtreme pushed a change to branch 0.4.x in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. was 32588a3 Cut 0.4.0 Release This change permanently discards the following revisions: discard 32588a3 Cut 0.4.0 Release
[servicecomb-pack] annotated tag 0.4.0 deleted (was 683ebc0)
This is an automated email from the ASF dual-hosted git repository. asifdxtreme pushed a change to annotated tag 0.4.0 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. *** WARNING: tag 0.4.0 was deleted! *** tag was 683ebc0 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[GitHub] [servicecomb-java-chassis] wujimin commented on a change in pull request #1158: [SCB-1229] update the version of dependency
wujimin commented on a change in pull request #1158: [SCB-1229] update the version of dependency URL: https://github.com/apache/servicecomb-java-chassis/pull/1158#discussion_r270909686 ## File path: integration-tests/tracing-tests/pom.xml ## @@ -66,6 +66,16 @@ org.apache.servicecomb tracing-zipkin + Review comment: should find the root cause of conflicts This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-java-chassis] wujimin merged pull request #1161: [SCB-1232] make GroupExecutor configuration compatible to old version
wujimin merged pull request #1161: [SCB-1232] make GroupExecutor configuration compatible to old version URL: https://github.com/apache/servicecomb-java-chassis/pull/1161 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[servicecomb-java-chassis] branch master updated: [SCB-1232] make GroupExecutor configuration compatible to old version
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 89c0628 [SCB-1232] make GroupExecutor configuration compatible to old
version
89c0628 is described below
commit 89c0628e50bc5677c88ad048fd822cfb68897f74
Author: wujimin
AuthorDate: Sun Mar 31 16:18:31 2019 +0800
[SCB-1232] make GroupExecutor configuration compatible to old version
---
.../servicecomb/core/executor/GroupExecutor.java | 38 +---
.../core/executor/TestGroupExecutor.java | 108 +
2 files changed, 89 insertions(+), 57 deletions(-)
diff --git
a/core/src/main/java/org/apache/servicecomb/core/executor/GroupExecutor.java
b/core/src/main/java/org/apache/servicecomb/core/executor/GroupExecutor.java
index cf0c8e7..9dd27b8 100644
--- a/core/src/main/java/org/apache/servicecomb/core/executor/GroupExecutor.java
+++ b/core/src/main/java/org/apache/servicecomb/core/executor/GroupExecutor.java
@@ -40,7 +40,7 @@ public class GroupExecutor implements Executor, Closeable {
public static final String KEY_GROUP = "servicecomb.executor.default.group";
// Deprecated
- public static final String KEY_THREAD =
"servicecomb.executor.default.thread-per-group";
+ public static final String KEY_OLD_MAX_THREAD =
"servicecomb.executor.default.thread-per-group";
public static final String KEY_CORE_THREADS =
"servicecomb.executor.default.coreThreads-per-group";
@@ -83,25 +83,31 @@ public class GroupExecutor implements Executor, Closeable {
}
public void initConfig() {
-groupCount =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_GROUP, 2).get();
-coreThreads =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_CORE_THREADS, 25).get();
-
-maxThreads =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_MAX_THREADS, -1).get();
-if (maxThreads <= 0) {
- maxThreads =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_THREAD, -1).get();
- if (maxThreads > 0) {
-LOGGER.warn("{} is deprecated, recommended to use {}.", KEY_THREAD,
KEY_MAX_THREADS);
- } else {
-maxThreads = 100;
- }
-}
-if (coreThreads > maxThreads) {
- LOGGER.warn("coreThreads is bigger than maxThreads, change from {} to
{}.", coreThreads, maxThreads);
+LOGGER.info("JDK standard thread pool rules:\n"
++ "1.use core threads.\n"
++ "2.if all core threads are busy, then queue the request.\n"
++ "3.if queue is full, then create new thread util reach the limit of
max threads.\n"
++ "4.if queue is full, and threads count is max, then reject the
request.");
+
+// the complex logic is to keep compatible
+// otherwise can throw exception if configuration is invalid.
+coreThreads =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_CORE_THREADS, -1).get();
+
+int oldMaxThreads =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_OLD_MAX_THREAD,
-1).get();
+maxThreads =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_MAX_THREADS,
oldMaxThreads).get();
+maxThreads = Math.max(coreThreads, maxThreads);
+maxThreads = maxThreads <= 0 ? 100 : maxThreads;
+
+maxQueueSize =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_MAX_QUEUE_SIZE,
Integer.MAX_VALUE).get();
+if (maxQueueSize == Integer.MAX_VALUE) {
coreThreads = maxThreads;
+ LOGGER.info("not configured {}, make coreThreads and maxThreads to be
{}.", KEY_MAX_QUEUE_SIZE, maxThreads);
+} else {
+ coreThreads = coreThreads <= 0 ? 25 : coreThreads;
}
+groupCount =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_GROUP, 2).get();
maxIdleInSecond =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_MAX_IDLE_SECOND,
60).get();
-maxQueueSize =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_MAX_QUEUE_SIZE,
Integer.MAX_VALUE).get();
LOGGER.info(
"executor group={}. per group settings, coreThreads={}, maxThreads={},
maxIdleInSecond={}, maxQueueSize={}.",
diff --git
a/core/src/test/java/org/apache/servicecomb/core/executor/TestGroupExecutor.java
b/core/src/test/java/org/apache/servicecomb/core/executor/TestGroupExecutor.java
index a5dd87a..dfb6fe6 100644
---
a/core/src/test/java/org/apache/servicecomb/core/executor/TestGroupExecutor.java
+++
b/core/src/test/java/org/apache/servicecomb/core/executor/TestGroupExecutor.java
@@ -22,7 +22,6 @@ import java.util.Map;
import java.util.concurrent.Executor;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
-import org.apache.servicecomb.foundation.test.scaffolding.log.LogCollector;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
@@ -56,16 +55,6 @@ public class TestGroupExecutor {
}
@Test
- public
[servicecomb-java-chassis] branch master updated: [SCB-1226] there are problems when request rejected by thread pool queue full
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 6d53ef2 [SCB-1226] there are problems when request rejected by thread
pool queue full
6d53ef2 is described below
commit 6d53ef26742f9031a4bda26b6b240e7715981f53
Author: wujimin
AuthorDate: Mon Apr 1 15:58:35 2019 +0800
[SCB-1226] there are problems when request rejected by thread pool queue
full
---
.../common/rest/AbstractRestInvocation.java| 49 --
.../common/rest/TestAbstractRestInvocation.java| 32 +-
.../org/apache/servicecomb/core/SCBEngine.java | 8 +++-
.../transport/highway/HighwayServerInvoke.java | 6 ++-
4 files changed, 69 insertions(+), 26 deletions(-)
diff --git
a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java
b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java
index f80309d..22cbc53 100644
---
a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java
+++
b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java
@@ -119,7 +119,7 @@ public abstract class AbstractRestInvocation {
protected void scheduleInvocation() {
try {
createInvocation();
-} catch (IllegalStateException e) {
+} catch (Throwable e) {
sendFailResponse(e);
return;
}
@@ -141,28 +141,33 @@ public abstract class AbstractRestInvocation {
return;
}
-operationMeta.getExecutor().execute(() -> {
- synchronized (this.requestEx) {
-try {
- if (isInQueueTimeout()) {
-throw new InvocationException(Status.INTERNAL_SERVER_ERROR,
"Timeout when processing the request.");
- }
- if (requestEx.getAttribute(RestConst.REST_REQUEST) != requestEx) {
-// already timeout
-// in this time, request maybe recycled and reused by web
container, do not use requestEx
-LOGGER.error("Rest request already timeout, abandon execute,
method {}, operation {}.",
-operationMeta.getHttpMethod(),
-operationMeta.getMicroserviceQualifiedName());
-return;
+try {
+ operationMeta.getExecutor().execute(() -> {
+synchronized (this.requestEx) {
+ try {
+if (isInQueueTimeout()) {
+ throw new InvocationException(Status.INTERNAL_SERVER_ERROR,
"Timeout when processing the request.");
+}
+if (requestEx.getAttribute(RestConst.REST_REQUEST) != requestEx) {
+ // already timeout
+ // in this time, request maybe recycled and reused by web
container, do not use requestEx
+ LOGGER.error("Rest request already timeout, abandon execute,
method {}, operation {}.",
+ operationMeta.getHttpMethod(),
+ operationMeta.getMicroserviceQualifiedName());
+ return;
+}
+
+runOnExecutor();
+ } catch (Throwable e) {
+LOGGER.error("rest server onRequest error", e);
+sendFailResponse(e);
}
-
- runOnExecutor();
-} catch (Throwable e) {
- LOGGER.error("rest server onRequest error", e);
- sendFailResponse(e);
}
- }
-});
+ });
+} catch (Throwable e) {
+ LOGGER.error("failed to schedule invocation, message={}, executor={}.",
e.getMessage(), e.getClass().getName());
+ sendFailResponse(e);
+}
}
private Holder checkQpsFlowControl(OperationMeta operationMeta) {
@@ -176,7 +181,7 @@ public abstract class AbstractRestInvocation {
produceProcessor = ProduceProcessorManager.JSON_PROCESSOR;
sendResponse(response);
});
- } catch (Exception e) {
+ } catch (Throwable e) {
LOGGER.error("failed to execute ProviderQpsFlowControlHandler", e);
qpsFlowControlReject.value = true;
sendFailResponse(e);
diff --git
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java
index 7e9c9ac..4e82258 100644
---
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java
+++
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executor;
+import java.util.concurrent.RejectedExecutionException;
import javax.ws.rs.core.Response.Status;
import javax.xml.ws.Holder;
@@ -885,17 +886,44 @@ public class
[GitHub] [servicecomb-java-chassis] wujimin merged pull request #1162: [SCB-1226] there are problems when request rejected by thread pool queue full
wujimin merged pull request #1162: [SCB-1226] there are problems when request rejected by thread pool queue full URL: https://github.com/apache/servicecomb-java-chassis/pull/1162 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-java-chassis] WillemJiang commented on issue #1158: [SCB-1229] update the version of dependency
WillemJiang commented on issue #1158: [SCB-1229] update the version of dependency URL: https://github.com/apache/servicecomb-java-chassis/pull/1158#issuecomment-478602104 We need to merge this patch and regenerate the license information for it. If the third party dependencies are using ASL, it just take few mins to fix the version. Let's merge this PR first. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-java-chassis] WillemJiang commented on issue #1149: [SCB-1218] Update the License Information
WillemJiang commented on issue #1149: [SCB-1218] Update the License Information URL: https://github.com/apache/servicecomb-java-chassis/pull/1149#issuecomment-478590245 @asifdxtreme I just created a new PR https://github.com/apache/servicecomb-java-chassis/pull/1163 with updated License information. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-java-chassis] WillemJiang opened a new pull request #1163: SCB-1218 Clean up the license information
WillemJiang opened a new pull request #1163: SCB-1218 Clean up the license information URL: https://github.com/apache/servicecomb-java-chassis/pull/1163 1. Updated the license maven plugin to generate the right license information 2. Clean up the license file against the generated third party files This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[servicecomb-java-chassis] branch SCB-1218 updated: SCB-1218 Added the reactive-stream
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch SCB-1218
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/SCB-1218 by this push:
new 2cda71f SCB-1218 Added the reactive-stream
2cda71f is described below
commit 2cda71f858b7d04d221f16f44c54cbd19a942fc5
Author: Willem Jiang
AuthorDate: Mon Apr 1 21:54:01 2019 +0800
SCB-1218 Added the reactive-stream
---
java-chassis-distribution/src/release/LICENSE | 7 ++
.../src/release/licenses/LICENSE-cc0 | 26 ++
2 files changed, 33 insertions(+)
diff --git a/java-chassis-distribution/src/release/LICENSE
b/java-chassis-distribution/src/release/LICENSE
index 54dde4c..58bea0f 100644
--- a/java-chassis-distribution/src/release/LICENSE
+++ b/java-chassis-distribution/src/release/LICENSE
@@ -208,6 +208,13 @@ separate copyright notices and license terms. Your use of
these
subcomponents is subject to the terms and conditions of the
following licenses.
+
+This product bundles files from reactive-streams which is licensed under the
+CC0 license.
+For details, see http://www.reactive-streams.org/
+You can find a copy of the License at licenses/LICENSE-reactivestream
+
+reactive-streams (org.reactivestreams:reactive-streams:1.0.0 -
http://www.reactive-streams.org/)
This product bundles files from stax2 which is licensed under the
diff --git a/java-chassis-distribution/src/release/licenses/LICENSE-cc0
b/java-chassis-distribution/src/release/licenses/LICENSE-cc0
new file mode 100644
index 000..4417dbe
--- /dev/null
+++ b/java-chassis-distribution/src/release/licenses/LICENSE-cc0
@@ -0,0 +1,26 @@
+Statement of Purpose
+The laws of most jurisdictions throughout the world automatically confer
exclusive Copyright and Related Rights (defined below) upon the creator and
subsequent owner(s) (each and all, an "owner") of an original work of
authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for the
purpose of contributing to a commons of creative, cultural and scientific works
("Commons") that the public can reliably and without fear of later claims of
infringement build upon, modify, incorporate in other works, reuse and
redistribute as freely as possible in any form whatsoever and for any purposes,
including without limitation commercial purposes. These owners may contribute
to the Commons to promote the [...]
+
+For these and/or other purposes and motivations, and without any expectation
of additional consideration or compensation, the person associating CC0 with a
Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and
publicly distribute the Work under its terms, with knowledge of his or her
Copyright and Related Rights in the Work and the meaning and intended legal
effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
protected by copyright and related or neighboring rights ("Copyright and
Related Rights"). Copyright and Related Rights include, but are not limited to,
the following:
+
+the right to reproduce, adapt, distribute, perform, display, communicate, and
translate a Work;
+moral rights retained by the original author(s) and/or performer(s);
+publicity and privacy rights pertaining to a person's image or likeness
depicted in a Work;
+rights protecting against unfair competition in regards to a Work, subject to
the limitations in paragraph 4(a), below;
+rights protecting the extraction, dissemination, use and reuse of data in a
Work;
+database rights (such as those arising under Directive 96/9/EC of the European
Parliament and of the Council of 11 March 1996 on the legal protection of
databases, and under any national implementation thereof, including any amended
or successor version of such directive); and
+other similar, equivalent or corresponding rights throughout the world based
on applicable law or treaty, and any national implementations thereof.
+2. Waiver. To the greatest extent permitted by, but not in contravention of,
applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
and Related Rights and associated claims and causes of action, whether now
known or unknown (including existing as well as future claims and causes of
action), in the Work (i) in all territories worldwide, (ii) for the maximum
duration provided by applicable la [...]
+
+3. Public License Fallback. Should any part of the Waiver for any reason be
judged legally invalid or ineffective under applicable law, then the
[servicecomb-java-chassis] branch SCB-1218 created (now 6f2022b)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-1218 in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git. at 6f2022b SCB-1218 Clean up the license of java-chassis This branch includes the following new commits: new 6f2022b SCB-1218 Clean up the license of java-chassis The 1 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.
[servicecomb-pack] branch SCB-1181 deleted (was 744f4d3)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-1181 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. was 744f4d3 SCB-1181 Added maven wrapper The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[GitHub] [servicecomb-pack] coveralls commented on issue #445: SCB-1235 Clean up the License information about third party
coveralls commented on issue #445: SCB-1235 Clean up the License information about third party URL: https://github.com/apache/servicecomb-pack/pull/445#issuecomment-478533524 [](https://coveralls.io/builds/22519961) Coverage increased (+0.1%) to 90.244% when pulling **07f1bcfa882a33f175d565642cab916308a0ad2b on SCB-1235** into **fc07239e07407664288a95a73bf2c111b82b672a on master**. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[servicecomb-pack] branch SCB-1223 deleted (was bbc0a5f)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-1223 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. was bbc0a5f SCB-1223 Polish the LICENSE file The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[servicecomb-pack] branch SCB-1142 deleted (was 24f2969)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-1142 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. was 24f2969 SCB-1142 Clean up the alpha-spring-boot-starter The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[servicecomb-pack] branch SCB-1180 deleted (was 0a8e271)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-1180 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. was 0a8e271 SCB-1180 Polish the alpha-server pom.xml The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[servicecomb-pack] branch SCB-1128 deleted (was e4321a6)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-1128 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. was e4321a6 SCB-1128 Clean up tcc-spring-demo unit tests The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[servicecomb-pack] branch SCB-1235 deleted (was 07f1bcf)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-1235 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. was 07f1bcf SCB-1235 Clean up the third party license information The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[servicecomb-pack] branch master updated (fc07239 -> b9fd242)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. from fc07239 SCB-1233 Release version removes eureka dependencies new 447982e SCB-1235 Setup license plugin to clean up third party license new b9fd242 SCB-1235 Clean up the third party license information The 1038 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: distribution/src/release/LICENSE | 518 ++--- .../src/release/licenses/LICENSE-bouncycastle | 8 + distribution/src/release/licenses/LICENSE-hamcrest | 27 ++ distribution/src/release/licenses/LICENSE-scala| 28 ++ pom.xml| 28 +- 5 files changed, 336 insertions(+), 273 deletions(-) create mode 100644 distribution/src/release/licenses/LICENSE-bouncycastle create mode 100644 distribution/src/release/licenses/LICENSE-hamcrest create mode 100644 distribution/src/release/licenses/LICENSE-scala
[GitHub] [servicecomb-pack] WillemJiang merged pull request #445: SCB-1235 Clean up the License information about third party
WillemJiang merged pull request #445: SCB-1235 Clean up the License information about third party URL: https://github.com/apache/servicecomb-pack/pull/445 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-pack] WillemJiang opened a new pull request #445: SCB-1235 Clean up the License information about third party
WillemJiang opened a new pull request #445: SCB-1235 Clean up the License information about third party URL: https://github.com/apache/servicecomb-pack/pull/445 Update the License plugin setting and clean up the License information This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[servicecomb-pack] branch SCB-1235 updated: SCB-1235 Clean up the third party license information
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch SCB-1235 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git The following commit(s) were added to refs/heads/SCB-1235 by this push: new 07f1bcf SCB-1235 Clean up the third party license information 07f1bcf is described below commit 07f1bcfa882a33f175d565642cab916308a0ad2b Author: Willem Jiang AuthorDate: Mon Apr 1 18:02:19 2019 +0800 SCB-1235 Clean up the third party license information --- distribution/src/release/LICENSE | 518 ++--- .../src/release/licenses/LICENSE-bouncycastle | 8 + distribution/src/release/licenses/LICENSE-hamcrest | 27 ++ distribution/src/release/licenses/LICENSE-scala| 28 ++ 4 files changed, 309 insertions(+), 272 deletions(-) diff --git a/distribution/src/release/LICENSE b/distribution/src/release/LICENSE index c44fae3..cc237fe 100644 --- a/distribution/src/release/LICENSE +++ b/distribution/src/release/LICENSE @@ -200,398 +200,372 @@ See the License for the specific language governing permissions and limitations under the License. - -=== -For org.aspectj:aspectjweaver:jar:1.8.10 === This product bundles AspectJ weaver which is licensed under the Eclipse Public License v1.0. For details, see http://www.aspectj.org You can find a copy of the License at licenses/LICENSE-epl-v10 -=== -For javax.transaction:javax.transaction-api:jar:1.2 -=== -This product bundles javax.transaction API which is licensed under the -COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1. -For details, see http://jta-spec.java.net -You can find a copy of the License at licenses/LICENSE-javax +* AspectJ weaver (org.aspectj:aspectjweaver:1.8.10 - http://www.aspectj.org) -=== -For ch.qos.logback:logback-core:jar:1.2.3 -ch.qos.logback:logback-classic:jar:1.2.3 -=== -This product bundles Logback which is licensed under the -Eclipse Public License v1.0. -For details, see http://logback.qos.ch -You can find a copy of the License at licenses/LICENSE-logback === -For org.slf4j:jul-to-slf4j:jar:1.7.25, -org.slf4j:slf4j-api:jar:1.7.25 -org.slf4j:log4j-to-slf4j:jar:2.11.1 -=== -This product bundles slf4j libraries which is licensed under the -MIT license. -For details, see http://www.slf4j.org -You can find a copy of the License at licenses/LICENSE-slf4j -=== - This product bundles ngx-admin libraries which is licensed under the MIT license. For details, see https://github.com/akveo/ngx-admin You can find a copy of the License at licenses/LICENSE-ngxadmin === -For com.google.protobuf:protobuf-java:bundle:3.5.1 -=== This product bundles protobuf which is licensed under the 3-Clause BSD license. -For details, see https://github.com/google/protobuf You can find a copy of the License at licenses/LICENSE-protobuf -=== -For javax.persistence:javax.persistence-api:jar:2.2 -javax.annotation:javax.annotation-api:jar:1.3.2 +* Protocol Buffers [Core] (com.google.protobuf:protobuf-java:3.5.1 - https://developers.google.com/protocol-buffers/protobuf-java/) + === This product bundles javax.persistence which is licensed under the Eclipse Public License v1.0. -For details, see https://github.com/javaee/jpa-spec You can find a copy of the License at licenses/LICENSE-epl-v10 -=== -For Boringssl(static library bundled in netty-tcnative-boringssl-static:2.0.7.Final) -=== -This product bundles Boringssl which is licensed under BSD style licenses. -For details, see https://github.com/google/boringssl -You can find a copy of the License at licenses/LICENSE-boringssl +* Expression Language 3.0 (org.glassfish:javax.el:3.0.0 - http://el-spec.java.net) +* Java Servlet API (javax.servlet:javax.servlet-api:4.0.1 - https://javaee.github.io/servlet-spec/) +* javax.annotation API (javax.annotation:javax.annotation-api:1.3.2 -
[GitHub] [servicecomb-service-center] ChinX commented on issue #543: 编译失败
ChinX commented on issue #543: 编译失败 URL: https://github.com/apache/servicecomb-service-center/issues/543#issuecomment-478496100 @lexkong 不知道是否开启了 GO111MODULE 的标识 由于SC使用了go mod 机制管理依赖包，不同的版本之间依赖包可能变动 建议尝试一下使用go mod命令编译： GO111MODULE=on go build -o service-center -v . 如果希望使用vendor目录进行编译可以执行 GO111MODULE=on go mod tidy GO111MODULE=on go mod vendor go build -o service-center -v . 我刚尝试了以上两种方式，最新版本在我的机器上都是可以正常编译的 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[servicecomb-service-center] branch master updated: Update bug_report.md
This is an automated email from the ASF dual-hosted git repository. littlecui pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git The following commit(s) were added to refs/heads/master by this push: new 90d6b97 Update bug_report.md 90d6b97 is described below commit 90d6b97034fdbd94448441c79d6b5af9eb5c553e Author: little-cui AuthorDate: Mon Apr 1 16:58:21 2019 +0800 Update bug_report.md --- .github/ISSUE_TEMPLATE/bug_report.md | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index afea384..4fb2185 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -18,10 +18,15 @@ Steps to reproduce the behavior: **Expected behavior** A clear and concise description of what you expected to happen. -**Platform (please complete the following information):** +**Platform And Runtime (please complete the following information):** + +Platform - OS: [e.g. iOS] - Browser [e.g. chrome, safari] - Version [e.g. 22] +Runtime + - Version [e.g. Go 1.11] + **Additional context** Add any other context about the problem here.
[servicecomb-pack] 01/01: SCB-1235 Setup license plugin to clean up third party license
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch SCB-1235 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git commit e2ecddf79e2aaacff4100f6d57e0224f06cac2e8 Author: Willem Jiang AuthorDate: Mon Apr 1 16:54:31 2019 +0800 SCB-1235 Setup license plugin to clean up third party license --- pom.xml | 28 +++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c7c6e7a..3f64dd9 100644 --- a/pom.xml +++ b/pom.xml @@ -599,7 +599,33 @@ org.codehaus.mojo license-maven-plugin -1.16 +1.19 + + +default-cli + + + true + + /org/codehaus/mojo/license/third-party-file-groupByMultiLicense.ftl + +The Apache Software License, Version 2.0|The Apache License, Version 2.0 +The Apache Software License, Version 2.0|Apache License, Version 2.0 +The Apache Software License, Version 2.0|Apache Public License 2.0 +The Apache Software License, Version 2.0|Apache 2 +The Apache Software License, Version 2.0|Apache 2.0 +The Apache Software License, Version 2.0|Apache-2.0 +The Apache Software License, Version 2.0|Apache License 2.0 +The Apache Software License, Version 2.0|Apache License, version 2.0 +3-Clause BSD License|BSD 3-clause +3-Clause BSD License|BSD 3-Clause +Eclipse Public License v1.0|Eclipse Public License 1.0 +Eclipse Public License v1.0|Eclipse Public License - v 1.0 +The MIT License|MIT License + + + + org.apache.rat
[GitHub] [servicecomb-service-center] little-cui commented on issue #543: 编译失败
little-cui commented on issue #543: 编译失败 URL: https://github.com/apache/servicecomb-service-center/issues/543#issuecomment-478494012 可以提供以下信息吗？ **Go version** **Platform (please complete the following information):** - OS: [e.g. iOS] - Browser [e.g. chrome, safari] - Version [e.g. 22] **Additional context** This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[servicecomb-pack] branch SCB-1235 created (now e2ecddf)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-1235 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. at e2ecddf SCB-1235 Setup license plugin to clean up third party license This branch includes the following new commits: new e2ecddf SCB-1235 Setup license plugin to clean up third party license The 1 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.
[GitHub] [servicecomb-java-chassis] wujimin opened a new pull request #1162: [SCB-1226] there are problems when request rejected by thread pool queue full
wujimin opened a new pull request #1162: [SCB-1226] there are problems when request rejected by thread pool queue full URL: https://github.com/apache/servicecomb-java-chassis/pull/1162 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-pack] WillemJiang merged pull request #444: [SCB-1233] Release version removes eureka dependencies
WillemJiang merged pull request #444: [SCB-1233] Release version removes eureka dependencies URL: https://github.com/apache/servicecomb-pack/pull/444 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[servicecomb-pack] branch master updated: SCB-1233 Release version removes eureka dependencies
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
The following commit(s) were added to refs/heads/master by this push:
new fc07239 SCB-1233 Release version removes eureka dependencies
fc07239 is described below
commit fc07239e07407664288a95a73bf2c111b82b672a
Author: 张磊
AuthorDate: Mon Apr 1 15:07:35 2019 +0800
SCB-1233 Release version removes eureka dependencies
---
alpha/alpha-server/pom.xml | 25 ---
.../alpha/server/AlphaIntegrationEventTest.java| 65
docs/user_guide.md | 170 +++--
docs/user_guide_zh.md | 170 +++--
4 files changed, 180 insertions(+), 250 deletions(-)
diff --git a/alpha/alpha-server/pom.xml b/alpha/alpha-server/pom.xml
index 228fd15..a079552 100644
--- a/alpha/alpha-server/pom.xml
+++ b/alpha/alpha-server/pom.xml
@@ -82,29 +82,7 @@
org.apache.servicecomb.pack
- alpha-spring-cloud-starter-eureka
-
-
- org.apache.servicecomb.pack
alpha-spring-cloud-starter-consul
-
-
- spring-cloud-commons
- org.springframework.cloud
-
-
- spring-cloud-context
- org.springframework.cloud
-
-
- spring-cloud-netflix-core
- org.springframework.cloud
-
-
- spring-cloud-starter-netflix-ribbon
- org.springframework.cloud
-
-
org.apache.servicecomb.pack
@@ -269,9 +247,6 @@
spring-cloud-eureka
-
-true
-
org.apache.servicecomb.pack
diff --git
a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationEventTest.java
b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationEventTest.java
deleted file mode 100644
index 0cb3804..000
---
a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationEventTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.pack.alpha.server;
-
-import com.google.common.eventbus.EventBus;
-import org.apache.servicecomb.pack.alpha.core.event.GrpcStartableStartedEvent;
-import org.junit.*;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.*;
-
-import static
org.apache.servicecomb.pack.alpha.server.discovery.eureka.GrpcStartableStartedEventListener.ALPHA_SERVER_GRPC_ADDRESS_KEY;
-import static org.awaitility.Awaitility.await;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.when;
-
-@RunWith(SpringRunner.class)
-@ActiveProfiles("test")
-@SpringBootTest(classes = {AlphaApplication.class, AlphaConfig.class},
-properties = {
-"alpha.server.host=0.0.0.0",
-"alpha.server.port=8080",
-"eureka.client.enabled=true"
- })
-public class AlphaIntegrationEventTest {
-
- @Autowired
- private EventBus eventBus;
-
- @MockBean
- private EurekaInstanceConfigBean eurekaInstanceConfigBean;
-
- @Test
- public void eurekaInstanceConfigBeanPortUpdater(){
-when(eurekaInstanceConfigBean.getMetadataMap()).thenReturn(new
HashMap<>());
-
this.eurekaInstanceConfigBean.getMetadataMap().put(ALPHA_SERVER_GRPC_ADDRESS_KEY,"0.0.0.0:0");
-eventBus.post(new GrpcStartableStartedEvent(9000));
-
assertThat(eurekaInstanceConfigBean.getMetadataMap().get(ALPHA_SERVER_GRPC_ADDRESS_KEY),is("0.0.0.0:9000"));
- }
-
-}
diff --git a/docs/user_guide.md
[GitHub] [servicecomb-pack] coveralls commented on issue #444: [SCB-1233] Release version removes eureka dependencies
coveralls commented on issue #444: [SCB-1233] Release version removes eureka dependencies URL: https://github.com/apache/servicecomb-pack/pull/444#issuecomment-478480854 [](https://coveralls.io/builds/22516647) Coverage decreased (-0.04%) to 90.122% when pulling **ca9612cd1044de2f82426366224813e8c18c3e38 on coolbeevip:SCB-1233** into **1ba63649fbe23d3830f8848cd68fc3340ca4b8b7 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-service-center] lexkong opened a new issue #543: 编译失败
lexkong opened a new issue #543: 编译失败 URL: https://github.com/apache/servicecomb-service-center/issues/543 最新版本，编译不通过： go build -o service-center -v . github.com/apache/servicecomb-service-center/server/handler/context github.com/apache/servicecomb-service-center/server/plugin/pkg/registry/etcd github.com/apache/servicecomb-service-center/server/plugin/pkg/registry/embededetcd # github.com/apache/servicecomb-service-center/server/handler/context server/handler/context/v3.go:49:4: undefined: util.Logger k8s.io/client-go/discovery 报：server/handler/context/v3.go:49:4: undefined: util.Logger This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-java-chassis] wujimin merged pull request #1160: [SCB-1231] add queue meter of http client connection pool
wujimin merged pull request #1160: [SCB-1231] add queue meter of http client connection pool URL: https://github.com/apache/servicecomb-java-chassis/pull/1160 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[servicecomb-java-chassis] branch master updated (6878d34 -> a81c092)
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git.
from 6878d34 [SCB-1230] avoid throw exception in
httpClientResponse.exceptionHandler
new 6188790 [SCB-1231] create endpoint metrics as early as possible
new b4d355a [SCB-1231] add queue meter of http client connection pool
new a81c092 [SCB-1231] publish queue meter of http client connection pool
to log
The 2182 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:
.../vertx/metrics/DefaultHttpClientMetrics.java| 29 +++--
.../vertx/metrics/DefaultTcpClientMetrics.java | 4 +-
.../vertx/metrics/DefaultVertxMetrics.java | 8 ++--
.../metric/DefaultClientEndpointMetric.java| 21 +++--
.../metric/DefaultClientEndpointMetricManager.java | 50 ++
.../metrics/metric/DefaultEndpointMetric.java | 8 ++--
.../metrics/metric/DefaultHttpSocketMetric.java| 3 ++
.../metric/DefaultServerEndpointMetric.java| 4 +-
.../metrics/metric/DefaultTcpSocketMetric.java | 8
.../metrics/TestDefaultHttpClientMetrics.java | 26 ++-
.../metrics/TestDefaultHttpServerMetrics.java | 1 -
.../vertx/metrics/TestDefaultTcpClientMetrics.java | 18 +---
.../vertx/metrics/TestDefaultTcpServerMetrics.java | 1 -
.../metrics/core/VertxMetersInitializer.java | 8 ++--
...ointMeter.java => HttpClientEndpointMeter.java} | 20 -
...ntsMeter.java => HttpClientEndpointsMeter.java} | 9 ++--
...dpointsMeter.java => ServerEndpointsMeter.java} | 7 +--
.../core/meter/vertx/VertxEndpointsMeter.java | 10 ++---
.../core/publish/ClientEndpointsLogPublisher.java | 11 +++--
.../core/publish/ServerEndpointsLogPublisher.java | 6 +--
.../metrics/core/TestVertxMetersInitializer.java | 15 ---
21 files changed, 146 insertions(+), 121 deletions(-)
copy
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/meter/vertx/{ServerEndpointMeter.java
=> HttpClientEndpointMeter.java} (64%)
copy
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/meter/vertx/{VertxServerEndpointsMeter.java
=> HttpClientEndpointsMeter.java} (80%)
rename
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/meter/vertx/{VertxServerEndpointsMeter.java
=> ServerEndpointsMeter.java} (83%)
[GitHub] [servicecomb-java-chassis] wujimin commented on a change in pull request #1161: [SCB-1232] make GroupExecutor configuration compatible to old version
wujimin commented on a change in pull request #1161: [SCB-1232] make
GroupExecutor configuration compatible to old version
URL:
https://github.com/apache/servicecomb-java-chassis/pull/1161#discussion_r270741350
##
File path:
core/src/main/java/org/apache/servicecomb/core/executor/GroupExecutor.java
##
@@ -83,25 +83,31 @@ public void init() {
}
public void initConfig() {
-groupCount =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_GROUP, 2).get();
-coreThreads =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_CORE_THREADS, 25).get();
-
-maxThreads =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_MAX_THREADS, -1).get();
-if (maxThreads <= 0) {
- maxThreads =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_THREAD, -1).get();
- if (maxThreads > 0) {
-LOGGER.warn("{} is deprecated, recommended to use {}.", KEY_THREAD,
KEY_MAX_THREADS);
- } else {
-maxThreads = 100;
- }
-}
-if (coreThreads > maxThreads) {
- LOGGER.warn("coreThreads is bigger than maxThreads, change from {} to
{}.", coreThreads, maxThreads);
+LOGGER.info("JDK standard thread pool rules:\n"
++ "1.use core threads.\n"
++ "2.if all core threads are busy, then queue the request.\n"
++ "3.if queue is full, then create new thread util reach the limit of
max threads.\n"
++ "4.if queue is full, and threads count is max, then reject the
request.");
+
+// the complex logic is to keep compatible
+// otherwise can throw exception if configuration is invalid.
+coreThreads =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_CORE_THREADS, -1).get();
+
+int oldMaxThreads =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_OLD_MAX_THREAD,
-1).get();
+maxThreads =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_MAX_THREADS,
oldMaxThreads).get();
+maxThreads = Math.max(coreThreads, maxThreads);
+maxThreads = maxThreads <= 0 ? 100 : maxThreads;
+
+maxQueueSize =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_MAX_QUEUE_SIZE,
Integer.MAX_VALUE).get();
+if (maxQueueSize == Integer.MAX_VALUE) {
coreThreads = maxThreads;
+ LOGGER.info("not configured {}, make coreThreads and maxThreads to be
{}.", KEY_MAX_QUEUE_SIZE, maxThreads);
+} else {
+ coreThreads = coreThreads <= 0 ? 25 : coreThreads;
Review comment:
only developers configured a small maxThreads and big coreThreads will cause
problem: ThreadPoolExecutor will throw exception in constructor
i think it's developers's duty to make a right configuration
we just handle compatible sense and default value.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [servicecomb-pack] coolbeevip opened a new pull request #444: [SCB-1233] Release version removes eureka dependencies
coolbeevip opened a new pull request #444: [SCB-1233] Release version removes eureka dependencies URL: https://github.com/apache/servicecomb-pack/pull/444 eureka-client.jar dependent a (LGPL 3.0 license) Compact HashMap (com.github.vlsi.compactmap:compactmap:1.2.1 - https://github.com/vlsi/compactmap/compactmap) I have removed the dependency on eureka from the release version. use '-Pspring-cloud-eureka' build support eureka version This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-java-chassis] wujimin commented on a change in pull request #1161: [SCB-1232] make GroupExecutor configuration compatible to old version
wujimin commented on a change in pull request #1161: [SCB-1232] make
GroupExecutor configuration compatible to old version
URL:
https://github.com/apache/servicecomb-java-chassis/pull/1161#discussion_r270739279
##
File path:
core/src/test/java/org/apache/servicecomb/core/executor/TestGroupExecutor.java
##
@@ -86,46 +75,83 @@ public void maxQueueSize() {
}
@Test
- public void maxThreads() {
+ public void threads_allDefault() {
groupExecutor.initConfig();
+Assert.assertEquals(100, groupExecutor.coreThreads);
Assert.assertEquals(100, groupExecutor.maxThreads);
+ }
+
+ @Test
+ public void threads_compatible() {
+ArchaiusUtils.setProperty(GroupExecutor.KEY_OLD_THREAD, 200);
-LogCollector collector = new LogCollector();
-ArchaiusUtils.setProperty(GroupExecutor.KEY_THREAD, 200);
groupExecutor.initConfig();
+Assert.assertEquals(200, groupExecutor.coreThreads);
Assert.assertEquals(200, groupExecutor.maxThreads);
-Assert.assertEquals(
-"servicecomb.executor.default.thread-per-group is deprecated,
recommended to use servicecomb.executor.default.maxThreads-per-group.",
-collector.getEvents().get(collector.getEvents().size() -
2).getMessage());
-collector.teardown();
+ }
+
+ @Test
+ public void threads_standard() {
+ArchaiusUtils.setProperty(GroupExecutor.KEY_CORE_THREADS, 25);
+ArchaiusUtils.setProperty(GroupExecutor.KEY_MAX_THREADS, 100);
-ArchaiusUtils.setProperty(GroupExecutor.KEY_MAX_THREADS, 300);
groupExecutor.initConfig();
-Assert.assertEquals(300, groupExecutor.maxThreads);
+Assert.assertEquals(25, groupExecutor.coreThreads);
+Assert.assertEquals(100, groupExecutor.maxThreads);
}
@Test
- public void adjustCoreThreads() {
+ public void threads_onlyMaxThread() {
ArchaiusUtils.setProperty(GroupExecutor.KEY_MAX_THREADS, 10);
-LogCollector collector = new LogCollector();
groupExecutor.initConfig();
Assert.assertEquals(10, groupExecutor.maxThreads);
-Assert.assertEquals(
-"coreThreads is bigger than maxThreads, change from 25 to 10.",
-collector.getEvents().get(collector.getEvents().size() -
2).getMessage());
-collector.teardown();
+Assert.assertEquals(10, groupExecutor.maxThreads);
Review comment:
because of jdk thread pool rule and compatible to old version
if upgrade from old version, no queueSize configured, it will be max int, if
queueSize is too big, then coreThreads different to maxThreads is no meaning
but we can not know how big is "too big"
if developers configured queueSize， we can only treat the developer know
what happened, just use the existing value.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [servicecomb-java-chassis] liubao68 commented on a change in pull request #1161: [SCB-1232] make GroupExecutor configuration compatible to old version
liubao68 commented on a change in pull request #1161: [SCB-1232] make
GroupExecutor configuration compatible to old version
URL:
https://github.com/apache/servicecomb-java-chassis/pull/1161#discussion_r270734371
##
File path:
core/src/test/java/org/apache/servicecomb/core/executor/TestGroupExecutor.java
##
@@ -86,46 +75,83 @@ public void maxQueueSize() {
}
@Test
- public void maxThreads() {
+ public void threads_allDefault() {
groupExecutor.initConfig();
+Assert.assertEquals(100, groupExecutor.coreThreads);
Assert.assertEquals(100, groupExecutor.maxThreads);
+ }
+
+ @Test
+ public void threads_compatible() {
+ArchaiusUtils.setProperty(GroupExecutor.KEY_OLD_THREAD, 200);
-LogCollector collector = new LogCollector();
-ArchaiusUtils.setProperty(GroupExecutor.KEY_THREAD, 200);
groupExecutor.initConfig();
+Assert.assertEquals(200, groupExecutor.coreThreads);
Assert.assertEquals(200, groupExecutor.maxThreads);
-Assert.assertEquals(
-"servicecomb.executor.default.thread-per-group is deprecated,
recommended to use servicecomb.executor.default.maxThreads-per-group.",
-collector.getEvents().get(collector.getEvents().size() -
2).getMessage());
-collector.teardown();
+ }
+
+ @Test
+ public void threads_standard() {
+ArchaiusUtils.setProperty(GroupExecutor.KEY_CORE_THREADS, 25);
+ArchaiusUtils.setProperty(GroupExecutor.KEY_MAX_THREADS, 100);
-ArchaiusUtils.setProperty(GroupExecutor.KEY_MAX_THREADS, 300);
groupExecutor.initConfig();
-Assert.assertEquals(300, groupExecutor.maxThreads);
+Assert.assertEquals(25, groupExecutor.coreThreads);
+Assert.assertEquals(100, groupExecutor.maxThreads);
}
@Test
- public void adjustCoreThreads() {
+ public void threads_onlyMaxThread() {
ArchaiusUtils.setProperty(GroupExecutor.KEY_MAX_THREADS, 10);
-LogCollector collector = new LogCollector();
groupExecutor.initConfig();
Assert.assertEquals(10, groupExecutor.maxThreads);
-Assert.assertEquals(
-"coreThreads is bigger than maxThreads, change from 25 to 10.",
-collector.getEvents().get(collector.getEvents().size() -
2).getMessage());
-collector.teardown();
+Assert.assertEquals(10, groupExecutor.maxThreads);
Review comment:
Why you keep this:
3.if configured queue, and queue size is not max int, then coreThreads
default to be 25
I can't figure out the relationship between queue size and max thread size.
For example, if users configure queue size to be MAX_INT/2
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [servicecomb-java-chassis] liubao68 commented on a change in pull request #1161: [SCB-1232] make GroupExecutor configuration compatible to old version
liubao68 commented on a change in pull request #1161: [SCB-1232] make
GroupExecutor configuration compatible to old version
URL:
https://github.com/apache/servicecomb-java-chassis/pull/1161#discussion_r27071
##
File path:
core/src/main/java/org/apache/servicecomb/core/executor/GroupExecutor.java
##
@@ -83,25 +83,31 @@ public void init() {
}
public void initConfig() {
-groupCount =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_GROUP, 2).get();
-coreThreads =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_CORE_THREADS, 25).get();
-
-maxThreads =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_MAX_THREADS, -1).get();
-if (maxThreads <= 0) {
- maxThreads =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_THREAD, -1).get();
- if (maxThreads > 0) {
-LOGGER.warn("{} is deprecated, recommended to use {}.", KEY_THREAD,
KEY_MAX_THREADS);
- } else {
-maxThreads = 100;
- }
-}
-if (coreThreads > maxThreads) {
- LOGGER.warn("coreThreads is bigger than maxThreads, change from {} to
{}.", coreThreads, maxThreads);
+LOGGER.info("JDK standard thread pool rules:\n"
++ "1.use core threads.\n"
++ "2.if all core threads are busy, then queue the request.\n"
++ "3.if queue is full, then create new thread util reach the limit of
max threads.\n"
++ "4.if queue is full, and threads count is max, then reject the
request.");
+
+// the complex logic is to keep compatible
+// otherwise can throw exception if configuration is invalid.
+coreThreads =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_CORE_THREADS, -1).get();
+
+int oldMaxThreads =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_OLD_MAX_THREAD,
-1).get();
+maxThreads =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_MAX_THREADS,
oldMaxThreads).get();
+maxThreads = Math.max(coreThreads, maxThreads);
+maxThreads = maxThreads <= 0 ? 100 : maxThreads;
+
+maxQueueSize =
DynamicPropertyFactory.getInstance().getIntProperty(KEY_MAX_QUEUE_SIZE,
Integer.MAX_VALUE).get();
+if (maxQueueSize == Integer.MAX_VALUE) {
coreThreads = maxThreads;
+ LOGGER.info("not configured {}, make coreThreads and maxThreads to be
{}.", KEY_MAX_QUEUE_SIZE, maxThreads);
+} else {
+ coreThreads = coreThreads <= 0 ? 25 : coreThreads;
Review comment:
This statement should be calculated before
maxThreads = Math.max(coreThreads, maxThreads);
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [servicecomb-java-chassis] heyile commented on issue #1158: [SCB-1229] update the version of dependency
heyile commented on issue #1158: [SCB-1229] update the version of dependency URL: https://github.com/apache/servicecomb-java-chassis/pull/1158#issuecomment-478457822 > > > Does license files need upgrated? see #1149 I will update license after #1149 . This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-java-chassis] heyile commented on issue #1158: [SCB-1229] update the version of dependency
heyile commented on issue #1158: [SCB-1229] update the version of dependency URL: https://github.com/apache/servicecomb-java-chassis/pull/1158#issuecomment-478456838 > upgrated I see. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[servicecomb-java-chassis] branch master updated: [SCB-1230] avoid throw exception in httpClientResponse.exceptionHandler
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
The following commit(s) were added to refs/heads/master by this push:
new 6878d34 [SCB-1230] avoid throw exception in
httpClientResponse.exceptionHandler
6878d34 is described below
commit 6878d343cb9e7b5ce2c975cf0afd26b25638f53e
Author: wujimin
AuthorDate: Sat Mar 30 21:22:30 2019 +0800
[SCB-1230] avoid throw exception in httpClientResponse.exceptionHandler
---
.../transport/rest/client/http/RestClientInvocation.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git
a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/RestClientInvocation.java
b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/RestClientInvocation.java
index 970e069..12d433d 100644
---
a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/RestClientInvocation.java
+++
b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/RestClientInvocation.java
@@ -249,7 +249,12 @@ public class RestClientInvocation {
}
stageTrace.finishClientFiltersResponse();
-asyncResp.fail(invocation.getInvocationType(), e);
+
+try {
+ asyncResp.fail(invocation.getInvocationType(), e);
+} catch (Throwable e1) {
+ LOGGER.error(invocation.getMarker(), "failed to invoke asyncResp.fail.",
e1);
+}
}
protected void setCseContext() {
[GitHub] [servicecomb-java-chassis] liubao68 merged pull request #1159: [SCB-1230] avoid throw exception in httpClientResponse.exceptionHandler
liubao68 merged pull request #1159: [SCB-1230] avoid throw exception in httpClientResponse.exceptionHandler URL: https://github.com/apache/servicecomb-java-chassis/pull/1159 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-java-chassis] liubao68 commented on issue #1158: [SCB-1229] update the version of dependency
liubao68 commented on issue #1158: [SCB-1229] update the version of dependency URL: https://github.com/apache/servicecomb-java-chassis/pull/1158#issuecomment-478453212 Does license files need upgrated? see https://github.com/apache/servicecomb-java-chassis/pull/1149 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[servicecomb-java-chassis] branch master updated (002ee16 -> 9ad8150)
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 002ee16 Upgrade the maven license plugin version to fix the class not found exception new 680934e [SCB-1224] az affinity is conflict with empty instance protection new 9ad8150 [SCB-1224] az affinity is conflict with empty instance protection: fix as reviewed The 2178 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: .../loadbalance/LoadbalanceHandler.java| 11 +-- .../filter/IsolationDiscoveryFilter.java | 18 - .../filter/ZoneAwareDiscoveryFilter.java | 28 +--- .../loadbalance/TestLoadBalanceHandler2.java | 84 +++--- .../loadbalance/TestLoadbalanceHandler.java| 13 5 files changed, 79 insertions(+), 75 deletions(-)
[GitHub] [servicecomb-java-chassis] liubao68 merged pull request #1154: [SCB-1224] az affinity is conflict with empty instance protection
liubao68 merged pull request #1154: [SCB-1224] az affinity is conflict with empty instance protection URL: https://github.com/apache/servicecomb-java-chassis/pull/1154 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
