[jira] [Resolved] (SCB-930) Service Center Frontend stops responding in Schema test if Schema has '\"' character in the description
[ https://issues.apache.org/jira/browse/SCB-930?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mohammad Asif Siddiqui resolved SCB-930. Resolution: Fixed > Service Center Frontend stops responding in Schema test if Schema has '\"' > character in the description > --- > > Key: SCB-930 > URL: https://issues.apache.org/jira/browse/SCB-930 > Project: Apache ServiceComb > Issue Type: Bug > Components: Service-Center >Affects Versions: service-center-1.0.0 >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > Fix For: service-center-1.1.0 > > > Service Center Frontend stops responding in Schema test if Schema has '\"' > character in the description. > Solution : Update the Regex for eliminating the new line character -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Closed] (SCB-978) Fix translation issues for Chinese Locale on First Load
[ https://issues.apache.org/jira/browse/SCB-978?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mohammad Asif Siddiqui closed SCB-978. -- Resolution: Fixed > Fix translation issues for Chinese Locale on First Load > --- > > Key: SCB-978 > URL: https://issues.apache.org/jira/browse/SCB-978 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Service-Center >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > Fix For: service-center-1.1.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-962) The forwardPolicy of Saga can configure the maximum of retries
[ https://issues.apache.org/jira/browse/SCB-962?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16663124#comment-16663124 ] ASF GitHub Bot commented on SCB-962: zhfeng commented on issue #322: [SCB-962] Support ForwardPolicy to configure the maximum of retries URL: https://github.com/apache/incubator-servicecomb-saga/pull/322#issuecomment-432896263 @KomachiSion Thanks for your contribution ! This is an automated message from the Apache Git Service. To respond to the message, please log on 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 > The forwardPolicy of Saga can configure the maximum of retries > -- > > Key: SCB-962 > URL: https://issues.apache.org/jira/browse/SCB-962 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Saga >Affects Versions: saga-0.2.0 >Reporter: Sion Yang >Assignee: Sion Yang >Priority: Major > Fix For: saga-0.3.0 > > Original Estimate: 168h > Remaining Estimate: 168h > > Currently, forwardPolicy would keep trying transaction part when transaction > failed, which may cause saga retry transaction infinitely. > So it's necessary to configure the maximum of transaction retries. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-962) The forwardPolicy of Saga can configure the maximum of retries
[ https://issues.apache.org/jira/browse/SCB-962?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16663122#comment-16663122 ] ASF GitHub Bot commented on SCB-962: zhfeng closed pull request #322: [SCB-962] Support ForwardPolicy to configure the maximum of retries URL: https://github.com/apache/incubator-servicecomb-saga/pull/322 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/docs/api/api.md b/docs/api/api.md index 581ab23c..756a75c0 100755 --- a/docs/api/api.md +++ b/docs/api/api.md @@ -21,6 +21,7 @@ POST /requests "transaction": { "method": "", "path": "", +"retries": "", "params": { } @@ -28,6 +29,7 @@ POST /requests "compensation": { "method": "", "path": "", +"retries": "", "params": { } @@ -46,10 +48,12 @@ JSON parameters: - transaction - user-defined transaction that executed by the Saga. - method - user-defined, HTTP method. - path - user-defined, HTTP path. +- retries - int, optional, default -1. The max retry times for transaction. If this parameter is less than or equal to 0, transaction will retry infinitely. - params - support `form`,`json`,`body`,`query`. - compensation - user-defined compensation that executed by the Saga. - method - user-defined, HTTP method. - path - user-defined, HTTP path. +- retries - int, optional, default 3. The max retry times for compensation. - params - support `form`,`json`,`body`,`query`. 2. Set content type to `text/plain`. @@ -212,12 +216,14 @@ There are a `maven` example ], "transaction": { "sql": "", +"retries": "", "params": [ [] ] }, "compensation": { "sql": "", +"retries": "", "params": [ [] ] @@ -235,9 +241,11 @@ JSON parameters: - parents - request ids. It means this request is only executed after all requests in the parents field are completed. - transaction - user-defined transaction that executed by the Saga. - sql - user-defined, forward sql. +- retries - int, optional, default -1. The max retry times for transaction. If this parameter is less than or equal to 0, transaction will retry infinitely. - params - parameters for forward sql. - compensation - user-defined compensation that executed by the Saga. - sql - user-defined, backward sql. +- retries - int, optional, default 3. The max retry times for compensation. - params - parameters for backward sql. 4. Invoke `SagaExecutionComponent.run(String json)` function to execute saga. diff --git a/saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/ActorBasedSagaIntegrationTest.java b/saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/ActorBasedSagaIntegrationTest.java index dff600d6..de62cf2b 100644 --- a/saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/ActorBasedSagaIntegrationTest.java +++ b/saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/ActorBasedSagaIntegrationTest.java @@ -371,6 +371,7 @@ public void retriesFailedTransactionTillSuccess() { when(transaction2.send(request2.serviceName(), transactionResponse1)) .thenThrow(exception).thenThrow(exception).thenReturn(transactionResponse2); +when(transaction2.retries()).thenReturn(-1); saga.run(); diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/Compensation.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/Compensation.java index a6a352b8..758ebd90 100644 --- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/Compensation.java +++ b/saga-core/src/main/java/org/apache/servicecomb/saga/core/Compensation.java @@ -52,8 +52,4 @@ public int retries() { return DEFAULT_RETRIES; } }; - - int DEFAULT_RETRIES = 3; - - int retries(); } diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/Fallback.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/Fallback.java index 8c1068b2..7215a6b9 100644 --- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/Fallback.java +++ b/saga-core/src/main/java/org/apache/servicecomb/saga/core/Fallback.java @@ -34,6 +34,11 @@ public SagaResponse send(String address) { public SagaResponse send(String address, SagaResponse response) { return send(address); } + +@Override +public int retries() { + return 0; +} }; String type(); diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/ForwardRecovery.java b/saga-core/src/main/java/org/apache/
[jira] [Created] (SCB-979) Add reminder log on the selection of SwaggerGeneratorContext
YaoHaishi created SCB-979: - Summary: Add reminder log on the selection of SwaggerGeneratorContext Key: SCB-979 URL: https://issues.apache.org/jira/browse/SCB-979 Project: Apache ServiceComb Issue Type: Improvement Components: Java-Chassis Reporter: YaoHaishi Assignee: YaoHaishi Add reminder log to show which SwaggerGeneratorContext is selected to generate swagger schema, to indicate some potential problem. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-978) Fix translation issues for Chinese Locale on First Load
[ https://issues.apache.org/jira/browse/SCB-978?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16662325#comment-16662325 ] ASF GitHub Bot commented on SCB-978: little-cui closed pull request #463: SCB-978 Fix translation issues for Chinese Locale on First Load URL: https://github.com/apache/incubator-servicecomb-service-center/pull/463 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/frontend/app/index.html b/frontend/app/index.html index ef9e966b..f7641df9 100644 --- a/frontend/app/index.html +++ b/frontend/app/index.html @@ -94,7 +94,7 @@ - + diff --git a/frontend/app/scripts/app.js b/frontend/app/scripts/app.js index ead209be..337dd2fe 100644 --- a/frontend/app/scripts/app.js +++ b/frontend/app/scripts/app.js @@ -23,15 +23,15 @@ angular.module('serviceCenter', ['ngAnimate', 'ngMaterial', 'ngAria', 'ngMessage $translateProvider.useSanitizeValueStrategy(null); $translateProvider.translations('en', english); -$translateProvider.translations('cz', chinese); +$translateProvider.translations('zh', chinese); var lang = ""; if (localStorage.getItem("lang") && localStorage.getItem("lang") != '') { lang = localStorage.getItem("lang"); } else if (navigator.language) { -lang = navigator.language.indexOf("zh") > -1 ? "cz" : "en"; +lang = navigator.language.indexOf("zh") > -1 ? "zh" : "en"; } else { -lang = navigator.userLanguage.indexOf("zh") > -1 ? "cz" : "en"; +lang = navigator.userLanguage.indexOf("zh") > -1 ? "zh" : "en"; } $translateProvider.preferredLanguage(lang); diff --git a/frontend/app/scripts/directives/tableDirective.js b/frontend/app/scripts/directives/tableDirective.js index 4f268fcf..2f0489a5 100644 --- a/frontend/app/scripts/directives/tableDirective.js +++ b/frontend/app/scripts/directives/tableDirective.js @@ -58,6 +58,8 @@ angular.module('serviceCenter') } } +scope.changePaginationLabel() + scope.paginationOptions = { rowSelection: false, multiSelect: false, diff --git a/frontend/app/scripts/languages/locale-cz.js b/frontend/app/scripts/languages/locale-zh.js similarity index 100% rename from frontend/app/scripts/languages/locale-cz.js rename to frontend/app/scripts/languages/locale-zh.js diff --git a/frontend/app/scripts/modules/dashboard/views/dashboard.html b/frontend/app/scripts/modules/dashboard/views/dashboard.html index 27d8181c..d960fdbf 100644 --- a/frontend/app/scripts/modules/dashboard/views/dashboard.html +++ b/frontend/app/scripts/modules/dashboard/views/dashboard.html @@ -27,7 +27,7 @@ -{{info.title | translate}} - {{info.count}} +{{info.title | translate}} : {{info.count}} @@ -121,7 +121,7 @@ -{{data.title | translate}} - {{data.count}} +{{data.title | translate}} : {{data.count}} diff --git a/frontend/app/scripts/views/index.html b/frontend/app/scripts/views/index.html index 1a0395f9..eae18ad3 100644 --- a/frontend/app/scripts/views/index.html +++ b/frontend/app/scripts/views/index.html @@ -35,9 +35,9 @@ - + English -{{ "chinese" | translate }} +{{ "chinese" | translate }} This is an automated message from the Apache Git Service. To respond to the message, please log on 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 > Fix translation issues for Chinese Locale on First Load > --- > > Key: SCB-978 > URL: https://issues.apache.org/jira/browse/SCB-978 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Service-Center >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > Fix For: service-center-1.1.0 > > -- This message was sent by Atlassian JIRA (v7
[jira] [Commented] (SCB-978) Fix translation issues for Chinese Locale on First Load
[ https://issues.apache.org/jira/browse/SCB-978?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16662084#comment-16662084 ] ASF GitHub Bot commented on SCB-978: coveralls commented on issue #463: SCB-978 Fix translation issues for Chinese Locale on First Load URL: https://github.com/apache/incubator-servicecomb-service-center/pull/463#issuecomment-432605208 [![Coverage Status](https://coveralls.io/builds/19691309/badge)](https://coveralls.io/builds/19691309) Coverage decreased (-0.2%) to 62.533% when pulling **4c87ee90b361ba8fb4aa6b46b7b5ac92e8ac5759 on asifdxtreme:master** into **0d10009d5324043b58bdc7f7ee356259b800739d on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on 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 > Fix translation issues for Chinese Locale on First Load > --- > > Key: SCB-978 > URL: https://issues.apache.org/jira/browse/SCB-978 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Service-Center >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > Fix For: service-center-1.1.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-978) Fix translation issues for Chinese Locale on First Load
[ https://issues.apache.org/jira/browse/SCB-978?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16662083#comment-16662083 ] ASF GitHub Bot commented on SCB-978: codecov-io commented on issue #463: SCB-978 Fix translation issues for Chinese Locale on First Load URL: https://github.com/apache/incubator-servicecomb-service-center/pull/463#issuecomment-432605078 # [Codecov](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/463?src=pr&el=h1) Report > Merging [#463](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/463?src=pr&el=desc) into [master](https://codecov.io/gh/apache/incubator-servicecomb-service-center/commit/0d10009d5324043b58bdc7f7ee356259b800739d?src=pr&el=desc) will **decrease** coverage by `0.02%`. > The diff coverage is `n/a`. [![Impacted file tree graph](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/463/graphs/tree.svg?width=650&token=GAaF7zrg8R&height=150&src=pr)](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/463?src=pr&el=tree) ```diff @@Coverage Diff @@ ## master #463 +/- ## == - Coverage60.2% 60.18% -0.03% == Files 156 156 Lines 1341513415 == - Hits 8077 8074 -3 Misses 4762 4762 - Partials 576 579 +3 ``` | [Impacted Files](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/463?src=pr&el=tree) | Coverage Δ | | |---|---|---| | [server/service/util/tag\_util.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/463/diff?src=pr&el=tree#diff-c2VydmVyL3NlcnZpY2UvdXRpbC90YWdfdXRpbC5nbw==) | `61.53% <0%> (-3.85%)` | :arrow_down: | | [pkg/util/tree.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/463/diff?src=pr&el=tree#diff-cGtnL3V0aWwvdHJlZS5nbw==) | `81.25% <0%> (-3.13%)` | :arrow_down: | | [pkg/log/logrotate.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/463/diff?src=pr&el=tree#diff-cGtnL2xvZy9sb2dyb3RhdGUuZ28=) | `33.71% <0%> (-0.58%)` | :arrow_down: | | [server/govern/service.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/463/diff?src=pr&el=tree#diff-c2VydmVyL2dvdmVybi9zZXJ2aWNlLmdv) | `73.33% <0%> (-0.34%)` | :arrow_down: | | [server/broker/service.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/463/diff?src=pr&el=tree#diff-c2VydmVyL2Jyb2tlci9zZXJ2aWNlLmdv) | `57.78% <0%> (-0.16%)` | :arrow_down: | | [server/service/tag.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/463/diff?src=pr&el=tree#diff-c2VydmVyL3NlcnZpY2UvdGFnLmdv) | `68.86% <0%> (+0.59%)` | :arrow_up: | | [pkg/util/util.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/463/diff?src=pr&el=tree#diff-cGtnL3V0aWwvdXRpbC5nbw==) | `67.56% <0%> (+1.35%)` | :arrow_up: | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/463?src=pr&el=continue). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/463?src=pr&el=footer). Last update [0d10009...4c87ee9](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/463?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments). This is an automated message from the Apache Git Service. To respond to the message, please log on 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 > Fix translation issues for Chinese Locale on First Load > --- > > Key: SCB-978 > URL: https://issues.apache.org/jira/browse/SCB-978 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Service-Center >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > Fix For: service-center-1.1.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-977) Dependencies will not be updated in 5min when micro service is changed
[ https://issues.apache.org/jira/browse/SCB-977?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16662076#comment-16662076 ] ASF GitHub Bot commented on SCB-977: asifdxtreme closed pull request #462: SCB-977 Dependencies will not be updated in 5min when re-create provider service URL: https://github.com/apache/incubator-servicecomb-service-center/pull/462 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/server/core/key_convertor.go b/server/core/key_convertor.go index fbb59fb8..296b727f 100644 --- a/server/core/key_convertor.go +++ b/server/core/key_convertor.go @@ -140,21 +140,21 @@ func GetInfoFromDependencyQueueKV(key []byte) (consumerId, domainProject, uuid s return } -func GetInfoFromDependencyRuleKV(key []byte) *pb.MicroServiceKey { +func GetInfoFromDependencyRuleKV(key []byte) (t string, _ *pb.MicroServiceKey) { keys := KvToResponse(key) l := len(keys) if l < 5 { - return nil + return "", nil } if keys[l-1] == "*" { - return &pb.MicroServiceKey{ + return keys[l-3], &pb.MicroServiceKey{ Tenant: fmt.Sprintf("%s/%s", keys[l-5], keys[l-4]), Environment: keys[l-2], ServiceName: keys[l-1], } } - return &pb.MicroServiceKey{ + return keys[l-5], &pb.MicroServiceKey{ Tenant: fmt.Sprintf("%s/%s", keys[l-7], keys[l-6]), Environment: keys[l-4], AppId: keys[l-3], diff --git a/server/core/key_convertor_test.go b/server/core/key_convertor_test.go index 21dd2bfb..422d8d48 100644 --- a/server/core/key_convertor_test.go +++ b/server/core/key_convertor_test.go @@ -129,27 +129,27 @@ func TestGetInfoFromKV(t *testing.T) { t.Fatalf("TestGetInfoFromKV failed") } - k := GetInfoFromDependencyRuleKV([]byte(GenerateProviderDependencyRuleKey("a/b", &proto.MicroServiceKey{ + dt, k := GetInfoFromDependencyRuleKV([]byte(GenerateProviderDependencyRuleKey("a/b", &proto.MicroServiceKey{ Tenant: "a/b", AppId: "c", ServiceName: "*", }))) - if k == nil || k.AppId != "" || k.ServiceName != "*" { + if dt != DEPS_PROVIDER || k == nil || k.AppId != "" || k.ServiceName != "*" { t.Fatalf("TestGetInfoFromKV failed") } - k = GetInfoFromDependencyRuleKV([]byte(GenerateProviderDependencyRuleKey("a/b", &proto.MicroServiceKey{ + dt, k = GetInfoFromDependencyRuleKV([]byte(GenerateProviderDependencyRuleKey("a/b", &proto.MicroServiceKey{ Tenant: "a/b", AppId: "c", ServiceName: "d", Version: "e", }))) - if k == nil || k.AppId != "c" || k.ServiceName != "d" { + if dt != DEPS_PROVIDER || k == nil || k.AppId != "c" || k.ServiceName != "d" { t.Fatalf("TestGetInfoFromKV failed") } - k = GetInfoFromDependencyRuleKV([]byte("abc")) - if k != nil { + dt, k = GetInfoFromDependencyRuleKV([]byte("abc")) + if dt != "" || k != nil { t.Fatalf("TestGetInfoFromKV failed") } } diff --git a/server/service/dependency_test.go b/server/service/dependency_test.go index 497b86c6..29500244 100644 --- a/server/service/dependency_test.go +++ b/server/service/dependency_test.go @@ -774,6 +774,8 @@ var _ = Describe("'Dependency' service", func() { Expect(err).To(BeNil()) Expect(resp.Response.Code).To(Equal(pb.Response_SUCCESS)) + Expect(deh.Handle()).To(BeNil()) + respGetC, err = serviceResource.GetConsumerDependencies(getContext(), &pb.GetDependenciesRequest{ ServiceId: consumerId1, NoSelf:true, @@ -781,6 +783,96 @@ var _ = Describe("'Dependency' service", func() { Expect(err).To(BeNil()) Expect(respGetC.Response.Code).To(Equal(pb.Response_SUCCESS)) Expect(len(respGetC.Providers)).To(Equal(1)) + + By("find before provider register") + resp, err = instanceResource.Find(getContext(), &pb.FindInstancesRequest{ + ConsumerServiceId: providerId2, + AppId: "get_dep_group", +
[jira] [Commented] (SCB-978) Fix translation issues for Chinese Locale on First Load
[ https://issues.apache.org/jira/browse/SCB-978?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16662063#comment-16662063 ] ASF GitHub Bot commented on SCB-978: asifdxtreme opened a new pull request #463: SCB-978 Fix translation issues for Chinese Locale on First Load URL: https://github.com/apache/incubator-servicecomb-service-center/pull/463 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). --- This is an automated message from the Apache Git Service. To respond to the message, please log on 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 > Fix translation issues for Chinese Locale on First Load > --- > > Key: SCB-978 > URL: https://issues.apache.org/jira/browse/SCB-978 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Service-Center >Reporter: Mohammad Asif Siddiqui >Assignee: Mohammad Asif Siddiqui >Priority: Major > Fix For: service-center-1.1.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Created] (SCB-978) Fix translation issues for Chinese Locale on First Load
Mohammad Asif Siddiqui created SCB-978: -- Summary: Fix translation issues for Chinese Locale on First Load Key: SCB-978 URL: https://issues.apache.org/jira/browse/SCB-978 Project: Apache ServiceComb Issue Type: Improvement Components: Service-Center Reporter: Mohammad Asif Siddiqui Assignee: Mohammad Asif Siddiqui Fix For: service-center-1.1.0 -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-977) Dependencies will not be updated in 5min when micro service is changed
[ https://issues.apache.org/jira/browse/SCB-977?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16662045#comment-16662045 ] ASF GitHub Bot commented on SCB-977: coveralls edited a comment on issue #462: SCB-977 Dependencies will not be updated in 5min when re-create provider service URL: https://github.com/apache/incubator-servicecomb-service-center/pull/462#issuecomment-432548911 [![Coverage Status](https://coveralls.io/builds/19690655/badge)](https://coveralls.io/builds/19690655) Coverage decreased (-0.1%) to 62.638% when pulling **687ffe360bd342353ee1194a60a2173fb1b436cb on little-cui:bug** into **0d10009d5324043b58bdc7f7ee356259b800739d on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on 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 > Dependencies will not be updated in 5min when micro service is changed > -- > > Key: SCB-977 > URL: https://issues.apache.org/jira/browse/SCB-977 > Project: Apache ServiceComb > Issue Type: Bug > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.1.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-972) Using SHA1 signature key as UUID of micro service
[ https://issues.apache.org/jira/browse/SCB-972?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16661977#comment-16661977 ] ASF GitHub Bot commented on SCB-972: little-cui closed pull request #461: SCB-972 Using Sha1 signature key as UUID of k8s service URL: https://github.com/apache/incubator-servicecomb-service-center/pull/461 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/docs/helm.md b/docs/helm.md index 405ea11f..dc8f7602 100644 --- a/docs/helm.md +++ b/docs/helm.md @@ -136,7 +136,7 @@ helm delete --purge servicecomb `k8s,servicecenter`(for accessing distinct kubernetes clusters). - **`clusters`** (string: "sc-0=http://127.0.0.1:2380";) The cluster address managed by Service Center. If `type` is set to `etcd`, its format is `http(s)://{etcd-1},http(s)://{etcd-2}`. If `type` is -set to other value, its format is `{cluster name 1}=http(s)://{cluster-1-1}|http(s)://{cluster-1-2},{cluster-2}=http(s)://{cluster-2-1}` +set to other value, its format is `{cluster name 1}=http(s)://{cluster-1-1},http(s)://{cluster-1-2},{cluster-2}=http(s)://{cluster-2-1}` + **registry** - **`enabled`** (bool: false) Register Service Center itself or not. - **`type`** (string: "embeded_etcd") The class of backend storage provider, this decide how diff --git a/server/plugin/pkg/discovery/k8s/adaptor/cacher_index.go b/server/plugin/pkg/discovery/k8s/adaptor/cacher_index.go index 5958f31d..73941ad5 100644 --- a/server/plugin/pkg/discovery/k8s/adaptor/cacher_index.go +++ b/server/plugin/pkg/discovery/k8s/adaptor/cacher_index.go @@ -30,8 +30,8 @@ type ServiceIndexCacher struct { func (c *ServiceIndexCacher) onServiceEvent(evt K8sEvent) { svc := evt.Object.(*v1.Service) domainProject := Kubernetes().GetDomainProject() - serviceId := uuid(svc.UID) indexKey := core.GenerateServiceIndexKey(generateServiceKey(domainProject, svc)) + serviceId := generateServiceId(domainProject, svc) if !ShouldRegisterService(svc) { kv := c.Cache().Get(indexKey) diff --git a/server/plugin/pkg/discovery/k8s/adaptor/cacher_instance.go b/server/plugin/pkg/discovery/k8s/adaptor/cacher_instance.go index 8147384b..cecbe253 100644 --- a/server/plugin/pkg/discovery/k8s/adaptor/cacher_instance.go +++ b/server/plugin/pkg/discovery/k8s/adaptor/cacher_instance.go @@ -33,7 +33,7 @@ type InstanceCacher struct { func (c *InstanceCacher) onServiceEvent(evt K8sEvent) { svc := evt.Object.(*v1.Service) domainProject := Kubernetes().GetDomainProject() - serviceId := uuid(svc.UID) + serviceId := generateServiceId(domainProject, svc) switch evt.EventType { case pb.EVT_DELETE: @@ -77,8 +77,9 @@ func (c *InstanceCacher) onEndpointsEvent(evt K8sEvent) { return } - serviceId := uuid(svc.UID) domainProject := Kubernetes().GetDomainProject() + serviceId := generateServiceId(domainProject, svc) + oldKvs := c.getInstances(domainProject, serviceId) newKvs := make(map[string]*discovery.KeyValue) for _, ss := range ep.Subsets { @@ -88,7 +89,7 @@ func (c *InstanceCacher) onEndpointsEvent(evt K8sEvent) { continue } - instanceId := uuid(pod.UID) + instanceId := UUID(pod.UID) key := core.GenerateInstanceKey(Kubernetes().GetDomainProject(), serviceId, instanceId) switch evt.EventType { case pb.EVT_CREATE, pb.EVT_UPDATE: diff --git a/server/plugin/pkg/discovery/k8s/adaptor/cacher_service.go b/server/plugin/pkg/discovery/k8s/adaptor/cacher_service.go index f1df1ac7..797b174e 100644 --- a/server/plugin/pkg/discovery/k8s/adaptor/cacher_service.go +++ b/server/plugin/pkg/discovery/k8s/adaptor/cacher_service.go @@ -30,7 +30,7 @@ type ServiceCacher struct { func (c *ServiceCacher) onServiceEvent(evt K8sEvent) { svc := evt.Object.(*v1.Service) domainProject := Kubernetes().GetDomainProject() - serviceId := uuid(svc.UID) + serviceId := generateServiceId(domainProject, svc) key := core.GenerateServiceKey(domainProject, serviceId) if !ShouldRegisterService(svc) { @@ -43,7 +43,7 @@ func (c *ServiceCacher) onServiceEvent(evt K8sEvent) { switch evt.EventType { case pb.EVT_CREATE, pb.EVT_UPDATE: - ms := FromK8sService(svc) + ms := FromK8sService(domainProject, svc) kv := AsKeyValue(key, ms, svc.ResourceVersion) if c.Cache().Get(key) == ni
[jira] [Commented] (SCB-977) Dependencies will not be updated in 5min when micro service is changed
[ https://issues.apache.org/jira/browse/SCB-977?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16661875#comment-16661875 ] ASF GitHub Bot commented on SCB-977: coveralls commented on issue #462: SCB-977 Dependencies will not be updated in 5min when micro service is changed URL: https://github.com/apache/incubator-servicecomb-service-center/pull/462#issuecomment-432548911 [![Coverage Status](https://coveralls.io/builds/19688329/badge)](https://coveralls.io/builds/19688329) Coverage increased (+0.1%) to 62.718% when pulling **e10d2db0c4e73a6631c7c5bf6e2db4defb0250fb on little-cui:bug** into **bd59e8bf98179b49c997f10ed4f529b2d1c0afcf on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on 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 > Dependencies will not be updated in 5min when micro service is changed > -- > > Key: SCB-977 > URL: https://issues.apache.org/jira/browse/SCB-977 > Project: Apache ServiceComb > Issue Type: Bug > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.1.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-977) Dependencies will not be updated in 5min when micro service is changed
[ https://issues.apache.org/jira/browse/SCB-977?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16661874#comment-16661874 ] ASF GitHub Bot commented on SCB-977: codecov-io commented on issue #462: SCB-977 Dependencies will not be updated in 5min when micro service is changed URL: https://github.com/apache/incubator-servicecomb-service-center/pull/462#issuecomment-432548456 # [Codecov](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/462?src=pr&el=h1) Report > Merging [#462](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/462?src=pr&el=desc) into [master](https://codecov.io/gh/apache/incubator-servicecomb-service-center/commit/bd59e8bf98179b49c997f10ed4f529b2d1c0afcf?src=pr&el=desc) will **increase** coverage by `0.02%`. > The diff coverage is `0%`. [![Impacted file tree graph](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/462/graphs/tree.svg?width=650&token=GAaF7zrg8R&height=150&src=pr)](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/462?src=pr&el=tree) ```diff @@Coverage Diff@@ ## master#462 +/- ## = + Coverage 60.17% 60.2% +0.02% = Files 156 156 Lines 13415 13415 = + Hits 80728076 +4 Misses 47624762 + Partials 581 577 -4 ``` | [Impacted Files](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/462?src=pr&el=tree) | Coverage Δ | | |---|---|---| | [server/service/event/tag\_event\_handler.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/462/diff?src=pr&el=tree#diff-c2VydmVyL3NlcnZpY2UvZXZlbnQvdGFnX2V2ZW50X2hhbmRsZXIuZ28=) | `7.69% <0%> (ø)` | :arrow_up: | | [server/service/event/service\_event\_handler.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/462/diff?src=pr&el=tree#diff-c2VydmVyL3NlcnZpY2UvZXZlbnQvc2VydmljZV9ldmVudF9oYW5kbGVyLmdv) | `12.5% <0%> (ø)` | :arrow_up: | | [server/broker/util.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/462/diff?src=pr&el=tree#diff-c2VydmVyL2Jyb2tlci91dGlsLmdv) | `53.47% <0%> (+0.26%)` | :arrow_up: | | [server/govern/service.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/462/diff?src=pr&el=tree#diff-c2VydmVyL2dvdmVybi9zZXJ2aWNlLmdv) | `73.66% <0%> (+0.33%)` | :arrow_up: | | [...erver/plugin/pkg/tracing/buildin/file\_collector.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/462/diff?src=pr&el=tree#diff-c2VydmVyL3BsdWdpbi9wa2cvdHJhY2luZy9idWlsZGluL2ZpbGVfY29sbGVjdG9yLmdv) | `64.07% <0%> (+0.97%)` | :arrow_up: | | [server/service/notification/stream.go](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/462/diff?src=pr&el=tree#diff-c2VydmVyL3NlcnZpY2Uvbm90aWZpY2F0aW9uL3N0cmVhbS5nbw==) | `69.56% <0%> (+4.34%)` | :arrow_up: | -- [Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/462?src=pr&el=continue). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta) > `Δ = absolute (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/462?src=pr&el=footer). Last update [bd59e8b...e10d2db](https://codecov.io/gh/apache/incubator-servicecomb-service-center/pull/462?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments). This is an automated message from the Apache Git Service. To respond to the message, please log on 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 > Dependencies will not be updated in 5min when micro service is changed > -- > > Key: SCB-977 > URL: https://issues.apache.org/jira/browse/SCB-977 > Project: Apache ServiceComb > Issue Type: Bug > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.1.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-962) The forwardPolicy of Saga can configure the maximum of retries
[ https://issues.apache.org/jira/browse/SCB-962?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16661858#comment-16661858 ] ASF GitHub Bot commented on SCB-962: zhfeng commented on issue #322: [SCB-962] Support ForwardPolicy to configure the maximum of retries URL: https://github.com/apache/incubator-servicecomb-saga/pull/322#issuecomment-432543539 Thanks @KomachiSion and it looks good to me. @WillemJiang do you have any input here ? This is an automated message from the Apache Git Service. To respond to the message, please log on 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 > The forwardPolicy of Saga can configure the maximum of retries > -- > > Key: SCB-962 > URL: https://issues.apache.org/jira/browse/SCB-962 > Project: Apache ServiceComb > Issue Type: Improvement > Components: Saga >Affects Versions: saga-0.2.0 >Reporter: Sion Yang >Assignee: Sion Yang >Priority: Major > Fix For: saga-0.3.0 > > Original Estimate: 168h > Remaining Estimate: 168h > > Currently, forwardPolicy would keep trying transaction part when transaction > failed, which may cause saga retry transaction infinitely. > So it's necessary to configure the maximum of transaction retries. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-977) Dependencies will not be updated in 5min when micro service is changed
[ https://issues.apache.org/jira/browse/SCB-977?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16661850#comment-16661850 ] ASF GitHub Bot commented on SCB-977: little-cui opened a new pull request #462: SCB-977 Dependencies will not be updated in 5min when micro service i… URL: https://github.com/apache/incubator-servicecomb-service-center/pull/462 …s changed (cherry picked from commit 92816c8) 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). --- This is an automated message from the Apache Git Service. To respond to the message, please log on 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 > Dependencies will not be updated in 5min when micro service is changed > -- > > Key: SCB-977 > URL: https://issues.apache.org/jira/browse/SCB-977 > Project: Apache ServiceComb > Issue Type: Bug > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > Fix For: service-center-1.1.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (SCB-952) Support sync ServiceComb service to Kubernetes
[ https://issues.apache.org/jira/browse/SCB-952?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16661844#comment-16661844 ] little-cui commented on SCB-952: In consul, this feature depends on the consul DNS. But SC can not run as a DNS server, so this issue can not be done. > Support sync ServiceComb service to Kubernetes > -- > > Key: SCB-952 > URL: https://issues.apache.org/jira/browse/SCB-952 > Project: Apache ServiceComb > Issue Type: New Feature > Components: Service-Center >Reporter: little-cui >Assignee: little-cui >Priority: Major > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Created] (SCB-977) Dependencies will not be updated in 5min when micro service is changed
little-cui created SCB-977: -- Summary: Dependencies will not be updated in 5min when micro service is changed Key: SCB-977 URL: https://issues.apache.org/jira/browse/SCB-977 Project: Apache ServiceComb Issue Type: Bug Components: Service-Center Reporter: little-cui Assignee: little-cui Fix For: service-center-1.1.0 -- This message was sent by Atlassian JIRA (v7.6.3#76005)