Ftr: Use invoker with same ip as client first. #1023
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package self_disc | ||
|
|
||
| import ( | ||
| "github.com/apache/dubbo-go/cluster/router" | ||
| "github.com/apache/dubbo-go/common" | ||
| "github.com/apache/dubbo-go/common/constant" | ||
| "github.com/apache/dubbo-go/common/extension" | ||
| ) | ||
|
|
||
| func init() { | ||
| extension.SetRouterFactory(constant.SelfDiscoveryRouterName, newSelfDiscRouteFactory) | ||
| } | ||
|
|
||
| // SelfDiscRouteFactory | ||
| type SelfDiscRouteFactory struct { | ||
| } | ||
|
|
||
| // newSelfDiscRouteFactory construct a new SelfDiscRouteFactory | ||
| func newSelfDiscRouteFactory() router.PriorityRouterFactory { | ||
| return &SelfDiscRouteFactory{} | ||
| } | ||
|
|
||
| // NewPriorityRouter construct a new NewSelfDiscRouter via url | ||
| func (f *SelfDiscRouteFactory) NewPriorityRouter(url *common.URL) (router.PriorityRouter, error) { | ||
| return NewSelfDiscRouter(url) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package self_disc | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
| ) | ||
|
|
||
| import ( | ||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| import ( | ||
| "github.com/apache/dubbo-go/common" | ||
| "github.com/apache/dubbo-go/protocol" | ||
| ) | ||
|
|
||
| // nolint | ||
| type MockInvoker struct { | ||
| url *common.URL | ||
| } | ||
|
|
||
| // nolint | ||
| func NewMockInvoker(url *common.URL) *MockInvoker { | ||
| return &MockInvoker{ | ||
| url: url, | ||
| } | ||
| } | ||
|
|
||
| // nolint | ||
| func (bi *MockInvoker) GetUrl() *common.URL { | ||
| return bi.url | ||
| } | ||
|
|
||
| // nolint | ||
| func (bi *MockInvoker) IsAvailable() bool { | ||
| return true | ||
| } | ||
|
|
||
| // nolint | ||
| func (bi *MockInvoker) IsDestroyed() bool { | ||
| return true | ||
| } | ||
|
|
||
| // nolint | ||
| func (bi *MockInvoker) Invoke(_ context.Context, _ protocol.Invocation) protocol.Result { | ||
| return nil | ||
| } | ||
|
|
||
| // nolint | ||
| func (bi *MockInvoker) Destroy() { | ||
| } | ||
|
|
||
| // nolint | ||
| func TestSelfDiscRouteFactory(t *testing.T) { | ||
| factory := newSelfDiscRouteFactory() | ||
| assert.NotNil(t, factory) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package self_disc | ||
|
|
||
| import ( | ||
| "github.com/RoaringBitmap/roaring" | ||
| ) | ||
|
|
||
| import ( | ||
| "github.com/apache/dubbo-go/cluster/router" | ||
| "github.com/apache/dubbo-go/cluster/router/utils" | ||
| "github.com/apache/dubbo-go/common" | ||
| "github.com/apache/dubbo-go/common/logger" | ||
| "github.com/apache/dubbo-go/protocol" | ||
| ) | ||
|
|
||
| const ( | ||
| selfDesc = "self-desc" | ||
|
There was a problem hiding this comment. Can you use There was a problem hiding this comment.
|
||
| name = "self-desc-router" | ||
| ) | ||
|
|
||
| // SelfDiscRouter provides a ip-same-first routing logic | ||
| // if there is not provider with same ip as consumer, it would not filter any invoker | ||
| // if exists same ip invoker, it would retains this invoker only | ||
| type SelfDiscRouter struct { | ||
| url *common.URL | ||
| localIP string | ||
| } | ||
|
|
||
| // NewSelfDiscRouter construct an SelfDiscRouter via url | ||
| func NewSelfDiscRouter(url *common.URL) (router.PriorityRouter, error) { | ||
| r := &SelfDiscRouter{ | ||
| url: url, | ||
| localIP: url.Ip, | ||
| } | ||
| return r, nil | ||
| } | ||
|
|
||
| // Route gets a list of match-logic invoker | ||
| func (r *SelfDiscRouter) Route(invokers *roaring.Bitmap, cache router.Cache, url *common.URL, invocation protocol.Invocation) *roaring.Bitmap { | ||
| addrPool := cache.FindAddrPool(r) | ||
| // Add selfDesc invoker to the list | ||
| selectedInvokers := utils.JoinIfNotEqual(addrPool[selfDesc], invokers) | ||
| // If all invokers are considered not match, downgrade to all invoker | ||
| if selectedInvokers.IsEmpty() { | ||
| logger.Warnf(" Now all invokers are not match, so downgraded to all! Service: [%s]", url.ServiceKey()) | ||
| return invokers | ||
| } | ||
| return selectedInvokers | ||
| } | ||
|
|
||
| // Pool separates same ip invoker from others. | ||
| func (r *SelfDiscRouter) Pool(invokers []protocol.Invoker) (router.AddrPool, router.AddrMetadata) { | ||
| rb := make(router.AddrPool, 8) | ||
| rb[selfDesc] = roaring.NewBitmap() | ||
| selfDescFound := false | ||
| for i, invoker := range invokers { | ||
| if invoker.GetUrl().Ip == r.localIP { | ||
| rb[selfDesc].Add(uint32(i)) | ||
| selfDescFound = true | ||
| } | ||
| } | ||
| if selfDescFound { | ||
| // found self desc | ||
| logger.Debug("found self desc ") | ||
| return rb, nil | ||
| } | ||
| for i, _ := range invokers { | ||
| rb[selfDesc].Add(uint32(i)) | ||
| } | ||
| return rb, nil | ||
| } | ||
|
|
||
| // ShouldPool will always return true to make sure self call logic constantly. | ||
| func (r *SelfDiscRouter) ShouldPool() bool { | ||
| return true | ||
| } | ||
|
|
||
| func (r *SelfDiscRouter) Name() string { | ||
| return name | ||
| } | ||
|
|
||
| // Priority | ||
| func (r *SelfDiscRouter) Priority() int64 { | ||
| return 0 | ||
| } | ||
|
|
||
| // URL Return URL in router | ||
| func (r *SelfDiscRouter) URL() *common.URL { | ||
| return r.url | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package self_disc | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "testing" | ||
| ) | ||
|
|
||
| import ( | ||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| import ( | ||
| "github.com/apache/dubbo-go/cluster/router" | ||
| "github.com/apache/dubbo-go/cluster/router/chain" | ||
| "github.com/apache/dubbo-go/cluster/router/utils" | ||
| "github.com/apache/dubbo-go/common" | ||
| "github.com/apache/dubbo-go/protocol" | ||
| "github.com/apache/dubbo-go/protocol/invocation" | ||
| ) | ||
|
|
||
| const ( | ||
| selfDiscRoute1010IP = "192.168.10.10" | ||
| selfDiscRoute1011IP = "192.168.10.11" | ||
| selfDiscRoute1012IP = "192.168.10.12" | ||
| selfDiscRouteMethodNameTest = "test" | ||
| selfDiscRouteUrlFormat = "dubbo://%s:20000/com.ikurento.user.UserProvider" | ||
| ) | ||
|
|
||
| func TestSelfDiscRouterRoute(t *testing.T) { | ||
| defer protocol.CleanAllStatus() | ||
| consumerURL, _ := common.NewURL(fmt.Sprintf(selfDiscRouteUrlFormat, selfDiscRoute1010IP)) | ||
| url1, _ := common.NewURL(fmt.Sprintf(selfDiscRouteUrlFormat, selfDiscRoute1010IP)) | ||
| url2, _ := common.NewURL(fmt.Sprintf(selfDiscRouteUrlFormat, selfDiscRoute1011IP)) | ||
| url3, _ := common.NewURL(fmt.Sprintf(selfDiscRouteUrlFormat, selfDiscRoute1012IP)) | ||
| hcr, _ := NewSelfDiscRouter(consumerURL) | ||
|
|
||
| var invokers []protocol.Invoker | ||
| invoker1 := NewMockInvoker(url1) | ||
| invoker2 := NewMockInvoker(url2) | ||
| invoker3 := NewMockInvoker(url3) | ||
| invokers = append(invokers, invoker1, invoker2, invoker3) | ||
| inv := invocation.NewRPCInvocation(selfDiscRouteMethodNameTest, nil, nil) | ||
| res := hcr.Route(utils.ToBitmap(invokers), setUpAddrCache(hcr.(*SelfDiscRouter), invokers), consumerURL, inv) | ||
| // now only same ip invoker is selected | ||
| assert.True(t, len(res.ToArray()) == 1) | ||
|
|
||
| // now all invoker with ip that not match client are selected | ||
| invokers = invokers[1:] | ||
| res = hcr.Route(utils.ToBitmap(invokers), setUpAddrCache(hcr.(*SelfDiscRouter), invokers), consumerURL, inv) | ||
| assert.True(t, len(res.ToArray()) == 2) | ||
| } | ||
|
|
||
| func setUpAddrCache(r router.Poolable, addrs []protocol.Invoker) router.Cache { | ||
| pool, info := r.Pool(addrs) | ||
| cache := chain.BuildCache(addrs) | ||
| cache.SetAddrMeta(r.Name(), info) | ||
| cache.SetAddrPool(r.Name(), pool) | ||
| return cache | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
dont use
_in package name. I think can change to selfThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think consistency for directory name and package name will not lead to misunderstanding.
And directory name should not be ‘aB’
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed