[GitHub] [servicecomb-java-chassis] wpcchengxuyuan closed issue #1181: 关于service comb文档上的一些疑问和实际运用中的不符点
wpcchengxuyuan closed issue #1181: 关于service comb文档上的一些疑问和实际运用中的不符点 URL: https://github.com/apache/servicecomb-java-chassis/issues/1181 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] wpcchengxuyuan commented on issue #1181: 关于service comb文档上的一些疑问和实际运用中的不符点
wpcchengxuyuan commented on issue #1181: 关于service comb文档上的一些疑问和实际运用中的不符点 URL: https://github.com/apache/servicecomb-java-chassis/issues/1181#issuecomment-483096044 原来如此,谢谢您的解答 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 weak-contract-type updated (8cf4d08 -> 3d61952)
This is an automated email from the ASF dual-hosted git repository. wujimin pushed a change to branch weak-contract-type in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git. from 8cf4d08 [SCB-1227][WIP][WEAK] update unit test new 7ab105d [SCB-1228][WIP][WEAK] delete swagger to class logic new efac97f [SCB-1228][WIP][WEAK] swagger springmvc generator switch to new mechanism new 7cfe158 [SCB-1228][WIP][WEAK] springmvc processors switch to new mechanism new 19423ae [SCB-1228][WIP][WEAK] update SPI definition new dcca218 [SCB-1228][WIP][WEAK] update unit test new 3d61952 [SCB-1228][WIP][WEAK] update chassis pom.xml to present interface argument name The 2224 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: pom.xml| 1 + .../springmvc/MultipartFilePropertyCreator.java| 39 --- .../springmvc/SpringmvcOperationGenerator.java}| 41 +-- .../springmvc/SpringmvcSwaggerGenerator.java} | 53 ++- .../SpringmvcSwaggerGeneratorContext.java | 120 --- .../SpringmvcSwaggerGeneratorFactory.java} | 15 +- ...stractHttpMethodMappingAnnotationProcessor.java | 61 ++-- ...ctSpringmvcSerializableParameterProcessor.java} | 47 ++- .../annotation/CookieValueAnnotationProcessor.java | 46 +-- .../DeleteMappingMethodAnnotationProcessor.java| 36 +- .../GetMappingMethodAnnotationProcessor.java | 32 +- .../PatchMappingMethodAnnotationProcessor.java | 35 +- .../PathVariableAnnotationProcessor.java | 38 +- .../PostMappingMethodAnnotationProcessor.java | 33 +- .../PutMappingMethodAnnotationProcessor.java | 32 +- .../RequestAttributeAnnotationProcessor.java | 35 +- .../annotation/RequestBodyAnnotationProcessor.java | 33 +- .../RequestHeaderAnnotationProcessor.java | 44 +-- .../RequestMappingClassAnnotationProcessor.java| 43 +-- .../RequestMappingMethodAnnotationProcessor.java | 51 +-- .../RequestParamAnnotationProcessor.java | 46 +-- .../annotation/RequestPartAnnotationProcessor.java | 43 ++- .../RestControllerClassAnnotationProcessor.java| 35 -- .../parameter/MultipartFileArrayProcessor.java}| 10 +- .../parameter/MultipartFileArrayTypeProcessor.java | 46 --- .../parameter/MultipartFileListProcessor.java} | 10 +- .../parameter/MultipartFileListTypeProcessor.java | 50 --- .../parameter/MultipartFileTypeProcessor.java | 19 +- .../SpringmvcDefaultObjectParameterProcessor.java | 115 -- .../SpringmvcDefaultParameterProcessor.java| 58 .../SpringmvcDefaultSimpleParameterProcessor.java | 40 --- .../response/ResponseEntityProcessor.java | 11 +- ...swagger.extend.property.creator.PropertyCreator | 18 - ...comb.swagger.generator.ClassAnnotationProcessor | 2 +- ...omb.swagger.generator.MethodAnnotationProcessor | 11 +- ...rvicecomb.swagger.generator.ParameterProcessor} | 11 +- ...cecomb.swagger.generator.ResponseTypeProcessor} | 0 ...comb.swagger.generator.SwaggerGeneratorFactory} | 2 +- .../TestSwaggerToClassGenerator_base.java | 55 --- .../TestSwaggerToClassGenerator_create.java| 61 .../TestSwaggerToClassGenerator_reuse.java | 63 .../swaggerToClassGenerator/ToClassSchema.java | 42 --- .../swaggerToClassGenerator/model/DependTypeA.java | 29 -- .../swaggerToClassGenerator/model/DependTypeB.java | 29 -- .../swaggerToClassGenerator/model/Generic.java | 39 --- .../model/RecursiveSelfType.java | 29 -- .../swagger/generator/springmvc/Echo.java | 37 ++ .../generator/springmvc/MethodResponseEntity.java | 2 +- .../generator/springmvc/MultiDefaultPath.java | 2 +- .../springmvc/TestResponseEntityProcessor.java | 31 -- .../swagger/generator/springmvc/TestSpringmvc.java | 187 ++ .../springmvc/model/DefaultParameterSchema.java| 32 +- .../SwaggerTestTarget.java}| 20 +- .../SwaggerTestTarget_ValueOverWritePath.java} | 11 +- .../generator/springmvc/model/TestParam.java} | 10 +- .../generator/springmvc/model/TestProducer.java} | 20 +- ...RequestMappingClassAnnotationProcessorTest.java | 98 -- ...equestMappingMethodAnnotationProcessorTest.java | 83 - ...ringmvcDefaultObjectParameterProcessorTest.java | 385 - .../SpringmvcDefaultParameterProcessorTest.java| 193 --- ...ringmvcDefaultSimpleParameterProcessorTest.java | 53 --- .../resources/schemas/asyncResponseEntity.yaml | 8 +- .../{inheritHttpMethod.yaml => cookie.yaml}| 6 +- .../test/resources/schemas/defaultParameter.yaml | 24 +- .../schemas/{inheritHttpMethod.yaml
[GitHub] [servicecomb-java-chassis] wujimin merged pull request #1171: [SCB-1228][WIP][WEAK] swagger generator springmvc not depend on dynamic class
wujimin merged pull request #1171: [SCB-1228][WIP][WEAK] swagger generator springmvc not depend on dynamic class URL: https://github.com/apache/servicecomb-java-chassis/pull/1171 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 #1170: [SCB-1227][WIP][WEAK] swagger generator jaxrs not depend on dynamic class
wujimin merged pull request #1170: [SCB-1227][WIP][WEAK] swagger generator jaxrs not depend on dynamic class URL: https://github.com/apache/servicecomb-java-chassis/pull/1170 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 weak-contract-type updated (7eae773 -> 8cf4d08)
This is an automated email from the ASF dual-hosted git repository. wujimin pushed a change to branch weak-contract-type in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git. from 7eae773 [SCB-1242] add spring data plugin project new 896cc64 [SCB-1227][WIP][WEAK] swagger jaxrs generator switch to new mechanism new 3ef1758 [SCB-1227][WIP][WEAK] jaxrs processors switch to new mechanism new a19e28d [SCB-1227][WIP][WEAK] update SPI definition new 8cf4d08 [SCB-1227][WIP][WEAK] update unit test The 2218 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: .../generator/jaxrs/JaxrsOperationGenerator.java | 73 .../generator/jaxrs/JaxrsSwaggerGenerator.java}| 30 +- .../jaxrs/JaxrsSwaggerGeneratorContext.java| 117 --- .../jaxrs/JaxrsSwaggerGeneratorFactory.java} | 23 +- .../annotation/BeanParamAnnotationProcessor.java | 229 - .../annotation/ConsumesAnnotationProcessor.java| 26 +- .../annotation/CookieParamAnnotationProcessor.java | 21 +- .../annotation/DeleteAnnotationProcessor.java | 12 +- .../annotation/FormParamAnnotationProcessor.java | 20 +- ...nProcessor.java => GetAnnotationProcessor.java} | 19 +- .../annotation/HeaderParamAnnotationProcessor.java | 21 +- .../annotation/PathClassAnnotationProcessor.java | 16 +- .../annotation/PathMethodAnnotationProcessor.java | 16 +- .../annotation/PathParamAnnotationProcessor.java | 20 +- .../annotation/PostAnnotationProcessor.java} | 11 +- .../annotation/ProducesAnnotationProcessor.java| 26 +- .../annotation/PutAnnotationProcessor.java}| 11 +- .../annotation/QueryParamAnnotationProcessor.java | 20 +- .../parameter/JaxrsDefaultParameterProcessor.java | 33 -- .../processor/response/JaxrsResponseProcessor.java | 20 +- ...comb.swagger.generator.ClassAnnotationProcessor | 2 +- ...omb.swagger.generator.MethodAnnotationProcessor | 12 +- ...ervicecomb.swagger.generator.ParameterProcessor | 6 +- ...cecomb.swagger.generator.ResponseTypeProcessor} | 0 ...comb.swagger.generator.SwaggerGeneratorFactory} | 2 +- .../servicecomb/swagger/generator/jaxrs/Echo.java | 57 .../swagger/generator/jaxrs/TestJaxrs.java | 114 --- .../generator/jaxrs/model/AggregatedParam.java | 83 + .../jaxrs/model/BeanParamComplexField.java | 16 +- .../jaxrs/model/BeanParamComplexSetter.java| 16 +- .../jaxrs/model/BeanParamDefaultBody.java | 5 +- .../jaxrs/model/BeanParamInvalidDefaultBody.java | 14 +- .../model/BeanParamWithJsonIgnoredTagged.java | 30 +- .../generator/jaxrs/model/BeanParamWithPart.java | 45 +-- .../generator/jaxrs/model/ConsumesAndProduces.java | 34 +- .../BeanParamAnnotationProcessorTest.java | 369 - .../ConsumesAnnotationProcessorTest.java | 86 - .../ProducesAnnotationProcessorTest.java | 59 .../schemas/{echo.yaml => aggregatedParam.yaml}| 55 ++- ...StringMethod.yaml => beanParamDefaultBody.yaml} | 9 +- ...ry.yaml => beanParamWithJsonIgnoredTagged.yaml} | 10 +- .../schemas/{form.yaml => beanParamWithPart.yaml} | 21 +- .../resources/schemas/{echo.yaml => consumes.yaml} | 83 +++-- .../schemas/{response.yaml => responseText.yaml} | 9 +- 44 files changed, 683 insertions(+), 1218 deletions(-) create mode 100644 swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/JaxrsOperationGenerator.java copy swagger/swagger-generator/{generator-core/src/main/java/org/apache/servicecomb/swagger/generator/pojo/PojoSwaggerGenerator.java => generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/JaxrsSwaggerGenerator.java} (58%) delete mode 100644 swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/JaxrsSwaggerGeneratorContext.java copy swagger/swagger-generator/generator-jaxrs/src/{test/java/org/apache/servicecomb/swagger/generator/jaxrs/MultiDefaultPath.java => main/java/org/apache/servicecomb/swagger/generator/jaxrs/JaxrsSwaggerGeneratorFactory.java} (60%) delete mode 100644 swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/BeanParamAnnotationProcessor.java copy common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/ParamValueProcessorCreator.java => swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/DeleteAnnotationProcessor.java (77%) rename
[GitHub] [servicecomb-java-chassis] wujimin edited a comment on issue #1181: 关于service comb文档上的一些疑问和实际运用中的不符点
wujimin edited a comment on issue #1181: 关于service comb文档上的一些疑问和实际运用中的不符点 URL: https://github.com/apache/servicecomb-java-chassis/issues/1181#issuecomment-483094501 赞,看文档很仔细 1. 写死的是读取tags的key,不是value 2. edge默认工作于reactive模式,此时的http client对象实际创建于server vertile中,所以,这个场景与client vertile实例数完全无关 如果将edge改为线程池模式,则http client对象会创建于client verticle中 其实,所有场景下,都是这个规则,如果是reactive流程,且当前已经处于transport vertx eventloop中,则需要创建http client时,不会再特地切线程的 另外,看连接数,需要区分是客户端连接数,还是服务端连接数,这一块metrics中会有详细的统计 ![image](https://user-images.githubusercontent.com/16874843/56105723-46c80400-5f70-11e9-8faf-f26267e4.png) 3. 当前因为一些历史原因,进程中不止创建了一个vertx实例,实际至少有registry和transport两个vertx实例,如果引入了ConfigCenter,还有一个config vertx实例,有一些浪费资源,后期会对此实现做修改 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 edited a comment on issue #1181: 关于service comb文档上的一些疑问和实际运用中的不符点
wujimin edited a comment on issue #1181: 关于service comb文档上的一些疑问和实际运用中的不符点 URL: https://github.com/apache/servicecomb-java-chassis/issues/1181#issuecomment-483094501 赞,看文档很仔细 1. 写死的是读取tags的key,不是value 2. edge默认工作于reactive模式,此时的http client对象实际创建于server vertile中,所以,这个场景与client vertile实例数完全无关 如果将edge改为线程池模式,则http client对象会创建于client verticle中 其实,所有场景下,都是这个规则,如果是reactive流程,则需要创建http client时,不会再特地切线程的 另外,看连接数,需要区分是客户端连接数,还是服务端连接数,这一块metrics中会有详细的统计 ![image](https://user-images.githubusercontent.com/16874843/56105723-46c80400-5f70-11e9-8faf-f26267e4.png) 3. 当前因为一些历史原因,进程中不止创建了一个vertx实例,实际至少有registry和transport两个vertx实例,如果引入了ConfigCenter,还有一个config vertx实例,有一些浪费资源,后期会对此实现做修改 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 issue #1181: 关于service comb文档上的一些疑问和实际运用中的不符点
wujimin commented on issue #1181: 关于service comb文档上的一些疑问和实际运用中的不符点 URL: https://github.com/apache/servicecomb-java-chassis/issues/1181#issuecomment-483094501 赞,看文档很仔细 1. 写死的是读取tags的key,不是value 2. edge默认工作于reactive模式,此时的http client对象实际创建于server vertile中,所以,这个场景与client vertile数据完全无关 如果将edge改为线程池模式,则http client对象会创建于client verticle中 其实,所有场景下,都是这个规则,如果是reactive流程,则需要创建http client时,不会再特地切线程的 另外,看连接数,需要区分是客户端连接数,还是服务端连接数,这一块metrics中会有详细的统计 ![image](https://user-images.githubusercontent.com/16874843/56105723-46c80400-5f70-11e9-8faf-f26267e4.png) 3. 当前因为一些历史原因,进程中不止创建了一个vertx实例,实际至少有registry和transport两个vertx实例,如果引入了ConfigCenter,还有一个config vertx实例,有一些浪费资源,后期会对此实现做修改 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] wpcchengxuyuan opened a new issue #1181: 关于service comb文档上的一些疑问和实际运用中的不符点
wpcchengxuyuan opened a new issue #1181: 关于service comb文档上的一些疑问和实际运用中的不符点 URL: https://github.com/apache/servicecomb-java-chassis/issues/1181 因为最近在做一些网关性能对比,所以对service comb做了一个详细的测评,以下是个人的疑惑,望您解答。 1.负载均衡部分关于服务端配置tag的疑问。 文档是![image](https://user-images.githubusercontent.com/18682598/56103780-15970600-5f67-11e9-996c-70a3651f7666.png) 而实际代码中写死为 ![image](https://user-images.githubusercontent.com/18682598/56104038-72df8700-5f68-11e9-8208-4e53b9b7fa5b.png)。 2.关于transport-rest连接数问题,文档中给出为client.thread-count*client.maxPoolsize的乘积。 ![image](https://user-images.githubusercontent.com/18682598/56104929-707f2c00-5f6c-11e9-9329-74e9aa394dc9.png) 我在实际操作过程中发现,如果server.thread-count>client.thread-count的乘积,则连接数为前者。因为是用ab压测工具采用1000并发直接压测网关服务,后端部署4个服务,所以应该能达到文档说的极限连接,然而后端服务连接数如图 ![image](https://user-images.githubusercontent.com/18682598/56104964-a3c1bb00-5f6c-11e9-9bbf-5bf54b4cdfdf.png)。有一条是本身服务的监听连接,则有45条和网关的连接。 网关配置如图 ![image](https://user-images.githubusercontent.com/18682598/56105004-dbc8fe00-5f6c-11e9-8551-b1885e40ab7d.png)。client.thread-count*maxPoolSize=24,server.thread-count*maxPoolSize=45。显然和文档不符,我猜测是由于服务本身又作为客户端又作为服务端,而通讯采用长连,连接需要复用,因此选用最大的。这只是猜测,望您指点疑惑。 3.关于transport-rest网络线程数问题,文档指出为 ![image](https://user-images.githubusercontent.com/18682598/56105276-ff407880-5f6d-11e9-8c81-5373846a092c.png),应该就是核数*2,机器核数为40 ![image](https://user-images.githubusercontent.com/18682598/56105318-33b43480-5f6e-11e9-8514-9eb7e51a09a6.png),然而jstack将eventloop统计之后发现不为这个数字 ![image](https://user-images.githubusercontent.com/18682598/56105371-7118c200-5f6e-11e9-9135-cf8be382f3e7.png)。然后也仔细的查看了jstack,除了eventloop没有其他的网络线程名称例如nio之类的。查看源码只发现服务作为server端时有一个accept线程,workEventLoop是通过addWork操作动态添加的。文档对于这部分貌似也不是正确的描述,希望您大致的指导解释一下。 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 #452: [SCB-1247] Set default value in alpha.cluster.address on omega side
WillemJiang merged pull request #452: [SCB-1247] Set default value in alpha.cluster.address on omega side URL: https://github.com/apache/servicecomb-pack/pull/452 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-1247 Set default value 0.0.0.0:8080 in alpha.cluster.address on omega side
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 2274eb9 SCB-1247 Set default value 0.0.0.0:8080 in alpha.cluster.address on omega side 2274eb9 is described below commit 2274eb96151b2cfc1f69ca204d5f3ddc0cf2fe20 Author: 张磊 AuthorDate: Wed Apr 10 09:36:48 2019 +0800 SCB-1247 Set default value 0.0.0.0:8080 in alpha.cluster.address on omega side --- .../servicecomb/pack/omega/spring/cloud/OmegaSpringConsulConfig.java | 2 +- .../servicecomb/pack/omega/spring/cloud/OmegaSpringEurekaConfig.java | 2 +- .../org/apache/servicecomb/pack/omega/spring/OmegaSpringConfig.java| 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/omega/omega-spring-cloud-consul-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringConsulConfig.java b/omega/omega-spring-cloud-consul-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringConsulConfig.java index 6c0935a..868bd4f 100644 --- a/omega/omega-spring-cloud-consul-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringConsulConfig.java +++ b/omega/omega-spring-cloud-consul-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringConsulConfig.java @@ -55,7 +55,7 @@ class OmegaSpringConsulConfig { @Bean AlphaClusterDiscovery alphaClusterAddress( @Value("${alpha.cluster.serviceId:servicecomb-alpha-server}") String serviceId, -@Value("${alpha.cluster.address:localhost:8080}") String[] addresses) { +@Value("${alpha.cluster.address:0.0.0.0:8080}") String[] addresses) { StringBuffer eurekaServiceUrls = new StringBuffer(); String[] alphaAddresses = this.getAlphaAddress(serviceId); diff --git a/omega/omega-spring-cloud-eureka-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringEurekaConfig.java b/omega/omega-spring-cloud-eureka-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringEurekaConfig.java index 114dcf0..f9d7d32 100644 --- a/omega/omega-spring-cloud-eureka-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringEurekaConfig.java +++ b/omega/omega-spring-cloud-eureka-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringEurekaConfig.java @@ -56,7 +56,7 @@ class OmegaSpringEurekaConfig { @Bean AlphaClusterDiscovery alphaClusterAddress( @Value("${alpha.cluster.serviceId:servicecomb-alpha-server}") String serviceId, -@Value("${alpha.cluster.address:localhost:8080}") String[] addresses) { +@Value("${alpha.cluster.address:0.0.0.0:8080}") String[] addresses) { StringBuffer eurekaServiceUrls = new StringBuffer(); String[] zones = eurekaClientConfig.getAvailabilityZones(eurekaClientConfig.getRegion()); for (String zone : zones) { diff --git a/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/OmegaSpringConfig.java b/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/OmegaSpringConfig.java index ba34927..ac16ba0 100644 --- a/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/OmegaSpringConfig.java +++ b/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/OmegaSpringConfig.java @@ -51,7 +51,6 @@ import org.springframework.context.annotation.Lazy; import java.lang.invoke.MethodHandles; @Configuration -@ConditionalOnProperty(value = {"alpha.cluster.address"}) class OmegaSpringConfig { private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); @@ -88,7 +87,7 @@ class OmegaSpringConfig { @Bean @ConditionalOnProperty(name = "alpha.cluster.register.type", havingValue = "default", matchIfMissing = true) - AlphaClusterDiscovery alphaClusterAddress(@Value("${alpha.cluster.address:localhost:8080}") String[] addresses){ + AlphaClusterDiscovery alphaClusterAddress(@Value("${alpha.cluster.address:0.0.0.0:8080}") String[] addresses){ return AlphaClusterDiscovery.builder().addresses(addresses).build(); }
[servicecomb-website] branch asf-site updated (bfaebb4 -> c316553)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git. from bfaebb4 Add Committer Zhang Lei new f5e385b Update the Release info for Java-Chassis 1.2.0 new c2ee816 Updated java-chassis release note. new 0be1e44 ServiceComb Pack 0.4.0 Integrated Discovery Service Consul new 3d5614a Add Committer Zhang Lei new c316553 Merge branch 'master' into asf-site The 953 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: _posts/2019-04-12-servicecomb-pack-consul.md | 134 + _posts/cn/2019-04-12-servicecomb-pack-consul.md| 132 + _release/cn/java_chassis_downloads.md | 5 +- _release/cn/java_chassis_releaseNotes.md | 213 - _release/cn/release.md | 5 +- _release/java_chassis_downloads.md | 5 +- _release/java_chassis_releaseNotes.md | 213 - _release/release.md| 5 +- .../alpha_register_to_consul.png | Bin 0 -> 123517 bytes .../consul_main.png| Bin 0 -> 95468 bytes 10 files changed, 702 insertions(+), 10 deletions(-) create mode 100755 _posts/2019-04-12-servicecomb-pack-consul.md create mode 100755 _posts/cn/2019-04-12-servicecomb-pack-consul.md create mode 100644 assets/images/2019-04-12-servicecomb-pack-consul/alpha_register_to_consul.png create mode 100644 assets/images/2019-04-12-servicecomb-pack-consul/consul_main.png
[servicecomb-website] branch master updated (0be1e44 -> 3d5614a)
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-website.git. from 0be1e44 ServiceComb Pack 0.4.0 Integrated Discovery Service Consul add 3d5614a Add Committer Zhang Lei No new revisions were added by this update. Summary of changes: _developers/cn/team.md | 1 + _developers/team.md| 1 + 2 files changed, 2 insertions(+)
[GitHub] [servicecomb-website] WillemJiang merged pull request #173: Add Committer Zhang Lei
WillemJiang merged pull request #173: Add Committer Zhang Lei URL: https://github.com/apache/servicecomb-website/pull/173 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-website] branch asf-site updated: Add Committer Zhang Lei
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git The following commit(s) were added to refs/heads/asf-site by this push: new bfaebb4 Add Committer Zhang Lei bfaebb4 is described below commit bfaebb41f439d232d91277f866572bf1dcfe209b Author: Lei Zhang AuthorDate: Sat Apr 13 00:39:12 2019 +0800 Add Committer Zhang Lei --- _developers/cn/team.md | 1 + _developers/team.md| 1 + 2 files changed, 2 insertions(+) diff --git a/_developers/cn/team.md b/_developers/cn/team.md index c5bd3b0..6ea6e06 100644 --- a/_developers/cn/team.md +++ b/_developers/cn/team.md @@ -31,6 +31,7 @@ last_modified_at: 2018-06-01T19:18:43+08:00 | zhangqi | Zhang qi | Huawei | * | | zhengyangyong | Zheng Yangyong | Huawei | * | | zhfeng| Feng Zheng | Redhat | * | +| zhanglei | Zhang Lei | BOCO | | * Contributors: diff --git a/_developers/team.md b/_developers/team.md index 9e743f8..273a995 100644 --- a/_developers/team.md +++ b/_developers/team.md @@ -32,6 +32,7 @@ This page lists who we are. By all means add yourself to the list - lets sort it | zhangqi | Zhang qi | Huawei | * | | zhengyangyong | Zheng Yangyong | Huawei | * | | zhfeng| Feng Zheng | Redhat | * | +| zhanglei | Zhang Lei | BOCO | | * Contributors:
[servicecomb-website] branch master updated: ServiceComb Pack 0.4.0 Integrated Discovery Service Consul
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-website.git The following commit(s) were added to refs/heads/master by this push: new 0be1e44 ServiceComb Pack 0.4.0 Integrated Discovery Service Consul 0be1e44 is described below commit 0be1e448d2cf0337aa9cbffdbc7332f8d7a9c544 Author: Lei Zhang AuthorDate: Sat Apr 13 00:32:29 2019 +0800 ServiceComb Pack 0.4.0 Integrated Discovery Service Consul --- _posts/2019-04-12-servicecomb-pack-consul.md | 134 + _posts/cn/2019-04-12-servicecomb-pack-consul.md| 132 .../alpha_register_to_consul.png | Bin 0 -> 123517 bytes .../consul_main.png| Bin 0 -> 95468 bytes 4 files changed, 266 insertions(+) diff --git a/_posts/2019-04-12-servicecomb-pack-consul.md b/_posts/2019-04-12-servicecomb-pack-consul.md new file mode 100755 index 000..4afa5ac --- /dev/null +++ b/_posts/2019-04-12-servicecomb-pack-consul.md @@ -0,0 +1,134 @@ +--- +lang: en +title: "ServiceComb Pack 0.4.0 Integrated Discovery Service : Consul" +ref: servicecomb-pack-consul +permalink: /docs/servicecomb-pack-consul/ +excerpt: "ServiceComb Pack Integrated Discovery Service Consul" +last_modified_at: 2019-04-12T:12:30+08:00 +author: Lei Zhang +tags: [ServiceComb Pack,Consul,Discovery] +redirect_from: + - /theme-setup/ +--- + +ServiceComb Pack supports the registration of Alpha service instances to Consul from version 0.4.0, and Omega-side programs can visit Alpha with Consul + +### Run Consul + +* Start Consul with Docker, please refer to the official website [https://www.consul.io](https://www.consul.io) for more ways + +```bash +docker run -d -p 8500:8500 consul +``` + +* Consul UI + +Visit http://0.0.0.0:8500 in the browser, you can see the following page indicates that Consul started successfully + +![consul_main]({{ site.url }}{{ site.baseurl }}/assets/images/2019-04-12-servicecomb-pack-consul/consul_main.png) + +### Run Alpha + +Enable registration to Consul with the parameter `spring.cloud.consul.enabled = true` + +```bash +java -jar alpha-server-0.4.0-exec.jar \ + --server.port=8090 \ + --alpha.server.port=8080 \ + --spring.datasource.url="jdbc:postgresql://127.0.0.1:5432/saga?useSSL=false" \ + --spring.datasource.username=saga-user \ + --spring.datasource.password=saga-password \ + --spring.cloud.consul.enabled=true \ + --spring.cloud.consul.host=0.0.0.0 \ + --spring.cloud.consul.port=8500 \ + --spring.profiles.active=prd +``` +**Note:** Check out for Consul more details [Spring Cloud Consul 2.x](https://cloud.spring.io/spring-cloud-consul/spring-cloud-consul.html) [Spring Cloud Consul 1.x](https://cloud.spring.io/spring-cloud-consul/1.3.x/single/spring-cloud-consul.html) + +After Alpha is launched, you can see that you have registered to Consul + +![alpha_register_to_consul]({{ site.url }}{{ site.baseurl }}/assets/images/2019-04-12-servicecomb-pack-consul/alpha_register_to_consul.png) + +Use `curl http://0.0.0.0:8500/v1/agent/services` You can see that Alpha's gRPC address and port have been registered in Consul's Tags + +```json +{ +"servicecomb-alpha-server-0-0-0-0-336b06581fb5b92ed91c7ade3fdafa88": { +"ID": "servicecomb-alpha-server-0-0-0-0-336b06581fb5b92ed91c7ade3fdafa88", +"Service": "servicecomb-alpha-server", +"Tags": [ +"alpha-server-host=0.0.0.0", +"alpha-server-port=8080", +"secure=false" +], +"Meta": {}, +"Port": 8090, +"Address": "192.168.1.116", +"Weights": { +"Passing": 1, +"Warning": 1 +}, +"EnableTagOverride": false +} +} +``` + +### Configuring the Omega side + +> ServiceComb Pack 0.4.0 Omega defaults use Spring Boot 2.x Spring and Cloud Consul 2.x, If your Omega side project base on Spring Boot 1.x you can use `-Pspring-boot-1` to rebuild ServiceComb Pack to Spring Boot 1.x and Spring Cloud Consul 1.x + +Modify the original omega project + +add dependencies + +```xml + + org.apache.servicecomb.pack + omega-spring-cloud-consul-starter + ${pack.version} + +``` + +Add the following to `application.yaml` + +```yaml +spring: + cloud: +consul: + discovery: + register: false + host: 0.0.0.0 + port: 8500 + +alpha: + cluster: +register: + type: consul +``` + +- `spring.cloud.consul.host` property is set to the Consul server’s instance address, `spring.cloud.consul.port` property is set to the Consul server’s instance port, `spring.cloud.consul.discovery.register=false` property is not register yourself , check out Spring Boot’s [Spring Cloud Consul 2.x](https://cloud.spring.io/spring-cloud-consul/spring-cloud-consul.html) or [Spring Cloud Consul
[servicecomb-website] branch master updated (850bec9 -> c2ee816)
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-website.git. from 850bec9 Polish the file 2019-04-03-servicecomb-pack-cluster.md new f5e385b Update the Release info for Java-Chassis 1.2.0 new c2ee816 Updated java-chassis release note. The 594 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: _release/cn/java_chassis_downloads.md| 5 +- _release/cn/java_chassis_releaseNotes.md | 213 ++- _release/cn/release.md | 5 +- _release/java_chassis_downloads.md | 5 +- _release/java_chassis_releaseNotes.md| 213 ++- _release/release.md | 5 +- 6 files changed, 436 insertions(+), 10 deletions(-)
[GitHub] [servicecomb-website] WillemJiang merged pull request #171: ServiceComb Pack 0.4.0 Integrated Discovery Service Consul
WillemJiang merged pull request #171: ServiceComb Pack 0.4.0 Integrated Discovery Service Consul URL: https://github.com/apache/servicecomb-website/pull/171 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-website] WillemJiang merged pull request #174: Update the Release info for Java-Chassis 1.2.0
WillemJiang merged pull request #174: Update the Release info for Java-Chassis 1.2.0 URL: https://github.com/apache/servicecomb-website/pull/174 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