Merge branch 'nacos-group:dev' into dev

nacos-group · Sep 22, 2024 · 32a6870 · 32a6870
2 parents f2a24b7 + ded6426
commit 32a6870
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,6 +23,7 @@ jobs:
       run: |
         dotnet build --configuration Release --source https://api.nuget.org/v3/index.json src/Nacos/Nacos.csproj
         dotnet build --configuration Release --source https://api.nuget.org/v3/index.json src/Nacos.AspNetCore/Nacos.AspNetCore.csproj
+        dotnet build --configuration Release --source https://api.nuget.org/v3/index.json src/Nacos.Microsoft.Extensions.ServiceDiscovery/Nacos.Microsoft.Extensions.ServiceDiscovery.csproj
         dotnet build --configuration Release --source https://api.nuget.org/v3/index.json src/Nacos.Microsoft.Extensions.Configuration/Nacos.Microsoft.Extensions.Configuration.csproj
         dotnet build --configuration Release --source https://api.nuget.org/v3/index.json parsers/Nacos.IniParser/Nacos.IniParser.csproj        
         dotnet build --configuration Release --source https://api.nuget.org/v3/index.json parsers/Nacos.YamlParser/Nacos.YamlParser.csproj                
@@ -32,6 +33,7 @@ jobs:
         ver=alpha`date +%Y%m%d%H%M%S`
         dotnet pack src/Nacos/Nacos.csproj --version-suffix $ver -o /home/runner/work/nugetpkgs -c Release --no-build
         dotnet pack src/Nacos.AspNetCore/Nacos.AspNetCore.csproj --version-suffix $ver -o /home/runner/work/nugetpkgs -c Release --no-build
+        dotnet pack src/Nacos.Microsoft.Extensions.ServiceDiscovery/Nacos.Microsoft.Extensions.ServiceDiscovery.csproj --version-suffix $ver -o /home/runner/work/nugetpkgs -c Release --no-build
         dotnet pack src/Nacos.Microsoft.Extensions.Configuration/Nacos.Microsoft.Extensions.Configuration.csproj --version-suffix $ver -o /home/runner/work/nugetpkgs -c Release --no-build
         dotnet pack parsers/Nacos.IniParser/Nacos.IniParser.csproj --version-suffix $ver -o /home/runner/work/nugetpkgs -c Release --no-build
         dotnet pack parsers/Nacos.YamlParser/Nacos.YamlParser.csproj --version-suffix $ver -o /home/runner/work/nugetpkgs -c Release --no-build

diff --git a/.github/workflows/release_stable.yml b/.github/workflows/release_stable.yml
@@ -23,6 +23,7 @@ jobs:
       run: |
         dotnet build --configuration Release --source https://api.nuget.org/v3/index.json src/Nacos/Nacos.csproj
         dotnet build --configuration Release --source https://api.nuget.org/v3/index.json src/Nacos.AspNetCore/Nacos.AspNetCore.csproj
+        dotnet build --configuration Release --source https://api.nuget.org/v3/index.json src/Nacos.Microsoft.Extensions.ServiceDiscovery/Nacos.Microsoft.Extensions.ServiceDiscovery.csproj
         dotnet build --configuration Release --source https://api.nuget.org/v3/index.json src/Nacos.Microsoft.Extensions.Configuration/Nacos.Microsoft.Extensions.Configuration.csproj        
         dotnet build --configuration Release --source https://api.nuget.org/v3/index.json parsers/Nacos.IniParser/Nacos.IniParser.csproj        
         dotnet build --configuration Release --source https://api.nuget.org/v3/index.json parsers/Nacos.YamlParser/Nacos.YamlParser.csproj           
@@ -31,6 +32,7 @@ jobs:
       run: |
         dotnet pack src/Nacos/Nacos.csproj -o /home/runner/work/nugetpkgs -c Release --no-build
         dotnet pack src/Nacos.AspNetCore/Nacos.AspNetCore.csproj -o /home/runner/work/nugetpkgs -c Release --no-build
+        dotnet pack src/Nacos.Microsoft.Extensions.ServiceDiscovery/Nacos.Microsoft.Extensions.ServiceDiscovery.csproj -o /home/runner/work/nugetpkgs -c Release --no-build
         dotnet pack src/Nacos.Microsoft.Extensions.Configuration/Nacos.Microsoft.Extensions.Configuration.csproj -o /home/runner/work/nugetpkgs -c Release --no-build
         dotnet pack parsers/Nacos.IniParser/Nacos.IniParser.csproj -o /home/runner/work/nugetpkgs -c Release --no-build
         dotnet pack parsers/Nacos.YamlParser/Nacos.YamlParser.csproj -o /home/runner/work/nugetpkgs -c Release --no-build

