Skip to content

Fix: service discovery registry notify before return #2168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 6, 2023
Merged

Fix: service discovery registry notify before return #2168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64f3e44
Fix: service discovery registry notify before return
Leospard Dec 23, 2022
ee183f1
format import
Leospard Dec 23, 2022
ebec1c3
modify notify url
Leospard Jan 5, 2023
b0a3801
add judge about the existence of instance's metadata revision
Leospard Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions registry/event/service_instances_changed_listener_impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func (lstn *ServiceInstancesChangedListenerImpl) OnEvent(e observer.Event) error
revisionToInstances[revision] = append(subInstances, instance)
metadataInfo := lstn.revisionToMetadata[revision]
if metadataInfo == nil {
metadataInfo, err = lstn.getMetadataInfo(instance, revision)
metadataInfo, err = GetMetadataInfo(instance, revision)
if err != nil {
return err
}
Expand Down Expand Up @@ -143,36 +143,6 @@ func (lstn *ServiceInstancesChangedListenerImpl) OnEvent(e observer.Event) error
return nil
}

// getMetadataInfo get metadata info when MetadataStorageTypePropertyName is null
func (lstn *ServiceInstancesChangedListenerImpl) getMetadataInfo(instance registry.ServiceInstance, revision string) (*common.MetadataInfo, error) {
var metadataStorageType string
var metadataInfo *common.MetadataInfo
if instance.GetMetadata() == nil {
metadataStorageType = constant.DefaultMetadataStorageType
} else {
metadataStorageType = instance.GetMetadata()[constant.MetadataStorageTypePropertyName]
}
if metadataStorageType == constant.RemoteMetadataStorageType {
remoteMetadataServiceImpl, err := extension.GetRemoteMetadataService()
if err != nil {
return nil, err
}
metadataInfo, err = remoteMetadataServiceImpl.GetMetadata(instance)
if err != nil {
return nil, err
}
} else {
var err error
proxyFactory := extension.GetMetadataServiceProxyFactory(constant.DefaultKey)
metadataService := proxyFactory.GetProxy(instance)
metadataInfo, err = metadataService.GetMetadataInfo(revision)
if err != nil {
return nil, err
}
}
return metadataInfo, nil
}

// AddListenerAndNotify add notify listener and notify to listen service event
func (lstn *ServiceInstancesChangedListenerImpl) AddListenerAndNotify(serviceKey string, notify registry.NotifyListener) {
lstn.listeners[serviceKey] = notify
Expand Down Expand Up @@ -212,3 +182,33 @@ func (lstn *ServiceInstancesChangedListenerImpl) GetPriority() int {
func (lstn *ServiceInstancesChangedListenerImpl) GetEventType() reflect.Type {
return reflect.TypeOf(&registry.ServiceInstancesChangedEvent{})
}

// GetMetadataInfo get metadata info when MetadataStorageTypePropertyName is null
func GetMetadataInfo(instance registry.ServiceInstance, revision string) (*common.MetadataInfo, error) {
var metadataStorageType string
var metadataInfo *common.MetadataInfo
if instance.GetMetadata() == nil {
metadataStorageType = constant.DefaultMetadataStorageType
} else {
metadataStorageType = instance.GetMetadata()[constant.MetadataStorageTypePropertyName]
}
if metadataStorageType == constant.RemoteMetadataStorageType {
remoteMetadataServiceImpl, err := extension.GetRemoteMetadataService()
if err != nil {
return nil, err
}
metadataInfo, err = remoteMetadataServiceImpl.GetMetadata(instance)
if err != nil {
return nil, err
}
} else {
var err error
proxyFactory := extension.GetMetadataServiceProxyFactory(constant.DefaultKey)
metadataService := proxyFactory.GetProxy(instance)
metadataInfo, err = metadataService.GetMetadataInfo(revision)
if err != nil {
return nil, err
}
}
return metadataInfo, nil
}
28 changes: 27 additions & 1 deletion registry/servicediscovery/service_discovery_registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import (
"dubbo.apache.org/dubbo-go/v3/registry"
"dubbo.apache.org/dubbo-go/v3/registry/event"
"dubbo.apache.org/dubbo-go/v3/registry/servicediscovery/synthesizer"
"dubbo.apache.org/dubbo-go/v3/remoting"
)

func init() {
Expand Down Expand Up @@ -230,7 +231,32 @@ func (s *serviceDiscoveryRegistry) Subscribe(url *common.URL, notify registry.No
}

// LoadSubscribeInstances load subscribe instance
func (s *serviceDiscoveryRegistry) LoadSubscribeInstances(_ *common.URL, _ registry.NotifyListener) error {
func (s *serviceDiscoveryRegistry) LoadSubscribeInstances(url *common.URL, notify registry.NotifyListener) error {
appName := url.GetParam(constant.ApplicationKey, url.Username)
instances := s.serviceDiscovery.GetInstances(appName)
for _, instance := range instances {
if instance.GetMetadata() == nil {
logger.Warnf("Instance metadata is nil: %s", instance.GetHost())
continue
}
revision, ok := instance.GetMetadata()[constant.ExportedServicesRevisionPropertyName]
if !ok {
logger.Warnf("Instance metadata revision is nil: %s", instance.GetHost())
continue
}
if "0" == revision {
logger.Infof("Find instance without valid service metadata: %s", instance.GetHost())
continue
}
metadataInfo, err := event.GetMetadataInfo(instance, revision)
if err != nil {
return err
}
instance.SetServiceMetadata(metadataInfo)
for _, url := range instance.ToURLs() {
notify.Notify(&registry.ServiceEvent{Action: remoting.EventTypeAdd, Service: url})
}
}
return nil
}

Expand Down