forked from cadence-workflow/cadence
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor PeerChooserFactory out of DispatcherProvider (cadence-workfl…
…ow#4508) * Refactor PeerChooserFactory out of DispatcherProvider * Update cmd/server/cadence/server.go Co-authored-by: Mantas Šidlauskas <sidlauskas.mantas@gmail.com>
- Loading branch information
1 parent
a53f4c9
commit e45753a
Showing
5 changed files
with
162 additions
and
30 deletions.
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| // Copyright (c) 2021 Uber Technologies, Inc. | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files (the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in | ||
| // all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| // THE SOFTWARE. | ||
|
|
||
| package rpc | ||
|
|
||
| import ( | ||
| "time" | ||
|
|
||
| "github.com/uber/cadence/common/log" | ||
|
|
||
| "go.uber.org/yarpc/api/peer" | ||
| "go.uber.org/yarpc/peer/roundrobin" | ||
| ) | ||
|
|
||
| const defaultDNSRefreshInterval = time.Second * 10 | ||
|
|
||
| type ( | ||
| PeerChooserFactory interface { | ||
| CreatePeerChooser(transport peer.Transport, address string) (peer.Chooser, error) | ||
| } | ||
| dnsPeerChooserFactory struct { | ||
| interval time.Duration | ||
| logger log.Logger | ||
| } | ||
| ) | ||
|
|
||
| func NewDNSPeerChooserFactory(interval time.Duration, logger log.Logger) *dnsPeerChooserFactory { | ||
| if interval <= 0 { | ||
| interval = defaultDNSRefreshInterval | ||
| } | ||
|
|
||
| return &dnsPeerChooserFactory{interval, logger} | ||
| } | ||
|
|
||
| func (f *dnsPeerChooserFactory) CreatePeerChooser(transport peer.Transport, address string) (peer.Chooser, error) { | ||
| peerList := roundrobin.New(transport) | ||
| peerListUpdater, err := newDNSUpdater(peerList, address, f.interval, f.logger) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| peerListUpdater.Start() | ||
| return peerList, nil | ||
| } |
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,82 @@ | ||
| // Copyright (c) 2021 Uber Technologies, Inc. | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files (the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in | ||
| // all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| // THE SOFTWARE. | ||
|
|
||
| package rpc | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| "go.uber.org/yarpc/api/peer" | ||
| "go.uber.org/yarpc/api/transport" | ||
|
|
||
| "github.com/uber/cadence/common/log" | ||
| ) | ||
|
|
||
| func TestDNSPeerChooserFactory(t *testing.T) { | ||
| logger := log.NewNoop() | ||
| ctx := context.Background() | ||
| interval := 100 * time.Millisecond | ||
|
|
||
| // Ensure default interval is set | ||
| factory := NewDNSPeerChooserFactory(0, logger) | ||
| assert.Equal(t, defaultDNSRefreshInterval, factory.interval) | ||
|
|
||
| factory = NewDNSPeerChooserFactory(interval, logger) | ||
| peerTransport := &fakePeerTransport{} | ||
|
|
||
| // Ensure invalid address returns error | ||
| _, err := factory.CreatePeerChooser(peerTransport, "invalid address") | ||
| assert.EqualError(t, err, "incorrect DNS:Port format") | ||
|
|
||
| chooser, err := factory.CreatePeerChooser(peerTransport, "localhost:1234") | ||
| require.NoError(t, err) | ||
|
|
||
| require.NoError(t, chooser.Start()) | ||
| require.True(t, chooser.IsRunning()) | ||
|
|
||
| // Wait for refresh | ||
| time.Sleep(interval) | ||
|
|
||
| peer, _, err := chooser.Choose(ctx, &transport.Request{}) | ||
| require.NoError(t, err) | ||
| require.NotNil(t, peer) | ||
| assert.Equal(t, "fakePeer", peer.Identifier()) | ||
| } | ||
|
|
||
| type ( | ||
| fakePeerTransport struct{} | ||
| fakePeer struct{} | ||
| ) | ||
|
|
||
| func (t *fakePeerTransport) RetainPeer(peer.Identifier, peer.Subscriber) (peer.Peer, error) { | ||
| return &fakePeer{}, nil | ||
| } | ||
| func (t *fakePeerTransport) ReleasePeer(peer.Identifier, peer.Subscriber) error { | ||
| return nil | ||
| } | ||
|
|
||
| func (p *fakePeer) Identifier() string { return "fakePeer" } | ||
| func (p *fakePeer) Status() peer.Status { return peer.Status{ConnectionStatus: peer.Available} } | ||
| func (p *fakePeer) StartRequest() {} | ||
| func (p *fakePeer) EndRequest() {} |
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