Merge membership Monitor and ServiceResolver to membership.Resolver #4646
Conversation
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
| @@ -597,24 +597,22 @@ func (adh *adminHandlerImpl) DescribeCluster( | |||
|
|
|||
| var rings []*types.RingInfo | |||
| for _, role := range service.List { | |||
| resolver, err := monitor.GetResolver(role) | |||
| if err != nil { | |||
| return nil, adh.error(err, scope) | |||
There was a problem hiding this comment.
Seems like we no longer return this error. Is this intended?
There was a problem hiding this comment.
thanks, fixed
mantas-sidlauskas
force-pushed
the
single_monitor
branch
from
7cb1433
to
4b2cffa
Compare
mantas-sidlauskas
changed the title
client/matching/peerResolver.go
Outdated
|
|
||
| // PeerResolver is used to resolve matching peers. | ||
| // Those are deployed instances of Cadence matching services that participate in the cluster ring. | ||
| // The resulting peer is simply an address of form ip:port where RPC calls can be routed to. | ||
| type PeerResolver struct { | ||
| membership membership.ServiceResolver | ||
| membership membership.Resolver |
There was a problem hiding this comment.
nit: this was renamed to resolver in client/history/peerResolver.go, maybe rename here as well for consistency?
There was a problem hiding this comment.
yep, can do
service/history/shard/controller.go
Outdated
| @@ -163,7 +165,7 @@ func (c *controller) Start() { | |||
| c.shutdownWG.Add(1) | |||
| go c.shardManagementPump() | |||
|
|
|||
| err := c.GetHistoryServiceResolver().AddListener(shardControllerMembershipUpdateListenerName, c.membershipUpdateCh) | |||
| err := c.GetMembershipResolver().Subscribe(service.History, shardControllerMembershipUpdateListenerName, c.membershipUpdateCh) | |||
| if err != nil { | |||
| c.logger.Error("Error adding listener", tag.Error(err)) | |||
There was a problem hiding this comment.
Please update this error message, as this is not listener anymore, but a subscriber.
service/history/shard/controller.go
Outdated
| @@ -178,7 +180,7 @@ func (c *controller) Stop() { | |||
|
|
|||
| c.PrepareToStop() | |||
|
|
|||
| if err := c.GetHistoryServiceResolver().RemoveListener(shardControllerMembershipUpdateListenerName); err != nil { | |||
| if err := c.GetMembershipResolver().Unsubscribe(service.History, shardControllerMembershipUpdateListenerName); err != nil { | |||
| c.logger.Error("Error removing membership update listener", tag.Error(err), tag.OperationFailed) | |||
There was a problem hiding this comment.
Update this error as well, listener -> subscriber.
service/matching/matchingEngine.go
Outdated
| @@ -109,7 +111,7 @@ func NewEngine(taskManager persistence.TaskManager, | |||
| logger log.Logger, | |||
| metricsClient metrics.Client, | |||
| domainCache cache.DomainCache, | |||
| resolver membership.ServiceResolver, | |||
| monitor membership.Resolver, | |||
There was a problem hiding this comment.
This var should be resolver
| @@ -55,7 +76,7 @@ func newDomainReplicationProcessor( | |||
| metricsClient metrics.Client, | |||
| taskExecutor domain.ReplicationTaskExecutor, | |||
| hostInfo *membership.HostInfo, | |||
| serviceResolver membership.ServiceResolver, | |||
| membership membership.Resolver, | |||
There was a problem hiding this comment.
nit: rename to resolver for consistency with other places
common/membership/hashring.go
Outdated
| event.HostsUpdated = append(event.HostsUpdated, NewHostInfo(addr, r.getLabelsMap())) | ||
| } | ||
|
|
||
| // Notify listeners |
There was a problem hiding this comment.
listeners -> subscribers
vytautas-karpavicius
approved these changes
Nov 19, 2021
mantas-sidlauskas
force-pushed
the
single_monitor
branch
from
940cc26
to
fcf7287
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What changed?
Membership monitor and service resolver interfaces merged to a single
membership.Resolverinterface.Resolveris using hashring to get ownership for a shard.Why?
This is part of refactoring needed to introduce selectable membership providers.
How did you test it?
Unit test/local test
Potential risks
Release notes
Documentation Changes