diff --git a/src/Nacos.Microsoft.Extensions.ServiceDiscovery/README.md b/src/Nacos.Microsoft.Extensions.ServiceDiscovery/README.md
@@ -0,0 +1,17 @@
+# nacos-sdk-csharp.Extensions.ServiceDiscovery
+
+nacos-sdk-csharp.Extensions.ServiceDiscovery provides service registration and discovery With Microsoft.Extensions.ServiceDiscovery.
+
+```csharp
+builder.Services.AddServiceDiscovery(o =>
+{
+    o.RefreshPeriod = TimeSpan.FromSeconds(60);
+})
+.AddConfigurationServiceEndpointProvider()
+.AddNacosSrvServiceEndpointProvider();
+```
+
+## Links
+
+* [Documentation](https://nacos-sdk-csharp.readthedocs.io/en/latest/)
+* [nacos-sdk-csharp GitHub](https://github.com/nacos-group/nacos-sdk-csharp)
diff --git a/src/Nacos/V2/Naming/Remote/Grpc/Redo/NamingGrpcRedoService.cs b/src/Nacos/V2/Naming/Remote/Grpc/Redo/NamingGrpcRedoService.cs
@@ -100,6 +100,7 @@ public void InstanceDeregister(string serviceName, string groupName)
             if (_registeredInstances.TryGetValue(key, out var data))
             {
                 data.Unregistering = true;
+                data.ExpectedRegistered = false;
             }
         }
 
@@ -125,7 +126,10 @@ public void RemoveInstanceForRedo(string serviceName, string groupName)
         {
             string key = NamingUtils.GetGroupedName(serviceName, groupName);
 
-            _registeredInstances.TryRemove(key, out _);
+            if (_registeredInstances.TryGetValue(key, out var data) && data != null && !data.ExpectedRegistered)
+            {
+                _registeredInstances.TryRemove(key, out _);
+            }
         }
 
         /// <summary>
@@ -190,6 +194,7 @@ public void SubscriberDeregister(string serviceName, string groupName, string cl
             if (_subscribes.TryGetValue(key, out var data))
             {
                 data.Unregistering = true;
+                data.ExpectedRegistered = false;
             }
         }
 
@@ -203,7 +208,10 @@ public void RemoveSubscriberForRedo(string serviceName, string groupName, string
         {
             string key = ServiceInfo.GetKey(NamingUtils.GetGroupedName(serviceName, groupName), cluster);
 
-            _subscribes.TryRemove(key, out _);
+            if (_subscribes.TryGetValue(key, out var data) && data != null && !data.ExpectedRegistered)
+            {
+                _subscribes.TryRemove(key, out _);
+            }
         }
 
         /// <summary>

diff --git a/src/Nacos/V2/Naming/Remote/Grpc/Redo/RedoData{T}.cs b/src/Nacos/V2/Naming/Remote/Grpc/Redo/RedoData{T}.cs
@@ -7,12 +7,15 @@ protected RedoData(string serviceName, string groupName)
         {
             this.ServiceName = serviceName;
             this.GroupName = groupName;
+            this.ExpectedRegistered = true;
         }
 
         public string ServiceName { get; private set; }
 
         public string GroupName { get; private set; }
 
+        public bool ExpectedRegistered { get; set; }
+
         public T Data { get; set; }
 
         public bool Registered { get; set; }

diff --git a/src/Nacos/V2/Naming/Remote/Grpc/Redo/RedoScheduledTask.cs b/src/Nacos/V2/Naming/Remote/Grpc/Redo/RedoScheduledTask.cs
@@ -66,6 +66,11 @@ private async Task RedoForInstance(InstanceRedoData redoData)
                 case RedoType.REGISTER:
                     if (IsClientDisabled()) return;
 
+                    if (redoData is BatchInstanceRedoData batchInstanceRedoData)
+                    {
+                        await _clientProxy.BatchRegisterServiceAsync(serviceName, groupName, batchInstanceRedoData.Instances).ConfigureAwait(false);
+                    }
+
                     await _clientProxy.DoRegisterService(serviceName, groupName, redoData.Data).ConfigureAwait(false);
                     break;
                 case RedoType.UNREGISTER: