[GitHub] [servicecomb-java-chassis] Shoothzj commented on pull request #3248: [SCB-2650][SCB-2290]fix retry will always wait
Shoothzj commented on PR #3248: URL: https://github.com/apache/servicecomb-java-chassis/pull/3248#issuecomment-1200354681 It's weird, `checkstyle` should find this unused static import before. -- 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. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-java-chassis] codecov-commenter commented on pull request #3244: Bump vertx version from 4.2.7 to 4.3.2
codecov-commenter commented on PR #3244: URL: https://github.com/apache/servicecomb-java-chassis/pull/3244#issuecomment-1200348913 # [Codecov](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3244?src=pr=h1_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) Report > Merging [#3244](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3244?src=pr=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (f263d75) into [master](https://codecov.io/gh/apache/servicecomb-java-chassis/commit/0b4b0d83b29675aba30e588705792a5adfb8095f?el=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (0b4b0d8) will **decrease** coverage by `0.00%`. > The diff coverage is `69.86%`. > :exclamation: Current head f263d75 differs from pull request most recent head 061789f. Consider uploading reports for the commit 061789f to get more accurate results ```diff @@ Coverage Diff @@ ## master#3244 +/- ## - Coverage 77.48% 77.47% -0.01% Complexity 1439 1439 Files 1629 1631 +2 Lines 4340943455 +46 Branches 3652 3657 +5 + Hits 3363433666 +32 - Misses 8267 8276 +9 - Partials 1508 1513 +5 ``` | [Impacted Files](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3244?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) | Coverage Δ | | |---|---|---| | [...servicecomb/edge/core/URLMappedEdgeDispatcher.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3244/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-ZWRnZS9lZGdlLWNvcmUvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3NlcnZpY2Vjb21iL2VkZ2UvY29yZS9VUkxNYXBwZWRFZGdlRGlzcGF0Y2hlci5qYXZh) | `52.08% <0.00%> (ø)` | | | [...cecomb/governance/policy/CircuitBreakerPolicy.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3244/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-Z292ZXJuYW5jZS9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2VydmljZWNvbWIvZ292ZXJuYW5jZS9wb2xpY3kvQ2lyY3VpdEJyZWFrZXJQb2xpY3kuamF2YQ==) | `56.25% <28.57%> (-4.79%)` | :arrow_down: | | [...che/servicecomb/governance/policy/RetryPolicy.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3244/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-Z292ZXJuYW5jZS9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2VydmljZWNvbWIvZ292ZXJuYW5jZS9wb2xpY3kvUmV0cnlQb2xpY3kuamF2YQ==) | `49.09% <44.44%> (-6.68%)` | :arrow_down: | | [...mb/governance/handler/InstanceBulkheadHandler.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3244/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-Z292ZXJuYW5jZS9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2VydmljZWNvbWIvZ292ZXJuYW5jZS9oYW5kbGVyL0luc3RhbmNlQnVsa2hlYWRIYW5kbGVyLmphdmE=) | `70.37% <70.37%> (ø)` | | | [...x/http/VertxServerRequestToHttpServletRequest.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3244/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-Zm91bmRhdGlvbnMvZm91bmRhdGlvbi12ZXJ0eC9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2VydmljZWNvbWIvZm91bmRhdGlvbi92ZXJ0eC9odHRwL1ZlcnR4U2VydmVyUmVxdWVzdFRvSHR0cFNlcnZsZXRSZXF1ZXN0LmphdmE=) | `87.36% <75.00%> (ø)` | | | [...vicecomb/transport/rest/vertx/RestBodyHandler.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3244/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-dHJhbnNwb3J0cy90cmFuc3BvcnQtcmVzdC90cmFuc3BvcnQtcmVzdC12ZXJ0eC9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2VydmljZWNvbWIvdHJhbnNwb3J0L3Jlc3QvdmVydHgvUmVzdEJvZHlIYW5kbGVyLmphdmE=) | `53.01% <75.00%> (-0.04%)` | :arrow_down: | | [...rvicecomb/config/priority/ConfigObjectFactory.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3244/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-Zm91bmRhdGlvbnMvZm91bmRhdGlvbi1jb25maWcvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3NlcnZpY2Vjb21iL2NvbmZpZy9wcmlvcml0eS9Db25maWdPYmplY3RGYWN0b3J5LmphdmE=) | `90.42% <100.00%> (+0.42%)` | :arrow_up: | |
[GitHub] [servicecomb-java-chassis] liubao68 opened a new pull request, #3248: [SCB-2650][SCB-2290]fix retry will always wait
liubao68 opened a new pull request, #3248: URL: https://github.com/apache/servicecomb-java-chassis/pull/3248 Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `mvn clean install -Pit` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). --- -- 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. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[servicecomb-java-chassis] branch Branch_2.7.7 created (now 2388f7bf2)
This is an automated email from the ASF dual-hosted git repository. liubao pushed a change to branch Branch_2.7.7 in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git at 2388f7bf2 [SCB-2646] fix metaspace oom problem (#3238) No new revisions were added by this update.
[servicecomb-java-chassis] branch branch_2.7.7 created (now 2388f7bf2)
This is an automated email from the ASF dual-hosted git repository. liubao pushed a change to branch branch_2.7.7 in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git at 2388f7bf2 [SCB-2646] fix metaspace oom problem (#3238) No new revisions were added by this update.
[servicecomb-java-chassis] branch master updated: [SCB-2646] fix metaspace oom problem (#3238)
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 2388f7bf2 [SCB-2646] fix metaspace oom problem (#3238) 2388f7bf2 is described below commit 2388f7bf263e4ea38f1c35afece6d453a0d9e9fb Author: yanghao <73453250+yanghao...@users.noreply.github.com> AuthorDate: Sun Jul 31 10:51:45 2022 +0800 [SCB-2646] fix metaspace oom problem (#3238) --- .../servicecomb/config/priority/ConfigObjectFactory.java | 16 +++- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/priority/ConfigObjectFactory.java b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/priority/ConfigObjectFactory.java index ecedf2648..7bec69d76 100644 --- a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/priority/ConfigObjectFactory.java +++ b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/priority/ConfigObjectFactory.java @@ -26,7 +26,9 @@ import java.util.Map; import org.apache.servicecomb.config.inject.InjectProperties; import org.apache.servicecomb.config.inject.InjectProperty; import org.apache.servicecomb.config.inject.PlaceholderResolver; +import org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx; import org.apache.servicecomb.foundation.common.utils.JsonUtils; +import org.apache.servicecomb.foundation.common.utils.LambdaMetafactoryUtils; import org.apache.servicecomb.foundation.common.utils.bean.Setter; import org.springframework.stereotype.Component; @@ -45,7 +47,9 @@ import com.fasterxml.jackson.databind.type.TypeFactory; @Component public class ConfigObjectFactory { private final PriorityPropertyFactory propertyFactory; - + private static final Map, JavaType> classCache = new ConcurrentHashMapEx<>(); + private static final Map javaTypeCache = new ConcurrentHashMapEx<>(); + private static final Map> beanDescriptionCache = new ConcurrentHashMapEx<>(); public ConfigObjectFactory(PriorityPropertyFactory propertyFactory) { this.propertyFactory = propertyFactory; } @@ -84,8 +88,9 @@ public class ConfigObjectFactory { public List createProperties(Object instance, String prefix, Map parameters) { List properties = new ArrayList<>(); -JavaType javaType = TypeFactory.defaultInstance().constructType(instance.getClass()); -BeanDescription beanDescription = JsonUtils.OBJ_MAPPER.getSerializationConfig().introspect(javaType); +JavaType javaType = classCache.computeIfAbsent(instance.getClass(), TypeFactory.defaultInstance()::constructType); +BeanDescription beanDescription = javaTypeCache.computeIfAbsent(javaType, +JsonUtils.OBJ_MAPPER.getSerializationConfig()::introspect); for (BeanPropertyDefinition propertyDefinition : beanDescription.findProperties()) { if (propertyDefinition.getField() == null) { continue; @@ -95,7 +100,8 @@ public class ConfigObjectFactory { continue; } - Setter setter = createObjectSetter(propertyDefinition); + Setter setter = beanDescriptionCache.computeIfAbsent(propertyDefinition, + LambdaMetafactoryUtils::createObjectSetter); PriorityProperty priorityProperty = createPriorityProperty(propertyDefinition.getField().getAnnotated(), prefix, parameters); setter.set(instance, priorityProperty.getValue()); @@ -205,7 +211,7 @@ public class ConfigObjectFactory { private String[] collectPropertyKeys(Field field, String prefix, Map parameters) { String propertyPrefix = prefix; -String[] keys = new String[] {field.getName()}; +String[] keys = new String[]{field.getName()}; InjectProperty injectProperty = field.getAnnotation(InjectProperty.class); if (injectProperty != null) {
[GitHub] [servicecomb-java-chassis] liubao68 merged pull request #3238: [SCB-2646] fix metaspace oom problem
liubao68 merged PR #3238: URL: https://github.com/apache/servicecomb-java-chassis/pull/3238 -- 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. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-java-chassis] liubao68 commented on a diff in pull request #3238: [SCB-2646] fix metaspace oom problem
liubao68 commented on code in PR #3238: URL: https://github.com/apache/servicecomb-java-chassis/pull/3238#discussion_r933916932 ## foundations/foundation-config/src/main/java/org/apache/servicecomb/config/priority/ConfigObjectFactory.java: ## @@ -95,7 +100,8 @@ public List createProperties(Object instance, String prefi continue; } - Setter setter = createObjectSetter(propertyDefinition); + Setter setter = beanDescriptionCache.computeIfAbsent(propertyDefinition, + LambdaMetafactoryUtils::createObjectSetter); Review Comment: import static org.apache.servicecomb.foundation.common.utils.LambdaMetafactoryUtils.createObjectSetter can be removed -- 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. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-java-chassis] liubao68 commented on a diff in pull request #3238: [SCB-2646] fix metaspace oom problem
liubao68 commented on code in PR #3238: URL: https://github.com/apache/servicecomb-java-chassis/pull/3238#discussion_r933916518 ## foundations/foundation-config/src/main/java/org/apache/servicecomb/config/priority/ConfigObjectFactory.java: ## @@ -205,7 +211,7 @@ private PriorityProperty createIntProperty(Field field, String[] keys, Intege private String[] collectPropertyKeys(Field field, String prefix, Map parameters) { String propertyPrefix = prefix; -String[] keys = new String[] {field.getName()}; +String[] keys = new String[]{field.getName()}; Review Comment: use formatter in etc foler and then format code -- 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. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[servicecomb-java-chassis] branch master updated: [SCB-2650][SCB-2290]support instance isolation and instance bulkhead (#3242)
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 d6fc0a6bf [SCB-2650][SCB-2290]support instance isolation and instance bulkhead (#3242) d6fc0a6bf is described below commit d6fc0a6bf28a28234fb6338ceafbd816c4c383b6 Author: liubao68 AuthorDate: Sun Jul 31 10:43:18 2022 +0800 [SCB-2650][SCB-2290]support instance isolation and instance bulkhead (#3242) --- .../src/main/resources/application.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../main/resources/config/base/log4j.properties| 2 +- .../governance/GovernanceConfiguration.java| 12 +++ .../handler/InstanceBulkheadHandler.java | 88 +++ .../handler/ext/AbstractFailurePredictor.java | 7 +- .../governance/policy/CircuitBreakerPolicy.java| 18 +++- .../servicecomb/governance/policy/RetryPolicy.java | 21 ++-- .../properties/InstanceBulkheadProperties.java | 19 ++-- .../governance/AbstractFailurePredictorTest.java | 64 +++ .../governance/GovernancePropertiesTest.java | 2 +- .../governance/InstanceBulkheadHandlerTest.java| 119 + governance/src/test/resources/application.yaml | 4 + ...r.java => ConsumerInstanceBulkheadHandler.java} | 68 +++- java => ConsumerInstanceIsolationHandler.java} | 72 +++-- .../governance/ProviderGovernanceHandler.java | 11 +- .../src/main/resources/config/cse.handler.xml | 6 +- 17 files changed, 371 insertions(+), 146 deletions(-) diff --git a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-client/src/main/resources/application.yml b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-client/src/main/resources/application.yml index 1eb345f43..c663b708b 100644 --- a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-client/src/main/resources/application.yml +++ b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-client/src/main/resources/application.yml @@ -37,7 +37,7 @@ servicecomb: handler: chain: Consumer: -default: governance-consumer,loadbalance +default: loadbalance Provider: default: governance-provider diff --git a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/src/main/resources/application.yml b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/src/main/resources/application.yml index 7d4118f29..972f3efb2 100644 --- a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/src/main/resources/application.yml +++ b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/src/main/resources/application.yml @@ -33,6 +33,6 @@ servicecomb: handler: chain: Consumer: -default: governance-consumer,loadbalance +default: loadbalance Provider: default: governance-provider \ No newline at end of file diff --git a/foundations/foundation-common/src/main/resources/config/base/log4j.properties b/foundations/foundation-common/src/main/resources/config/base/log4j.properties index 83de4e475..0cdb3bfbd 100644 --- a/foundations/foundation-common/src/main/resources/config/base/log4j.properties +++ b/foundations/foundation-common/src/main/resources/config/base/log4j.properties @@ -25,7 +25,7 @@ log4j.logger.runLogger=INFO log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d [%p] %m %l%n +log4j.appender.stdout.layout.ConversionPattern=[%d{-MM-dd HH:mm:ss,SSS/zzz}][%t][%p]%m %l%n log4j.appender.paas=org.apache.servicecomb.foundation.common.utils.RollingFileAppenderExt log4j.appender.paas.file=${paas.logs.dir}${paas.logs.file} diff --git a/governance/src/main/java/org/apache/servicecomb/governance/GovernanceConfiguration.java b/governance/src/main/java/org/apache/servicecomb/governance/GovernanceConfiguration.java index 03eb52156..9307da436 100644 --- a/governance/src/main/java/org/apache/servicecomb/governance/GovernanceConfiguration.java +++ b/governance/src/main/java/org/apache/servicecomb/governance/GovernanceConfiguration.java @@ -22,6 +22,7 @@ import java.util.Map; import org.apache.servicecomb.governance.handler.BulkheadHandler; import org.apache.servicecomb.governance.handler.CircuitBreakerHandler; import org.apache.servicecomb.governance.handler.FaultInjectionHandler; +import org.apache.servicecomb.governance.handler.InstanceBulkheadHandler; import
[GitHub] [servicecomb-java-chassis] liubao68 merged pull request #3242: [SCB-2650][SCB-2290]support instance isolation and instance bulkhead
liubao68 merged PR #3242: URL: https://github.com/apache/servicecomb-java-chassis/pull/3242 -- 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. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-java-chassis] liubao68 commented on a diff in pull request #3242: [SCB-2650][SCB-2290]support instance isolation and instance bulkhead
liubao68 commented on code in PR #3242: URL: https://github.com/apache/servicecomb-java-chassis/pull/3242#discussion_r933914112 ## handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filterext/IsolationDiscoveryFilter.java: ## @@ -44,7 +44,7 @@ public class IsolationDiscoveryFilter implements ServerListFilterExt { private static final Logger LOGGER = LoggerFactory.getLogger(IsolationDiscoveryFilter.class); private final DynamicBooleanProperty emptyProtection = DynamicPropertyFactory.getInstance() - .getBooleanProperty(EMPTY_INSTANCE_PROTECTION, false); + .getBooleanProperty(EMPTY_INSTANCE_PROTECTION, true); Review Comment: I changed back -- 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. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-java-chassis] Shoothzj commented on a diff in pull request #3242: [SCB-2650][SCB-2290]support instance isolation and instance bulkhead
Shoothzj commented on code in PR #3242: URL: https://github.com/apache/servicecomb-java-chassis/pull/3242#discussion_r933913741 ## handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filterext/IsolationDiscoveryFilter.java: ## @@ -44,7 +44,7 @@ public class IsolationDiscoveryFilter implements ServerListFilterExt { private static final Logger LOGGER = LoggerFactory.getLogger(IsolationDiscoveryFilter.class); private final DynamicBooleanProperty emptyProtection = DynamicPropertyFactory.getInstance() - .getBooleanProperty(EMPTY_INSTANCE_PROTECTION, false); + .getBooleanProperty(EMPTY_INSTANCE_PROTECTION, true); Review Comment: does this is a default value change? should we put it in the upgrade guide? -- 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. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[servicecomb-pack] 01/03: SCB-2641 Fix wrong version placeholder
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 commit 7bdf3347f9943d90692c0b91221e1e37e9193ae0 Author: Lei Zhang AuthorDate: Mon Jul 25 23:29:17 2022 +0800 SCB-2641 Fix wrong version placeholder --- demo/saga-dubbo-demo/service-api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/saga-dubbo-demo/service-api/pom.xml b/demo/saga-dubbo-demo/service-api/pom.xml index 54841f2b..abbb2057 100644 --- a/demo/saga-dubbo-demo/service-api/pom.xml +++ b/demo/saga-dubbo-demo/service-api/pom.xml @@ -24,7 +24,7 @@ org.apache.servicecomb.pack.demo service-pub - ${revision} + ${project.version}
[servicecomb-pack] 02/03: SCB-2641 Fix wrong version placeholder
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 commit 62676a1cf30af1c8d4af070daa6ec6ff939775ea Author: Lei Zhang AuthorDate: Tue Jul 26 09:52:43 2022 +0800 SCB-2641 Fix wrong version placeholder --- demo/saga-dubbo-demo/serviceb/pom.xml| 2 +- demo/saga-dubbo-demo/servicec/pom.xml| 2 +- integration-tests/coverage-aggregate/pom.xml | 4 ++-- pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/demo/saga-dubbo-demo/serviceb/pom.xml b/demo/saga-dubbo-demo/serviceb/pom.xml index d5261d45..ab4c6862 100644 --- a/demo/saga-dubbo-demo/serviceb/pom.xml +++ b/demo/saga-dubbo-demo/serviceb/pom.xml @@ -24,7 +24,7 @@ org.apache.servicecomb.pack.demo service-api - ${revision} + ${project.version} compile diff --git a/demo/saga-dubbo-demo/servicec/pom.xml b/demo/saga-dubbo-demo/servicec/pom.xml index 2704a054..9d9839e0 100644 --- a/demo/saga-dubbo-demo/servicec/pom.xml +++ b/demo/saga-dubbo-demo/servicec/pom.xml @@ -24,7 +24,7 @@ org.apache.servicecomb.pack.demo service-api - ${revision} + ${project.version} compile diff --git a/integration-tests/coverage-aggregate/pom.xml b/integration-tests/coverage-aggregate/pom.xml index ddae2d8c..45733f06 100644 --- a/integration-tests/coverage-aggregate/pom.xml +++ b/integration-tests/coverage-aggregate/pom.xml @@ -76,12 +76,12 @@ org.apache.servicecomb.pack.tests pack-tests - ${revision} + ${project.version} org.apache.servicecomb.pack.tests explicit-transaction-context-tests - ${revision} + ${project.version} diff --git a/pom.xml b/pom.xml index 95084569..74b37008 100644 --- a/pom.xml +++ b/pom.xml @@ -197,7 +197,7 @@ org.apache.servicecomb.pack docker-build-config -${revision} +${project.version}
[servicecomb-pack] branch master updated (a6f25ac6 -> fbffe451)
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 a6f25ac6 SCB-2641 Increase wait time for slow CI new 7bdf3347 SCB-2641 Fix wrong version placeholder new 62676a1c SCB-2641 Fix wrong version placeholder new fbffe451 SCB-2641 Increase waiting time for slow CI The 3 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: .../spec/saga/akka/it/SagaIntegrationTest.java | 24 +++--- demo/saga-dubbo-demo/service-api/pom.xml | 2 +- demo/saga-dubbo-demo/serviceb/pom.xml | 2 +- demo/saga-dubbo-demo/servicec/pom.xml | 2 +- integration-tests/coverage-aggregate/pom.xml | 4 ++-- pom.xml| 2 +- 6 files changed, 18 insertions(+), 18 deletions(-)
[servicecomb-pack] 03/03: SCB-2641 Increase waiting time for slow CI
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 commit fbffe4512c48ff1a6945472bc48c4ebabb571057 Author: Lei Zhang AuthorDate: Tue Jul 26 10:56:35 2022 +0800 SCB-2641 Increase waiting time for slow CI --- .../spec/saga/akka/it/SagaIntegrationTest.java | 24 +++--- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/alpha/alpha-spec-saga-akka/src/test/java/org/apache/servicecomb/pack/alpha/spec/saga/akka/it/SagaIntegrationTest.java b/alpha/alpha-spec-saga-akka/src/test/java/org/apache/servicecomb/pack/alpha/spec/saga/akka/it/SagaIntegrationTest.java index 2d24caca..3b3cdcf9 100644 --- a/alpha/alpha-spec-saga-akka/src/test/java/org/apache/servicecomb/pack/alpha/spec/saga/akka/it/SagaIntegrationTest.java +++ b/alpha/alpha-spec-saga-akka/src/test/java/org/apache/servicecomb/pack/alpha/spec/saga/akka/it/SagaIntegrationTest.java @@ -99,7 +99,7 @@ public class SagaIntegrationTest { SagaEventSender.successfulEvents(globalTxId, localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> { memoryActorEventChannel.send(event); }); -await().atMost(60, SECONDS).until(() -> { +await().atMost(120, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system) .getLastSagaData(); return sagaData != null && sagaData.isTerminated() @@ -127,7 +127,7 @@ public class SagaIntegrationTest { memoryActorEventChannel.send(event); }); -await().atMost(60, SECONDS).until(() -> { +await().atMost(120, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData(); return sagaData !=null && sagaData.isTerminated() && sagaData.getLastState()==SagaActorState.COMPENSATED; }); @@ -146,7 +146,7 @@ public class SagaIntegrationTest { SagaEventSender.middleTxAbortedEvents(globalTxId, localTxId_1, localTxId_2).stream().forEach( event -> { memoryActorEventChannel.send(event); }); -await().atMost(60, SECONDS).until(() -> { +await().atMost(120, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData(); return sagaData !=null && sagaData.isTerminated() && sagaData.getLastState()==SagaActorState.COMPENSATED; }); @@ -167,7 +167,7 @@ public class SagaIntegrationTest { SagaEventSender.lastTxAbortedEvents(globalTxId, localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> { memoryActorEventChannel.send(event); }); -await().atMost(60, SECONDS).until(() -> { +await().atMost(120, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData(); return sagaData !=null && sagaData.isTerminated() && sagaData.getLastState()==SagaActorState.COMPENSATED; }); @@ -189,7 +189,7 @@ public class SagaIntegrationTest { SagaEventSender.sagaAbortedEventBeforeTxComponsitedEvents(globalTxId, localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> { memoryActorEventChannel.send(event); }); -await().atMost(60, SECONDS).until(() -> { +await().atMost(120, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData(); return sagaData !=null && sagaData.isTerminated() && sagaData.getLastState()==SagaActorState.COMPENSATED; }); @@ -211,7 +211,7 @@ public class SagaIntegrationTest { SagaEventSender.receivedRemainingEventAfterFirstTxAbortedEvents(globalTxId, localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> { memoryActorEventChannel.send(event); }); -await().atMost(60, SECONDS).until(() -> { +await().atMost(120, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData(); return sagaData !=null && sagaData.isTerminated() && sagaData.getLastState()==SagaActorState.COMPENSATED; }); @@ -233,7 +233,7 @@ public class SagaIntegrationTest { SagaEventSender.sagaAbortedEventAfterAllTxEndedsEvents(globalTxId, localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> { memoryActorEventChannel.send(event); }); -await().atMost(60, SECONDS).until(() -> { +await().atMost(120, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData(); return sagaData !=null && sagaData.isTerminated() && sagaData.getLastState()==SagaActorState.COMPENSATED; }); @@ -255,7 +255,7 @@ public class SagaIntegrationTest { SagaEventSender.omegaSendSagaTimeoutEvents(globalTxId, localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> {
[GitHub] [servicecomb-pack] WillemJiang merged pull request #765: SCB-2641 Fix wrong version placeholder
WillemJiang merged PR #765: URL: https://github.com/apache/servicecomb-pack/pull/765 -- 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. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[servicecomb-java-chassis] branch master updated (ce30988aa -> 8456e39bd)
This is an automated email from the ASF dual-hosted git repository. shoothzj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git from ce30988aa [SCB-2652]migrate handler-publickey-auth module to mockito (#3246) add 8456e39bd [SCB-2653] Clean up unused Slf4jMavenTransferListener config (#3247) No new revisions were added by this update. Summary of changes: .github/workflows/maven.yml | 2 +- .github/workflows/rat_check.yml | 2 +- .../java/org/apache/servicecomb/demo/TestMgr.java | 2 +- .../main/resources/config/log4j.eclipse.properties| 19 --- 4 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 demo/demo-schema/src/main/resources/config/log4j.eclipse.properties
[GitHub] [servicecomb-java-chassis] Shoothzj merged pull request #3247: [SCB-2653] Clean up unused Slf4jMavenTransferListener config
Shoothzj merged PR #3247: URL: https://github.com/apache/servicecomb-java-chassis/pull/3247 -- 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. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-java-chassis] Shoothzj merged pull request #3246: [SCB-2652]migrate handler-publickey-auth module to mockito
Shoothzj merged PR #3246: URL: https://github.com/apache/servicecomb-java-chassis/pull/3246 -- 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. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[servicecomb-java-chassis] branch master updated (26e08641b -> ce30988aa)
This is an automated email from the ASF dual-hosted git repository. shoothzj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git from 26e08641b [SCB-2651] Use gmaven-plus plugin instead of gmaven plugin (#3245) add ce30988aa [SCB-2652]migrate handler-publickey-auth module to mockito (#3246) No new revisions were added by this update. Summary of changes: handlers/handler-publickey-auth/pom.xml| 4 +- .../provider/TestRSAProviderTokenManager.java | 71 +- 2 files changed, 32 insertions(+), 43 deletions(-)
[GitHub] [servicecomb-java-chassis] codecov-commenter commented on pull request #3247: [SCB-2653] Clean up unused Slf4jMavenTransferListener config
codecov-commenter commented on PR #3247: URL: https://github.com/apache/servicecomb-java-chassis/pull/3247#issuecomment-1200129610 # [Codecov](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3247?src=pr=h1_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) Report > Merging [#3247](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3247?src=pr=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (3feb81f) into [master](https://codecov.io/gh/apache/servicecomb-java-chassis/commit/281a98e3338d4a99706ef57ead9fbba3467e1425?el=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (281a98e) will **increase** coverage by `0.01%`. > The diff coverage is `n/a`. ```diff @@ Coverage Diff @@ ## master#3247 +/- ## + Coverage 77.48% 77.50% +0.01% Complexity 1439 1439 Files 1629 1629 Lines 4340943409 Branches 3652 3652 + Hits 3363433642 +8 + Misses 8269 8262 -7 + Partials 1506 1505 -1 ``` | [Impacted Files](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3247?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) | Coverage Δ | | |---|---|---| | [...egistry/client/http/ServiceRegistryClientImpl.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3247/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-c2VydmljZS1yZWdpc3RyeS9yZWdpc3RyeS1zZXJ2aWNlLWNlbnRlci9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2VydmljZWNvbWIvc2VydmljZXJlZ2lzdHJ5L2NsaWVudC9odHRwL1NlcnZpY2VSZWdpc3RyeUNsaWVudEltcGwuamF2YQ==) | `71.31% <0.00%> (+1.14%)` | :arrow_up: | | [...mb/serviceregistry/client/http/RestClientUtil.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3247/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-c2VydmljZS1yZWdpc3RyeS9yZWdpc3RyeS1zZXJ2aWNlLWNlbnRlci9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2VydmljZWNvbWIvc2VydmljZXJlZ2lzdHJ5L2NsaWVudC9odHRwL1Jlc3RDbGllbnRVdGlsLmphdmE=) | `80.37% <0.00%> (+1.86%)` | :arrow_up: | Help us with your feedback. Take ten seconds to tell us [how you rate us](https://about.codecov.io/nps?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). -- 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. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-java-chassis] codecov-commenter commented on pull request #3246: [SCB-2652]migrate handler-publickey-auth module to mockito
codecov-commenter commented on PR #3246: URL: https://github.com/apache/servicecomb-java-chassis/pull/3246#issuecomment-1200128726 # [Codecov](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3246?src=pr=h1_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) Report > Merging [#3246](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3246?src=pr=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (d89d57e) into [master](https://codecov.io/gh/apache/servicecomb-java-chassis/commit/0b4b0d83b29675aba30e588705792a5adfb8095f?el=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (0b4b0d8) will **increase** coverage by `0.02%`. > The diff coverage is `n/a`. ```diff @@ Coverage Diff @@ ## master#3246 +/- ## + Coverage 77.48% 77.50% +0.02% Complexity 1439 1439 Files 1629 1629 Lines 4340943409 Branches 3652 3652 + Hits 3363433643 +9 + Misses 8267 8261 -6 + Partials 1508 1505 -3 ``` | [Impacted Files](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3246?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) | Coverage Δ | | |---|---|---| | [...ecomb/provider/pojo/PojoConsumerMetaRefresher.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3246/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-cHJvdmlkZXJzL3Byb3ZpZGVyLXBvam8vc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3NlcnZpY2Vjb21iL3Byb3ZpZGVyL3Bvam8vUG9qb0NvbnN1bWVyTWV0YVJlZnJlc2hlci5qYXZh) | `75.60% <0.00%> (-2.44%)` | :arrow_down: | | [...mb/config/ConfigCenterConfigurationSourceImpl.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3246/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-ZHluYW1pYy1jb25maWcvY29uZmlnLWNjL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9zZXJ2aWNlY29tYi9jb25maWcvQ29uZmlnQ2VudGVyQ29uZmlndXJhdGlvblNvdXJjZUltcGwuamF2YQ==) | `9.57% <0.00%> (-1.07%)` | :arrow_down: | | [...egistry/client/http/ServiceRegistryClientImpl.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3246/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-c2VydmljZS1yZWdpc3RyeS9yZWdpc3RyeS1zZXJ2aWNlLWNlbnRlci9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2VydmljZWNvbWIvc2VydmljZXJlZ2lzdHJ5L2NsaWVudC9odHRwL1NlcnZpY2VSZWdpc3RyeUNsaWVudEltcGwuamF2YQ==) | `71.31% <0.00%> (+1.14%)` | :arrow_up: | | [...he/servicecomb/foundation/common/net/NetUtils.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3246/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-Zm91bmRhdGlvbnMvZm91bmRhdGlvbi1jb21tb24vc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3NlcnZpY2Vjb21iL2ZvdW5kYXRpb24vY29tbW9uL25ldC9OZXRVdGlscy5qYXZh) | `66.40% <0.00%> (+1.60%)` | :arrow_up: | | [...mb/serviceregistry/client/http/RestClientUtil.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3246/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-c2VydmljZS1yZWdpc3RyeS9yZWdpc3RyeS1zZXJ2aWNlLWNlbnRlci9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2VydmljZWNvbWIvc2VydmljZXJlZ2lzdHJ5L2NsaWVudC9odHRwL1Jlc3RDbGllbnRVdGlsLmphdmE=) | `80.37% <0.00%> (+1.86%)` | :arrow_up: | | [...comb/core/definition/MicroserviceVersionsMeta.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3246/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-Y29yZS9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2VydmljZWNvbWIvY29yZS9kZWZpbml0aW9uL01pY3Jvc2VydmljZVZlcnNpb25zTWV0YS5qYXZh) | `100.00% <0.00%> (+5.26%)` | :arrow_up: | Help us with your feedback. Take ten seconds to tell us [how you rate us](https://about.codecov.io/nps?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation). -- 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. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[servicecomb-service-center] branch master updated: [fix]frontend UT failure (#1316)
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 20e85923 [fix]frontend UT failure (#1316) 20e85923 is described below commit 20e859231cfdab94e1ba61120f6b83366e8946f8 Author: little-cui AuthorDate: Sat Jul 30 17:35:30 2022 +0800 [fix]frontend UT failure (#1316) --- frontend/server/server_test.go | 27 ++- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/frontend/server/server_test.go b/frontend/server/server_test.go index 2c46fbe5..5ff31e50 100644 --- a/frontend/server/server_test.go +++ b/frontend/server/server_test.go @@ -21,8 +21,8 @@ import ( "net/http" "os" "path/filepath" - "sync" "testing" + "time" "github.com/labstack/echo/v4" "github.com/stretchr/testify/assert" @@ -39,20 +39,14 @@ func init() { } func TestStatic(t *testing.T) { - var wg sync.WaitGroup - cfg := Config{ SCAddr: "http://; + SCAddr, FrontendAddr: FrontAddr, } - wg.Add(1) - go func() { - wg.Done() - Serve(cfg) - }() + go Serve(cfg) + time.Sleep(500 * time.Millisecond) - wg.Wait() res, err := http.Get("http://; + FrontAddr) assert.NoError(t, err, "Error accessing frontend: %s", err) assert.Equal(t, http.StatusOK, res.StatusCode, "Expected http %d, got %d", http.StatusOK, res.StatusCode) @@ -60,10 +54,8 @@ func TestStatic(t *testing.T) { } func TestSCProxy(t *testing.T) { - var wg sync.WaitGroup greeting := "Hi, there!" - wg.Add(1) // simulate service center backend go func() { e := echo.New() @@ -71,11 +63,10 @@ func TestSCProxy(t *testing.T) { e.GET("/sayHi", func(c echo.Context) error { return c.String(http.StatusOK, greeting) }) - wg.Done() _ = e.Start(SCAddr) }() + time.Sleep(500 * time.Millisecond) - wg.Wait() res, err := http.Get("http://; + FrontAddr + "/sc/sayHi") assert.NoError(t, err, "Error accessing sc proxy: %s", err) assert.Equal(t, http.StatusOK, res.StatusCode, "Expected http %d, got %d", http.StatusOK, res.StatusCode) @@ -91,20 +82,14 @@ func TestSCProxy(t *testing.T) { } func TestDirectoryTraversal(t *testing.T) { - var wg sync.WaitGroup - cfg := Config{ SCAddr: "http://; + SCAddr, FrontendAddr: FrontAddr, } - wg.Add(1) - go func() { - wg.Done() - Serve(cfg) - }() + go Serve(cfg) + time.Sleep(500 * time.Millisecond) - wg.Wait() res, err := http.Get("http://; + FrontAddr + "/..\\schema/schemahandler.go") assert.NoError(t, err, "Error accessing frontend: %s", err) assert.Equal(t, http.StatusNotFound, res.StatusCode, "Expected http status is 404")
[GitHub] [servicecomb-service-center] little-cui merged pull request #1316: [fix]frontend UT failure
little-cui merged PR #1316: URL: https://github.com/apache/servicecomb-service-center/pull/1316 -- 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. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-java-chassis] Shoothzj closed pull request #2891: [SCB-2509] Bump vertx version from 4.2.7 to 4.3.0
Shoothzj closed pull request #2891: [SCB-2509] Bump vertx version from 4.2.7 to 4.3.0 URL: https://github.com/apache/servicecomb-java-chassis/pull/2891 -- 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. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-java-chassis] codecov-commenter commented on pull request #3242: [SCB-2650][SCB-2290]support instance isolation and instance bulkhead
codecov-commenter commented on PR #3242: URL: https://github.com/apache/servicecomb-java-chassis/pull/3242#issuecomment-1200123708 # [Codecov](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3242?src=pr=h1_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) Report > Merging [#3242](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3242?src=pr=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (c0e69fd) into [master](https://codecov.io/gh/apache/servicecomb-java-chassis/commit/0b4b0d83b29675aba30e588705792a5adfb8095f?el=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (0b4b0d8) will **increase** coverage by `0.01%`. > The diff coverage is `75.00%`. ```diff @@ Coverage Diff @@ ## master#3242 +/- ## + Coverage 77.48% 77.49% +0.01% Complexity 1439 1439 Files 1629 1631 +2 Lines 4340943441 +32 Branches 3652 3654 +2 + Hits 3363433666 +32 - Misses 8267 8268 +1 + Partials 1508 1507 -1 ``` | [Impacted Files](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3242?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) | Coverage Δ | | |---|---|---| | [...mb/governance/handler/InstanceBulkheadHandler.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3242/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-Z292ZXJuYW5jZS9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2VydmljZWNvbWIvZ292ZXJuYW5jZS9oYW5kbGVyL0luc3RhbmNlQnVsa2hlYWRIYW5kbGVyLmphdmE=) | `70.37% <70.37%> (ø)` | | | [...ervicecomb/governance/GovernanceConfiguration.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3242/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-Z292ZXJuYW5jZS9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2VydmljZWNvbWIvZ292ZXJuYW5jZS9Hb3Zlcm5hbmNlQ29uZmlndXJhdGlvbi5qYXZh) | `100.00% <100.00%> (ø)` | | | [...ernance/properties/InstanceBulkheadProperties.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3242/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-Z292ZXJuYW5jZS9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2VydmljZWNvbWIvZ292ZXJuYW5jZS9wcm9wZXJ0aWVzL0luc3RhbmNlQnVsa2hlYWRQcm9wZXJ0aWVzLmphdmE=) | `100.00% <100.00%> (ø)` | | | [...mb/config/ConfigCenterConfigurationSourceImpl.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3242/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-ZHluYW1pYy1jb25maWcvY29uZmlnLWNjL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9zZXJ2aWNlY29tYi9jb25maWcvQ29uZmlnQ2VudGVyQ29uZmlndXJhdGlvblNvdXJjZUltcGwuamF2YQ==) | `9.57% <0.00%> (-1.07%)` | :arrow_down: | | [...egistry/client/http/ServiceRegistryClientImpl.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3242/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-c2VydmljZS1yZWdpc3RyeS9yZWdpc3RyeS1zZXJ2aWNlLWNlbnRlci9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2VydmljZWNvbWIvc2VydmljZXJlZ2lzdHJ5L2NsaWVudC9odHRwL1NlcnZpY2VSZWdpc3RyeUNsaWVudEltcGwuamF2YQ==) | `70.93% <0.00%> (+0.76%)` | :arrow_up: | | [...he/servicecomb/foundation/common/net/NetUtils.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3242/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-Zm91bmRhdGlvbnMvZm91bmRhdGlvbi1jb21tb24vc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3NlcnZpY2Vjb21iL2ZvdW5kYXRpb24vY29tbW9uL25ldC9OZXRVdGlscy5qYXZh) | `66.40% <0.00%> (+1.60%)` | :arrow_up: | | [...mb/serviceregistry/client/http/RestClientUtil.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3242/diff?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-c2VydmljZS1yZWdpc3RyeS9yZWdpc3RyeS1zZXJ2aWNlLWNlbnRlci9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2VydmljZWNvbWIvc2VydmljZXJlZ2lzdHJ5L2NsaWVudC9odHRwL1Jlc3RDbGllbnRVdGlsLmphdmE=) | `80.37% <0.00%> (+1.86%)` | :arrow_up: | |
[GitHub] [servicecomb-service-center] little-cui opened a new pull request, #1316: [fix]frontend UT failure
little-cui opened a new pull request, #1316: URL: https://github.com/apache/servicecomb-service-center/pull/1316 Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `go build` `go test` `go fmt` `go vet` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). - [ ] Never comment source code, delete it. - [ ] UT should has "context, subject, expected result" result as test case name, when you call t.Run(). --- -- 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. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-java-chassis] liubao68 closed issue #3208: IsolationDiscoveryFilter实例隔离的时候只更新了data,children如果已经缓存了,则不会更新,所以起不到隔离作用
liubao68 closed issue #3208: IsolationDiscoveryFilter实例隔离的时候只更新了data,children如果已经缓存了,则不会更新,所以起不到隔离作用 URL: https://github.com/apache/servicecomb-java-chassis/issues/3208 -- 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. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-service-center] little-cui merged pull request #1315: [feat]upgrade kie version
little-cui merged PR #1315: URL: https://github.com/apache/servicecomb-service-center/pull/1315 -- 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. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[servicecomb-service-center] branch master updated: [feat]upgrade kie version (#1315)
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 c06202d2 [feat]upgrade kie version (#1315) c06202d2 is described below commit c06202d24fe4bc3e11d1a3258da22ca1ae1b1174 Author: little-cui AuthorDate: Sat Jul 30 16:32:25 2022 +0800 [feat]upgrade kie version (#1315) --- go.mod | 4 ++-- go.sum | 4 syncer/service/replicator/resource/config.go | 21 + 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/go.mod b/go.mod index a804b146..e100c100 100644 --- a/go.mod +++ b/go.mod @@ -8,8 +8,8 @@ replace ( require ( github.com/NYTimes/gziphandler v1.1.1 - github.com/apache/servicecomb-kie v0.2.1-0.20220725091517-2ff76fd2d869 - github.com/apache/servicecomb-service-center/eventbase v0.0.0-20220624011743-417c1e9a3e18 + github.com/apache/servicecomb-kie v0.2.1-0.20220730063957-66e6f5efd400 + github.com/apache/servicecomb-service-center/eventbase v0.0.0-20220120070230-26997eb876ca github.com/beego/beego/v2 v2.0.2 github.com/cheggaaa/pb v1.0.25 github.com/deckarep/golang-set v1.8.0 diff --git a/go.sum b/go.sum index 8ebf3e07..3165904f 100644 --- a/go.sum +++ b/go.sum @@ -93,6 +93,10 @@ github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+Dx github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apache/servicecomb-kie v0.2.1-0.20220725091517-2ff76fd2d869 h1:P4jg4QemhLxOvaJt8chzCjHipIiSgPy2I8J1xMkSga4= github.com/apache/servicecomb-kie v0.2.1-0.20220725091517-2ff76fd2d869/go.mod h1:64faZcMJTiTzcIFBO+4/i2TlzfILq1PUoB5DF61J+Bk= +github.com/apache/servicecomb-kie v0.2.1-0.20220730030322-a03aaf31cbdd h1:6azoQKFID9dveUu3He/ntxd2Rgu4Deze2D3bl2GJWSE= +github.com/apache/servicecomb-kie v0.2.1-0.20220730030322-a03aaf31cbdd/go.mod h1:64faZcMJTiTzcIFBO+4/i2TlzfILq1PUoB5DF61J+Bk= +github.com/apache/servicecomb-kie v0.2.1-0.20220730063957-66e6f5efd400 h1:zvkDWVT9EIybCbPUHPOplIt9D85v8d9nbGYXrZwHu9c= +github.com/apache/servicecomb-kie v0.2.1-0.20220730063957-66e6f5efd400/go.mod h1:64faZcMJTiTzcIFBO+4/i2TlzfILq1PUoB5DF61J+Bk= github.com/apache/thrift v0.0.0-20180125231006-3d556248a8b9 h1:ymi1nHra1RZXqjg5xvka4YVyK+3uKPk2B9HUlPRIiBc= github.com/apache/thrift v0.0.0-20180125231006-3d556248a8b9/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= diff --git a/syncer/service/replicator/resource/config.go b/syncer/service/replicator/resource/config.go index 1d054188..73c9a2f5 100644 --- a/syncer/service/replicator/resource/config.go +++ b/syncer/service/replicator/resource/config.go @@ -21,39 +21,20 @@ import ( "context" "errors" "fmt" - "path/filepath" - "strings" kiemodel "github.com/apache/servicecomb-kie/pkg/model" - kiecfg "github.com/apache/servicecomb-kie/server/config" kiedb "github.com/apache/servicecomb-kie/server/datasource" "github.com/apache/servicecomb-service-center/pkg/log" "github.com/apache/servicecomb-service-center/pkg/util" "github.com/apache/servicecomb-service-center/server/config" - "github.com/apache/servicecomb-service-center/server/plugin/security/tlsconf" v1sync "github.com/apache/servicecomb-service-center/syncer/api/v1" - "github.com/little-cui/etcdadpt" ) const Config = "config" func NewConfig(e *v1sync.Event) Resource { kind := config.GetString("registry.kind", "etcd", config.WithStandby("registry_plugin")) - uri := config.GetString("registry.etcd.cluster.endpoints", "http://127.0.0.1:2379;, config.WithStandby("manager_cluster")) - isHTTPS := strings.Contains(strings.ToLower(uri), "https://;) - tlsOpts := tlsconf.GetOptions() - kiecfg.Configurations.DB.Kind = kind - err := kiedb.Init(kiecfg.DB{ - Kind:kind, - URI: uri, - SSLEnabled: config.GetSSL().SslEnabled && isHTTPS, - Timeout: config.GetDuration("registry.etcd.request.timeout", etcdadpt.DefaultRequestTimeout, config.WithStandby("registry_timeout")).String(), - RootCA: filepath.Join(tlsOpts.Dir, "trust.cer"), - CertFile:filepath.Join(tlsOpts.Dir, "server.cer"), - KeyFile: filepath.Join(tlsOpts.Dir, "server_key.pem"), - CertPwdFile: filepath.Join(tlsOpts.Dir, "cert_pwd"), - VerifyPeer: tlsOpts.VerifyPeer, - }) + err := kiedb.Init(kind) if err != nil { log.Fatal(fmt.Sprintf("kie datasource[%s] init failed",
[servicecomb-java-chassis] branch master updated: [SCB-2651] Use gmaven-plus plugin instead of gmaven plugin (#3245)
This is an automated email from the ASF dual-hosted git repository. shoothzj 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 26e08641b [SCB-2651] Use gmaven-plus plugin instead of gmaven plugin (#3245) 26e08641b is described below commit 26e08641ba65930c113380a254df43ec86d23901 Author: ZhangJian He AuthorDate: Sat Jul 30 15:13:22 2022 +0800 [SCB-2651] Use gmaven-plus plugin instead of gmaven plugin (#3245) --- .../demo-multi-service-center-client/pom.xml | 14 ++ .../pom.xml| 14 ++ demo/docker-run-config-edge/pom.xml| 32 -- demo/docker-run-config-local/pom.xml | 32 -- demo/docker-run-config/pom.xml | 32 -- demo/pom.xml | 7 + pom.xml| 6 7 files changed, 83 insertions(+), 54 deletions(-) diff --git a/demo/demo-multi-service-center/demo-multi-service-center-client/pom.xml b/demo/demo-multi-service-center/demo-multi-service-center-client/pom.xml index 929dd17b6..205370cd6 100644 --- a/demo/demo-multi-service-center/demo-multi-service-center-client/pom.xml +++ b/demo/demo-multi-service-center/demo-multi-service-center-client/pom.xml @@ -184,8 +184,8 @@ docker-maven-plugin -org.codehaus.gmaven -gmaven-plugin +org.codehaus.gmavenplus +gmavenplus-plugin add-default-properties @@ -194,10 +194,12 @@ execute - -project.properties.setProperty('docker.hostname', 'localhost') -log.info("Docker hostname is " + project.properties['docker.hostname']) - + + + project.properties.setProperty('docker.hostname', 'localhost') + log.info("Docker hostname is " + project.properties['docker.hostname']) + + diff --git a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/pom.xml b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/pom.xml index 51c49e3a5..2a92d9db6 100644 --- a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/pom.xml +++ b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/pom.xml @@ -152,8 +152,8 @@ docker-maven-plugin -org.codehaus.gmaven -gmaven-plugin +org.codehaus.gmavenplus +gmavenplus-plugin add-default-properties @@ -162,10 +162,12 @@ execute - -project.properties.setProperty('docker.hostname', 'localhost') -log.info("Docker hostname is " + project.properties['docker.hostname']) - + + + project.properties.setProperty('docker.hostname', 'localhost') + log.info("Docker hostname is " + project.properties['docker.hostname']) + + diff --git a/demo/docker-run-config-edge/pom.xml b/demo/docker-run-config-edge/pom.xml index 463b21241..daaf8a5ce 100644 --- a/demo/docker-run-config-edge/pom.xml +++ b/demo/docker-run-config-edge/pom.xml @@ -260,8 +260,8 @@ -org.codehaus.gmaven -gmaven-plugin +org.codehaus.gmavenplus +gmavenplus-plugin add-default-properties @@ -270,10 +270,12 @@ execute - -project.properties.setProperty('docker.hostname', 'localhost') -log.info("Docker hostname is " + project.properties['docker.hostname']) - + + + project.properties.setProperty('docker.hostname', 'localhost') + log.info("Docker hostname is " + project.properties['docker.hostname']) + + @@ -304,8 +306,8 @@ -org.codehaus.gmaven -gmaven-plugin +org.codehaus.gmavenplus +gmavenplus-plugin
[GitHub] [servicecomb-java-chassis] Shoothzj merged pull request #3245: [SCB-2651] Use gmaven-plus plugin instead of gmaven plugin
Shoothzj merged PR #3245: URL: https://github.com/apache/servicecomb-java-chassis/pull/3245 -- 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. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[servicecomb-kie] branch master updated: [fix]the default value of sync.enabled should be false (#251)
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-kie.git The following commit(s) were added to refs/heads/master by this push: new 66e6f5e [fix]the default value of sync.enabled should be false (#251) 66e6f5e is described below commit 66e6f5efd40075052f63c2d06d3ac92391c0cae0 Author: little-cui AuthorDate: Sat Jul 30 14:39:57 2022 +0800 [fix]the default value of sync.enabled should be false (#251) --- examples/dev/kie-conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/dev/kie-conf.yaml b/examples/dev/kie-conf.yaml index 4b40ec0..703dbeb 100644 --- a/examples/dev/kie-conf.yaml +++ b/examples/dev/kie-conf.yaml @@ -19,4 +19,4 @@ db: # rsaPublicKeyFile: ./examples/dev/public.key sync: # turn on the synchronization switch related operations will be written to the task in the db - enabled: true \ No newline at end of file + enabled: false \ No newline at end of file
[GitHub] [servicecomb-kie] little-cui merged pull request #251: [fix]the default value of sync.enabled should be false
little-cui merged PR #251: URL: https://github.com/apache/servicecomb-kie/pull/251 -- 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. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-service-center] little-cui opened a new pull request, #1315: [feat]upgrade kie version
little-cui opened a new pull request, #1315: URL: https://github.com/apache/servicecomb-service-center/pull/1315 Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `go build` `go test` `go fmt` `go vet` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). - [ ] Never comment source code, delete it. - [ ] UT should has "context, subject, expected result" result as test case name, when you call t.Run(). --- -- 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. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org