AlexStocks commented on code in PR #36:
URL: https://github.com/apache/dubbo-net/pull/36#discussion_r4585191468
##########
Tests/UnitTestForDubboNet/MyNacosTest.cs:
##########
@@ -104,6 +106,94 @@ await nacos.GetProvidersAsync(Service, Group),
}
}
+ [Fact]
+ public async Task
ProviderDiscovery_DisposeRemovesOnlyItsOwnNamingSubscription()
+ {
+ var server = new FakeNacos();
+ server.Add("1", 20880);
+ using MyNacos nacos = server.CreateClient();
+ int callsA = 0, callsB = 0;
+ using var first = new ProviderDiscovery(null!, nacos, Group, null!,
+ _ => { callsA++; return Task.CompletedTask; }, () => { });
+ using var second = new ProviderDiscovery(null!, nacos, Group, null!,
+ _ => { callsB++; return Task.CompletedTask; }, () => { });
+
+ Assert.Single((await
first.GetProviderEndPointsAsync(Service)).EndPoints);
+ Assert.Single((await
second.GetProviderEndPointsAsync(Service)).EndPoints);
+ Assert.Equal(1, server.NamingSubscribes);
+ await server.PushNaming();
+ Assert.Equal((1, 1), (callsA, callsB));
+
+ first.Dispose();
+ Assert.Single(server.NamingListeners);
+ await server.PushNaming();
+ Assert.Equal((1, 2), (callsA, callsB));
+ second.Dispose();
+ Assert.Empty(server.NamingListeners);
+ }
+
+ [Fact]
+ public async Task
ProviderDiscovery_CoalescesConcurrentLookupsAndDoesNotCacheTheResult()
+ {
+ var server = new FakeNacos();
+ server.Add("1", 20880);
+ server.InstanceGate = new TaskCompletionSource<List<Instance>>(
+ TaskCreationOptions.RunContinuationsAsynchronously);
+ using MyNacos nacos = server.CreateClient();
+ using var discovery = new ProviderDiscovery(null!, nacos, Group, null!,
+ _ => Task.CompletedTask, () => { });
+
+ Task<DubboServiceEndPointInfos>[] callers = Enumerable.Range(0, 32)
Review Comment:
[P2] `ProviderDiscovery_CoalescesConcurrentLookupsAndDoesNotCacheTheResult`
的 32 次调用是串行的,保护不到本 PR 唯一的行为修正
**触发条件**:后续有人把 `Registry/ProviderDiscovery.cs:133-136` 的 `Lazy` 改回裸
factory(`GetOrAdd(key, _ => DiscoverAsync(...))`)时,本用例仍然通过。
**实际影响**:`Enumerable.Range(0, 32).Select(...).ToArray()`
在单线程上顺序枚举。第一次调用已经把未完成的 `Lazy` 写进 `_inFlight`——`Lazy.Value` 求值到 `DiscoverAsync`
的 `await _nacos.GetProviderEndPointsAsync(...)` 处挂起,字典条目在 factory 返回后就已存在;随后 31
次必然命中同一条目。旧实现的 `GetOrAdd(serviceName, _ =>
GetSeviceProviderEndPointsAsync(...))` 也是把「已启动并挂起的 Task」先存进字典,串行场景下
`InstanceReads` 同样是 1。因此 `Assert.Equal(1, server.InstanceReads)` 对修复前后都成立,PR
说明里列为唯一有意引入的行为修正(“duplicate SDK lookups under contention”)没有回归保护。
**证据**(head 9809ceae,源码级判断):`Registry/ProviderDiscovery.cs:133-136` 的
`Lazy(..., ExecutionAndPublication)` 写法本身正确,被丢弃的 factory 只丢一个未求值的
`Lazy`,不会启动查询;问题只在测试侧——`Tests/UnitTestForDubboNet/MyNacosTest.cs:146-152`
全程没有并发原语,而 `ConcurrentDictionary.GetOrAdd` 的 factory 只在键缺失时同步执行。仓库 CI(run
42585065292,head 9809ceae)通过只说明该用例成立,不说明它有区分力。
**修复方向**:让 32 个调用真正同时进入 `GetProviderEndPointsAsync`:用 `ManualResetEventSlim`
作栅栏后为每个调用 `Task.Run`,或在 `Parallel.For` 内发起,再断言 `InstanceReads == 1`。这样裸 factory
实现在竞争下会真的产生多次 `InstanceReads`,用例才具备回归能力。「不缓存结果」的断言(第 154-155 行)不需要改动。
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]