fix metadata, serialization and metadata url

apache · Aug 1, 2024 · cde8a93 · cde8a93
1 parent 9dc558b
commit cde8a93
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/metadata/service/exporter/configurable/exporter.go b/metadata/service/exporter/configurable/exporter.go
@@ -120,7 +120,7 @@ func (exporter *MetadataServiceExporter) exportV1() error {
 		invoker := server.NewInternalInvoker(ivkURL, &info, exporter.metadataServiceV1)
 		exporter.Exporter = extension.GetProtocol(protocolwrapper.FILTER).Export(invoker)
 		logger.Infof("[Metadata Service] MetadataService has been exported at url : %v ", invoker.GetURL())
-		exporter.metadataService.SetMetadataServiceURL(ivkURL)
+		exporter.metadataService.SetMetadataServiceURL(invoker.GetURL())
 		return nil
 	}
 }
@@ -160,18 +160,23 @@ func getMetadataProtocolAndPort() (string, string) {
 	}
 
 	var protocolConfig *config.ProtocolConfig
-	for s, pc := range rootConfig.Protocols {
-		if s != constant.DefaultProtocol && s != constant.TriProtocol {
+	for _, pc := range rootConfig.Protocols {
+		if pc.Name != constant.DefaultProtocol && pc.Name != constant.TriProtocol {
 			continue
 		}
-		if s == protocol {
+		if pc.Name == protocol {
 			protocolConfig = pc
 			break
 		}
 	}
 
 	if protocol == "" {
-		protocolConfig = rootConfig.Protocols[constant.TriProtocol]
+		for _, pc := range rootConfig.Protocols {
+			if pc.Name == constant.TriProtocol {
+				protocolConfig = pc
+				break
+			}
+		}
 	}
 
 	if protocolConfig == nil {

diff --git a/metadata/service/local/metadata_service_proxy_factory.go b/metadata/service/local/metadata_service_proxy_factory.go
@@ -133,6 +133,7 @@ func buildStandardMetadataServiceURL(ins registry.ServiceInstance) []*common.URL
 			u.Path = constant.MetadataServiceV2Name
 			u.SetParam(constant.VersionKey, metaV)
 			u.SetParam(constant.InterfaceKey, constant.MetadataServiceV2Name)
+			u.DelParam(constant.SerializationKey)
 		} else {
 			u.SetParam(constant.SerializationKey, constant.Hessian2Serialization)
 		}