From 04f7b2a525f75ee4e62b7f8c388f74264a8af603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Tue, 23 Jun 2020 20:35:47 +0100 Subject: [PATCH 01/31] add lazy initialization; change API to facilitate it --- .../Core/ClientTimeoutTests.cs | 2 +- .../Core/ConnectionSimulacronTests.cs | 20 +- .../Core/HeartbeatTests.cs | 2 +- .../Core/PoolShortTests.cs | 8 +- .../Core/SessionStateTests.cs | 2 +- .../Core/SessionTests.cs | 31 +- .../Core/SpeculativeExecutionLongTests.cs | 2 +- src/Cassandra.Tests/BuilderTests.cs | 2 +- .../Connections/HostConnectionPoolTests.cs | 2 +- .../DataStax/Insights/InsightsClientTests.cs | 10 +- .../Mapping/Linq/LinqCreateTableUnitTests.cs | 6 +- src/Cassandra.Tests/RequestHandlerTests.cs | 12 +- .../Requests/PrepareHandlerTests.cs | 12 +- src/Cassandra.Tests/SessionTests.cs | 2 +- src/Cassandra/Builder.cs | 4 +- src/Cassandra/Cluster.cs | 387 +++++++++--------- .../Connections/Control/ControlConnection.cs | 18 +- .../Control/ControlConnectionFactory.cs | 5 +- .../Control/IControlConnectionFactory.cs | 3 +- .../Connections/HostConnectionPool.cs | 6 +- src/Cassandra/Data/Linq/CqlQueryBase.cs | 5 + src/Cassandra/Data/Linq/SessionExtensions.cs | 31 +- src/Cassandra/Data/Linq/Table.cs | 11 +- .../DataStax/Insights/IInsightsClient.cs | 2 +- .../Insights/IInsightsSupportVerifier.cs | 5 +- .../InfoProviders/IInsightsInfoProvider.cs | 2 +- .../AuthProviderInfoProvider.cs | 3 +- .../ConfigAntiPatternsInfoProvider.cs | 6 +- .../StartupMessage/DataCentersInfoProvider.cs | 6 +- .../StartupMessage/DriverInfoProvider.cs | 3 +- .../ExecutionProfileInfoProvider.cs | 3 +- .../StartupMessage/HostnameInfoProvider.cs | 2 +- .../OtherOptionsInfoProvider.cs | 2 +- .../StartupMessage/PlatformInfoProvider.cs | 2 +- .../PoolSizeByHostDistanceInfoProvider.cs | 6 +- .../ReconnectionPolicyInfoProvider.cs | 2 +- .../StatusMessage/NodeStatusInfoProvider.cs | 5 +- .../DataStax/Insights/InsightsClient.cs | 34 +- .../Insights/InsightsSupportVerifier.cs | 10 +- .../IInsightsMessageFactory.cs | 2 +- .../InsightsStartupMessageFactory.cs | 36 +- .../InsightsStatusMessageFactory.cs | 10 +- src/Cassandra/Extensions.cs | 31 +- src/Cassandra/ICluster.cs | 81 +--- src/Cassandra/IMetadataQueryProvider.cs | 6 +- src/Cassandra/ISession.cs | 10 - src/Cassandra/Metadata.cs | 78 ++-- .../ConstantSpeculativeExecutionPolicy.cs | 2 +- .../Policies/DCAwareRoundRobinPolicy.cs | 27 +- .../Policies/DefaultLoadBalancingPolicy.cs | 14 +- .../Policies/ILoadBalancingPolicy.cs | 7 +- .../Policies/ILocalDatacenterProvider.cs | 2 +- .../Policies/ISpeculativeExecutionPolicy.cs | 2 +- .../Policies/LocalDatacenterProvider.cs | 31 +- .../Policies/NoSpeculativeExecutionPolicy.cs | 2 +- .../Policies/RetryLoadBalancingPolicy.cs | 8 +- src/Cassandra/Policies/RoundRobinPolicy.cs | 20 +- src/Cassandra/Policies/TokenAwarePolicy.cs | 17 +- .../ProtocolEvents/ProtocolEventDebouncer.cs | 10 +- src/Cassandra/ProtocolVersion.cs | 8 + src/Cassandra/QueryTrace.cs | 9 +- src/Cassandra/Requests/IPrepareHandler.cs | 4 +- src/Cassandra/Requests/IRequestHandler.cs | 7 + .../Requests/IRequestHandlerFactory.cs | 13 +- src/Cassandra/Requests/PrepareHandler.cs | 21 +- src/Cassandra/Requests/ReprepareHandler.cs | 3 +- src/Cassandra/Requests/RequestExecution.cs | 27 +- src/Cassandra/Requests/RequestHandler.cs | 151 ++++++- .../Requests/RequestHandlerFactory.cs | 18 +- src/Cassandra/SchemaParser.cs | 6 +- src/Cassandra/Session.cs | 127 +++--- .../SessionManagement/IInternalCluster.cs | 9 +- .../SessionManagement/IInternalSession.cs | 5 +- .../SessionManagement/ISessionFactory.cs | 7 +- .../SessionManagement/SessionFactory.cs | 10 +- src/Cassandra/SessionState.cs | 4 +- src/Cassandra/UdtMappingDefinitions.cs | 22 +- 77 files changed, 869 insertions(+), 654 deletions(-) diff --git a/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs b/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs index a184ca40c..c9d71fb58 100644 --- a/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs +++ b/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs @@ -206,7 +206,7 @@ public void Should_Use_Statement_ReadTimeout() var queryOptions = new QueryOptions().SetRetryOnTimeout(false); var builder = ClusterBuilder().AddContactPoint(_testCluster.InitialContactPoint) .WithSocketOptions(socketOptions) - .WithPoolingOptions(PoolingOptions.Create().SetHeartBeatInterval(0)) + .WithPoolingOptions(PoolingOptions.Get().SetHeartBeatInterval(0)) .WithQueryTimeout(Timeout.Infinite) .WithQueryOptions(queryOptions); using (var cluster = builder.Build()) diff --git a/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs b/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs index 89fcf5d2f..a6ed492eb 100644 --- a/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs +++ b/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs @@ -51,8 +51,9 @@ public async Task Should_ThrowOperationTimedOut_When_ServerAppliesTcpBackPressur .SetStreamMode(streamMode) .SetDefunctReadTimeoutThreshold(int.MaxValue))); + var metadata = await Session.Cluster.GetMetadataAsync().ConfigureAwait(false); var maxRequestsPerConnection = Session.Cluster.Configuration - .GetOrCreatePoolingOptions(Session.Cluster.Metadata.ControlConnection.ProtocolVersion) + .GetPoolingOptions(metadata.ProtocolVersion) .GetMaxRequestsPerConnection(); var tenKbBuffer = new byte[10240]; @@ -60,7 +61,7 @@ public async Task Should_ThrowOperationTimedOut_When_ServerAppliesTcpBackPressur // send number of requests = max pending var requests = - Enumerable.Repeat(0, maxRequestsPerConnection * Session.Cluster.AllHosts().Count) + Enumerable.Repeat(0, maxRequestsPerConnection * metadata.AllHosts().Count) .Select(i => Session.ExecuteAsync(new SimpleStatement("INSERT INTO table1 (id) VALUES (?)", tenKbBuffer))).ToList(); var taskAll = Task.WhenAll(requests); @@ -88,6 +89,7 @@ public async Task Should_ThrowOperationTimedOut_When_ServerAppliesTcpBackPressur [Test] public async Task Should_RetryOnNextNodes_When_ANodeIsPaused(bool streamMode) { + var metadata = await Session.Cluster.GetMetadataAsync().ConfigureAwait(false); var pausedNode = TestCluster.GetNode(2); SetupNewSession(b => @@ -103,7 +105,7 @@ public async Task Should_RetryOnNextNodes_When_ANodeIsPaused(bool streamMode) var maxRequestsPerConnection = Session.Cluster.Configuration - .GetOrCreatePoolingOptions(Session.Cluster.Metadata.ControlConnection.ProtocolVersion) + .GetPoolingOptions(metadata.ProtocolVersion) .GetMaxRequestsPerConnection(); var tenKbBuffer = new byte[10240]; @@ -112,7 +114,7 @@ public async Task Should_RetryOnNextNodes_When_ANodeIsPaused(bool streamMode) // send number of requests = max pending var requests = - Enumerable.Repeat(0, maxRequestsPerConnection * Session.Cluster.AllHosts().Count) + Enumerable.Repeat(0, maxRequestsPerConnection * metadata.AllHosts().Count) .Select(i => Session.ExecuteAsync(new SimpleStatement("INSERT INTO table1 (id) VALUES (?)", tenKbBuffer))).ToList(); var pools = InternalSession.GetPools().ToList(); @@ -146,6 +148,7 @@ public async Task Should_RetryOnNextNodes_When_ANodeIsPaused(bool streamMode) [Test] public async Task Should_ContinueRoutingTrafficToNonPausedNodes_When_ANodeIsPaused(bool streamMode) { + var metadata = await Session.Cluster.GetMetadataAsync().ConfigureAwait(false); var pausedNode = TestCluster.GetNode(2); const string profileName = "running-nodes"; @@ -167,7 +170,7 @@ public async Task Should_ContinueRoutingTrafficToNonPausedNodes_When_ANodeIsPaus var maxRequestsPerConnection = Session.Cluster.Configuration - .GetOrCreatePoolingOptions(Session.Cluster.Metadata.ControlConnection.ProtocolVersion) + .GetPoolingOptions(metadata.ProtocolVersion) .GetMaxRequestsPerConnection(); var tenKbBuffer = new byte[10240]; @@ -176,7 +179,7 @@ public async Task Should_ContinueRoutingTrafficToNonPausedNodes_When_ANodeIsPaus // send number of requests = max pending var requests = - Enumerable.Repeat(0, maxRequestsPerConnection * Session.Cluster.AllHosts().Count) + Enumerable.Repeat(0, maxRequestsPerConnection * metadata.AllHosts().Count) .Select(i => Session.ExecuteAsync(new SimpleStatement("INSERT INTO table1 (id) VALUES (?)", tenKbBuffer))).ToList(); try @@ -233,6 +236,7 @@ public async Task Should_ContinueRoutingTrafficToNonPausedNodes_When_ANodeIsPaus [Test] public async Task Should_KeepOperationsInWriteQueue_When_ServerAppliesTcpBackPressure(bool streamMode) { + var metadata = await Session.Cluster.GetMetadataAsync().ConfigureAwait(false); SetupNewSession(b => b.WithPoolingOptions( new PoolingOptions() @@ -243,7 +247,7 @@ public async Task Should_KeepOperationsInWriteQueue_When_ServerAppliesTcpBackPre .SetStreamMode(streamMode))); var maxRequestsPerConnection = Session.Cluster.Configuration - .GetOrCreatePoolingOptions(Session.Cluster.Metadata.ControlConnection.ProtocolVersion) + .GetPoolingOptions(metadata.ProtocolVersion) .GetMaxRequestsPerConnection(); var tenKbBuffer = new byte[10240]; @@ -296,7 +300,7 @@ public async Task Should_KeepOperationsInWriteQueue_When_ServerAppliesTcpBackPre Assert.Greater(moreFailedRequests.Count, 1); Assert.AreEqual(moreRequests.Count, moreFailedRequests.Count); - Assert.GreaterOrEqual(connections.Sum(c => c.InFlight), maxRequestsPerConnection * Session.Cluster.AllHosts().Count); + Assert.GreaterOrEqual(connections.Sum(c => c.InFlight), maxRequestsPerConnection * metadata.AllHosts().Count); // ReSharper disable once PossibleNullReferenceException Assert.IsTrue(moreFailedRequests.All(t => t.IsFaulted && ((NoHostAvailableException)t.Exception.InnerException).Errors.All(e => e.Value is BusyPoolException))); diff --git a/src/Cassandra.IntegrationTests/Core/HeartbeatTests.cs b/src/Cassandra.IntegrationTests/Core/HeartbeatTests.cs index 1c18b38fc..95e0650c6 100644 --- a/src/Cassandra.IntegrationTests/Core/HeartbeatTests.cs +++ b/src/Cassandra.IntegrationTests/Core/HeartbeatTests.cs @@ -49,7 +49,7 @@ public void OneTimeTearDown() public async Task Connection_Should_Send_Options_Requests_For_Heartbeats(bool executeQuery) { var builder = ClusterBuilder() - .WithPoolingOptions(PoolingOptions.Create().SetHeartBeatInterval(4000)) + .WithPoolingOptions(PoolingOptions.Get().SetHeartBeatInterval(4000)) .AddContactPoint(_testCluster.InitialContactPoint); using (var cluster = builder.Build()) diff --git a/src/Cassandra.IntegrationTests/Core/PoolShortTests.cs b/src/Cassandra.IntegrationTests/Core/PoolShortTests.cs index 51d4d1932..3cc51c4dd 100644 --- a/src/Cassandra.IntegrationTests/Core/PoolShortTests.cs +++ b/src/Cassandra.IntegrationTests/Core/PoolShortTests.cs @@ -256,7 +256,7 @@ public void Connect_With_Ssl_Test() [TestCase(ProtocolVersion.V2, 2)] public async Task PoolingOptions_Create_Based_On_Protocol(ProtocolVersion protocolVersion, int coreConnectionLength) { - var options1 = PoolingOptions.Create(protocolVersion); + var options1 = PoolingOptions.Get(protocolVersion); using (var sCluster = SimulacronCluster.CreateNew(new SimulacronOptions())) using (var cluster = ClusterBuilder() .AddContactPoint(sCluster.InitialContactPoint) @@ -284,7 +284,7 @@ await TestHelper.RetryAssertAsync(async () => public async Task Should_Create_Core_Connections_To_Hosts_In_Local_Dc_When_Warmup_Is_Enabled() { const int nodeLength = 4; - var poolingOptions = PoolingOptions.Create().SetCoreConnectionsPerHost(HostDistance.Local, 5); + var poolingOptions = PoolingOptions.Get().SetCoreConnectionsPerHost(HostDistance.Local, 5); // Use multiple DCs: 4 nodes in first DC and 3 nodes in second DC using (var testCluster = SimulacronCluster.CreateNew(new SimulacronOptions { Nodes = $"{nodeLength},3" })) @@ -430,7 +430,7 @@ public async Task Should_Use_Next_Host_When_First_Host_Is_Busy() const int maxRequestsPerConnection = 100; var builder = ClusterBuilder() .WithPoolingOptions( - PoolingOptions.Create() + PoolingOptions.Get() .SetCoreConnectionsPerHost(HostDistance.Local, connectionLength) .SetMaxConnectionsPerHost(HostDistance.Local, connectionLength) .SetHeartBeatInterval(0) @@ -480,7 +480,7 @@ public async Task Should_Throw_NoHostAvailableException_When_All_Host_Are_Busy() var builder = ClusterBuilder() .WithPoolingOptions( - PoolingOptions.Create() + PoolingOptions.Get() .SetCoreConnectionsPerHost(HostDistance.Local, connectionLength) .SetMaxConnectionsPerHost(HostDistance.Local, connectionLength) .SetHeartBeatInterval(0) diff --git a/src/Cassandra.IntegrationTests/Core/SessionStateTests.cs b/src/Cassandra.IntegrationTests/Core/SessionStateTests.cs index 0571f6542..fbe14638f 100644 --- a/src/Cassandra.IntegrationTests/Core/SessionStateTests.cs +++ b/src/Cassandra.IntegrationTests/Core/SessionStateTests.cs @@ -54,7 +54,7 @@ public void OneTimeTearDown() [Test] public async Task Session_GetState_Should_Return_A_Snapshot_Of_The_Pools_State() { - var poolingOptions = PoolingOptions.Create().SetCoreConnectionsPerHost(HostDistance.Local, 2); + var poolingOptions = PoolingOptions.Get().SetCoreConnectionsPerHost(HostDistance.Local, 2); using (var cluster = ClusterBuilder() .AddContactPoint(_testCluster.InitialContactPoint) .WithPoolingOptions(poolingOptions) diff --git a/src/Cassandra.IntegrationTests/Core/SessionTests.cs b/src/Cassandra.IntegrationTests/Core/SessionTests.cs index a2b1e8c01..0387c5b64 100644 --- a/src/Cassandra.IntegrationTests/Core/SessionTests.cs +++ b/src/Cassandra.IntegrationTests/Core/SessionTests.cs @@ -171,7 +171,7 @@ public void Session_Keyspace_Create_Case_Sensitive() } [Test] - public void Should_Create_The_Right_Amount_Of_Connections() + public async Task Should_Create_The_Right_Amount_Of_Connections() { var localCluster1 = GetNewTemporaryCluster( builder => builder @@ -180,7 +180,8 @@ public void Should_Create_The_Right_Amount_Of_Connections() .SetCoreConnectionsPerHost(HostDistance.Local, 3))); var localSession1 = (IInternalSession)localCluster1.Connect(); - var hosts1 = localCluster1.AllHosts().ToList(); + var metadata1 = await localCluster1.GetMetadataAsync().ConfigureAwait(false); + var hosts1 = metadata1.AllHosts().ToList(); Assert.AreEqual(3, hosts1.Count); //Execute multiple times a query on the newly created keyspace for (var i = 0; i < 12; i++) @@ -188,9 +189,9 @@ public void Should_Create_The_Right_Amount_Of_Connections() localSession1.Execute("SELECT * FROM system.local"); } - Thread.Sleep(2000); - var pool11 = localSession1.GetOrCreateConnectionPool(hosts1[0], HostDistance.Local); - var pool12 = localSession1.GetOrCreateConnectionPool(hosts1[1], HostDistance.Local); + await Task.Delay(2000).ConfigureAwait(false); + var pool11 = await localSession1.GetOrCreateConnectionPool(hosts1[0], HostDistance.Local).ConfigureAwait(false); + var pool12 = await localSession1.GetOrCreateConnectionPool(hosts1[1], HostDistance.Local).ConfigureAwait(false); Assert.That(pool11.OpenConnections, Is.EqualTo(3)); Assert.That(pool12.OpenConnections, Is.EqualTo(3)); @@ -199,8 +200,9 @@ public void Should_Create_The_Right_Amount_Of_Connections() .WithPoolingOptions(new PoolingOptions().SetCoreConnectionsPerHost(HostDistance.Local, 1)) .Build()) { + var metadata2 = await localCluster2.GetMetadataAsync().ConfigureAwait(false); var localSession2 = (IInternalSession)localCluster2.Connect(); - var hosts2 = localCluster2.AllHosts().ToList(); + var hosts2 = metadata2.AllHosts().ToList(); Assert.AreEqual(3, hosts2.Count); //Execute multiple times a query on the newly created keyspace for (var i = 0; i < 6; i++) @@ -208,9 +210,9 @@ public void Should_Create_The_Right_Amount_Of_Connections() localSession2.Execute("SELECT * FROM system.local"); } - Thread.Sleep(2000); - var pool21 = localSession2.GetOrCreateConnectionPool(hosts2[0], HostDistance.Local); - var pool22 = localSession2.GetOrCreateConnectionPool(hosts2[1], HostDistance.Local); + await Task.Delay(2000).ConfigureAwait(false); + var pool21 = await localSession2.GetOrCreateConnectionPool(hosts2[0], HostDistance.Local).ConfigureAwait(false); + var pool22 = await localSession2.GetOrCreateConnectionPool(hosts2[1], HostDistance.Local).ConfigureAwait(false); Assert.That(pool21.OpenConnections, Is.EqualTo(1)); Assert.That(pool22.OpenConnections, Is.EqualTo(1)); } @@ -237,14 +239,15 @@ public async Task Session_With_Host_Changing_Distance() var counter = 0; using (var localCluster = builder.Build()) { - var localSession = (IInternalSession)localCluster.Connect(); - var remoteHost = localCluster.AllHosts().First(h => TestHelper.GetLastAddressByte(h) == 2); + var metadata = await localCluster.GetMetadataAsync().ConfigureAwait(false); + var localSession = (IInternalSession) await localCluster.ConnectAsync().ConfigureAwait(false); + var remoteHost = metadata.AllHosts().First(h => TestHelper.GetLastAddressByte(h) == 2); var stopWatch = new Stopwatch(); var distanceReset = 0; TestHelper.Invoke(() => localSession.Execute("SELECT key FROM system.local"), 10); - var hosts = localCluster.AllHosts().ToArray(); - var pool1 = localSession.GetOrCreateConnectionPool(hosts[0], HostDistance.Local); - var pool2 = localSession.GetOrCreateConnectionPool(hosts[1], HostDistance.Local); + var hosts = metadata.AllHosts().ToArray(); + var pool1 = await localSession.GetOrCreateConnectionPool(hosts[0], HostDistance.Local).ConfigureAwait(false); + var pool2 = await localSession.GetOrCreateConnectionPool(hosts[1], HostDistance.Local).ConfigureAwait(false); var tcs = new TaskCompletionSource(); tcs.SetResult(null); var completedTask = tcs.Task; diff --git a/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionLongTests.cs b/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionLongTests.cs index 209fbd64d..b46fc1b77 100644 --- a/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionLongTests.cs +++ b/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionLongTests.cs @@ -90,7 +90,7 @@ public void SpeculativeExecution_Pause_Using_All_Stream_Ids() Cluster.MaxProtocolVersion = 2; try { - var pooling = PoolingOptions.Create(); + var pooling = PoolingOptions.Get(); var session = GetSession(new ConstantSpeculativeExecutionPolicy(50L, 1), true, null, pooling); const int pauseThreshold = 140 * 2; var tasks = new List>(); diff --git a/src/Cassandra.Tests/BuilderTests.cs b/src/Cassandra.Tests/BuilderTests.cs index 115d39438..0fb48e36d 100644 --- a/src/Cassandra.Tests/BuilderTests.cs +++ b/src/Cassandra.Tests/BuilderTests.cs @@ -165,7 +165,7 @@ public void WithMaxProtocolVersion_Validates_Greater_Than_Zero() public void PoolingOptions_Create_Based_On_Protocol_Version(ProtocolVersion protocolVersion, int coreConnections, int maxConnections) { - var options1 = PoolingOptions.Create(protocolVersion); + var options1 = PoolingOptions.Get(protocolVersion); var cluster1 = Cluster.Builder() .AddContactPoint("::1") .WithPoolingOptions(options1) diff --git a/src/Cassandra.Tests/Connections/HostConnectionPoolTests.cs b/src/Cassandra.Tests/Connections/HostConnectionPoolTests.cs index c8e521c57..eccc8e26e 100644 --- a/src/Cassandra.Tests/Connections/HostConnectionPoolTests.cs +++ b/src/Cassandra.Tests/Connections/HostConnectionPoolTests.cs @@ -104,7 +104,7 @@ private IHostConnectionPool CreatePool(IEndPointResolver res = null) new DefaultRetryPolicy(), NoSpeculativeExecutionPolicy.Instance, new AtomicMonotonicTimestampGenerator()), - PoolingOptions = PoolingOptions.Create(ProtocolVersion.V4).SetCoreConnectionsPerHost(HostDistance.Local, 2) + PoolingOptions = PoolingOptions.Get(ProtocolVersion.V4).SetCoreConnectionsPerHost(HostDistance.Local, 2) }.Build(); var pool = new HostConnectionPool( diff --git a/src/Cassandra.Tests/DataStax/Insights/InsightsClientTests.cs b/src/Cassandra.Tests/DataStax/Insights/InsightsClientTests.cs index 3b2509494..8d7da5be8 100644 --- a/src/Cassandra.Tests/DataStax/Insights/InsightsClientTests.cs +++ b/src/Cassandra.Tests/DataStax/Insights/InsightsClientTests.cs @@ -73,7 +73,7 @@ public void Should_LogFiveTimes_When_ThereAreMoreThanFiveErrorsOnStartupMessageS It.IsAny()); Mock.Get(cluster.Metadata.ControlConnection).Setup(mockExpression).ReturnsAsync((Response)null); - target.Init(); + target.InitializeAsync(); TestHelper.RetryAssert( () => @@ -113,7 +113,7 @@ public void Should_ResetErrorCounterForLogging_When_ThereSendMessageIsSuccessful .ReturnsAsync(new FakeResultResponse(ResultResponse.ResultResponseKind.Void)) .ReturnsAsync((Response)null); - target.Init(); + target.InitializeAsync(); TestHelper.RetryAssert( () => @@ -257,7 +257,7 @@ public void Should_InvokeRpcCallCorrectlyAndImmediately_When_SendStartupMessageI .ReturnsAsync(new FakeResultResponse(ResultResponse.ResultResponseKind.Void)) .Callback((query, opts) => { queryProtocolOptions.Enqueue(opts); }); - target.Init(); + target.InitializeAsync(); TestHelper.RetryAssert( () => { Assert.GreaterOrEqual(queryProtocolOptions.Count, 1); }, 10, 50); @@ -381,7 +381,7 @@ public void Should_InvokeRpcCallCorrectlyAndImmediatelyWithExecutionProfiles_Whe .ReturnsAsync(new FakeResultResponse(ResultResponse.ResultResponseKind.Void)) .Callback((query, opts) => { queryProtocolOptions.Enqueue(opts); }); - target.Init(); + target.InitializeAsync(); TestHelper.RetryAssert( () => { Assert.GreaterOrEqual(queryProtocolOptions.Count, 1); }, 10, 50); @@ -418,7 +418,7 @@ public void Should_InvokeRpcCallCorrectlyAndPeriodically_When_SendStatusMessageI .ReturnsAsync(new FakeResultResponse(ResultResponse.ResultResponseKind.Void)) .Callback((query, opts) => { queryProtocolOptions.Enqueue(opts); }); - target.Init(); + target.InitializeAsync(); TestHelper.RetryAssert(() => { Assert.GreaterOrEqual(queryProtocolOptions.Count, 5); }, 5, 400); queryProtocolOptions.TryDequeue(out var result); // ignore startup message diff --git a/src/Cassandra.Tests/Mapping/Linq/LinqCreateTableUnitTests.cs b/src/Cassandra.Tests/Mapping/Linq/LinqCreateTableUnitTests.cs index 0c26462f6..fed8a868d 100644 --- a/src/Cassandra.Tests/Mapping/Linq/LinqCreateTableUnitTests.cs +++ b/src/Cassandra.Tests/Mapping/Linq/LinqCreateTableUnitTests.cs @@ -585,11 +585,9 @@ private static Mock GetSessionMock(ISerializerManager serializer = nul serializer = new SerializerManager(ProtocolVersion.MaxSupported); } var sessionMock = new Mock(MockBehavior.Strict); - var config = new Configuration(); - var metadata = new Metadata(config); var ccMock = new Mock(MockBehavior.Strict); - ccMock.Setup(cc => cc.Serializer).Returns(serializer); - metadata.ControlConnection = ccMock.Object; + var config = new Configuration(); + var metadata = new Metadata(config, serializer, ccMock.Object); var clusterMock = new Mock(); clusterMock.Setup(c => c.Metadata).Returns(metadata); clusterMock.Setup(c => c.Configuration).Returns(config); diff --git a/src/Cassandra.Tests/RequestHandlerTests.cs b/src/Cassandra.Tests/RequestHandlerTests.cs index 8cd0b84d8..658d41814 100644 --- a/src/Cassandra.Tests/RequestHandlerTests.cs +++ b/src/Cassandra.Tests/RequestHandlerTests.cs @@ -308,7 +308,7 @@ public void GetRequest_With_Timestamp_Generator_Empty_Value() Cassandra.Policies.DefaultLoadBalancingPolicy, Cassandra.Policies.DefaultReconnectionPolicy, Cassandra.Policies.DefaultRetryPolicy, Cassandra.Policies.DefaultSpeculativeExecutionPolicy, new NoTimestampGenerator()); - var config = RequestHandlerTests.GetConfig(new QueryOptions(), policies, PoolingOptions.Create()); + var config = RequestHandlerTests.GetConfig(new QueryOptions(), policies, PoolingOptions.Get()); var request = RequestHandler.GetRequest( statement, RequestHandlerTests.Serializer, config.DefaultRequestOptions); @@ -341,7 +341,7 @@ public void GetRequest_With_Timestamp_Generator_Empty_Value_With_Statement_Times Cassandra.Policies.DefaultLoadBalancingPolicy, Cassandra.Policies.DefaultReconnectionPolicy, Cassandra.Policies.DefaultRetryPolicy, Cassandra.Policies.DefaultSpeculativeExecutionPolicy, new NoTimestampGenerator()); - var config = RequestHandlerTests.GetConfig(new QueryOptions(), policies, PoolingOptions.Create()); + var config = RequestHandlerTests.GetConfig(new QueryOptions(), policies, PoolingOptions.Get()); var request = RequestHandler.GetRequest(statement, Serializer, config.DefaultRequestOptions); var bodyBuffer = GetBodyBuffer(request); @@ -372,7 +372,7 @@ public void GetRequest_Batch_With_64K_Queries() batch.Add(new SimpleStatement("QUERY")); } - var config = RequestHandlerTests.GetConfig(new QueryOptions(), Cassandra.Policies.DefaultPolicies, PoolingOptions.Create()); + var config = RequestHandlerTests.GetConfig(new QueryOptions(), Cassandra.Policies.DefaultPolicies, PoolingOptions.Get()); var request = RequestHandler.GetRequest(batch, Serializer, config.DefaultRequestOptions); var bodyBuffer = GetBodyBuffer(request); @@ -390,7 +390,7 @@ public void GetRequest_Batch_With_Timestamp_Generator() // To microsecond precision startDate = startDate.Subtract(TimeSpan.FromTicks(startDate.Ticks % 10)); - var config = RequestHandlerTests.GetConfig(new QueryOptions(), Cassandra.Policies.DefaultPolicies, PoolingOptions.Create()); + var config = RequestHandlerTests.GetConfig(new QueryOptions(), Cassandra.Policies.DefaultPolicies, PoolingOptions.Get()); var request = RequestHandler.GetRequest(batch, Serializer, config.DefaultRequestOptions); var bodyBuffer = GetBodyBuffer(request); @@ -426,7 +426,7 @@ public void GetRequest_Batch_With_Empty_Timestamp_Generator() Cassandra.Policies.DefaultRetryPolicy, Cassandra.Policies.DefaultSpeculativeExecutionPolicy, new NoTimestampGenerator()); - var config = RequestHandlerTests.GetConfig(new QueryOptions(), policies, PoolingOptions.Create()); + var config = RequestHandlerTests.GetConfig(new QueryOptions(), policies, PoolingOptions.Get()); var request = RequestHandler.GetRequest(batch, Serializer, config.DefaultRequestOptions); var bodyBuffer = GetBodyBuffer(request); @@ -453,7 +453,7 @@ public void GetRequest_Batch_With_Provided_Timestamp() providedTimestamp = providedTimestamp.Subtract(TimeSpan.FromTicks(providedTimestamp.Ticks % 10)); batch.SetTimestamp(providedTimestamp); - var config = RequestHandlerTests.GetConfig(new QueryOptions(), Cassandra.Policies.DefaultPolicies, PoolingOptions.Create()); + var config = RequestHandlerTests.GetConfig(new QueryOptions(), Cassandra.Policies.DefaultPolicies, PoolingOptions.Get()); var request = RequestHandler.GetRequest(batch, Serializer, config.DefaultRequestOptions); var bodyBuffer = GetBodyBuffer(request); diff --git a/src/Cassandra.Tests/Requests/PrepareHandlerTests.cs b/src/Cassandra.Tests/Requests/PrepareHandlerTests.cs index f1fc60888..7151faf17 100644 --- a/src/Cassandra.Tests/Requests/PrepareHandlerTests.cs +++ b/src/Cassandra.Tests/Requests/PrepareHandlerTests.cs @@ -85,7 +85,7 @@ public async Task Should_NotSendRequestToSecondHost_When_SecondHostDoesntHavePoo var distanceCount = Interlocked.Read(ref lbpCluster.DistanceCount); var request = new PrepareRequest(_serializer, "TEST", null, null); - await mockResult.PrepareHandler.Prepare( + await mockResult.PrepareHandler.PrepareAsync( request, mockResult.Session, queryPlan.GetEnumerator()).ConfigureAwait(false); @@ -156,7 +156,7 @@ public async Task Should_NotSendRequestToSecondHost_When_SecondHostPoolDoesNotHa var distanceCount = Interlocked.Read(ref lbpCluster.DistanceCount); var request = new PrepareRequest(_serializer, "TEST", null, null); - await mockResult.PrepareHandler.Prepare( + await mockResult.PrepareHandler.PrepareAsync( request, mockResult.Session, queryPlan.GetEnumerator()).ConfigureAwait(false); @@ -228,7 +228,7 @@ public async Task Should_SendRequestToAllHosts_When_AllHostsHaveConnections() var distanceCount = Interlocked.Read(ref lbpCluster.DistanceCount); var request = new PrepareRequest(_serializer, "TEST", null, null); - await mockResult.PrepareHandler.Prepare( + await mockResult.PrepareHandler.PrepareAsync( request, mockResult.Session, queryPlan.GetEnumerator()).ConfigureAwait(false); @@ -299,7 +299,7 @@ public async Task Should_SendRequestToAllHosts_When_AllHostsHaveConnectionsButFi var distanceCount = Interlocked.Read(ref lbpCluster.DistanceCount); var request = new PrepareRequest(_serializer, "TEST", null, null); - await mockResult.PrepareHandler.Prepare( + await mockResult.PrepareHandler.PrepareAsync( request, mockResult.Session, queryPlan.GetEnumerator()).ConfigureAwait(false); @@ -370,7 +370,7 @@ public async Task Should_SendRequestToAllHosts_When_AllHostsHaveConnectionsButFi var distanceCount = Interlocked.Read(ref lbpCluster.DistanceCount); var request = new PrepareRequest(_serializer, "TEST", null, null); - await mockResult.PrepareHandler.Prepare( + await mockResult.PrepareHandler.PrepareAsync( request, mockResult.Session, queryPlan.GetEnumerator()).ConfigureAwait(false); @@ -442,7 +442,7 @@ public async Task Should_SendRequestToFirstHostOnly_When_PrepareOnAllHostsIsFals var distanceCount = Interlocked.Read(ref lbpCluster.DistanceCount); var request = new PrepareRequest(_serializer, "TEST", null, null); - await mockResult.PrepareHandler.Prepare( + await mockResult.PrepareHandler.PrepareAsync( request, mockResult.Session, queryPlan.GetEnumerator()).ConfigureAwait(false); diff --git a/src/Cassandra.Tests/SessionTests.cs b/src/Cassandra.Tests/SessionTests.cs index 4657b03ae..a8058f7d7 100644 --- a/src/Cassandra.Tests/SessionTests.cs +++ b/src/Cassandra.Tests/SessionTests.cs @@ -34,7 +34,7 @@ public void Should_GenerateNewSessionId_When_SessionIsCreated() var sessionNames = new ConcurrentQueue(); var sessionFactoryMock = Mock.Of(); Mock.Get(sessionFactoryMock).Setup(s => - s.CreateSessionAsync(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + s.CreateSession(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .ReturnsAsync(Mock.Of()) .Callback((c, ks, serializer, name) => { sessionNames.Enqueue(name); }); diff --git a/src/Cassandra/Builder.cs b/src/Cassandra/Builder.cs index b931d3ff1..894718cda 100644 --- a/src/Cassandra/Builder.cs +++ b/src/Cassandra/Builder.cs @@ -1050,7 +1050,7 @@ public Builder WithExecutionProfiles(Action profileOpt /// specifies what is the default for each option. /// /// - /// In case you disable Metadata synchronization, please ensure you invoke in order to keep the token metadata up to date + /// In case you disable Metadata synchronization, please ensure you invoke (accessible via ) in order to keep the token metadata up to date /// otherwise you will not be getting everything you can out of token aware routing, i.e. , which is enabled by the default. /// /// @@ -1061,7 +1061,7 @@ public Builder WithExecutionProfiles(Action profileOpt /// /// Token metadata will not be computed and stored. /// This means that token aware routing (, enabled by default) will only work correctly - /// if you keep the token metadata up to date using the method. + /// if you keep the token metadata up to date using the method (accessible via ). /// If you wish to go this route of manually refreshing the metadata then /// it's recommended to refresh only the keyspaces that this application will use, by passing the keyspace parameter. /// diff --git a/src/Cassandra/Cluster.cs b/src/Cassandra/Cluster.cs index 6ce58e10b..32f6be9d0 100644 --- a/src/Cassandra/Cluster.cs +++ b/src/Cassandra/Cluster.cs @@ -39,15 +39,19 @@ namespace Cassandra /// public class Cluster : IInternalCluster { + private const int Disposed = 10; + private const int Initialized = 5; + private const int Initializing = 1; + private static readonly IPEndPoint DefaultContactPoint = new IPEndPoint(IPAddress.Parse("127.0.0.1"), 9042); private static ProtocolVersion _maxProtocolVersion = ProtocolVersion.MaxSupported; internal static readonly Logger Logger = new Logger(typeof(Cluster)); private readonly CopyOnWriteList _connectedSessions = new CopyOnWriteList(); private readonly IControlConnection _controlConnection; - private volatile bool _initialized; + private readonly SerializerManager _serializerManager; private volatile Exception _initException; - private readonly SemaphoreSlim _initLock = new SemaphoreSlim(1, 1); + private readonly SemaphoreSlim _sessionCreateLock = new SemaphoreSlim(1, 1); private long _sessionCounter = -1; private readonly bool _implicitContactPoint = false; @@ -55,13 +59,15 @@ public class Cluster : IInternalCluster private readonly IProtocolEventDebouncer _protocolEventDebouncer; private IReadOnlyList _loadBalancingPolicies; - /// - public event Action HostAdded; - - /// - public event Action HostRemoved; + private readonly Task _initTask; + private long _state = Cluster.Initializing; + internal IInternalCluster InternalRef => this; + + private bool IsDisposed => Interlocked.Read(ref _state) == Cluster.Disposed; + + ISerializerManager IInternalCluster.SerializerManager => _serializerManager; /// IControlConnection IInternalCluster.GetControlConnection() @@ -142,19 +148,23 @@ public static int MaxProtocolVersion bool IInternalCluster.ImplicitContactPoint => _implicitContactPoint; /// - public Metadata Metadata + public Metadata Metadata => TaskHelper.WaitToComplete(GetMetadataAsync()); + + /// + public Task GetMetadataAsync() { - get - { - TaskHelper.WaitToComplete(Init()); - return _metadata; - } + return InternalRef.TryInitAndGetMetadataAsync(); } private Cluster(IEnumerable contactPoints, Configuration configuration) { Configuration = configuration; - _metadata = new Metadata(configuration); + + _protocolEventDebouncer = new ProtocolEventDebouncer( + configuration.TimerFactory, + TimeSpan.FromMilliseconds(configuration.MetadataSyncOptions.RefreshSchemaDelayIncrement), + TimeSpan.FromMilliseconds(configuration.MetadataSyncOptions.MaxTotalRefreshSchemaDelay)); + var protocolVersion = _maxProtocolVersion; if (Configuration.ProtocolOptions.MaxProtocolVersionValue != null && Configuration.ProtocolOptions.MaxProtocolVersionValue.Value.IsSupported(configuration)) @@ -162,11 +172,6 @@ private Cluster(IEnumerable contactPoints, Configuration configuration) protocolVersion = Configuration.ProtocolOptions.MaxProtocolVersionValue.Value; } - _protocolEventDebouncer = new ProtocolEventDebouncer( - configuration.TimerFactory, - TimeSpan.FromMilliseconds(configuration.MetadataSyncOptions.RefreshSchemaDelayIncrement), - TimeSpan.FromMilliseconds(configuration.MetadataSyncOptions.MaxTotalRefreshSchemaDelay)); - var contactPointsList = contactPoints.ToList(); if (contactPointsList.Count == 0) { @@ -176,136 +181,143 @@ private Cluster(IEnumerable contactPoints, Configuration configuration) } var parsedContactPoints = configuration.ContactPointParser.ParseContactPoints(contactPointsList); - + _serializerManager = new SerializerManager(protocolVersion, configuration.TypeSerializers); _controlConnection = configuration.ControlConnectionFactory.Create( this, _protocolEventDebouncer, - protocolVersion, + _serializerManager, Configuration, _metadata, parsedContactPoints); - _metadata.ControlConnection = _controlConnection; + _metadata = new Metadata(configuration, _serializerManager, _controlConnection); + + _initTask = Task.Run(InitAsync); } - /// - /// Initializes once (Thread-safe) the control connection and metadata associated with the Cluster instance - /// - private async Task Init() + /// + Task IInternalCluster.TryInitAndGetMetadataAsync() { - if (_initialized) + var currentState = Interlocked.Read(ref _state); + if (currentState == Cluster.Disposed) + { + throw new ObjectDisposedException("This cluster object has been disposed."); + } + + if (currentState == Cluster.Initialized) { //It was already initialized - return; + return Task.FromResult(_metadata); + } + + if (_initException != null) + { + //There was an exception that is not possible to recover from + throw _initException; } - await _initLock.WaitAsync().ConfigureAwait(false); + + return _initTask; + } + + private async Task InitAsync() + { + Cluster.Logger.Info("Connecting to cluster using {0}", Cluster.GetAssemblyInfo()); try { - if (_initialized) + // Collect all policies in collections + var loadBalancingPolicies = new HashSet(new ReferenceEqualityComparer()); + var speculativeExecutionPolicies = new HashSet(new ReferenceEqualityComparer()); + foreach (var options in Configuration.RequestOptions.Values) { - //It was initialized when waiting on the lock - return; + loadBalancingPolicies.Add(options.LoadBalancingPolicy); + speculativeExecutionPolicies.Add(options.SpeculativeExecutionPolicy); } - if (_initException != null) + + _loadBalancingPolicies = loadBalancingPolicies.ToList(); + + // Only abort the async operations when at least twice the time for ConnectTimeout per host passed + var initialAbortTimeout = Configuration.SocketOptions.ConnectTimeoutMillis * 2 * _metadata.Hosts.Count; + initialAbortTimeout = Math.Max(initialAbortTimeout, Configuration.SocketOptions.MetadataAbortTimeout); + var initTask = _controlConnection.InitAsync(); + try { - //There was an exception that is not possible to recover from - throw _initException; + await initTask.WaitToCompleteAsync(initialAbortTimeout).ConfigureAwait(false); } - Cluster.Logger.Info("Connecting to cluster using {0}", GetAssemblyInfo()); - try + catch (TimeoutException ex) { - // Collect all policies in collections - var loadBalancingPolicies = new HashSet(new ReferenceEqualityComparer()); - var speculativeExecutionPolicies = new HashSet(new ReferenceEqualityComparer()); - foreach (var options in Configuration.RequestOptions.Values) - { - loadBalancingPolicies.Add(options.LoadBalancingPolicy); - speculativeExecutionPolicies.Add(options.SpeculativeExecutionPolicy); - } - - _loadBalancingPolicies = loadBalancingPolicies.ToList(); - - // Only abort the async operations when at least twice the time for ConnectTimeout per host passed - var initialAbortTimeout = Configuration.SocketOptions.ConnectTimeoutMillis * 2 * _metadata.Hosts.Count; - initialAbortTimeout = Math.Max(initialAbortTimeout, Configuration.SocketOptions.MetadataAbortTimeout); - var initTask = _controlConnection.InitAsync(); - try - { - await initTask.WaitToCompleteAsync(initialAbortTimeout).ConfigureAwait(false); - } - catch (TimeoutException ex) + var newEx = new TimeoutException( + "Cluster initialization was aborted after timing out. This mechanism is put in place to" + + " avoid blocking the calling thread forever. This usually caused by a networking issue" + + " between the client driver instance and the cluster. You can increase this timeout via " + + "the SocketOptions.ConnectTimeoutMillis config setting. This can also be related to deadlocks " + + "caused by mixing synchronous and asynchronous code.", ex); + _initException = new InitFatalErrorException(newEx); + initTask.ContinueWith(t => { - var newEx = new TimeoutException( - "Cluster initialization was aborted after timing out. This mechanism is put in place to" + - " avoid blocking the calling thread forever. This usually caused by a networking issue" + - " between the client driver instance and the cluster. You can increase this timeout via " + - "the SocketOptions.ConnectTimeoutMillis config setting. This can also be related to deadlocks " + - "caused by mixing synchronous and asynchronous code.", ex); - _initException = new InitFatalErrorException(newEx); - initTask.ContinueWith(t => + if (t.IsFaulted && t.Exception != null) { - if (t.IsFaulted && t.Exception != null) - { - _initException = new InitFatalErrorException(t.Exception.InnerException); - } - }, TaskContinuationOptions.ExecuteSynchronously).Forget(); - throw newEx; - } - - // initialize the local datacenter provider - Configuration.LocalDatacenterProvider.Initialize(this); - - // Initialize policies - foreach (var lbp in loadBalancingPolicies) - { - lbp.Initialize(this); - } - - foreach (var sep in speculativeExecutionPolicies) - { - sep.Initialize(this); - } - - InitializeHostDistances(); - - // Set metadata dependent options - SetMetadataDependentOptions(); + _initException = new InitFatalErrorException(t.Exception.InnerException); + } + }, TaskContinuationOptions.ExecuteSynchronously).Forget(); + throw newEx; } - catch (NoHostAvailableException) + + var previousState = Interlocked.CompareExchange(ref _state, Cluster.Initialized, Cluster.Initializing); + if (previousState == Cluster.Disposed) { - //No host available now, maybe later it can recover from - throw; + await ShutdownInternalAsync().ConfigureAwait(false); + throw new ObjectDisposedException("Cluster instance was disposed before initialization finished."); } - catch (TimeoutException) + + // initialize the local datacenter provider + Configuration.LocalDatacenterProvider.Initialize(this, _metadata); + + // Initialize policies + foreach (var lbp in loadBalancingPolicies) { - throw; + lbp.Initialize(_metadata); } - catch (Exception ex) + + foreach (var sep in speculativeExecutionPolicies) { - //There was an error that the driver is not able to recover from - //Store the exception for the following times - _initException = new InitFatalErrorException(ex); - //Throw the actual exception for the first time - throw; + sep.Initialize(_metadata); } - Cluster.Logger.Info("Cluster Connected using binary protocol version: [" + _controlConnection.Serializer.CurrentProtocolVersion + "]"); - _initialized = true; - _metadata.Hosts.Added += OnHostAdded; - _metadata.Hosts.Removed += OnHostRemoved; + + InitializeHostDistances(); + + // Set metadata dependent options + SetMetadataDependentOptions(); + + Cluster.Logger.Info("Cluster Connected using binary protocol version: [" + _serializerManager.CurrentProtocolVersion + "]"); + _metadata.Hosts.Added += _metadata.OnHostAdded; + _metadata.Hosts.Removed += _metadata.OnHostRemoved; _metadata.Hosts.Up += OnHostUp; + Cluster.Logger.Info("Cluster [" + _metadata.ClusterName + "] has been initialized."); + + return _metadata; } - finally + catch (NoHostAvailableException) { - _initLock.Release(); + //No host available now, maybe later it can recover from + throw; + } + catch (TimeoutException) + { + throw; + } + catch (Exception ex) + { + //There was an error that the driver is not able to recover from + //Store the exception for the following times + _initException = new InitFatalErrorException(ex); + //Throw the actual exception for the first time + throw; } - - Cluster.Logger.Info("Cluster [" + Metadata.ClusterName + "] has been initialized."); - return; } private void InitializeHostDistances() { - foreach (var host in AllHosts()) + foreach (var host in _metadata.AllHosts()) { InternalRef.RetrieveAndSetDistance(host); } @@ -322,14 +334,7 @@ IReadOnlyDictionary> IInternalCl { return _metadata.ResolvedContactPoints; } - - /// - public ICollection AllHosts() - { - //Do not connect at first - return _metadata.AllHosts(); - } - + /// /// Creates a new session on this cluster. /// @@ -361,13 +366,26 @@ public ISession Connect(string keyspace) /// Case-sensitive keyspace name to use public async Task ConnectAsync(string keyspace) { - await Init().ConfigureAwait(false); - var newSessionName = GetNewSessionName(); - var session = await Configuration.SessionFactory.CreateSessionAsync(this, keyspace, _controlConnection.Serializer, newSessionName).ConfigureAwait(false); - await session.Init().ConfigureAwait(false); - _connectedSessions.Add(session); - Cluster.Logger.Info("Session connected ({0})", session.GetHashCode()); - return session; + await _sessionCreateLock.WaitAsync().ConfigureAwait(false); + try + { + if (IsDisposed) + { + throw new ObjectDisposedException("This cluster instance is disposed."); + } + + var newSessionName = GetNewSessionName(); + var session = + Configuration.SessionFactory.CreateSession(this, keyspace, newSessionName); + _connectedSessions.Add(session); + Cluster.Logger.Info("Session connected ({0})", session.GetHashCode()); + return session; + + } + finally + { + _sessionCreateLock.Release(); + } } private string GetNewSessionName() @@ -426,34 +444,6 @@ public void Dispose() Shutdown(); } - /// - public Host GetHost(IPEndPoint address) - { - return Metadata.GetHost(address); - } - - /// - public ICollection GetReplicas(byte[] partitionKey) - { - return Metadata.GetReplicas(partitionKey); - } - - /// - public ICollection GetReplicas(string keyspace, byte[] partitionKey) - { - return Metadata.GetReplicas(keyspace, partitionKey); - } - - private void OnHostRemoved(Host h) - { - HostRemoved?.Invoke(h); - } - - private void OnHostAdded(Host h) - { - HostAdded?.Invoke(h); - } - private async void OnHostUp(Host h) { try @@ -473,19 +463,7 @@ private async void OnHostUp(Host h) "that came UP:" + Environment.NewLine + "{1}", h?.Address?.ToString(), ex.ToString()); } } - - /// - public bool RefreshSchema(string keyspace = null, string table = null) - { - return Metadata.RefreshSchema(keyspace, table); - } - - /// - public Task RefreshSchemaAsync(string keyspace = null, string table = null) - { - return Metadata.RefreshSchemaAsync(keyspace, table); - } - + /// public void Shutdown(int timeoutMs = Timeout.Infinite) { @@ -495,11 +473,19 @@ public void Shutdown(int timeoutMs = Timeout.Infinite) /// public async Task ShutdownAsync(int timeoutMs = Timeout.Infinite) { - if (!_initialized) + var previousState = Interlocked.Exchange(ref _state, Cluster.Disposed); + + IEnumerable sessions; + await _sessionCreateLock.WaitAsync().ConfigureAwait(false); + try { - return; + sessions = _connectedSessions.ClearAndGet(); } - var sessions = _connectedSessions.ClearAndGet(); + finally + { + _sessionCreateLock.Release(); + } + try { var tasks = new List(); @@ -510,15 +496,23 @@ public async Task ShutdownAsync(int timeoutMs = Timeout.Infinite) await Task.WhenAll(tasks).WaitToCompleteAsync(timeoutMs).ConfigureAwait(false); } - catch (AggregateException ex) + catch (Exception ex) { - if (ex.InnerExceptions.Count == 1) - { - throw ex.InnerExceptions[0]; - } - throw; + Cluster.Logger.Warning("Exception occured while disposing session instances: {0}", ex.ToString()); } - _metadata.ShutDown(timeoutMs); + + if (previousState != Cluster.Initialized) + { + return; + } + + await ShutdownInternalAsync().ConfigureAwait(false); + + Cluster.Logger.Info("Cluster [" + _metadata.ClusterName + "] has been shut down."); + } + + private async Task ShutdownInternalAsync() + { _controlConnection.Dispose(); await _protocolEventDebouncer.ShutdownAsync().ConfigureAwait(false); Configuration.Timer.Dispose(); @@ -534,9 +528,6 @@ public async Task ShutdownAsync(int timeoutMs = Timeout.Infinite) { sep.Dispose(); } - - Cluster.Logger.Info("Cluster [" + Metadata.ClusterName + "] has been shut down."); - return; } /// @@ -559,17 +550,39 @@ HostDistance IInternalCluster.RetrieveAndSetDistance(Host host) } /// - async Task IInternalCluster.Prepare( - IInternalSession session, ISerializerManager serializerManager, PrepareRequest request) + async Task IInternalCluster.PrepareAsync( + IInternalSession session, string cqlQuery, string keyspace, IDictionary customPayload) + { + var metadata = await InternalRef.TryInitAndGetMetadataAsync().ConfigureAwait(false); + + var serializer = metadata.SerializerManager.GetCurrentSerializer(); + var currentVersion = serializer.ProtocolVersion; + if (!currentVersion.SupportsKeyspaceInRequest() && keyspace != null) + { + // Validate protocol version here and not at PrepareRequest level, as PrepareRequest can be issued + // in the background (prepare and retry, prepare on up, ...) + throw new NotSupportedException($"Protocol version {currentVersion} does not support" + + " setting the keyspace as part of the PREPARE request"); + } + var request = new PrepareRequest(serializer, cqlQuery, keyspace, customPayload); + + return await PrepareAsync(session, metadata, request).ConfigureAwait(false); + } + + private async Task PrepareAsync(IInternalSession session, Metadata metadata, PrepareRequest request) { var lbp = session.Cluster.Configuration.DefaultRequestOptions.LoadBalancingPolicy; - var handler = InternalRef.Configuration.PrepareHandlerFactory.CreatePrepareHandler(serializerManager, this); - var ps = await handler.Prepare(request, session, lbp.NewQueryPlan(session.Keyspace, null).GetEnumerator()).ConfigureAwait(false); + var handler = InternalRef.Configuration.PrepareHandlerFactory.CreatePrepareHandler(_serializerManager, this); + var ps = await handler.PrepareAsync( + request, + session, + metadata, + lbp.NewQueryPlan(_metadata, session.Keyspace, null).GetEnumerator()).ConfigureAwait(false); var psAdded = InternalRef.PreparedQueries.GetOrAdd(ps.Id, ps); if (ps != psAdded) { PrepareHandler.Logger.Warning("Re-preparing already prepared query is generally an anti-pattern and will likely " + - "affect performance. Consider preparing the statement only once. Query='{0}'", ps.Cql); + "affect performance. Consider preparing the statement only once. Query='{0}'", ps.Cql); ps = psAdded; } @@ -597,7 +610,7 @@ private async Task ReprepareAllQueries(Host host) PrepareHandler.Logger.Info($"Re-preparing {preparedQueries.Count} queries on {host.Address}"); var tasks = new List(preparedQueries.Count); var handler = InternalRef.Configuration.PrepareHandlerFactory.CreateReprepareHandler(); - var serializer = _metadata.ControlConnection.Serializer.GetCurrentSerializer(); + var serializer = _serializerManager.GetCurrentSerializer(); using (var semaphore = new SemaphoreSlim(64, 64)) { foreach (var ps in preparedQueries) diff --git a/src/Cassandra/Connections/Control/ControlConnection.cs b/src/Cassandra/Connections/Control/ControlConnection.cs index b3cf92782..2026d59c6 100644 --- a/src/Cassandra/Connections/Control/ControlConnection.cs +++ b/src/Cassandra/Connections/Control/ControlConnection.cs @@ -54,12 +54,7 @@ internal class ControlConnection : IControlConnection private readonly ISupportedOptionsInitializer _supportedOptionsInitializer; private bool IsShutdown => Interlocked.Read(ref _isShutdown) > 0L; - - /// - /// Gets the binary protocol version to be used for this cluster. - /// - public ProtocolVersion ProtocolVersion => _serializer.CurrentProtocolVersion; - + /// public Host Host { @@ -71,12 +66,10 @@ public Host Host public IPEndPoint LocalAddress => _connection?.LocalAddress; - public ISerializerManager Serializer => _serializer; - internal ControlConnection( IInternalCluster cluster, IProtocolEventDebouncer eventDebouncer, - ProtocolVersion initialProtocolVersion, + ISerializerManager serializerManager, Configuration config, Metadata metadata, IEnumerable contactPoints) @@ -87,7 +80,7 @@ internal ControlConnection( _reconnectionSchedule = _reconnectionPolicy.NewSchedule(); _reconnectionTimer = new Timer(ReconnectEventHandler, null, Timeout.Infinite, Timeout.Infinite); _config = config; - _serializer = new SerializerManager(initialProtocolVersion, config.TypeSerializers); + _serializer = serializerManager; _eventDebouncer = eventDebouncer; _contactPoints = contactPoints; _topologyRefresher = config.TopologyRefresherFactory.Create(metadata, config); @@ -201,11 +194,12 @@ private IEnumerable>> AllHostsEndPointReso } private IEnumerable>> DefaultLbpHostsEnumerable( + Metadata metadata, ConcurrentDictionary attemptedContactPoints, ConcurrentDictionary attemptedHosts, bool isInitializing) { - foreach (var host in _config.DefaultRequestOptions.LoadBalancingPolicy.NewQueryPlan(null, null)) + foreach (var host in _config.DefaultRequestOptions.LoadBalancingPolicy.NewQueryPlan(metadata, null, null)) { if (attemptedHosts.TryAdd(host, null)) { @@ -263,7 +257,7 @@ private async Task Connect(bool isInitializing) // start with endpoints from the default LBP if it is already initialized if (!isInitializing) { - endPointResolutionTasksLazyIterator = DefaultLbpHostsEnumerable(attemptedContactPoints, attemptedHosts, isInitializing); + endPointResolutionTasksLazyIterator = DefaultLbpHostsEnumerable(_metadata, attemptedContactPoints, attemptedHosts, isInitializing); } // add contact points next diff --git a/src/Cassandra/Connections/Control/ControlConnectionFactory.cs b/src/Cassandra/Connections/Control/ControlConnectionFactory.cs index 3490389c7..ef3b3191f 100644 --- a/src/Cassandra/Connections/Control/ControlConnectionFactory.cs +++ b/src/Cassandra/Connections/Control/ControlConnectionFactory.cs @@ -16,6 +16,7 @@ using System.Collections.Generic; using Cassandra.ProtocolEvents; +using Cassandra.Serialization; using Cassandra.SessionManagement; namespace Cassandra.Connections.Control @@ -25,7 +26,7 @@ internal class ControlConnectionFactory : IControlConnectionFactory public IControlConnection Create( IInternalCluster cluster, IProtocolEventDebouncer protocolEventDebouncer, - ProtocolVersion initialProtocolVersion, + ISerializerManager serializerManager, Configuration config, Metadata metadata, IEnumerable contactPoints) @@ -33,7 +34,7 @@ public IControlConnection Create( return new ControlConnection( cluster, protocolEventDebouncer, - initialProtocolVersion, + serializerManager, config, metadata, contactPoints); diff --git a/src/Cassandra/Connections/Control/IControlConnectionFactory.cs b/src/Cassandra/Connections/Control/IControlConnectionFactory.cs index ac8af1cd5..648483c70 100644 --- a/src/Cassandra/Connections/Control/IControlConnectionFactory.cs +++ b/src/Cassandra/Connections/Control/IControlConnectionFactory.cs @@ -16,6 +16,7 @@ using System.Collections.Generic; using Cassandra.ProtocolEvents; +using Cassandra.Serialization; using Cassandra.SessionManagement; namespace Cassandra.Connections.Control @@ -25,7 +26,7 @@ internal interface IControlConnectionFactory IControlConnection Create( IInternalCluster cluster, IProtocolEventDebouncer protocolEventDebouncer, - ProtocolVersion initialProtocolVersion, + ISerializerManager serializerManager, Configuration config, Metadata metadata, IEnumerable contactPoints); diff --git a/src/Cassandra/Connections/HostConnectionPool.cs b/src/Cassandra/Connections/HostConnectionPool.cs index f299772ed..429d7de35 100644 --- a/src/Cassandra/Connections/HostConnectionPool.cs +++ b/src/Cassandra/Connections/HostConnectionPool.cs @@ -107,9 +107,9 @@ private static class PoolState /// public IConnection[] ConnectionsSnapshot => _connections.GetSnapshot(); - - - public HostConnectionPool(Host host, Configuration config, ISerializerManager serializerManager, IObserverFactory observerFactory) + + public HostConnectionPool( + Host host, Configuration config, ISerializerManager serializerManager, IObserverFactory observerFactory) { _host = host; _host.Down += OnHostDown; diff --git a/src/Cassandra/Data/Linq/CqlQueryBase.cs b/src/Cassandra/Data/Linq/CqlQueryBase.cs index a5eb77f9b..f38f0671e 100644 --- a/src/Cassandra/Data/Linq/CqlQueryBase.cs +++ b/src/Cassandra/Data/Linq/CqlQueryBase.cs @@ -197,5 +197,10 @@ internal T WaitToCompleteWithMetrics(Task task, int timeout = Timeout.Infi { return TaskHelper.WaitToCompleteWithMetrics(_metricsManager, task, timeout); } + + internal void WaitToCompleteWithMetrics(Task task, int timeout = Timeout.Infinite) + { + TaskHelper.WaitToCompleteWithMetrics(_metricsManager, task, timeout); + } } } \ No newline at end of file diff --git a/src/Cassandra/Data/Linq/SessionExtensions.cs b/src/Cassandra/Data/Linq/SessionExtensions.cs index 084c3a0fc..1e6e8f232 100644 --- a/src/Cassandra/Data/Linq/SessionExtensions.cs +++ b/src/Cassandra/Data/Linq/SessionExtensions.cs @@ -14,7 +14,9 @@ // limitations under the License. // +using System.Threading.Tasks; using Cassandra.Mapping; +using Cassandra.Tasks; namespace Cassandra.Data.Linq { @@ -45,17 +47,42 @@ public static Table GetTable(this ISession session, string tab return new Table(session, config, tableName, keyspaceName); } + /// + /// This method might block if there is no open connection. + /// Please use instead if your application + /// uses the Task Parallel Library (e.g. async/await). + /// public static Batch CreateBatch(this ISession session) { - return CreateBatch(session, BatchType.Logged); + return session.CreateBatch(BatchType.Logged); } + + /// + /// This method might block if there is no open connection. + /// Please use instead if your application + /// uses the Task Parallel Library (e.g. async/await). + /// public static Batch CreateBatch(this ISession session, BatchType batchType) { - if (session == null || session.BinaryProtocolVersion > 1) + return TaskHelper.WaitToComplete( + session.CreateBatchAsync(batchType), + session.Cluster.Configuration.DefaultRequestOptions.QueryAbortTimeout); + } + + public static Task CreateBatchAsync(this ISession session) + { + return session.CreateBatchAsync(BatchType.Logged); + } + + public static async Task CreateBatchAsync(this ISession session, BatchType batchType) + { + var metadata = await session.Cluster.GetMetadataAsync().ConfigureAwait(false); + if (metadata.ProtocolVersion.SupportsBatch()) { return new BatchV2(session, batchType); } + return new BatchV1(session, batchType); } } diff --git a/src/Cassandra/Data/Linq/Table.cs b/src/Cassandra/Data/Linq/Table.cs index d49f91962..f3c3633fd 100644 --- a/src/Cassandra/Data/Linq/Table.cs +++ b/src/Cassandra/Data/Linq/Table.cs @@ -20,6 +20,7 @@ using System.Threading.Tasks; using Cassandra.Mapping; using Cassandra.Mapping.Statements; +using Cassandra.Tasks; namespace Cassandra.Data.Linq { @@ -150,12 +151,7 @@ public Type GetEntityType() public void Create() { - var serializer = _session.Cluster.Metadata.ControlConnection.Serializer.GetCurrentSerializer(); - var cqlQueries = CqlGenerator.GetCreate(serializer, PocoData, Name, KeyspaceName, false); - foreach (var cql in cqlQueries) - { - _session.Execute(cql); - } + WaitToCompleteWithMetrics(CreateAsync(), QueryAbortTimeout); } public void CreateIfNotExists() @@ -172,7 +168,8 @@ public void CreateIfNotExists() public async Task CreateAsync() { - var serializer = _session.Cluster.Metadata.ControlConnection.Serializer.GetCurrentSerializer(); + var metadata = await _session.Cluster.GetMetadataAsync().ConfigureAwait(false); + var serializer = metadata.SerializerManager.GetCurrentSerializer(); var cqlQueries = CqlGenerator.GetCreate(serializer, PocoData, Name, KeyspaceName, false); foreach (var cql in cqlQueries) { diff --git a/src/Cassandra/DataStax/Insights/IInsightsClient.cs b/src/Cassandra/DataStax/Insights/IInsightsClient.cs index 6979f51ba..3fab45016 100644 --- a/src/Cassandra/DataStax/Insights/IInsightsClient.cs +++ b/src/Cassandra/DataStax/Insights/IInsightsClient.cs @@ -21,7 +21,7 @@ namespace Cassandra.DataStax.Insights { internal interface IInsightsClient : IDisposable { - void Init(); + Task InitializeAsync(); Task ShutdownAsync(); } diff --git a/src/Cassandra/DataStax/Insights/IInsightsSupportVerifier.cs b/src/Cassandra/DataStax/Insights/IInsightsSupportVerifier.cs index ebee85c22..7abdc449e 100644 --- a/src/Cassandra/DataStax/Insights/IInsightsSupportVerifier.cs +++ b/src/Cassandra/DataStax/Insights/IInsightsSupportVerifier.cs @@ -12,16 +12,15 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// +// using System; -using Cassandra.SessionManagement; namespace Cassandra.DataStax.Insights { internal interface IInsightsSupportVerifier { - bool SupportsInsights(IInternalCluster cluster); + bool SupportsInsights(Metadata metadata); bool DseVersionSupportsInsights(Version dseVersion); } diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/IInsightsInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/IInsightsInfoProvider.cs index ddd20962a..08a9712d2 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/IInsightsInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/IInsightsInfoProvider.cs @@ -20,6 +20,6 @@ namespace Cassandra.DataStax.Insights.InfoProviders { internal interface IInsightsInfoProvider { - T GetInformation(IInternalCluster cluster, IInternalSession session); + T GetInformation(IInternalCluster cluster, IInternalSession session, Metadata metadata); } } \ No newline at end of file diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/AuthProviderInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/AuthProviderInfoProvider.cs index ccbc6085c..539d9ab42 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/AuthProviderInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/AuthProviderInfoProvider.cs @@ -21,7 +21,8 @@ namespace Cassandra.DataStax.Insights.InfoProviders.StartupMessage { internal class AuthProviderInfoProvider : IInsightsInfoProvider { - public AuthProviderInfo GetInformation(IInternalCluster cluster, IInternalSession session) + public AuthProviderInfo GetInformation( + IInternalCluster cluster, IInternalSession session, Metadata metadata) { var type = cluster.Configuration.AuthProvider.GetType(); return new AuthProviderInfo diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ConfigAntiPatternsInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ConfigAntiPatternsInfoProvider.cs index 44c152d64..648ecd5da 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ConfigAntiPatternsInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ConfigAntiPatternsInfoProvider.cs @@ -92,11 +92,11 @@ static ConfigAntiPatternsInfoProvider() public static IReadOnlyDictionary, Dictionary>> AntiPatternsProviders { get; } - public Dictionary GetInformation(IInternalCluster cluster, IInternalSession session) + public Dictionary GetInformation(IInternalCluster cluster, IInternalSession session, Metadata metadata) { var antiPatterns = new Dictionary(); - var resolvedContactPoints = cluster.Metadata.ResolvedContactPoints; + var resolvedContactPoints = metadata.ResolvedContactPoints; var contactPointsEndPoints = resolvedContactPoints .Values @@ -104,7 +104,7 @@ public Dictionary GetInformation(IInternalCluster cluster, IInte .Select(c => c.GetHostIpEndPointWithFallback()) .ToList(); - var contactPointsHosts = cluster + var contactPointsHosts = metadata .AllHosts() .Where(host => (host.ContactPoint != null && resolvedContactPoints.ContainsKey(host.ContactPoint)) || contactPointsEndPoints.Contains(host.Address)) diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DataCentersInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DataCentersInfoProvider.cs index 577cc84c4..ea0e1c6bf 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DataCentersInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DataCentersInfoProvider.cs @@ -21,16 +21,16 @@ namespace Cassandra.DataStax.Insights.InfoProviders.StartupMessage { internal class DataCentersInfoProvider : IInsightsInfoProvider> { - public HashSet GetInformation(IInternalCluster cluster, IInternalSession session) + public HashSet GetInformation(IInternalCluster cluster, IInternalSession session, Metadata metadata) { var dataCenters = new HashSet(); var remoteConnectionsLength = cluster .Configuration - .GetOrCreatePoolingOptions(cluster.Metadata.ControlConnection.ProtocolVersion) + .GetOrCreatePoolingOptions(metadata.ProtocolVersion) .GetCoreConnectionsPerHost(HostDistance.Remote); - foreach (var h in cluster.AllHosts()) + foreach (var h in metadata.AllHosts()) { if (h.Datacenter == null) { diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DriverInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DriverInfoProvider.cs index b83d0082a..f31e083ae 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DriverInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DriverInfoProvider.cs @@ -21,7 +21,8 @@ namespace Cassandra.DataStax.Insights.InfoProviders.StartupMessage { internal class DriverInfoProvider : IInsightsInfoProvider { - public DriverInfo GetInformation(IInternalCluster cluster, IInternalSession session) + public DriverInfo GetInformation( + IInternalCluster cluster, IInternalSession session, Metadata metadata) { return new DriverInfo { diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ExecutionProfileInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ExecutionProfileInfoProvider.cs index ad69bb0c0..e009fc0a8 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ExecutionProfileInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ExecutionProfileInfoProvider.cs @@ -38,7 +38,8 @@ public ExecutionProfileInfoProvider( _retryPolicyInfoProvider = retryPolicyInfoProvider; } - public Dictionary GetInformation(IInternalCluster cluster, IInternalSession session) + public Dictionary GetInformation( + IInternalCluster cluster, IInternalSession session, Metadata metadata) { // add default first so that it is on top var dict = new Dictionary diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/HostnameInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/HostnameInfoProvider.cs index 05319a4f3..cbe5a0c7c 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/HostnameInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/HostnameInfoProvider.cs @@ -21,7 +21,7 @@ namespace Cassandra.DataStax.Insights.InfoProviders.StartupMessage { internal class HostnameInfoProvider : IInsightsInfoProvider { - public string GetInformation(IInternalCluster cluster, IInternalSession session) + public string GetInformation(IInternalCluster cluster, IInternalSession session, Metadata metadata) { return Dns.GetHostName(); } diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/OtherOptionsInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/OtherOptionsInfoProvider.cs index 1a47d9fc1..a157338f6 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/OtherOptionsInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/OtherOptionsInfoProvider.cs @@ -21,7 +21,7 @@ namespace Cassandra.DataStax.Insights.InfoProviders.StartupMessage { internal class OtherOptionsInfoProvider : IInsightsInfoProvider> { - public Dictionary GetInformation(IInternalCluster cluster, IInternalSession session) + public Dictionary GetInformation(IInternalCluster cluster, IInternalSession session, Metadata metadata) { return null; } diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/PlatformInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/PlatformInfoProvider.cs index dd9046004..4068a55ee 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/PlatformInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/PlatformInfoProvider.cs @@ -26,7 +26,7 @@ namespace Cassandra.DataStax.Insights.InfoProviders.StartupMessage { internal class PlatformInfoProvider : IInsightsInfoProvider { - public InsightsPlatformInfo GetInformation(IInternalCluster cluster, IInternalSession session) + public InsightsPlatformInfo GetInformation(IInternalCluster cluster, IInternalSession session, Metadata metadata) { var cpuInfo = PlatformHelper.GetCpuInfo(); var dependencies = typeof(PlatformInfoProvider).GetTypeInfo().Assembly.GetReferencedAssemblies().Select(name => diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/PoolSizeByHostDistanceInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/PoolSizeByHostDistanceInfoProvider.cs index 25043952d..64f7c4a3d 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/PoolSizeByHostDistanceInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/PoolSizeByHostDistanceInfoProvider.cs @@ -21,17 +21,17 @@ namespace Cassandra.DataStax.Insights.InfoProviders.StartupMessage { internal class PoolSizeByHostDistanceInfoProvider : IInsightsInfoProvider { - public PoolSizeByHostDistance GetInformation(IInternalCluster cluster, IInternalSession session) + public PoolSizeByHostDistance GetInformation(IInternalCluster cluster, IInternalSession session, Metadata metadata) { return new PoolSizeByHostDistance { Local = cluster .Configuration - .GetOrCreatePoolingOptions(cluster.Metadata.ControlConnection.ProtocolVersion) + .GetOrCreatePoolingOptions(metadata.ProtocolVersion) .GetCoreConnectionsPerHost(HostDistance.Local), Remote = cluster .Configuration - .GetOrCreatePoolingOptions(cluster.Metadata.ControlConnection.ProtocolVersion) + .GetOrCreatePoolingOptions(metadata.ProtocolVersion) .GetCoreConnectionsPerHost(HostDistance.Remote) }; } diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ReconnectionPolicyInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ReconnectionPolicyInfoProvider.cs index 888fd30b4..1822e358d 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ReconnectionPolicyInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ReconnectionPolicyInfoProvider.cs @@ -56,7 +56,7 @@ static ReconnectionPolicyInfoProvider() public static IReadOnlyDictionary>> PolicyOptionsProviders { get; } - public PolicyInfo GetInformation(IInternalCluster cluster, IInternalSession session) + public PolicyInfo GetInformation(IInternalCluster cluster, IInternalSession session, Metadata metadata) { var policy = cluster.Configuration.Policies.ReconnectionPolicy; var type = policy.GetType(); diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StatusMessage/NodeStatusInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StatusMessage/NodeStatusInfoProvider.cs index 413a4efcc..ed33a1113 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StatusMessage/NodeStatusInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StatusMessage/NodeStatusInfoProvider.cs @@ -22,10 +22,11 @@ namespace Cassandra.DataStax.Insights.InfoProviders.StatusMessage { internal class NodeStatusInfoProvider : IInsightsInfoProvider> { - public Dictionary GetInformation(IInternalCluster cluster, IInternalSession session) + public Dictionary GetInformation( + IInternalCluster cluster, IInternalSession session, Metadata metadata) { var nodeStatusDictionary = new Dictionary(); - var state = session.GetState(); + var state = session.GetState(metadata); var connectedHosts = state.GetConnectedHosts(); foreach (var h in connectedHosts) diff --git a/src/Cassandra/DataStax/Insights/InsightsClient.cs b/src/Cassandra/DataStax/Insights/InsightsClient.cs index 393a06da8..a170d9e96 100644 --- a/src/Cassandra/DataStax/Insights/InsightsClient.cs +++ b/src/Cassandra/DataStax/Insights/InsightsClient.cs @@ -59,11 +59,13 @@ public InsightsClient( private bool Initialized => _insightsTask != null; - private async Task SendStartupMessageAsync() + private async Task SendStartupMessageAsync(Metadata metadata) { try { - await SendJsonMessageAsync(_startupMessageFactory.CreateMessage(_cluster, _session)).ConfigureAwait(false); + await SendJsonMessageAsync( + _startupMessageFactory.CreateMessage(_cluster, _session, metadata), + metadata).ConfigureAwait(false); _errorCount = 0; return true; } @@ -81,11 +83,13 @@ private async Task SendStartupMessageAsync() } } - private async Task SendStatusMessageAsync() + private async Task SendStatusMessageAsync(Metadata metadata) { try { - await SendJsonMessageAsync(_statusMessageFactory.CreateMessage(_cluster, _session)).ConfigureAwait(false); + await SendJsonMessageAsync( + _statusMessageFactory.CreateMessage(_cluster, _session, metadata), + metadata).ConfigureAwait(false); _errorCount = 0; return true; } @@ -103,16 +107,17 @@ private async Task SendStatusMessageAsync() } } - public void Init() + public async Task InitializeAsync() { - if (!ShouldStartInsightsTask()) + var metadata = await _cluster.GetMetadataAsync().ConfigureAwait(false); + if (!ShouldStartInsightsTask(metadata)) { _insightsTask = null; return; } _cancellationTokenSource = new CancellationTokenSource(); - _insightsTask = Task.Run(MainLoopAsync); + _insightsTask = Task.Run(() => MainLoopAsync(metadata)); } public Task ShutdownAsync() @@ -131,12 +136,13 @@ public void Dispose() ShutdownAsync().GetAwaiter().GetResult(); } - private bool ShouldStartInsightsTask() + private bool ShouldStartInsightsTask(Metadata metadata) { - return _monitorReportingOptions.MonitorReportingEnabled && _cluster.Configuration.InsightsSupportVerifier.SupportsInsights(_cluster); + return _monitorReportingOptions.MonitorReportingEnabled + && _cluster.Configuration.InsightsSupportVerifier.SupportsInsights(metadata); } - private async Task MainLoopAsync() + private async Task MainLoopAsync(Metadata metadata) { try { @@ -153,11 +159,11 @@ private async Task MainLoopAsync() { if (!startupSent) { - startupSent = await SendStartupMessageAsync().ConfigureAwait(false); + startupSent = await SendStartupMessageAsync(metadata).ConfigureAwait(false); } else { - await SendStatusMessageAsync().ConfigureAwait(false); + await SendStatusMessageAsync(metadata).ConfigureAwait(false); } await TaskHelper.DelayWithCancellation( @@ -178,7 +184,7 @@ await TaskHelper.DelayWithCancellation( InsightsClient.Logger.Verbose("Insights task is ending."); } - private async Task SendJsonMessageAsync(T message) + private async Task SendJsonMessageAsync(T message, Metadata metadata) { var queryProtocolOptions = new QueryProtocolOptions( ConsistencyLevel.One, @@ -189,7 +195,7 @@ private async Task SendJsonMessageAsync(T message) ConsistencyLevel.Any); var response = await RunWithTokenAsync(() => - _cluster.Metadata.ControlConnection.UnsafeSendQueryRequestAsync( + metadata.ControlConnection.UnsafeSendQueryRequestAsync( InsightsClient.ReportInsightRpc, queryProtocolOptions)).ConfigureAwait(false); diff --git a/src/Cassandra/DataStax/Insights/InsightsSupportVerifier.cs b/src/Cassandra/DataStax/Insights/InsightsSupportVerifier.cs index f60bb72c3..51bbc1489 100644 --- a/src/Cassandra/DataStax/Insights/InsightsSupportVerifier.cs +++ b/src/Cassandra/DataStax/Insights/InsightsSupportVerifier.cs @@ -12,11 +12,10 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// +// using System; using System.Linq; -using Cassandra.SessionManagement; namespace Cassandra.DataStax.Insights { @@ -26,12 +25,12 @@ internal class InsightsSupportVerifier : IInsightsSupportVerifier private static readonly Version MinDse51Version = new Version(5, 1, 13); private static readonly Version Dse600Version = new Version(6, 0, 0); - public bool SupportsInsights(IInternalCluster cluster) + public bool SupportsInsights(Metadata metadata) { - var allHosts = cluster.AllHosts(); + var allHosts = metadata.AllHosts(); return allHosts.Count != 0 && allHosts.All(h => DseVersionSupportsInsights(h.DseVersion)); } - + public bool DseVersionSupportsInsights(Version dseVersion) { if (dseVersion == null) @@ -54,6 +53,5 @@ public bool DseVersionSupportsInsights(Version dseVersion) return false; } - } } \ No newline at end of file diff --git a/src/Cassandra/DataStax/Insights/MessageFactories/IInsightsMessageFactory.cs b/src/Cassandra/DataStax/Insights/MessageFactories/IInsightsMessageFactory.cs index f9aaf1d09..b81d3d596 100644 --- a/src/Cassandra/DataStax/Insights/MessageFactories/IInsightsMessageFactory.cs +++ b/src/Cassandra/DataStax/Insights/MessageFactories/IInsightsMessageFactory.cs @@ -21,6 +21,6 @@ namespace Cassandra.DataStax.Insights.MessageFactories { internal interface IInsightsMessageFactory { - Insight CreateMessage(IInternalCluster cluster, IInternalSession session); + Insight CreateMessage(IInternalCluster cluster, IInternalSession session, Metadata metadata); } } \ No newline at end of file diff --git a/src/Cassandra/DataStax/Insights/MessageFactories/InsightsStartupMessageFactory.cs b/src/Cassandra/DataStax/Insights/MessageFactories/InsightsStartupMessageFactory.cs index 05944b4d4..6cafcbd6b 100644 --- a/src/Cassandra/DataStax/Insights/MessageFactories/InsightsStartupMessageFactory.cs +++ b/src/Cassandra/DataStax/Insights/MessageFactories/InsightsStartupMessageFactory.cs @@ -36,12 +36,12 @@ public InsightsStartupMessageFactory(IInsightsMetadataFactory metadataFactory, I _infoProviders = infoProviders; } - public Insight CreateMessage(IInternalCluster cluster, IInternalSession session) + public Insight CreateMessage(IInternalCluster cluster, IInternalSession session, Metadata metadata) { - var metadata = _metadataFactory.CreateInsightsMetadata( + var insightsMetadata = _metadataFactory.CreateInsightsMetadata( InsightsStartupMessageFactory.StartupMessageName, InsightsStartupMessageFactory.StartupV1MappingId, InsightType.Event); - var driverInfo = _infoProviders.DriverInfoProvider.GetInformation(cluster, session); + var driverInfo = _infoProviders.DriverInfoProvider.GetInformation(cluster, session, metadata); var startupData = new InsightsStartupData { ClientId = cluster.Configuration.ClusterId.ToString(), @@ -52,33 +52,33 @@ public Insight CreateMessage(IInternalCluster cluster, IInt ApplicationVersion = cluster.Configuration.ApplicationVersion, ApplicationNameWasGenerated = cluster.Configuration.ApplicationNameWasGenerated, ContactPoints = - cluster.Metadata.ResolvedContactPoints.ToDictionary( + metadata.ResolvedContactPoints.ToDictionary( kvp => kvp.Key.StringRepresentation, kvp => kvp.Value.Select(ipEndPoint => ipEndPoint.GetHostIpEndPointWithFallback().ToString()).ToList()), - DataCenters = _infoProviders.DataCentersInfoProvider.GetInformation(cluster, session), - InitialControlConnection = cluster.Metadata.ControlConnection.EndPoint?.GetHostIpEndPointWithFallback().ToString(), - LocalAddress = cluster.Metadata.ControlConnection.LocalAddress?.ToString(), - HostName = _infoProviders.HostnameProvider.GetInformation(cluster, session), - ProtocolVersion = (byte)cluster.Metadata.ControlConnection.ProtocolVersion, - ExecutionProfiles = _infoProviders.ExecutionProfileInfoProvider.GetInformation(cluster, session), - PoolSizeByHostDistance = _infoProviders.PoolSizeByHostDistanceInfoProvider.GetInformation(cluster, session), + DataCenters = _infoProviders.DataCentersInfoProvider.GetInformation(cluster, session, metadata), + InitialControlConnection = metadata.ControlConnection.EndPoint?.GetHostIpEndPointWithFallback().ToString(), + LocalAddress = metadata.ControlConnection.LocalAddress?.ToString(), + HostName = _infoProviders.HostnameProvider.GetInformation(cluster, session, metadata), + ProtocolVersion = (byte)metadata.ProtocolVersion, + ExecutionProfiles = _infoProviders.ExecutionProfileInfoProvider.GetInformation(cluster, session, metadata), + PoolSizeByHostDistance = _infoProviders.PoolSizeByHostDistanceInfoProvider.GetInformation(cluster, session, metadata), HeartbeatInterval = cluster .Configuration - .GetOrCreatePoolingOptions(cluster.Metadata.ControlConnection.ProtocolVersion) + .GetOrCreatePoolingOptions(metadata.ProtocolVersion) .GetHeartBeatInterval() ?? 0, Compression = cluster.Configuration.ProtocolOptions.Compression, - ReconnectionPolicy = _infoProviders.ReconnectionPolicyInfoProvider.GetInformation(cluster, session), + ReconnectionPolicy = _infoProviders.ReconnectionPolicyInfoProvider.GetInformation(cluster, session, metadata), Ssl = new SslInfo { Enabled = cluster.Configuration.ProtocolOptions.SslOptions != null }, - AuthProvider = _infoProviders.AuthProviderInfoProvider.GetInformation(cluster, session), - OtherOptions = _infoProviders.OtherOptionsInfoProvider.GetInformation(cluster, session), - PlatformInfo = _infoProviders.PlatformInfoProvider.GetInformation(cluster, session), - ConfigAntiPatterns = _infoProviders.ConfigAntiPatternsInfoProvider.GetInformation(cluster, session), + AuthProvider = _infoProviders.AuthProviderInfoProvider.GetInformation(cluster, session, metadata), + OtherOptions = _infoProviders.OtherOptionsInfoProvider.GetInformation(cluster, session, metadata), + PlatformInfo = _infoProviders.PlatformInfoProvider.GetInformation(cluster, session, metadata), + ConfigAntiPatterns = _infoProviders.ConfigAntiPatternsInfoProvider.GetInformation(cluster, session, metadata), PeriodicStatusInterval = cluster.Configuration.MonitorReportingOptions.StatusEventDelayMilliseconds / 1000 }; return new Insight { - Metadata = metadata, + Metadata = insightsMetadata, Data = startupData }; } diff --git a/src/Cassandra/DataStax/Insights/MessageFactories/InsightsStatusMessageFactory.cs b/src/Cassandra/DataStax/Insights/MessageFactories/InsightsStatusMessageFactory.cs index 0bfa519b5..c52272624 100644 --- a/src/Cassandra/DataStax/Insights/MessageFactories/InsightsStatusMessageFactory.cs +++ b/src/Cassandra/DataStax/Insights/MessageFactories/InsightsStatusMessageFactory.cs @@ -38,22 +38,22 @@ public InsightsStatusMessageFactory( _connectedNodesInfoProvider = connectedNodesInfoProvider; } - public Insight CreateMessage(IInternalCluster cluster, IInternalSession session) + public Insight CreateMessage(IInternalCluster cluster, IInternalSession session, Metadata metadata) { - var metadata = _insightsMetadataFactory.CreateInsightsMetadata( + var insightsMetadata = _insightsMetadataFactory.CreateInsightsMetadata( InsightsStatusMessageFactory.StatusMessageName, InsightsStatusMessageFactory.StatusV1MappingId, InsightType.Event); var data = new InsightsStatusData { ClientId = cluster.Configuration.ClusterId.ToString(), SessionId = session.InternalSessionId.ToString(), - ControlConnection = cluster.Metadata.ControlConnection.EndPoint?.GetHostIpEndPointWithFallback().ToString(), - ConnectedNodes = _connectedNodesInfoProvider.GetInformation(cluster, session) + ControlConnection = metadata.ControlConnection.EndPoint?.GetHostIpEndPointWithFallback().ToString(), + ConnectedNodes = _connectedNodesInfoProvider.GetInformation(cluster, session, metadata) }; return new Insight { - Metadata = metadata, + Metadata = insightsMetadata, Data = data }; } diff --git a/src/Cassandra/Extensions.cs b/src/Cassandra/Extensions.cs index 377c45b39..29a204fd4 100644 --- a/src/Cassandra/Extensions.cs +++ b/src/Cassandra/Extensions.cs @@ -14,7 +14,9 @@ // limitations under the License. // +using System.Threading.Tasks; using Cassandra.SessionManagement; +using Cassandra.Tasks; namespace Cassandra { @@ -27,7 +29,13 @@ namespace Cassandra public static class Extensions { /// + /// + /// This method will block if no connection has been opened yet. Please use if + /// your application uses the Task Parallel Library (e.g. async/await). + /// + /// /// Gets a snapshot containing information on the connections pools held by this Client at the current time. + /// /// /// The information provided in the returned object only represents the state at the moment this method was /// called and it's not maintained in sync with the driver metadata. @@ -36,14 +44,31 @@ public static class Extensions /// /// public static ISessionState GetState(this ISession instance) + { + return TaskHelper.WaitToComplete( + instance.GetStateAsync(), + instance.Cluster.Configuration.DefaultRequestOptions.QueryAbortTimeout); + } + + /// + /// Gets a snapshot containing information on the connections pools held by this Client at the current time. + /// + /// The information provided in the returned object only represents the state at the moment this method was + /// called and it's not maintained in sync with the driver metadata. + /// + /// + /// + /// + public static async Task GetStateAsync(this ISession instance) { var session = instance as IInternalSession; - return session == null ? SessionState.Empty() : SessionState.From(session); + var metadata = await instance.Cluster.GetMetadataAsync().ConfigureAwait(false); + return session == null ? SessionState.Empty() : SessionState.From(session, metadata); } - internal static ISessionState GetState(this IInternalSession instance) + internal static ISessionState GetState(this IInternalSession instance, Metadata metadata) { - return SessionState.From(instance); + return SessionState.From(instance, metadata); } } } \ No newline at end of file diff --git a/src/Cassandra/ICluster.cs b/src/Cassandra/ICluster.cs index 84a74a922..2067687eb 100644 --- a/src/Cassandra/ICluster.cs +++ b/src/Cassandra/ICluster.cs @@ -15,8 +15,6 @@ // using System; -using System.Collections.Generic; -using System.Net; using System.Threading; using System.Threading.Tasks; @@ -31,9 +29,9 @@ namespace Cassandra /// Cassandra cluster would be: /// /// - /// Cluster cluster = Cluster.Builder().AddContactPoint("192.168.0.1").Build(); - /// Session session = cluster.Connect("db1"); - /// foreach (var row in session.Execute("SELECT * FROM table1")) + /// Cluster cluster = Cluster.Builder().AddContactPoint("192.168.0.1").Build(); + /// Session session = cluster.Connect("db1"); + /// foreach (var row in session.Execute("SELECT * FROM table1")) /// // do something ... /// /// @@ -46,36 +44,31 @@ namespace Cassandra public interface ICluster : IDisposable { /// - /// Gets read-only metadata on the connected cluster. - /// This includes the - /// know nodes (with their status as seen by the driver) as well as the schema - /// definitions. + /// This property may block while waiting for the creation of a connection if none has been established yet. + /// Use instead if your application uses the Task Parallel Library (e.g. async/await). /// - /// This method may trigger the creation of a connection if none has been established yet. + /// Gets read-only metadata on the connected cluster. + /// This includes the + /// know nodes (with their status as seen by the driver) as well as the schema definitions. /// /// Metadata Metadata { get; } /// - /// Cluster client configuration - /// - Configuration Configuration { get; } - - /// - /// Returns all known hosts of this cluster. - /// - ICollection AllHosts(); - - /// - /// Event that gets triggered when a new host is added to the cluster + /// Gets read-only metadata on the connected cluster. + /// This includes the + /// know nodes (with their status as seen by the driver) as well as the schema definitions. + /// + /// This method may trigger the creation of a connection if none has been established yet. + /// /// - event Action HostAdded; + Task GetMetadataAsync(); /// - /// Event that gets triggered when a host has been removed from the cluster + /// Cluster client configuration /// - event Action HostRemoved; - + Configuration Configuration { get; } + /// /// Creates a new session on this cluster. /// @@ -100,52 +93,18 @@ public interface ICluster : IDisposable /// Case-sensitive keyspace name to use Task ConnectAsync(string keyspace); - /// - /// Get the host instance for a given Ip address. - /// - /// Ip address of the host - /// The host or null if not found - Host GetHost(IPEndPoint address); - - /// - /// Gets a collection of replicas for a given partitionKey. Backward-compatibility only, use GetReplicas(keyspace, partitionKey) instead. - /// - /// Byte array representing the partition key - /// - ICollection GetReplicas(byte[] partitionKey); - - /// - /// Gets a collection of replicas for a given partitionKey on a given keyspace - /// - /// Byte array representing the partition key - /// Byte array representing the partition key - /// - ICollection GetReplicas(string keyspace, byte[] partitionKey); - /// /// Shutdown this cluster instance. This closes all connections from all the /// sessions of this * Cluster instance and reclaim all resources /// used by it.

This method has no effect if the cluster was already shutdown.

/// void Shutdown(int timeoutMs = Timeout.Infinite); - + /// /// Shutdown this cluster instance asynchronously. This closes all connections from all the /// sessions of this * Cluster instance and reclaim all resources /// used by it.

This method has no effect if the cluster was already shutdown.

/// Task ShutdownAsync(int timeoutMs = Timeout.Infinite); - - /// - /// Updates keyspace metadata (including token metadata for token aware routing) for a given keyspace or a specific keyspace table. - /// If no keyspace is provided then this method will update the metadata and token map for all the keyspaces of the cluster. - /// - Task RefreshSchemaAsync(string keyspace = null, string table = null); - - /// - /// Updates keyspace metadata (including token metadata for token aware routing) for a given keyspace or a specific keyspace table. - /// If no keyspace is provided then this method will update the metadata and token map for all the keyspaces of the cluster. - /// - bool RefreshSchema(string keyspace = null, string table = null); } -} +} \ No newline at end of file diff --git a/src/Cassandra/IMetadataQueryProvider.cs b/src/Cassandra/IMetadataQueryProvider.cs index 597081b09..43c679df5 100644 --- a/src/Cassandra/IMetadataQueryProvider.cs +++ b/src/Cassandra/IMetadataQueryProvider.cs @@ -28,8 +28,6 @@ namespace Cassandra /// internal interface IMetadataQueryProvider { - ProtocolVersion ProtocolVersion { get; } - /// /// The address of the endpoint used by the ControlConnection /// @@ -39,9 +37,7 @@ internal interface IMetadataQueryProvider /// The local address of the socket used by the ControlConnection /// IPEndPoint LocalAddress { get; } - - ISerializerManager Serializer { get; } - + Task> QueryAsync(string cqlQuery, bool retry = false); Task SendQueryRequestAsync(string cqlQuery, bool retry, QueryProtocolOptions queryProtocolOptions); diff --git a/src/Cassandra/ISession.cs b/src/Cassandra/ISession.cs index 9f9e3f8f7..a815aa2be 100644 --- a/src/Cassandra/ISession.cs +++ b/src/Cassandra/ISession.cs @@ -39,11 +39,6 @@ namespace Cassandra /// public interface ISession: IDisposable { - /// - /// Gets the Cassandra native binary protocol version - /// - int BinaryProtocolVersion { get; } - /// /// Gets the cluster information and state /// @@ -318,10 +313,5 @@ public interface ISession: IDisposable /// Disposes the session asynchronously. /// Task ShutdownAsync(); - - [Obsolete("Method deprecated. The driver internally waits for schema agreement when there is an schema change. See ProtocolOptions.MaxSchemaAgreementWaitSeconds for more info.")] - void WaitForSchemaAgreement(RowSet rs); - [Obsolete("Method deprecated. The driver internally waits for schema agreement when there is an schema change. See ProtocolOptions.MaxSchemaAgreementWaitSeconds for more info.")] - bool WaitForSchemaAgreement(IPEndPoint forHost); } } diff --git a/src/Cassandra/Metadata.cs b/src/Cassandra/Metadata.cs index e68bff204..131c20524 100644 --- a/src/Cassandra/Metadata.cs +++ b/src/Cassandra/Metadata.cs @@ -26,6 +26,7 @@ using Cassandra.Connections.Control; using Cassandra.MetadataHelpers; using Cassandra.Requests; +using Cassandra.Serialization; using Cassandra.Tasks; namespace Cassandra @@ -34,11 +35,12 @@ namespace Cassandra /// Keeps metadata on the connected cluster, including known nodes and schema /// definitions. /// - public class Metadata : IDisposable + public class Metadata { private const string SelectSchemaVersionPeers = "SELECT schema_version FROM system.peers"; private const string SelectSchemaVersionLocal = "SELECT schema_version FROM system.local"; private static readonly Logger Logger = new Logger(typeof(ControlConnection)); + private readonly ISerializerManager _serializerManager; private volatile TokenMap _tokenMap; private volatile ConcurrentDictionary _keyspaces = new ConcurrentDictionary(); private volatile ISchemaParser _schemaParser; @@ -60,6 +62,16 @@ public class Metadata : IDisposable /// Determines whether the cluster is provided as a service (DataStax Astra). /// public bool IsDbaas { get; private set; } = false; + + /// + /// Event that gets triggered when a new host is added to the cluster + /// + public event Action HostAdded; + + /// + /// Event that gets triggered when a host has been removed from the cluster + /// + public event Action HostRemoved; /// /// Gets the configuration associated with this instance. @@ -69,7 +81,14 @@ public class Metadata : IDisposable /// /// Control connection to be used to execute the queries to retrieve the metadata /// - internal IControlConnection ControlConnection { get; set; } + internal IControlConnection ControlConnection { get; } + + /// + /// Gets the Cassandra native binary protocol version + /// + public ProtocolVersion ProtocolVersion => _serializerManager.GetCurrentSerializer().ProtocolVersion; + + internal ISerializerManager SerializerManager => _serializerManager; internal ISchemaParser SchemaParser { get { return _schemaParser; } } @@ -81,28 +100,40 @@ public class Metadata : IDisposable internal IReadOnlyTokenMap TokenToReplicasMap => _tokenMap; - internal Metadata(Configuration configuration) + internal Metadata(Configuration configuration, ISerializerManager serializerManager, IControlConnection controlConnection) { + _serializerManager = serializerManager; _queryAbortTimeout = configuration.DefaultRequestOptions.QueryAbortTimeout; Configuration = configuration; Hosts = new Hosts(); Hosts.Down += OnHostDown; Hosts.Up += OnHostUp; + ControlConnection = controlConnection; } - internal Metadata(Configuration configuration, SchemaParser schemaParser) : this(configuration) + internal Metadata( + Configuration configuration, + ISerializerManager serializerManager, + IControlConnection controlConnection, + SchemaParser schemaParser) + : this(configuration, serializerManager, controlConnection) { _schemaParser = schemaParser; } - public void Dispose() + internal void SetResolvedContactPoints(IDictionary> resolvedContactPoints) + { + _resolvedContactPoints = new CopyOnWriteDictionary>(resolvedContactPoints); + } + + internal void OnHostRemoved(Host h) { - ShutDown(); + HostRemoved?.Invoke(h); } - internal void SetResolvedContactPoints(IDictionary> resolvedContactPoints) + internal void OnHostAdded(Host h) { - _resolvedContactPoints = new CopyOnWriteDictionary>(resolvedContactPoints); + HostAdded?.Invoke(h); } public Host GetHost(IPEndPoint address) @@ -433,17 +464,19 @@ internal Task GetQueryTraceAsync(QueryTrace trace) { return _schemaParser.GetQueryTraceAsync(trace, Configuration.Timer); } - + /// - /// Updates the keyspace and token information + /// Updates keyspace metadata (including token metadata for token aware routing) for a given keyspace or a specific keyspace table. + /// If no keyspace is provided then this method will update the metadata and token map for all the keyspaces of the cluster. /// public bool RefreshSchema(string keyspace = null, string table = null) { return TaskHelper.WaitToComplete(RefreshSchemaAsync(keyspace, table), Configuration.DefaultRequestOptions.QueryAbortTimeout * 2); } - + /// - /// Updates the keyspace and token information + /// Updates keyspace metadata (including token metadata for token aware routing) for a given keyspace or a specific keyspace table. + /// If no keyspace is provided then this method will update the metadata and token map for all the keyspaces of the cluster. /// public async Task RefreshSchemaAsync(string keyspace = null, string table = null) { @@ -466,14 +499,7 @@ public async Task RefreshSchemaAsync(string keyspace = null, string table } return true; } - - public void ShutDown(int timeoutMs = Timeout.Infinite) - { - //it is really not required to be called, left as it is part of the public API - //dereference the control connection - ControlConnection = null; - } - + /// /// this method should be called by the event debouncer /// @@ -592,7 +618,7 @@ private static bool CheckSchemaVersionResults( /// Waits until that the schema version in all nodes is the same or the waiting time passed. /// This method blocks the calling thread. /// - internal bool WaitForSchemaAgreement(IConnection connection) + internal async Task WaitForSchemaAgreementAsync(IConnection connection) { if (Hosts.Count == 1) { @@ -607,7 +633,7 @@ internal bool WaitForSchemaAgreement(IConnection connection) var totalVersions = 0; while (DateTime.Now.Subtract(start).TotalSeconds < waitSeconds) { - var serializer = ControlConnection.Serializer.GetCurrentSerializer(); + var serializer = _serializerManager.GetCurrentSerializer(); var schemaVersionLocalQuery = new QueryRequest( serializer, @@ -624,16 +650,16 @@ internal bool WaitForSchemaAgreement(IConnection connection) null); var queries = new[] { connection.Send(schemaVersionLocalQuery), connection.Send(schemaVersionPeersQuery) }; // ReSharper disable once CoVariantArrayConversion - Task.WaitAll(queries, Configuration.DefaultRequestOptions.QueryAbortTimeout); + await Task.WhenAll(queries); if (Metadata.CheckSchemaVersionResults( - Configuration.MetadataRequestHandler.GetRowSet(queries[0].Result), - Configuration.MetadataRequestHandler.GetRowSet(queries[1].Result))) + Configuration.MetadataRequestHandler.GetRowSet(await queries[0].ConfigureAwait(false)), + Configuration.MetadataRequestHandler.GetRowSet(await queries[1].ConfigureAwait(false)))) { return true; } - Thread.Sleep(500); + await Task.Delay(500).ConfigureAwait(false); } Metadata.Logger.Info($"Waited for schema agreement, still {totalVersions} schema versions in the cluster."); } diff --git a/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs b/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs index 3303a0d6f..7c654dd49 100644 --- a/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs +++ b/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs @@ -54,7 +54,7 @@ public void Dispose() } - public void Initialize(ICluster cluster) + public void Initialize(Metadata metadata) { } diff --git a/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs b/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs index c967f7063..fe09e9510 100644 --- a/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs +++ b/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs @@ -16,9 +16,8 @@ using System; using System.Collections.Generic; -using System.Threading; using System.Linq; -using Cassandra.SessionManagement; +using System.Threading; namespace Cassandra { @@ -36,7 +35,6 @@ public class DCAwareRoundRobinPolicy : ILoadBalancingPolicy private readonly int _maxIndex = int.MaxValue - 10000; private volatile List _hosts; private readonly object _hostCreationLock = new object(); - private ICluster _cluster; private int _index; /// @@ -72,21 +70,19 @@ public DCAwareRoundRobinPolicy(string localDc) : this(inferLocalDc: false) LocalDc = localDc; } - + /// /// Gets the Local Datacenter. This value is provided in the constructor. /// public string LocalDc { get; private set; } - public void Initialize(ICluster cluster) + public void Initialize(Metadata metadata) { - _cluster = cluster; - //When the pool changes, it should clear the local cache - _cluster.HostAdded += _ => ClearHosts(); - _cluster.HostRemoved += _ => ClearHosts(); + metadata.HostAdded += _ => ClearHosts(); + metadata.HostRemoved += _ => ClearHosts(); - LocalDc = cluster.Configuration.LocalDatacenterProvider.DiscoverLocalDatacenter( + LocalDc = metadata.Configuration.LocalDatacenterProvider.DiscoverLocalDatacenter( _inferLocalDc, LocalDc); } @@ -112,11 +108,12 @@ public HostDistance Distance(Host host) /// per remote datacenter. The order of the local node in the returned query plan /// will follow a Round-robin algorithm.

/// + /// The information about the session instance for which the policy is created. /// Keyspace on which the query is going to be executed /// the query for which to build the plan. /// a new query plan, i.e. an iterator indicating which host to try /// first for querying, which one to use as failover, etc... - public IEnumerable NewQueryPlan(string keyspace, IStatement query) + public IEnumerable NewQueryPlan(Metadata metadata, string keyspace, IStatement query) { var startIndex = Interlocked.Increment(ref _index); @@ -126,7 +123,7 @@ public IEnumerable NewQueryPlan(string keyspace, IStatement query) Interlocked.Exchange(ref _index, 0); } - var hosts = GetHosts(); + var hosts = GetHosts(metadata); //Round-robin through local nodes for (var i = 0; i < hosts.Count; i++) { @@ -148,7 +145,7 @@ private string GetDatacenter(Host host) /// /// Gets a tuple containing the list of local and remote nodes /// - internal List GetHosts() + internal List GetHosts(Metadata metadata) { var hosts = _hosts; if (hosts != null) @@ -166,7 +163,7 @@ internal List GetHosts() } //shallow copy the nodes - var allNodes = _cluster.AllHosts().ToArray(); + var allNodes = metadata.AllHosts().ToArray(); hosts = allNodes.Where(h => GetDatacenter(h) == LocalDc).ToList(); _hosts = hosts; @@ -174,4 +171,4 @@ internal List GetHosts() return hosts; } } -} +} \ No newline at end of file diff --git a/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs b/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs index 48394e9a3..eaab841b4 100644 --- a/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs +++ b/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs @@ -84,29 +84,29 @@ public HostDistance Distance(Host host) /// /// Initializes the policy. /// - public void Initialize(ICluster cluster) + public void Initialize(Metadata metadata) { - ChildPolicy.Initialize(cluster); + ChildPolicy.Initialize(metadata); } /// /// Returns the hosts to used for a query. /// - public IEnumerable NewQueryPlan(string keyspace, IStatement statement) + public IEnumerable NewQueryPlan(Metadata metadata, string keyspace, IStatement statement) { if (statement is TargettedSimpleStatement targetedStatement && targetedStatement.PreferredHost != null) { _lastPreferredHost = targetedStatement.PreferredHost; - return YieldPreferred(keyspace, targetedStatement); + return YieldPreferred(metadata, keyspace, targetedStatement); } - return ChildPolicy.NewQueryPlan(keyspace, statement); + return ChildPolicy.NewQueryPlan(metadata, keyspace, statement); } - private IEnumerable YieldPreferred(string keyspace, TargettedSimpleStatement statement) + private IEnumerable YieldPreferred(Metadata metadata, string keyspace, TargettedSimpleStatement statement) { yield return statement.PreferredHost; - foreach (var h in ChildPolicy.NewQueryPlan(keyspace, statement)) + foreach (var h in ChildPolicy.NewQueryPlan(metadata, keyspace, statement)) { yield return h; } diff --git a/src/Cassandra/Policies/ILoadBalancingPolicy.cs b/src/Cassandra/Policies/ILoadBalancingPolicy.cs index 00a48f12f..5638ab6f4 100644 --- a/src/Cassandra/Policies/ILoadBalancingPolicy.cs +++ b/src/Cassandra/Policies/ILoadBalancingPolicy.cs @@ -32,8 +32,8 @@ public interface ILoadBalancingPolicy /// before any call to another of the methods of the policy. /// /// - /// The information about the session instance for which the policy is created. - void Initialize(ICluster cluster); + /// The information about the session instance for which the policy is created. + void Initialize(Metadata metadata); /// /// Returns the distance assigned by this policy to the provided host.

The @@ -58,11 +58,12 @@ public interface ILoadBalancingPolicy /// be so), the next host will be used. If all hosts of the returned /// Iterator are down, the query will fail.

/// + /// The information about the session instance for which the policy is created. /// The query for which to build a plan, it can be null. /// Keyspace on which the query is going to be executed, it can be null. /// An iterator of Host. The query is tried against the hosts returned /// by this iterator in order, until the query has been sent successfully to one /// of the host. - IEnumerable NewQueryPlan(string keyspace, IStatement query); + IEnumerable NewQueryPlan(Metadata metadata, string keyspace, IStatement query); } } diff --git a/src/Cassandra/Policies/ILocalDatacenterProvider.cs b/src/Cassandra/Policies/ILocalDatacenterProvider.cs index 481b383c0..1a9bba535 100644 --- a/src/Cassandra/Policies/ILocalDatacenterProvider.cs +++ b/src/Cassandra/Policies/ILocalDatacenterProvider.cs @@ -30,6 +30,6 @@ internal interface ILocalDatacenterProvider /// /// Should be called after we have an initialized cluster instance. /// - void Initialize(IInternalCluster cluster); + void Initialize(IInternalCluster cluster, Metadata metadata); } } \ No newline at end of file diff --git a/src/Cassandra/Policies/ISpeculativeExecutionPolicy.cs b/src/Cassandra/Policies/ISpeculativeExecutionPolicy.cs index f470bb4ad..adcc7d0ef 100644 --- a/src/Cassandra/Policies/ISpeculativeExecutionPolicy.cs +++ b/src/Cassandra/Policies/ISpeculativeExecutionPolicy.cs @@ -28,7 +28,7 @@ public interface ISpeculativeExecutionPolicy : IDisposable /// /// Initializes the policy at cluster startup. /// - void Initialize(ICluster cluster); + void Initialize(Metadata metadata); /// /// Returns the plan to use for a new query. diff --git a/src/Cassandra/Policies/LocalDatacenterProvider.cs b/src/Cassandra/Policies/LocalDatacenterProvider.cs index 07eedeca6..fcad9f454 100644 --- a/src/Cassandra/Policies/LocalDatacenterProvider.cs +++ b/src/Cassandra/Policies/LocalDatacenterProvider.cs @@ -1,12 +1,12 @@ -// +// // Copyright (C) DataStax Inc. -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -16,23 +16,24 @@ using System; using System.Collections.Generic; using System.Linq; + using Cassandra.SessionManagement; namespace Cassandra { internal class LocalDatacenterProvider : ILocalDatacenterProvider { - private bool _initialized = false; + private volatile bool _initialized = false; - private IInternalCluster _cluster; - private IEnumerable _availableDcs; - private string _availableDcsStr; - private string _cachedDatacenter; + private volatile IInternalCluster _cluster; + private volatile IEnumerable _availableDcs; + private volatile string _availableDcsStr; + private volatile string _cachedDatacenter; - public void Initialize(IInternalCluster cluster) + public void Initialize(IInternalCluster cluster, Metadata metadata) { _cluster = cluster; - _availableDcs = _cluster.AllHosts().Select(h => h.Datacenter).Where(dc => dc != null).Distinct().ToList(); + _availableDcs = metadata.AllHosts().Select(h => h.Datacenter).Where(dc => dc != null).Distinct().ToList(); _availableDcsStr = string.Join(", ", _availableDcs); _initialized = true; } @@ -67,7 +68,7 @@ public string DiscoverLocalDatacenter(bool inferLocalDc, string policyDatacenter "It can be specified in the load balancing policy constructor or " + $"via the Builder.WithLocalDatacenter() method. Available datacenters: {_availableDcsStr}."); } - + // implicit contact point so infer the local datacenter from the control connection host return InferLocalDatacenter(); } @@ -93,13 +94,13 @@ private string InferLocalDatacenter() } // Use the host used by the control connection - _cachedDatacenter = - cc.Host?.Datacenter ?? + _cachedDatacenter = + cc.Host?.Datacenter ?? throw new InvalidOperationException( "The local datacenter could not be inferred from the implicit contact point, " + "please set it explicitly in the load balancing policy constructor or " + $"via the Builder.WithLocalDatacenter() method. Available datacenters: {_availableDcsStr}."); - + return _cachedDatacenter; } } diff --git a/src/Cassandra/Policies/NoSpeculativeExecutionPolicy.cs b/src/Cassandra/Policies/NoSpeculativeExecutionPolicy.cs index 500aa96e7..2c956e6c3 100644 --- a/src/Cassandra/Policies/NoSpeculativeExecutionPolicy.cs +++ b/src/Cassandra/Policies/NoSpeculativeExecutionPolicy.cs @@ -36,7 +36,7 @@ public void Dispose() } - public void Initialize(ICluster cluster) + public void Initialize(Metadata metadata) { } diff --git a/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs b/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs index 1cbd7c079..2346f623a 100644 --- a/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs +++ b/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs @@ -34,9 +34,9 @@ public RetryLoadBalancingPolicy(ILoadBalancingPolicy loadBalancingPolicy, IRecon public ILoadBalancingPolicy LoadBalancingPolicy { get; } - public void Initialize(ICluster cluster) + public void Initialize(Metadata metadata) { - LoadBalancingPolicy.Initialize(cluster); + LoadBalancingPolicy.Initialize(metadata); } public HostDistance Distance(Host host) @@ -44,12 +44,12 @@ public HostDistance Distance(Host host) return LoadBalancingPolicy.Distance(host); } - public IEnumerable NewQueryPlan(string keyspace, IStatement query) + public IEnumerable NewQueryPlan(Metadata metadata, string keyspace, IStatement query) { IReconnectionSchedule schedule = ReconnectionPolicy.NewSchedule(); while (true) { - IEnumerable childQueryPlan = LoadBalancingPolicy.NewQueryPlan(keyspace, query); + IEnumerable childQueryPlan = LoadBalancingPolicy.NewQueryPlan(metadata, keyspace, query); foreach (Host host in childQueryPlan) yield return host; diff --git a/src/Cassandra/Policies/RoundRobinPolicy.cs b/src/Cassandra/Policies/RoundRobinPolicy.cs index 990839ead..16946f990 100644 --- a/src/Cassandra/Policies/RoundRobinPolicy.cs +++ b/src/Cassandra/Policies/RoundRobinPolicy.cs @@ -14,15 +14,14 @@ // limitations under the License. // -using System.Collections.Generic; -using System.Threading; +using System.Collections.Generic; using System.Linq; - +using System.Threading; namespace Cassandra { /// - /// A Round-robin load balancing policy. + /// A Round-robin load balancing policy. /// This policy queries nodes in a /// round-robin fashion. For a given query, if an host fail, the next one /// (following the round-robin order) is tried, until all hosts have been tried. @@ -35,12 +34,10 @@ namespace Cassandra /// public class RoundRobinPolicy : ILoadBalancingPolicy { - ICluster _cluster; - int _index; + private int _index; - public void Initialize(ICluster cluster) + public void Initialize(Metadata metadata) { - this._cluster = cluster; } /// @@ -62,14 +59,15 @@ public HostDistance Distance(Host host) /// plans returned will cycle over all the host of the cluster in a round-robin /// fashion.

/// + /// The information about the session instance for which the policy is created. /// Keyspace on which the query is going to be executed /// the query for which to build the plan. /// a new query plan, i.e. an iterator indicating which host to try /// first for querying, which one to use as failover, etc... - public IEnumerable NewQueryPlan(string keyspace, IStatement query) + public IEnumerable NewQueryPlan(Metadata metadata, string keyspace, IStatement query) { //shallow copy the all hosts - var hosts = (from h in _cluster.AllHosts() select h).ToArray(); + var hosts = (from h in metadata.AllHosts() select h).ToArray(); var startIndex = Interlocked.Increment(ref _index); //Simplified overflow protection @@ -84,4 +82,4 @@ public IEnumerable NewQueryPlan(string keyspace, IStatement query) } } } -} +} \ No newline at end of file diff --git a/src/Cassandra/Policies/TokenAwarePolicy.cs b/src/Cassandra/Policies/TokenAwarePolicy.cs index ddd1ccfe5..e4ed87175 100644 --- a/src/Cassandra/Policies/TokenAwarePolicy.cs +++ b/src/Cassandra/Policies/TokenAwarePolicy.cs @@ -27,14 +27,13 @@ namespace Cassandra /// /// /// The method is inherited from the child policy. - /// The host yielded by the method will first return the + /// The host yielded by the method will first return the /// replicas for the statement, based on the . /// /// /// public class TokenAwarePolicy : ILoadBalancingPolicy { - private ICluster _cluster; private readonly ThreadLocal _prng = new ThreadLocal(() => new Random( // Predictable random numbers are OK Environment.TickCount * Environment.CurrentManagedThreadId)); @@ -52,10 +51,9 @@ public TokenAwarePolicy(ILoadBalancingPolicy childPolicy) public ILoadBalancingPolicy ChildPolicy { get; } - public void Initialize(ICluster cluster) + public void Initialize(Metadata metadata) { - _cluster = cluster; - ChildPolicy.Initialize(cluster); + ChildPolicy.Initialize(metadata); } /// @@ -77,16 +75,17 @@ public HostDistance Distance(Host host) /// IStatement.RoutingKey is not null). Following what /// it will return the plan of the child policy.

/// + /// The information about the session instance for which the policy is created. /// Keyspace on which the query is going to be executed /// the query for which to build the plan. /// the new query plan. - public IEnumerable NewQueryPlan(string loggedKeyspace, IStatement query) + public IEnumerable NewQueryPlan(Metadata metadata, string loggedKeyspace, IStatement query) { var routingKey = query?.RoutingKey; IEnumerable childIterator; if (routingKey == null) { - childIterator = ChildPolicy.NewQueryPlan(loggedKeyspace, query); + childIterator = ChildPolicy.NewQueryPlan(metadata, loggedKeyspace, query); foreach (var h in childIterator) { yield return h; @@ -95,7 +94,7 @@ public IEnumerable NewQueryPlan(string loggedKeyspace, IStatement query) } var keyspace = query.Keyspace ?? loggedKeyspace; - var replicas = _cluster.GetReplicas(keyspace, routingKey.RawRoutingKey); + var replicas = metadata.GetReplicas(keyspace, routingKey.RawRoutingKey); var localReplicaSet = new HashSet(); var localReplicaList = new List(replicas.Count); @@ -117,7 +116,7 @@ public IEnumerable NewQueryPlan(string loggedKeyspace, IStatement query) } // Then, return the rest of child policy hosts - childIterator = ChildPolicy.NewQueryPlan(loggedKeyspace, query); + childIterator = ChildPolicy.NewQueryPlan(metadata, loggedKeyspace, query); foreach (var h in childIterator) { if (localReplicaSet.Contains(h)) diff --git a/src/Cassandra/ProtocolEvents/ProtocolEventDebouncer.cs b/src/Cassandra/ProtocolEvents/ProtocolEventDebouncer.cs index 92bcc7ec2..c46037427 100644 --- a/src/Cassandra/ProtocolEvents/ProtocolEventDebouncer.cs +++ b/src/Cassandra/ProtocolEvents/ProtocolEventDebouncer.cs @@ -16,6 +16,7 @@ using System; using System.Linq; +using System.Threading; using System.Threading.Tasks; using System.Threading.Tasks.Dataflow; @@ -32,7 +33,8 @@ internal class ProtocolEventDebouncer : IProtocolEventDebouncer private readonly ActionBlock, ProtocolEvent, bool>> _enqueueBlock; private readonly ActionBlock _processQueueBlock; private readonly SlidingWindowExclusiveTimer _timer; - + + private int _disposed = 0; private volatile EventQueue _queue = null; public ProtocolEventDebouncer(ITimerFactory timerFactory, TimeSpan delay, TimeSpan maxDelay) @@ -114,6 +116,12 @@ public async Task HandleEventAsync(ProtocolEvent ev, bool processNow) /// public async Task ShutdownAsync() { + // Dispose once + if (Interlocked.Increment(ref _disposed) != 1) + { + return; + } + _enqueueBlock.Complete(); await _enqueueBlock.Completion.ConfigureAwait(false); diff --git a/src/Cassandra/ProtocolVersion.cs b/src/Cassandra/ProtocolVersion.cs index a0054210b..4b2e18e29 100644 --- a/src/Cassandra/ProtocolVersion.cs +++ b/src/Cassandra/ProtocolVersion.cs @@ -313,6 +313,14 @@ public static bool CanStartupResponseErrorBeWrapped(this ProtocolVersion version return version >= ProtocolVersion.V4; } + /// + /// Determines whether UDTs are supported in the provided protocol version. + /// + public static bool SupportsUserDefinedTypes(this ProtocolVersion version) + { + return version >= ProtocolVersion.V3; + } + public static int GetHeaderSize(this ProtocolVersion version) { if (version.Uses2BytesStreamIds()) diff --git a/src/Cassandra/QueryTrace.cs b/src/Cassandra/QueryTrace.cs index 1c082f8de..c3df980f0 100644 --- a/src/Cassandra/QueryTrace.cs +++ b/src/Cassandra/QueryTrace.cs @@ -33,8 +33,8 @@ namespace Cassandra public class QueryTrace { private readonly object _fetchLock = new object(); - private readonly Metadata _metadata; private readonly Guid _traceId; + private readonly ISession _session; private IPAddress _coordinator; private int _duration = int.MinValue; private List _events; @@ -177,7 +177,7 @@ public QueryTrace(Guid traceId, ISession session) //The instance is created before fetching the actual trace metadata //The properties will be populated later. _traceId = traceId; - _metadata = session.Cluster.Metadata; + _session = session; _metadataFetchSyncTimeout = session.Cluster.Configuration.DefaultRequestOptions.QueryAbortTimeout; } @@ -227,12 +227,13 @@ private void DoFetchTrace() } } - internal Task LoadAsync() + internal async Task LoadAsync() { // mark as disconnected, guaranteeing that it wont make metadata fetches triggered by a property get // ReSharper disable once InconsistentlySynchronizedField : Can be both async and sync, don't mind _isDisconnected = false; - return _metadata.GetQueryTraceAsync(this); + var metadata = await _session.Cluster.GetMetadataAsync().ConfigureAwait(false); + return await metadata.GetQueryTraceAsync(this).ConfigureAwait(false); } /// diff --git a/src/Cassandra/Requests/IPrepareHandler.cs b/src/Cassandra/Requests/IPrepareHandler.cs index 9b0f63657..2e0c92a21 100644 --- a/src/Cassandra/Requests/IPrepareHandler.cs +++ b/src/Cassandra/Requests/IPrepareHandler.cs @@ -23,7 +23,7 @@ namespace Cassandra.Requests { internal interface IPrepareHandler { - Task Prepare( - PrepareRequest request, IInternalSession session, IEnumerator queryPlan); + Task PrepareAsync( + PrepareRequest request, IInternalSession session, Metadata metadata, IEnumerator queryPlan); } } \ No newline at end of file diff --git a/src/Cassandra/Requests/IRequestHandler.cs b/src/Cassandra/Requests/IRequestHandler.cs index da12db4b2..3ad0f0d92 100644 --- a/src/Cassandra/Requests/IRequestHandler.cs +++ b/src/Cassandra/Requests/IRequestHandler.cs @@ -29,6 +29,8 @@ namespace Cassandra.Requests /// internal interface IRequestHandler { + Metadata Metadata { get; } + IRequestOptions RequestOptions { get; } IExtendedRetryPolicy RetryPolicy { get; } @@ -46,6 +48,11 @@ internal interface IRequestHandler /// Marks this instance as completed (if not already) and in a new Task using the default scheduler, it invokes the action and sets the result /// bool SetCompleted(RowSet result, Action action); + + /// + /// Marks this instance as completed (if not already) and in a new Task using the default scheduler, it awaits the task and sets the result + /// + bool SetCompletedWithTask(RowSet result, Func task); void SetNoMoreHosts(NoHostAvailableException ex, IRequestExecution execution); diff --git a/src/Cassandra/Requests/IRequestHandlerFactory.cs b/src/Cassandra/Requests/IRequestHandlerFactory.cs index 1235c8dd7..2a48e85ef 100644 --- a/src/Cassandra/Requests/IRequestHandlerFactory.cs +++ b/src/Cassandra/Requests/IRequestHandlerFactory.cs @@ -22,10 +22,17 @@ namespace Cassandra.Requests { internal interface IRequestHandlerFactory { - IRequestHandler Create(IInternalSession session, ISerializer serializer, IRequest request, IStatement statement, IRequestOptions options); + IRequestHandler Create( + IInternalSession session, + Metadata metadata, + ISerializer serializer, + IRequest request, + IStatement statement, + IRequestOptions options); - IRequestHandler Create(IInternalSession session, ISerializer serializer, IStatement statement, IRequestOptions options); + IRequestHandler Create( + IInternalSession session, Metadata metadata, ISerializer serializer, IStatement statement, IRequestOptions options); - IRequestHandler Create(IInternalSession session, ISerializer serializer); + IRequestHandler Create(IInternalSession session, Metadata metadata, ISerializer serializer); } } \ No newline at end of file diff --git a/src/Cassandra/Requests/PrepareHandler.cs b/src/Cassandra/Requests/PrepareHandler.cs index c8d22bb0a..dcc726758 100644 --- a/src/Cassandra/Requests/PrepareHandler.cs +++ b/src/Cassandra/Requests/PrepareHandler.cs @@ -42,10 +42,10 @@ public PrepareHandler(ISerializerManager serializerManager, IInternalCluster clu _reprepareHandler = reprepareHandler; } - public async Task Prepare( - PrepareRequest request, IInternalSession session, IEnumerator queryPlan) + public async Task PrepareAsync( + PrepareRequest request, IInternalSession session, Metadata metadata, IEnumerator queryPlan) { - var prepareResult = await SendRequestToOneNode(session, queryPlan, request).ConfigureAwait(false); + var prepareResult = await SendRequestToOneNode(session, metadata, queryPlan, request).ConfigureAwait(false); if (session.Cluster.Configuration.QueryOptions.IsPrepareOnAllHosts()) { @@ -55,7 +55,8 @@ public async Task Prepare( return prepareResult.PreparedStatement; } - private async Task SendRequestToOneNode(IInternalSession session, IEnumerator queryPlan, PrepareRequest request) + private async Task SendRequestToOneNode( + IInternalSession session, Metadata metadata, IEnumerator queryPlan, PrepareRequest request) { var triedHosts = new Dictionary(); @@ -70,7 +71,9 @@ private async Task SendRequestToOneNode(IInternalSession session, var result = await connection.Send(request).ConfigureAwait(false); return new PrepareResult { - PreparedStatement = await GetPreparedStatement(result, request, request.Keyspace ?? connection.Keyspace, session.Cluster).ConfigureAwait(false), + PreparedStatement = + await GetPreparedStatement( + result, request, request.Keyspace ?? connection.Keyspace, metadata).ConfigureAwait(false), TriedHosts = triedHosts, HostAddress = host.Address }; @@ -127,7 +130,7 @@ private Host GetNextHost(IEnumerator queryPlan, out HostDistance distance) } private async Task GetPreparedStatement( - Response response, PrepareRequest request, string keyspace, ICluster cluster) + Response response, PrepareRequest request, string keyspace, Metadata metadata) { if (response == null) { @@ -154,11 +157,11 @@ private async Task GetPreparedStatement( { IncomingPayload = resultResponse.CustomPayload }; - await FillRoutingInfo(ps, cluster).ConfigureAwait(false); + await FillRoutingInfo(ps, metadata).ConfigureAwait(false); return ps; } - private static async Task FillRoutingInfo(PreparedStatement ps, ICluster cluster) + private static async Task FillRoutingInfo(PreparedStatement ps, Metadata metadata) { var column = ps.Variables.Columns.FirstOrDefault(); if (column?.Keyspace == null) @@ -181,7 +184,7 @@ private static async Task FillRoutingInfo(PreparedStatement ps, ICluster cluster try { const string msgRoutingNotSet = "Routing information could not be set for query \"{0}\""; - var table = await cluster.Metadata.GetTableAsync(column.Keyspace, column.Table).ConfigureAwait(false); + var table = await metadata.GetTableAsync(column.Keyspace, column.Table).ConfigureAwait(false); if (table == null) { Logger.Info(msgRoutingNotSet, ps.Cql); diff --git a/src/Cassandra/Requests/ReprepareHandler.cs b/src/Cassandra/Requests/ReprepareHandler.cs index 685ccc0ac..b7d0618b1 100644 --- a/src/Cassandra/Requests/ReprepareHandler.cs +++ b/src/Cassandra/Requests/ReprepareHandler.cs @@ -31,7 +31,8 @@ public async Task ReprepareOnAllNodesWithExistingConnections( IInternalSession session, PrepareRequest request, PrepareResult prepareResult) { var pools = session.GetPools(); - var hosts = session.InternalCluster.AllHosts(); + var metadata = await session.Cluster.GetMetadataAsync().ConfigureAwait(false); + var hosts = metadata.AllHosts(); var poolsByHosts = pools.Join( hosts, po => po.Key, h => h.Address, diff --git a/src/Cassandra/Requests/RequestExecution.cs b/src/Cassandra/Requests/RequestExecution.cs index bde33115d..229ef4bf1 100644 --- a/src/Cassandra/Requests/RequestExecution.cs +++ b/src/Cassandra/Requests/RequestExecution.cs @@ -47,7 +47,11 @@ internal class RequestExecution : IRequestExecution /// private volatile Host _host; - public RequestExecution(IRequestHandler parent, IInternalSession session, IRequest request, IRequestObserver requestObserver) + public RequestExecution( + IRequestHandler parent, + IInternalSession session, + IRequest request, + IRequestObserver requestObserver) { _parent = parent; _session = session; @@ -210,7 +214,7 @@ private void HandleRowSetResult(Response response) if (resultResponse.Output is OutputSchemaChange schemaChange) { //Schema changes need to do blocking operations - HandleSchemaChange(resultResponse, schemaChange); + HandleSchemaChangeAsync(resultResponse, schemaChange); return; } RowSet rs; @@ -229,7 +233,7 @@ private void HandleRowSetResult(Response response) _parent.SetCompleted(null, FillRowSet(rs, resultResponse)); } - private void HandleSchemaChange(ResultResponse response, OutputSchemaChange schemaChange) + private void HandleSchemaChangeAsync(ResultResponse response, OutputSchemaChange schemaChange) { var result = FillRowSet(new RowSet(), response); @@ -237,17 +241,19 @@ private void HandleSchemaChange(ResultResponse response, OutputSchemaChange sche result.Info.SetSchemaInAgreement(false); // Wait for the schema change before returning the result - _parent.SetCompleted( + _parent.SetCompletedWithTask( result, - () => + async () => { - var schemaAgreed = _session.Cluster.Metadata.WaitForSchemaAgreement(_connection); + var schemaAgreed = await _parent.Metadata.WaitForSchemaAgreementAsync(_connection).ConfigureAwait(false); result.Info.SetSchemaInAgreement(schemaAgreed); try { - TaskHelper.WaitToComplete( - _session.InternalCluster.GetControlConnection().HandleSchemaChangeEvent(schemaChange.SchemaChangeEventArgs, true), - _session.Cluster.Configuration.ProtocolOptions.MaxSchemaAgreementWaitSeconds * 1000); + await _session.InternalCluster.GetControlConnection() + .HandleSchemaChangeEvent(schemaChange.SchemaChangeEventArgs, true) + .WaitToCompleteAsync( + _session.Cluster.Configuration.ProtocolOptions.MaxSchemaAgreementWaitSeconds * 1000) + .ConfigureAwait(false); } catch (TimeoutException) { @@ -322,7 +328,8 @@ private void SetAutoPage(RowSet rs, IInternalSession session) var request = (IQueryRequest)_parent.BuildRequest(); request.PagingState = pagingState; - return _session.Cluster.Configuration.RequestHandlerFactory.Create(session, _parent.Serializer, request, statement, _parent.RequestOptions).SendAsync(); + return _session.Cluster.Configuration.RequestHandlerFactory.Create( + session, _parent.Metadata, _parent.Serializer, request, statement, _parent.RequestOptions).SendAsync(); }, _parent.RequestOptions.QueryAbortTimeout, _session.MetricsManager); } } diff --git a/src/Cassandra/Requests/RequestHandler.cs b/src/Cassandra/Requests/RequestHandler.cs index cca23b0b7..36b469a9b 100644 --- a/src/Cassandra/Requests/RequestHandler.cs +++ b/src/Cassandra/Requests/RequestHandler.cs @@ -49,25 +49,37 @@ internal class RequestHandler : IRequestHandler private ISpeculativeExecutionPlan _executionPlan; private volatile HashedWheelTimer.ITimeout _nextExecutionTimeout; private readonly IRequestObserver _requestObserver; + public IExtendedRetryPolicy RetryPolicy { get; } + public ISerializer Serializer { get; } + public IStatement Statement { get; } + public IRequestOptions RequestOptions { get; } + public Metadata Metadata { get; } + /// /// Creates a new instance using a request, the statement and the execution profile. /// public RequestHandler( - IInternalSession session, ISerializer serializer, IRequest request, IStatement statement, IRequestOptions requestOptions) + IInternalSession session, + Metadata metadata, + ISerializer serializer, + IRequest request, + IStatement statement, + IRequestOptions requestOptions) { _session = session ?? throw new ArgumentNullException(nameof(session)); + Metadata = metadata ?? throw new ArgumentNullException(nameof(metadata)); _requestObserver = session.ObserverFactory.CreateRequestObserver(); _requestResultHandler = new TcsMetricsRequestResultHandler(_requestObserver); _request = request; Serializer = serializer ?? throw new ArgumentNullException(nameof(session)); Statement = statement; RequestOptions = requestOptions ?? throw new ArgumentNullException(nameof(requestOptions)); - + RetryPolicy = RequestOptions.RetryPolicy; if (statement?.RetryPolicy != null) @@ -75,23 +87,34 @@ public RequestHandler( RetryPolicy = statement.RetryPolicy.Wrap(RetryPolicy); } - _queryPlan = RequestHandler.GetQueryPlan(session, statement, RequestOptions.LoadBalancingPolicy).GetEnumerator(); + _queryPlan = RequestHandler.GetQueryPlan(session, metadata, statement, RequestOptions.LoadBalancingPolicy).GetEnumerator(); } /// /// Creates a new instance using the statement to build the request. /// Statement can not be null. /// - public RequestHandler(IInternalSession session, ISerializer serializer, IStatement statement, IRequestOptions requestOptions) - : this(session, serializer, RequestHandler.GetRequest(statement, serializer, requestOptions), statement, requestOptions) + public RequestHandler( + IInternalSession session, + Metadata metadata, + ISerializer serializer, + IStatement statement, + IRequestOptions requestOptions) + : this( + session, + metadata, + serializer, + RequestHandler.GetRequest(statement, serializer, requestOptions), + statement, + requestOptions) { } /// /// Creates a new instance with no request, suitable for getting a connection. /// - public RequestHandler(IInternalSession session, ISerializer serializer) - : this(session, serializer, null, null, session.Cluster.Configuration.DefaultRequestOptions) + public RequestHandler(IInternalSession session, Metadata metadata, ISerializer serializer) + : this(session, metadata, serializer, null, null, session.Cluster.Configuration.DefaultRequestOptions) { } @@ -100,13 +123,13 @@ public RequestHandler(IInternalSession session, ISerializer serializer) /// In the special case when a Host is provided at Statement level, it will return a query plan with a single /// host. /// - private static IEnumerable GetQueryPlan(ISession session, IStatement statement, ILoadBalancingPolicy lbp) + private static IEnumerable GetQueryPlan(ISession session, Metadata metadata, IStatement statement, ILoadBalancingPolicy lbp) { // Single host iteration var host = (statement as Statement)?.Host; return host == null - ? lbp.NewQueryPlan(session.Keyspace, statement) + ? lbp.NewQueryPlan(metadata, session.Keyspace, statement) : Enumerable.Repeat(host, 1); } @@ -182,19 +205,22 @@ public bool SetCompleted(RowSet result, Action action) { return SetCompleted(null, result, action); } + + /// + public bool SetCompletedWithTask(RowSet result, Func task) + { + return SetCompletedWithTask(null, result, task); + } - /// - /// Marks this instance as completed. - /// If ex is not null, sets the exception. - /// If action is not null, it invokes it using the default task scheduler. - /// - private bool SetCompleted(Exception ex, RowSet result, Action action) + private bool SetCompletedState() + { + var finishedNow = Interlocked.CompareExchange(ref _state, RequestHandler.StateCompleted, RequestHandler.StateInit) + == RequestHandler.StateInit; + return finishedNow; + } + + private void CancelRunningExecutions() { - var finishedNow = Interlocked.CompareExchange(ref _state, RequestHandler.StateCompleted, RequestHandler.StateInit) == RequestHandler.StateInit; - if (!finishedNow) - { - return false; - } //Cancel the current timer //When the next execution timer is being scheduled at the *same time* //the timer is not going to be cancelled, in that case, this instance is going to stay alive a little longer @@ -203,11 +229,21 @@ private bool SetCompleted(Exception ex, RowSet result, Action action) { execution.Cancel(); } + } + + private bool SetResultException(Exception ex) + { if (ex != null) { _requestResultHandler.TrySetException(ex); return true; } + + return false; + } + + private void InvokeCallbackAndSetResult(RowSet result, Action action) + { if (action != null) { //Create a new Task using the default scheduler, invoke the action and set the result @@ -223,9 +259,82 @@ private bool SetCompleted(Exception ex, RowSet result, Action action) _requestResultHandler.TrySetException(actionEx); } }); - return true; + return; } + _requestResultHandler.TrySetResult(result); + return; + } + + private void AwaitTaskAndSetResult(RowSet result, Func task) + { + if (task != null) + { + //Create a new Task using the default scheduler, invoke the action and set the result + Task.Run(async () => + { + try + { + await task().ConfigureAwait(false); + _requestResultHandler.TrySetResult(result); + } + catch (Exception actionEx) + { + _requestResultHandler.TrySetException(actionEx); + } + }); + return; + } + + _requestResultHandler.TrySetResult(result); + return; + } + + /// + /// Marks this instance as completed. + /// If ex is not null, sets the exception. + /// If action is not null, it invokes it using the default task scheduler. + /// + private bool SetCompleted(Exception ex, RowSet result, Action action) + { + var finishedNow = SetCompletedState(); + if (!finishedNow) + { + return false; + } + + CancelRunningExecutions(); + + if (SetResultException(ex)) + { + return true; + } + + InvokeCallbackAndSetResult(result, action); + return true; + } + + /// + /// Marks this instance as completed. + /// If ex is not null, sets the exception. + /// If action is not null, it invokes it using the default task scheduler. + /// + private bool SetCompletedWithTask(Exception ex, RowSet result, Func task) + { + var finishedNow = SetCompletedState(); + if (!finishedNow) + { + return false; + } + + CancelRunningExecutions(); + + if (SetResultException(ex)) + { + return true; + } + + AwaitTaskAndSetResult(result, task); return true; } diff --git a/src/Cassandra/Requests/RequestHandlerFactory.cs b/src/Cassandra/Requests/RequestHandlerFactory.cs index 6763c0fd4..5a85d52a0 100644 --- a/src/Cassandra/Requests/RequestHandlerFactory.cs +++ b/src/Cassandra/Requests/RequestHandlerFactory.cs @@ -22,20 +22,26 @@ namespace Cassandra.Requests { internal class RequestHandlerFactory : IRequestHandlerFactory { - public IRequestHandler Create(IInternalSession session, ISerializer serializer, IRequest request, IStatement statement, IRequestOptions options) + public IRequestHandler Create( + IInternalSession session, + Metadata metadata, + ISerializer serializer, + IRequest request, + IStatement statement, + IRequestOptions options) { - return new RequestHandler(session, serializer, request, statement, options); + return new RequestHandler(session, metadata, serializer, request, statement, options); } public IRequestHandler Create( - IInternalSession session, ISerializer serializer, IStatement statement, IRequestOptions options) + IInternalSession session, Metadata metadata, ISerializer serializer, IStatement statement, IRequestOptions options) { - return new RequestHandler(session, serializer, statement, options); + return new RequestHandler(session, metadata, serializer, statement, options); } - public IRequestHandler Create(IInternalSession session, ISerializer serializer) + public IRequestHandler Create(IInternalSession session, Metadata metadata, ISerializer serializer) { - return new RequestHandler(session, serializer); + return new RequestHandler(session, metadata, serializer); } } } \ No newline at end of file diff --git a/src/Cassandra/SchemaParser.cs b/src/Cassandra/SchemaParser.cs index f6e45cb8f..d8d59fa4c 100644 --- a/src/Cassandra/SchemaParser.cs +++ b/src/Cassandra/SchemaParser.cs @@ -494,7 +494,7 @@ public override Task GetAggregateAsync(string keyspaceName, s ReturnType = DataTypeParser.ParseFqTypeName(row.GetValue("return_type")), ArgumentTypes = (row.GetValue("argument_types") ?? emptyArray).Select(s => DataTypeParser.ParseFqTypeName(s)).ToArray(), }; - var initConditionRaw = Deserialize(Cc, row.GetValue("initcond"), aggregate.StateType.TypeCode, aggregate.StateType.TypeInfo); + var initConditionRaw = Deserialize(Parent.SerializerManager, row.GetValue("initcond"), aggregate.StateType.TypeCode, aggregate.StateType.TypeInfo); if (initConditionRaw != null) { aggregate.InitialCondition = initConditionRaw.ToString(); @@ -503,13 +503,13 @@ public override Task GetAggregateAsync(string keyspaceName, s }); } - private static object Deserialize(IMetadataQueryProvider cc, byte[] buffer, ColumnTypeCode typeCode, IColumnInfo typeInfo) + private static object Deserialize(ISerializerManager serializerManager, byte[] buffer, ColumnTypeCode typeCode, IColumnInfo typeInfo) { if (buffer == null) { return null; } - return cc.Serializer.GetCurrentSerializer().Deserialize(buffer, 0, buffer.Length, typeCode, typeInfo); + return serializerManager.GetCurrentSerializer().Deserialize(buffer, 0, buffer.Length, typeCode, typeInfo); } } diff --git a/src/Cassandra/Session.cs b/src/Cassandra/Session.cs index 423616068..dfa2231d1 100644 --- a/src/Cassandra/Session.cs +++ b/src/Cassandra/Session.cs @@ -39,19 +39,22 @@ namespace Cassandra /// public class Session : IInternalSession { - private readonly ISerializerManager _serializerManager; + private const int Disposed = 10; + private const int Initialized = 5; + private const int Initializing = 1; + private static readonly Logger Logger = new Logger(typeof(Session)); private readonly IThreadSafeDictionary _connectionPool; private readonly IInternalCluster _cluster; - private int _disposed; private volatile string _keyspace; private readonly IMetricsManager _metricsManager; private readonly IObserverFactory _observerFactory; private readonly IInsightsClient _insightsClient; - internal IInternalSession InternalRef => this; + private readonly Task _initTask; + private long _state = Session.Initializing; - public int BinaryProtocolVersion => (int)_serializerManager.GetCurrentSerializer().ProtocolVersion; + internal IInternalSession InternalRef => this; /// public ICluster Cluster => _cluster; @@ -70,7 +73,7 @@ public class Session : IInternalSession /// /// Determines if the session is already disposed /// - public bool IsDisposed => Volatile.Read(ref _disposed) > 0; + public bool IsDisposed => Interlocked.Read(ref _state) == Session.Disposed; /// /// Gets or sets the keyspace @@ -104,20 +107,18 @@ internal Session( IInternalCluster cluster, Configuration configuration, string keyspace, - ISerializerManager serializerManager, string sessionName) { - _serializerManager = serializerManager; _cluster = cluster; Configuration = configuration; Keyspace = keyspace; SessionName = sessionName; - UserDefinedTypes = new UdtMappingDefinitions(this, serializerManager); _connectionPool = new CopyOnWriteDictionary(); - _cluster.HostRemoved += OnHostRemoved; _metricsManager = new MetricsManager(configuration.MetricsProvider, Configuration.MetricsOptions, Configuration.MetricsEnabled, SessionName); _observerFactory = configuration.ObserverFactoryBuilder.Build(_metricsManager); _insightsClient = configuration.InsightsClientFactory.Create(cluster, this); + UserDefinedTypes = new UdtMappingDefinitions(this); + _initTask = Task.Run(InitInternalAsync); } /// @@ -151,7 +152,7 @@ public void ChangeKeyspace(string keyspace) /// public void CreateKeyspace(string keyspace, Dictionary replication = null, bool durableWrites = true) { - WaitForSchemaAgreement(Execute(CqlQueryTools.GetCreateKeyspaceCql(keyspace, replication, durableWrites, false))); + Execute(CqlQueryTools.GetCreateKeyspaceCql(keyspace, replication, durableWrites, false)); Session.Logger.Info("Keyspace [" + keyspace + "] has been successfully CREATED."); } @@ -192,24 +193,31 @@ public void Dispose() { ShutdownAsync().GetAwaiter().GetResult(); } - + /// public async Task ShutdownAsync() { //Only dispose once - if (Interlocked.Increment(ref _disposed) != 1) + var previousState = Interlocked.Exchange(ref _state, Session.Disposed); + if (previousState == Session.Disposed) { return; } + await ShutdownInternalAsync().ConfigureAwait(false); + } + + private async Task ShutdownInternalAsync() + { if (_insightsClient != null) { await _insightsClient.ShutdownAsync().ConfigureAwait(false); } _metricsManager?.Dispose(); - - _cluster.HostRemoved -= OnHostRemoved; + + var metadata = await InternalRef.InternalCluster.GetMetadataAsync().ConfigureAwait(false); + metadata.HostRemoved -= OnHostRemoved; var pools = _connectionPool.ToArray(); foreach (var pool in pools) @@ -218,34 +226,57 @@ public async Task ShutdownAsync() } } - /// - async Task IInternalSession.Init() + Task IInternalSession.TryInitAndGetMetadataAsync() { - _metricsManager.InitializeMetrics(this); + var currentState = Interlocked.Read(ref _state); + if (currentState == Session.Disposed) + { + throw new ObjectDisposedException("This session object has been disposed."); + } + + return _initTask; + } - if (Configuration.GetOrCreatePoolingOptions(_serializerManager.CurrentProtocolVersion).GetWarmup()) + private async Task InitInternalAsync() + { + var metadata = await InternalRef.InternalCluster.TryInitAndGetMetadataAsync().ConfigureAwait(false); + metadata.HostRemoved += OnHostRemoved; + + _metricsManager.InitializeMetrics(this); + + var serializerManager = _cluster.SerializerManager; + if (Configuration.GetOrCreatePoolingOptions(serializerManager.CurrentProtocolVersion).GetWarmup()) { - await Warmup().ConfigureAwait(false); + await WarmupAsync().ConfigureAwait(false); } if (Keyspace != null) { // Borrow a connection, trying to fail fast - var handler = Configuration.RequestHandlerFactory.Create(this, _serializerManager.GetCurrentSerializer()); + var handler = Configuration.RequestHandlerFactory.Create(this, metadata, serializerManager.GetCurrentSerializer()); await handler.GetNextConnectionAsync(new Dictionary()).ConfigureAwait(false); } - - _insightsClient.Init(); + + await _insightsClient.InitializeAsync().ConfigureAwait(false); + + var previousState = Interlocked.CompareExchange(ref _state, Session.Initialized, Session.Initializing); + if (previousState == Session.Disposed) + { + await ShutdownInternalAsync().ConfigureAwait(false); + } + + return metadata; } - + /// /// Creates the required connections on all hosts in the local DC. /// Returns a Task that is marked as completed after all pools were warmed up. /// In case, all the host pool warmup fail, it logs an error. /// - private async Task Warmup() + private async Task WarmupAsync() { - var hosts = _cluster.AllHosts().Where(h => _cluster.RetrieveAndSetDistance(h) == HostDistance.Local).ToArray(); + var metadata = await _cluster.GetMetadataAsync().ConfigureAwait(false); + var hosts = metadata.AllHosts().Where(h => _cluster.RetrieveAndSetDistance(h) == HostDistance.Local).ToArray(); var tasks = new Task[hosts.Length]; for (var i = 0; i < hosts.Length; i++) { @@ -337,10 +368,16 @@ public Task ExecuteAsync(IStatement statement, string executionProfileNa return ExecuteAsync(statement, InternalRef.GetRequestOptions(executionProfileName)); } - private Task ExecuteAsync(IStatement statement, IRequestOptions requestOptions) + private async Task ExecuteAsync(IStatement statement, IRequestOptions requestOptions) + { + var metadata = await InternalRef.TryInitAndGetMetadataAsync().ConfigureAwait(false); + return await ExecuteAsync(metadata, statement, requestOptions).ConfigureAwait(false); + } + + private Task ExecuteAsync(Metadata metadata, IStatement statement, IRequestOptions requestOptions) { return Configuration.RequestHandlerFactory - .Create(this, _serializerManager.GetCurrentSerializer(), statement, requestOptions) + .Create(this, metadata, metadata.SerializerManager.GetCurrentSerializer(), statement, requestOptions) .SendAsync(); } @@ -350,7 +387,7 @@ IHostConnectionPool IInternalSession.GetOrCreateConnectionPool(Host host, HostDi var hostPool = _connectionPool.GetOrAdd(host.Address, address => { var newPool = Configuration.HostConnectionPoolFactory.Create( - host, Configuration, _serializerManager, _observerFactory); + host, Configuration, _cluster.SerializerManager, _observerFactory); newPool.AllConnectionClosed += InternalRef.OnAllConnectionClosed; newPool.SetDistance(distance); _metricsManager.GetOrCreateNodeMetrics(host).InitializePoolGauges(newPool); @@ -459,26 +496,7 @@ public Task PrepareAsync(string cqlQuery, string keyspace) public async Task PrepareAsync( string cqlQuery, string keyspace, IDictionary customPayload) { - var serializer = _serializerManager.GetCurrentSerializer(); - var currentVersion = serializer.ProtocolVersion; - if (!currentVersion.SupportsKeyspaceInRequest() && keyspace != null) - { - // Validate protocol version here and not at PrepareRequest level, as PrepareRequest can be issued - // in the background (prepare and retry, prepare on up, ...) - throw new NotSupportedException($"Protocol version {currentVersion} does not support" + - " setting the keyspace as part of the PREPARE request"); - } - var request = new PrepareRequest(serializer, cqlQuery, keyspace, customPayload); - return await _cluster.Prepare(this, _serializerManager, request).ConfigureAwait(false); - } - - public void WaitForSchemaAgreement(RowSet rs) - { - } - - public bool WaitForSchemaAgreement(IPEndPoint hostAddress) - { - return false; + return await _cluster.PrepareAsync(this, cqlQuery, keyspace, customPayload).ConfigureAwait(false); } private IStatement GetDefaultStatement(string cqlQuery) @@ -506,7 +524,7 @@ private void OnHostRemoved(Host host) pool.Dispose(); } } - + /// public GraphResultSet ExecuteGraph(IGraphStatement statement) { @@ -528,15 +546,16 @@ public GraphResultSet ExecuteGraph(IGraphStatement statement, string executionPr /// public async Task ExecuteGraphAsync(IGraphStatement graphStatement, string executionProfileName) { + var metadata = await InternalRef.TryInitAndGetMetadataAsync().ConfigureAwait(false); var requestOptions = InternalRef.GetRequestOptions(executionProfileName); var stmt = graphStatement.ToIStatement(requestOptions.GraphOptions); - await GetAnalyticsPrimary(stmt, graphStatement, requestOptions).ConfigureAwait(false); + await GetAnalyticsPrimary(metadata, stmt, graphStatement, requestOptions).ConfigureAwait(false); var rs = await ExecuteAsync(stmt, requestOptions).ConfigureAwait(false); return GraphResultSet.CreateNew(rs, graphStatement, requestOptions.GraphOptions); } private async Task GetAnalyticsPrimary( - IStatement statement, IGraphStatement graphStatement, IRequestOptions requestOptions) + Metadata metadata, IStatement statement, IGraphStatement graphStatement, IRequestOptions requestOptions) { if (!(statement is TargettedSimpleStatement) || !requestOptions.GraphOptions.IsAnalyticsQuery(graphStatement)) { @@ -557,10 +576,10 @@ private async Task GetAnalyticsPrimary( return statement; } - return AdaptRpcPrimaryResult(rs, targetedSimpleStatement); + return AdaptRpcPrimaryResult(metadata, rs, targetedSimpleStatement); } - private IStatement AdaptRpcPrimaryResult(RowSet rowSet, TargettedSimpleStatement statement) + private IStatement AdaptRpcPrimaryResult(Metadata metadata, RowSet rowSet, TargettedSimpleStatement statement) { var row = rowSet.FirstOrDefault(); if (row == null) @@ -578,7 +597,7 @@ private IStatement AdaptRpcPrimaryResult(RowSet rowSet, TargettedSimpleStatement var hostName = location.Substring(0, location.LastIndexOf(':')); var address = Configuration.AddressTranslator.Translate( new IPEndPoint(IPAddress.Parse(hostName), Configuration.ProtocolOptions.Port)); - var host = Cluster.GetHost(address); + var host = metadata.GetHost(address); statement.PreferredHost = host; return statement; } diff --git a/src/Cassandra/SessionManagement/IInternalCluster.cs b/src/Cassandra/SessionManagement/IInternalCluster.cs index d90f02dd5..11a4175b6 100644 --- a/src/Cassandra/SessionManagement/IInternalCluster.cs +++ b/src/Cassandra/SessionManagement/IInternalCluster.cs @@ -27,6 +27,8 @@ namespace Cassandra.SessionManagement /// internal interface IInternalCluster : ICluster { + ISerializerManager SerializerManager { get; } + bool AnyOpenConnections(Host host); /// @@ -51,7 +53,7 @@ internal interface IInternalCluster : ICluster /// parallel. /// In case the statement was already in the prepared statements cache, logs an warning but prepares it anyway. /// - Task Prepare(IInternalSession session, ISerializerManager serializerManager, PrepareRequest request); + Task PrepareAsync(IInternalSession session, string cqlQuery, string keyspace, IDictionary customPayload); IReadOnlyDictionary> GetResolvedEndpoints(); @@ -59,5 +61,10 @@ internal interface IInternalCluster : ICluster /// Helper method to retrieve the aggregate distance from all configured LoadBalancingPolicies and set it at Host level. /// HostDistance RetrieveAndSetDistance(Host host); + + /// + /// Initializes once (Thread-safe) the control connection and returns the metadata associated with the Cluster instance + /// + Task TryInitAndGetMetadataAsync(); } } \ No newline at end of file diff --git a/src/Cassandra/SessionManagement/IInternalSession.cs b/src/Cassandra/SessionManagement/IInternalSession.cs index c8b9e236f..5629a7770 100644 --- a/src/Cassandra/SessionManagement/IInternalSession.cs +++ b/src/Cassandra/SessionManagement/IInternalSession.cs @@ -36,10 +36,7 @@ internal interface IInternalSession : ISession /// Guid InternalSessionId { get; } - /// - /// Initialize the session - /// - Task Init(); + Task TryInitAndGetMetadataAsync(); /// /// Gets or creates the connection pool for a given host diff --git a/src/Cassandra/SessionManagement/ISessionFactory.cs b/src/Cassandra/SessionManagement/ISessionFactory.cs index 8bcab0372..ef918fd51 100644 --- a/src/Cassandra/SessionManagement/ISessionFactory.cs +++ b/src/Cassandra/SessionManagement/ISessionFactory.cs @@ -14,14 +14,11 @@ // limitations under the License. // -using System.Threading.Tasks; -using Cassandra.Serialization; - namespace Cassandra.SessionManagement { internal interface ISessionFactory { - Task CreateSessionAsync( - IInternalCluster cluster, string keyspace, ISerializerManager serializer, string sessionName); + IInternalSession CreateSession( + IInternalCluster cluster, string keyspace, string sessionName); } } \ No newline at end of file diff --git a/src/Cassandra/SessionManagement/SessionFactory.cs b/src/Cassandra/SessionManagement/SessionFactory.cs index f27526762..4f7878fbe 100644 --- a/src/Cassandra/SessionManagement/SessionFactory.cs +++ b/src/Cassandra/SessionManagement/SessionFactory.cs @@ -14,18 +14,14 @@ // limitations under the License. // -using System.Threading.Tasks; -using Cassandra.Serialization; - namespace Cassandra.SessionManagement { internal class SessionFactory : ISessionFactory { - public Task CreateSessionAsync( - IInternalCluster cluster, string keyspace, ISerializerManager serializer, string sessionName) + public IInternalSession CreateSession( + IInternalCluster cluster, string keyspace, string sessionName) { - return Task.FromResult( - new Session(cluster, cluster.Configuration, keyspace, serializer, sessionName).InternalRef); + return new Session(cluster, cluster.Configuration, keyspace, sessionName).InternalRef; } } } \ No newline at end of file diff --git a/src/Cassandra/SessionState.cs b/src/Cassandra/SessionState.cs index d3cb4faa3..858261623 100644 --- a/src/Cassandra/SessionState.cs +++ b/src/Cassandra/SessionState.cs @@ -62,13 +62,13 @@ public override string ToString() return builder.ToString(); } - internal static SessionState From(IInternalSession session) + internal static SessionState From(IInternalSession session, Metadata metadata) { var pools = session.GetPools(); var result = new Dictionary(); foreach (var kv in pools) { - var host = session.Cluster.GetHost(kv.Key); + var host = metadata.GetHost(kv.Key); if (host == null) { continue; diff --git a/src/Cassandra/UdtMappingDefinitions.cs b/src/Cassandra/UdtMappingDefinitions.cs index 96f04c9df..2a1c25d6d 100644 --- a/src/Cassandra/UdtMappingDefinitions.cs +++ b/src/Cassandra/UdtMappingDefinitions.cs @@ -18,7 +18,7 @@ using System.Collections.Concurrent; using System.Linq; using System.Threading.Tasks; -using Cassandra.Serialization; + using Cassandra.SessionManagement; using Cassandra.Tasks; @@ -32,14 +32,12 @@ public class UdtMappingDefinitions private readonly ConcurrentDictionary _udtByNetType; private readonly IInternalCluster _cluster; private readonly IInternalSession _session; - private readonly ISerializerManager _serializer; - internal UdtMappingDefinitions(IInternalSession session, ISerializerManager serializer) + internal UdtMappingDefinitions(IInternalSession session) { _udtByNetType = new ConcurrentDictionary(); _cluster = session.InternalCluster; _session = session; - _serializer = serializer; } /// @@ -61,6 +59,7 @@ public async Task DefineAsync(params UdtMap[] udtMaps) { throw new ArgumentNullException("udtMaps"); } + var metadata = await _cluster.GetMetadataAsync().ConfigureAwait(false); var sessionKeyspace = _session.Keyspace; if (string.IsNullOrEmpty(sessionKeyspace) && udtMaps.Any(map => map.Keyspace == null)) { @@ -68,17 +67,17 @@ public async Task DefineAsync(params UdtMap[] udtMaps) "You can specify it while creating the UdtMap, while creating the Session and" + " while creating the Cluster (default keyspace config setting)."); } - if (_session.BinaryProtocolVersion < 3) + if (!metadata.ProtocolVersion.SupportsUserDefinedTypes()) { throw new NotSupportedException("User defined type mapping is supported with C* 2.1+ and protocol version 3+"); } // Add types to both indexes foreach (var map in udtMaps) { - var udtDefition = await GetDefinitionAsync(map.Keyspace ?? sessionKeyspace, map).ConfigureAwait(false); - map.SetSerializer(_serializer.GetCurrentSerializer()); + var udtDefition = await GetDefinitionAsync(map.Keyspace ?? sessionKeyspace, map, metadata).ConfigureAwait(false); + map.SetSerializer(metadata.SerializerManager.GetCurrentSerializer()); map.Build(udtDefition); - _serializer.SetUdtMap(udtDefition.Name, map); + metadata.SerializerManager.SetUdtMap(udtDefition.Name, map); _udtByNetType.AddOrUpdate(map.NetType, map, (k, oldValue) => map); } } @@ -87,7 +86,7 @@ public async Task DefineAsync(params UdtMap[] udtMaps) /// Gets the definition and validates the fields /// /// - private async Task GetDefinitionAsync(string keyspace, UdtMap map) + private async Task GetDefinitionAsync(string keyspace, UdtMap map, Metadata metadata) { var caseSensitiveUdtName = map.UdtName; if (map.IgnoreCase) @@ -95,7 +94,8 @@ private async Task GetDefinitionAsync(string keyspace, UdtMap map //identifiers are lower cased in Cassandra caseSensitiveUdtName = caseSensitiveUdtName.ToLowerInvariant(); } - var udtDefinition = await _cluster.Metadata.GetUdtDefinitionAsync(keyspace, caseSensitiveUdtName).ConfigureAwait(false); + + var udtDefinition = await metadata.GetUdtDefinitionAsync(keyspace, caseSensitiveUdtName).ConfigureAwait(false); if (udtDefinition == null) { throw new InvalidTypeException($"{caseSensitiveUdtName} UDT not found on keyspace {keyspace}"); @@ -113,4 +113,4 @@ internal UdtMap GetUdtMap(string keyspace, Type netType) return _udtByNetType.TryGetValue(netType, out UdtMap map) ? map : null; } } -} +} \ No newline at end of file From cc0ebde7b5f7242da5d0e0340f80cb268e0b25c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Wed, 24 Jun 2020 12:24:03 +0100 Subject: [PATCH 02/31] change LBP and SEP Initialize to be async --- .../Core/ConnectionSimulacronTests.cs | 2 +- .../Connections/Control/ControlConnectionTests.cs | 4 ++-- src/Cassandra.Tests/TestHelper.cs | 2 +- src/Cassandra/Cluster.cs | 4 ++-- .../Policies/ConstantSpeculativeExecutionPolicy.cs | 6 ++++-- src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs | 6 +++++- src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs | 5 +++-- src/Cassandra/Policies/ILoadBalancingPolicy.cs | 8 +++++++- src/Cassandra/Policies/ISpeculativeExecutionPolicy.cs | 3 ++- src/Cassandra/Policies/NoSpeculativeExecutionPolicy.cs | 6 ++++-- src/Cassandra/Policies/RetryLoadBalancingPolicy.cs | 5 +++-- src/Cassandra/Policies/RoundRobinPolicy.cs | 5 ++++- src/Cassandra/Policies/TokenAwarePolicy.cs | 5 +++-- 13 files changed, 41 insertions(+), 20 deletions(-) diff --git a/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs b/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs index a6ed492eb..a66a67313 100644 --- a/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs +++ b/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs @@ -382,7 +382,7 @@ public TestDisallowListLbp(ILoadBalancingPolicy parent, params IPEndPoint[] disa public void Initialize(ICluster cluster) { - _parent.Initialize(cluster); + _parent.InitializeAsync(cluster); } public HostDistance Distance(Host host) diff --git a/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs b/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs index 4bdbdc847..db3b8f8a6 100644 --- a/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs +++ b/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs @@ -213,7 +213,7 @@ public void Should_NotAttemptDownOrIgnoredHosts() .Setup(c => c.RetrieveAndSetDistance(It.IsAny())) .Returns(h => config.Policies.LoadBalancingPolicy.Distance(h)); Mock.Get(cluster).Setup(c => c.AllHosts()).Returns(() => metadata.AllHosts()); - config.Policies.LoadBalancingPolicy.Initialize(cluster); + config.Policies.LoadBalancingPolicy.InitializeAsync(cluster); connectionOpenEnabled = false; @@ -271,7 +271,7 @@ public async Task Should_NotLeakConnections_When_DisposeAndReconnectHappenSimult Mock.Get(cluster).Setup(c => c.AllHosts()).Returns(() => metadata.AllHosts()); Mock.Get(cluster).Setup(c => c.GetControlConnection()).Returns(cc); config.LocalDatacenterProvider.Initialize(cluster); - config.Policies.LoadBalancingPolicy.Initialize(cluster); + config.Policies.LoadBalancingPolicy.InitializeAsync(cluster); createResult.ConnectionFactory.CreatedConnections.Clear(); diff --git a/src/Cassandra.Tests/TestHelper.cs b/src/Cassandra.Tests/TestHelper.cs index 08db9850e..1425ef61a 100644 --- a/src/Cassandra.Tests/TestHelper.cs +++ b/src/Cassandra.Tests/TestHelper.cs @@ -731,7 +731,7 @@ public OrderedLoadBalancingPolicy() public void Initialize(ICluster cluster) { _hosts = cluster.AllHosts(); - _childPolicy.Initialize(cluster); + _childPolicy.InitializeAsync(cluster); } public HostDistance Distance(Host host) diff --git a/src/Cassandra/Cluster.cs b/src/Cassandra/Cluster.cs index 32f6be9d0..4377a4b9c 100644 --- a/src/Cassandra/Cluster.cs +++ b/src/Cassandra/Cluster.cs @@ -275,12 +275,12 @@ private async Task InitAsync() // Initialize policies foreach (var lbp in loadBalancingPolicies) { - lbp.Initialize(_metadata); + await lbp.InitializeAsync(_metadata).ConfigureAwait(false); } foreach (var sep in speculativeExecutionPolicies) { - sep.Initialize(_metadata); + await sep.InitializeAsync(_metadata).ConfigureAwait(false); } InitializeHostDistances(); diff --git a/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs b/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs index 7c654dd49..818ea220d 100644 --- a/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs +++ b/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs @@ -15,6 +15,8 @@ // using System; +using System.Threading.Tasks; +using Cassandra.Tasks; // ReSharper disable once CheckNamespace namespace Cassandra @@ -54,9 +56,9 @@ public void Dispose() } - public void Initialize(Metadata metadata) + public Task InitializeAsync(Metadata metadata) { - + return TaskHelper.Completed; } public ISpeculativeExecutionPlan NewPlan(string keyspace, IStatement statement) diff --git a/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs b/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs index fe09e9510..7a1818b3e 100644 --- a/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs +++ b/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs @@ -18,6 +18,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading; +using System.Threading.Tasks; +using Cassandra.Tasks; namespace Cassandra { @@ -76,7 +78,7 @@ public DCAwareRoundRobinPolicy(string localDc) : this(inferLocalDc: false) /// public string LocalDc { get; private set; } - public void Initialize(Metadata metadata) + public Task InitializeAsync(Metadata metadata) { //When the pool changes, it should clear the local cache metadata.HostAdded += _ => ClearHosts(); @@ -84,6 +86,8 @@ public void Initialize(Metadata metadata) LocalDc = metadata.Configuration.LocalDatacenterProvider.DiscoverLocalDatacenter( _inferLocalDc, LocalDc); + + return TaskHelper.Completed; } /// diff --git a/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs b/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs index eaab841b4..e8e01155b 100644 --- a/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs +++ b/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs @@ -16,6 +16,7 @@ using System; using System.Collections.Generic; +using System.Threading.Tasks; namespace Cassandra { @@ -84,9 +85,9 @@ public HostDistance Distance(Host host) /// /// Initializes the policy. /// - public void Initialize(Metadata metadata) + public Task InitializeAsync(Metadata metadata) { - ChildPolicy.Initialize(metadata); + return ChildPolicy.InitializeAsync(metadata); } /// diff --git a/src/Cassandra/Policies/ILoadBalancingPolicy.cs b/src/Cassandra/Policies/ILoadBalancingPolicy.cs index 5638ab6f4..00210c81c 100644 --- a/src/Cassandra/Policies/ILoadBalancingPolicy.cs +++ b/src/Cassandra/Policies/ILoadBalancingPolicy.cs @@ -15,6 +15,7 @@ // using System.Collections.Generic; +using System.Threading.Tasks; namespace Cassandra { @@ -25,7 +26,12 @@ namespace Cassandra public interface ILoadBalancingPolicy { /// + /// /// Initialize this load balancing policy. + /// + /// + /// If the implementation is not async, we recommend returning Task.CompletedTask or Task.FromResult(0); + /// /// /// Note that the driver guarantees /// that it will call this method exactly once per policy object and will do so @@ -33,7 +39,7 @@ public interface ILoadBalancingPolicy /// /// /// The information about the session instance for which the policy is created. - void Initialize(Metadata metadata); + Task InitializeAsync(Metadata metadata); /// /// Returns the distance assigned by this policy to the provided host.

The diff --git a/src/Cassandra/Policies/ISpeculativeExecutionPolicy.cs b/src/Cassandra/Policies/ISpeculativeExecutionPolicy.cs index adcc7d0ef..96f2341af 100644 --- a/src/Cassandra/Policies/ISpeculativeExecutionPolicy.cs +++ b/src/Cassandra/Policies/ISpeculativeExecutionPolicy.cs @@ -15,6 +15,7 @@ // using System; +using System.Threading.Tasks; // ReSharper disable once CheckNamespace namespace Cassandra @@ -28,7 +29,7 @@ public interface ISpeculativeExecutionPolicy : IDisposable ///

/// Initializes the policy at cluster startup. /// - void Initialize(Metadata metadata); + Task InitializeAsync(Metadata metadata); /// /// Returns the plan to use for a new query. diff --git a/src/Cassandra/Policies/NoSpeculativeExecutionPolicy.cs b/src/Cassandra/Policies/NoSpeculativeExecutionPolicy.cs index 2c956e6c3..a6f5dbaef 100644 --- a/src/Cassandra/Policies/NoSpeculativeExecutionPolicy.cs +++ b/src/Cassandra/Policies/NoSpeculativeExecutionPolicy.cs @@ -14,6 +14,8 @@ // limitations under the License. // +using System.Threading.Tasks; +using Cassandra.Tasks; // ReSharper disable once CheckNamespace namespace Cassandra @@ -36,9 +38,9 @@ public void Dispose() } - public void Initialize(Metadata metadata) + public Task InitializeAsync(Metadata metadata) { - + return TaskHelper.Completed; } public ISpeculativeExecutionPlan NewPlan(string keyspace, IStatement statement) diff --git a/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs b/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs index 2346f623a..a89bdc77c 100644 --- a/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs +++ b/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs @@ -17,6 +17,7 @@ using System; using System.Collections.Generic; using System.Threading; +using System.Threading.Tasks; namespace Cassandra { @@ -34,9 +35,9 @@ public RetryLoadBalancingPolicy(ILoadBalancingPolicy loadBalancingPolicy, IRecon public ILoadBalancingPolicy LoadBalancingPolicy { get; } - public void Initialize(Metadata metadata) + public Task InitializeAsync(Metadata metadata) { - LoadBalancingPolicy.Initialize(metadata); + return LoadBalancingPolicy.InitializeAsync(metadata); } public HostDistance Distance(Host host) diff --git a/src/Cassandra/Policies/RoundRobinPolicy.cs b/src/Cassandra/Policies/RoundRobinPolicy.cs index 16946f990..422814ee9 100644 --- a/src/Cassandra/Policies/RoundRobinPolicy.cs +++ b/src/Cassandra/Policies/RoundRobinPolicy.cs @@ -17,6 +17,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading; +using System.Threading.Tasks; +using Cassandra.Tasks; namespace Cassandra { @@ -36,8 +38,9 @@ public class RoundRobinPolicy : ILoadBalancingPolicy { private int _index; - public void Initialize(Metadata metadata) + public Task InitializeAsync(Metadata metadata) { + return TaskHelper.Completed; } /// diff --git a/src/Cassandra/Policies/TokenAwarePolicy.cs b/src/Cassandra/Policies/TokenAwarePolicy.cs index e4ed87175..b3bc0bb51 100644 --- a/src/Cassandra/Policies/TokenAwarePolicy.cs +++ b/src/Cassandra/Policies/TokenAwarePolicy.cs @@ -18,6 +18,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading; +using System.Threading.Tasks; namespace Cassandra { @@ -51,9 +52,9 @@ public TokenAwarePolicy(ILoadBalancingPolicy childPolicy) public ILoadBalancingPolicy ChildPolicy { get; } - public void Initialize(Metadata metadata) + public Task InitializeAsync(Metadata metadata) { - ChildPolicy.Initialize(metadata); + return ChildPolicy.InitializeAsync(metadata); } /// From 37c35f9292e44c0912dae448025a742ddbc71781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Wed, 24 Jun 2020 13:08:11 +0100 Subject: [PATCH 03/31] fix deadlock in session shutdown --- src/Cassandra/Session.cs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Cassandra/Session.cs b/src/Cassandra/Session.cs index dfa2231d1..14a005b3f 100644 --- a/src/Cassandra/Session.cs +++ b/src/Cassandra/Session.cs @@ -46,7 +46,6 @@ public class Session : IInternalSession private static readonly Logger Logger = new Logger(typeof(Session)); private readonly IThreadSafeDictionary _connectionPool; private readonly IInternalCluster _cluster; - private volatile string _keyspace; private readonly IMetricsManager _metricsManager; private readonly IObserverFactory _observerFactory; private readonly IInsightsClient _insightsClient; @@ -54,6 +53,9 @@ public class Session : IInternalSession private readonly Task _initTask; private long _state = Session.Initializing; + private volatile Metadata _initializedMetadata; + private volatile string _keyspace; + internal IInternalSession InternalRef => this; /// @@ -199,7 +201,7 @@ public async Task ShutdownAsync() { //Only dispose once var previousState = Interlocked.Exchange(ref _state, Session.Disposed); - if (previousState == Session.Disposed) + if (previousState != Session.Initialized) { return; } @@ -215,8 +217,8 @@ private async Task ShutdownInternalAsync() } _metricsManager?.Dispose(); - - var metadata = await InternalRef.InternalCluster.GetMetadataAsync().ConfigureAwait(false); + + var metadata = _initializedMetadata; metadata.HostRemoved -= OnHostRemoved; var pools = _connectionPool.ToArray(); @@ -258,11 +260,13 @@ private async Task InitInternalAsync() } await _insightsClient.InitializeAsync().ConfigureAwait(false); - + + _initializedMetadata = metadata; var previousState = Interlocked.CompareExchange(ref _state, Session.Initialized, Session.Initializing); if (previousState == Session.Disposed) { await ShutdownInternalAsync().ConfigureAwait(false); + throw new ObjectDisposedException("Session instance was disposed before initialization finished."); } return metadata; From 3d9c2568fae08d35127fc184ce298b0ab31b259f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Wed, 24 Jun 2020 13:34:26 +0100 Subject: [PATCH 04/31] add Session.ConnectAsync() --- src/Cassandra/Cluster.cs | 12 ++++--- src/Cassandra/ISession.cs | 28 ++++++++++++++++ src/Cassandra/Session.cs | 33 ++++++++++++++++--- .../SessionManagement/IInternalCluster.cs | 3 ++ 4 files changed, 66 insertions(+), 10 deletions(-) diff --git a/src/Cassandra/Cluster.cs b/src/Cassandra/Cluster.cs index 4377a4b9c..a9182e3f7 100644 --- a/src/Cassandra/Cluster.cs +++ b/src/Cassandra/Cluster.cs @@ -75,6 +75,8 @@ IControlConnection IInternalCluster.GetControlConnection() return _controlConnection; } + Exception IInternalCluster.InitException => _initException; + /// ConcurrentDictionary IInternalCluster.PreparedQueries { get; } = new ConcurrentDictionary(new ByteArrayComparer()); @@ -199,15 +201,15 @@ private Cluster(IEnumerable contactPoints, Configuration configuration) Task IInternalCluster.TryInitAndGetMetadataAsync() { var currentState = Interlocked.Read(ref _state); - if (currentState == Cluster.Disposed) + if (currentState == Cluster.Initialized) { - throw new ObjectDisposedException("This cluster object has been disposed."); + //It was already initialized + return _initTask; } - if (currentState == Cluster.Initialized) + if (currentState == Cluster.Disposed) { - //It was already initialized - return Task.FromResult(_metadata); + throw new ObjectDisposedException("This cluster object has been disposed."); } if (_initException != null) diff --git a/src/Cassandra/ISession.cs b/src/Cassandra/ISession.cs index a815aa2be..b53ade1e1 100644 --- a/src/Cassandra/ISession.cs +++ b/src/Cassandra/ISession.cs @@ -65,6 +65,34 @@ public interface ISession: IDisposable /// string SessionName { get; } + /// + /// + /// Waits until the initialization task is finished (this task is started when the Session is created). + /// + /// It is not necessary to call this method but you can use it if you want the initialization to happen + /// in a specific state of your application (e.g. during startup before your application listens for requests). + /// + /// + /// If your application uses the Task Parallel Library (e.g. async/await) please use instead. + /// + /// + /// If the initialization failed. + /// If the initialization timed out. + /// If further attempts to connect are made after initialization has failed. + void Connect(); + + /// + /// + /// Waits until the initialization task is finished (this task is started when the Session is created). + /// It is not necessary to call this method but you can use it if you want the initialization to happen + /// in a specific state of your application (e.g. during startup before your application listens for requests). + /// + /// + /// If the initialization failed. + /// If the initialization timed out. + /// If further attempts to connect are made after initialization has failed. + Task ConnectAsync(); + /// /// Begins asynchronous execute operation. /// diff --git a/src/Cassandra/Session.cs b/src/Cassandra/Session.cs index 14a005b3f..815b397dd 100644 --- a/src/Cassandra/Session.cs +++ b/src/Cassandra/Session.cs @@ -29,8 +29,6 @@ using Cassandra.Metrics; using Cassandra.Metrics.Internal; using Cassandra.Observers.Abstractions; -using Cassandra.Requests; -using Cassandra.Serialization; using Cassandra.SessionManagement; using Cassandra.Tasks; @@ -100,6 +98,18 @@ string IInternalSession.Keyspace public string SessionName { get; } + /// + public void Connect() + { + TaskHelper.WaitToComplete(ConnectAsync()); + } + + /// + public Task ConnectAsync() + { + return InternalRef.TryInitAndGetMetadataAsync(); + } + public Policies Policies => Configuration.Policies; /// @@ -231,10 +241,23 @@ private async Task ShutdownInternalAsync() Task IInternalSession.TryInitAndGetMetadataAsync() { var currentState = Interlocked.Read(ref _state); + + if (currentState == Session.Initialized) + { + //It was already initialized + return _initTask; + } + if (currentState == Session.Disposed) { throw new ObjectDisposedException("This session object has been disposed."); } + + if (_cluster.InitException != null) + { + //There was an exception that is not possible to recover from + throw _cluster.InitException; + } return _initTask; } @@ -243,9 +266,9 @@ private async Task InitInternalAsync() { var metadata = await InternalRef.InternalCluster.TryInitAndGetMetadataAsync().ConfigureAwait(false); metadata.HostRemoved += OnHostRemoved; - + _metricsManager.InitializeMetrics(this); - + var serializerManager = _cluster.SerializerManager; if (Configuration.GetOrCreatePoolingOptions(serializerManager.CurrentProtocolVersion).GetWarmup()) { @@ -260,7 +283,7 @@ private async Task InitInternalAsync() } await _insightsClient.InitializeAsync().ConfigureAwait(false); - + _initializedMetadata = metadata; var previousState = Interlocked.CompareExchange(ref _state, Session.Initialized, Session.Initializing); if (previousState == Session.Disposed) diff --git a/src/Cassandra/SessionManagement/IInternalCluster.cs b/src/Cassandra/SessionManagement/IInternalCluster.cs index 11a4175b6..4c4820bfa 100644 --- a/src/Cassandra/SessionManagement/IInternalCluster.cs +++ b/src/Cassandra/SessionManagement/IInternalCluster.cs @@ -14,6 +14,7 @@ // limitations under the License. // +using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Threading.Tasks; @@ -47,6 +48,8 @@ internal interface IInternalCluster : ICluster /// ConcurrentDictionary PreparedQueries { get; } + Exception InitException { get; } + /// /// Executes the prepare request on the first host selected by the load balancing policy. /// When is enabled, it prepares on the rest of the hosts in From 57cc9a369fa0d9b6dab737ebcb548a9640eccb3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Wed, 24 Jun 2020 13:34:53 +0100 Subject: [PATCH 05/31] add upgrade guide section --- doc/upgrade-guide/upgrade-to-4x/README.md | 81 ++++++++++++++++++++++- 1 file changed, 80 insertions(+), 1 deletion(-) diff --git a/doc/upgrade-guide/upgrade-to-4x/README.md b/doc/upgrade-guide/upgrade-to-4x/README.md index 22cb79268..2e515f4bf 100644 --- a/doc/upgrade-guide/upgrade-to-4x/README.md +++ b/doc/upgrade-guide/upgrade-to-4x/README.md @@ -23,4 +23,83 @@ The `usedHostsPerRemoteDc` parameter on the `DCAwareRoundRobinPolicy` gave the i A good write up on datacenter failover describing some of these considerations can be found [here][dc-failover-post]. -[dc-failover-post]: https://medium.com/@foundev/cassandra-local-quorum-should-stay-local-c174d555cc57 +## Creation of `ISession` instances returns immediately + +In C# driver 4.0, when you create an `ISession` instance, the initialization task will be started in the background. When a request is executed, the driver will wait for the initialization task to finish before sending the request. + +If you want to explicitely wait for the initialization to be finished, you can use one of these new methods: `ISession.ConnectAsync()` / `ISession.Connect()`. + +## Addition of several async methods (e.g. `ICluster.GetMetadataAsync()`) + +The `ICluster.Metadata` property has always blocked until the initialization task is finished but until now there weren't many issues with this behavior because the user would create a session right away which would initialize the `ICluster` instance in a blocking manner. + +Now that the initialization happens in the background, it's more likely that the user faces a scenario where the `ICluster.Metadata` blocks which is really bad if the application uses TPL (e.g. `async/await`) because it could block a thread of the shared threadpool. + +To fix this, we added an `async` way to retrieve the `Metadata` instance: `ICluster.GetMetadataAsync()`. + +If you would like to keep using the `ICluster.Metadata` property, please make sure that you explicitly initialize the session before accessing it in case your application uses `async/await` to avoid blocking the thread. + +There were some methods that used the `ICluster.Metadata` property so we have added async variants of those methods as well: + +| Existing method | New async method | Namespace | +|------------------------------|-------------------------------|-----------------------| +| `CreateBatch(this ISession)` | `ISession.CreateBatchAsync()` | `Cassandra.Data.Linq` | +| `GetState(this ISession)` | `ISession.GetStateAsync()` | `Cassandra` | + +## `Metadata` API changes + +Several methods of the `ICluster` interface were actually wrappers around methods that are implemented in the `Metadata` class. We decided to move all metadata related elements from `ICluster`/`ISession` to `Metadata` because of two reasons: + +- Simplification of the driver's API, it makes more sense to have metadata related methods, properties and events on the `Metadata` class +- The cluster/session initialization happens in the background, which means that we would have to add a lot of `async` methods to the `ICluster` interface if we kept them (similar to what we did with `GetMetadataAsync()`) + +If you are using one of theses elements that were moved to the `Metadata` class, you can use `ICluster.Metadata` or `ICluster.GetMetadataAsync()` to access it (see previous section for a brief explanation about this). + +These are the methods, properties and events that were affected: + +| Old API | New API | +|------------------------------------|-----------------------------------| +| `ICluster.AllHosts()` | `Metadata.AllHosts()` | +| `ICluster.GetHost()` | `Metadata.GetHost()` | +| `ICluster.GetReplicas()` | `Metadata.GetReplicas()` | +| `ICluster.RefreshSchema()` | `Metadata.RefreshSchema()` | +| `ICluster.RefreshSchemaAsync()` | `Metadata.RefreshSchemaAsync()` | +| `ICluster.HostAdded` | `Metadata.HostAdded` | +| `ICluster.HostRemoved` | `Metadata.HostRemoved` | +| `ISession.BinaryProtocolVersion` | `Metadata.ProtocolVersion` | + +Note: `Metadata.ProtocolVersion` returns an `enum` instead of `int`, you can cast this `enum` to `int` if you need it (`ISession.BinaryProtocolVersion` did this internally). + +## Removal of `ISession.WaitForSchemaAgreement()` + +When a DDL request is executed, the driver will wait for schema agreement before returning control to the user. See `ProtocolOptions.MaxSchemaAgreementWaitSeconds` for more info. + +If you want to manually check for schema agreement you can use the `Metadata.CheckSchemaAgreementAsync()` method. + +## `Metadata` no longer implements `IDisposable` + +The implementation of `IDisposable` was pretty much empty at this point so we decided to remove it. + +We also removed `Metadata.ShutDown()` for the same reason. + +## `ILoadBalancingPolicy` interface changes + +You are only affected by these changes if you implemented a custom load balancing policy in your application instead of using one of those that are provided by the driver. + +### `ILoadBalancingPolicy.Initialize()` + +The `Initialize()` method is now `InitializeAsync()` and returns a `Task`. If the implementation is not async, we recommend returning `Task.CompletedTask` or `Task.FromResult(0)`. + + `InitializeAsync()` now has a `Metadata` parameter instead of `ICluster`. You can obtain the hosts collection and replicas using the `Metadata` class (see the earlier section related to `Metadata` API changes for more information on these changes). + +### `ILoadBalancingPolicy.NewQueryPlan()` + +The `NewQueryPlan()` method now has a `Metadata` parameter in addition to `string` (keyspace) and `IStatement`. + +This is to simplify the process of implementing a custom load balancing policy. Previously, all implementations had to be stateful and threadsafe, i.e., the `cluster` object that was provided in the `Initialize()` was necessary in order to implement the `NewQueryPlan()` method. + +Now you can build a completely stateless load balancing policy (which is guaranteed to be threadsafe) by obtaining the hosts / replicas via the `Metadata` parameter in the `NewQueryPlan()` method. In this scenario you can have an implementation of the `InitializeAsync()` method that just returns `Task.CompletedTask` or `Task.FromResult(0)`. + +You can still build more complex load balancing policies that access some kind of metadata service for example by implementing the `InitializeAsync()` method. + +[dc-failover-post]: https://medium.com/@foundev/cassandra-local-quorum-should-stay-local-c174d555cc57 \ No newline at end of file From 81d9da0e53ac0521f19a01c619907887a0520762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Fri, 26 Jun 2020 12:21:22 +0100 Subject: [PATCH 06/31] moved control connection creation to Metadata --- src/Cassandra/Cluster.cs | 36 ++++-------------- src/Cassandra/Metadata.cs | 38 ++++++++++++++++--- .../Policies/LocalDatacenterProvider.cs | 4 +- src/Cassandra/Requests/RequestExecution.cs | 10 ++--- .../SessionManagement/IInternalCluster.cs | 7 +--- 5 files changed, 50 insertions(+), 45 deletions(-) diff --git a/src/Cassandra/Cluster.cs b/src/Cassandra/Cluster.cs index a9182e3f7..15c8e51ac 100644 --- a/src/Cassandra/Cluster.cs +++ b/src/Cassandra/Cluster.cs @@ -48,15 +48,13 @@ public class Cluster : IInternalCluster private static ProtocolVersion _maxProtocolVersion = ProtocolVersion.MaxSupported; internal static readonly Logger Logger = new Logger(typeof(Cluster)); private readonly CopyOnWriteList _connectedSessions = new CopyOnWriteList(); - private readonly IControlConnection _controlConnection; private readonly SerializerManager _serializerManager; + private readonly bool _implicitContactPoint = false; private volatile Exception _initException; private readonly SemaphoreSlim _sessionCreateLock = new SemaphoreSlim(1, 1); private long _sessionCounter = -1; - private readonly bool _implicitContactPoint = false; private readonly Metadata _metadata; - private readonly IProtocolEventDebouncer _protocolEventDebouncer; private IReadOnlyList _loadBalancingPolicies; private readonly Task _initTask; @@ -68,13 +66,7 @@ public class Cluster : IInternalCluster private bool IsDisposed => Interlocked.Read(ref _state) == Cluster.Disposed; ISerializerManager IInternalCluster.SerializerManager => _serializerManager; - - /// - IControlConnection IInternalCluster.GetControlConnection() - { - return _controlConnection; - } - + Exception IInternalCluster.InitException => _initException; /// @@ -162,11 +154,6 @@ private Cluster(IEnumerable contactPoints, Configuration configuration) { Configuration = configuration; - _protocolEventDebouncer = new ProtocolEventDebouncer( - configuration.TimerFactory, - TimeSpan.FromMilliseconds(configuration.MetadataSyncOptions.RefreshSchemaDelayIncrement), - TimeSpan.FromMilliseconds(configuration.MetadataSyncOptions.MaxTotalRefreshSchemaDelay)); - var protocolVersion = _maxProtocolVersion; if (Configuration.ProtocolOptions.MaxProtocolVersionValue != null && Configuration.ProtocolOptions.MaxProtocolVersionValue.Value.IsSupported(configuration)) @@ -174,6 +161,8 @@ private Cluster(IEnumerable contactPoints, Configuration configuration) protocolVersion = Configuration.ProtocolOptions.MaxProtocolVersionValue.Value; } + _serializerManager = new SerializerManager(protocolVersion, configuration.TypeSerializers); + var contactPointsList = contactPoints.ToList(); if (contactPointsList.Count == 0) { @@ -183,16 +172,8 @@ private Cluster(IEnumerable contactPoints, Configuration configuration) } var parsedContactPoints = configuration.ContactPointParser.ParseContactPoints(contactPointsList); - _serializerManager = new SerializerManager(protocolVersion, configuration.TypeSerializers); - _controlConnection = configuration.ControlConnectionFactory.Create( - this, - _protocolEventDebouncer, - _serializerManager, - Configuration, - _metadata, - parsedContactPoints); - - _metadata = new Metadata(configuration, _serializerManager, _controlConnection); + + _metadata = new Metadata(this, configuration, _serializerManager, parsedContactPoints); _initTask = Task.Run(InitAsync); } @@ -240,7 +221,7 @@ private async Task InitAsync() // Only abort the async operations when at least twice the time for ConnectTimeout per host passed var initialAbortTimeout = Configuration.SocketOptions.ConnectTimeoutMillis * 2 * _metadata.Hosts.Count; initialAbortTimeout = Math.Max(initialAbortTimeout, Configuration.SocketOptions.MetadataAbortTimeout); - var initTask = _controlConnection.InitAsync(); + var initTask = _metadata.InitializeAsync(); try { await initTask.WaitToCompleteAsync(initialAbortTimeout).ConfigureAwait(false); @@ -515,8 +496,7 @@ public async Task ShutdownAsync(int timeoutMs = Timeout.Infinite) private async Task ShutdownInternalAsync() { - _controlConnection.Dispose(); - await _protocolEventDebouncer.ShutdownAsync().ConfigureAwait(false); + await _metadata.ShutdownAsync().ConfigureAwait(false); Configuration.Timer.Dispose(); // Dispose policies diff --git a/src/Cassandra/Metadata.cs b/src/Cassandra/Metadata.cs index 131c20524..4039b7133 100644 --- a/src/Cassandra/Metadata.cs +++ b/src/Cassandra/Metadata.cs @@ -25,8 +25,10 @@ using Cassandra.Connections; using Cassandra.Connections.Control; using Cassandra.MetadataHelpers; +using Cassandra.ProtocolEvents; using Cassandra.Requests; using Cassandra.Serialization; +using Cassandra.SessionManagement; using Cassandra.Tasks; namespace Cassandra @@ -44,6 +46,7 @@ public class Metadata private volatile TokenMap _tokenMap; private volatile ConcurrentDictionary _keyspaces = new ConcurrentDictionary(); private volatile ISchemaParser _schemaParser; + private readonly IProtocolEventDebouncer _protocolEventDebouncer; private readonly int _queryAbortTimeout; private volatile CopyOnWriteDictionary> _resolvedContactPoints = new CopyOnWriteDictionary>(); @@ -56,7 +59,7 @@ public class Metadata /// Returns the name of currently connected cluster. /// /// the Cassandra name of currently connected cluster. - public String ClusterName { get; internal set; } + public string ClusterName { get; internal set; } /// /// Determines whether the cluster is provided as a service (DataStax Astra). @@ -100,27 +103,52 @@ public class Metadata internal IReadOnlyTokenMap TokenToReplicasMap => _tokenMap; - internal Metadata(Configuration configuration, ISerializerManager serializerManager, IControlConnection controlConnection) + internal Metadata(IInternalCluster cluster, Configuration configuration, ISerializerManager serializerManager, IEnumerable parsedContactPoints) { _serializerManager = serializerManager; _queryAbortTimeout = configuration.DefaultRequestOptions.QueryAbortTimeout; Configuration = configuration; Hosts = new Hosts(); + + _protocolEventDebouncer = new ProtocolEventDebouncer( + configuration.TimerFactory, + TimeSpan.FromMilliseconds(configuration.MetadataSyncOptions.RefreshSchemaDelayIncrement), + TimeSpan.FromMilliseconds(configuration.MetadataSyncOptions.MaxTotalRefreshSchemaDelay)); + + ControlConnection = configuration.ControlConnectionFactory.Create( + cluster, + _protocolEventDebouncer, + _serializerManager, + Configuration, + this, + parsedContactPoints); + Hosts.Down += OnHostDown; Hosts.Up += OnHostUp; - ControlConnection = controlConnection; } internal Metadata( + IInternalCluster cluster, Configuration configuration, ISerializerManager serializerManager, - IControlConnection controlConnection, + IEnumerable contactPoints, SchemaParser schemaParser) - : this(configuration, serializerManager, controlConnection) + : this(cluster, configuration, serializerManager, contactPoints) { _schemaParser = schemaParser; } + internal Task InitializeAsync() + { + return ControlConnection.InitAsync(); + } + + internal Task ShutdownAsync() + { + ControlConnection.Dispose(); + return _protocolEventDebouncer.ShutdownAsync(); + } + internal void SetResolvedContactPoints(IDictionary> resolvedContactPoints) { _resolvedContactPoints = new CopyOnWriteDictionary>(resolvedContactPoints); diff --git a/src/Cassandra/Policies/LocalDatacenterProvider.cs b/src/Cassandra/Policies/LocalDatacenterProvider.cs index fcad9f454..b35da2d98 100644 --- a/src/Cassandra/Policies/LocalDatacenterProvider.cs +++ b/src/Cassandra/Policies/LocalDatacenterProvider.cs @@ -26,6 +26,7 @@ internal class LocalDatacenterProvider : ILocalDatacenterProvider private volatile bool _initialized = false; private volatile IInternalCluster _cluster; + private volatile Metadata _metadata; private volatile IEnumerable _availableDcs; private volatile string _availableDcsStr; private volatile string _cachedDatacenter; @@ -33,6 +34,7 @@ internal class LocalDatacenterProvider : ILocalDatacenterProvider public void Initialize(IInternalCluster cluster, Metadata metadata) { _cluster = cluster; + _metadata = metadata; _availableDcs = metadata.AllHosts().Select(h => h.Datacenter).Where(dc => dc != null).Distinct().ToList(); _availableDcsStr = string.Join(", ", _availableDcs); _initialized = true; @@ -87,7 +89,7 @@ private string ValidateAndReturnDatacenter(string datacenter) private string InferLocalDatacenter() { - var cc = _cluster.GetControlConnection(); + var cc = _metadata.ControlConnection; if (cc == null) { throw new DriverInternalError("ControlConnection was not correctly set"); diff --git a/src/Cassandra/Requests/RequestExecution.cs b/src/Cassandra/Requests/RequestExecution.cs index 229ef4bf1..6f2dbce74 100644 --- a/src/Cassandra/Requests/RequestExecution.cs +++ b/src/Cassandra/Requests/RequestExecution.cs @@ -249,11 +249,11 @@ private void HandleSchemaChangeAsync(ResultResponse response, OutputSchemaChange result.Info.SetSchemaInAgreement(schemaAgreed); try { - await _session.InternalCluster.GetControlConnection() - .HandleSchemaChangeEvent(schemaChange.SchemaChangeEventArgs, true) - .WaitToCompleteAsync( - _session.Cluster.Configuration.ProtocolOptions.MaxSchemaAgreementWaitSeconds * 1000) - .ConfigureAwait(false); + await _parent.Metadata.ControlConnection + .HandleSchemaChangeEvent(schemaChange.SchemaChangeEventArgs, true) + .WaitToCompleteAsync( + _session.Cluster.Configuration.ProtocolOptions.MaxSchemaAgreementWaitSeconds * 1000) + .ConfigureAwait(false); } catch (TimeoutException) { diff --git a/src/Cassandra/SessionManagement/IInternalCluster.cs b/src/Cassandra/SessionManagement/IInternalCluster.cs index 4c4820bfa..430d2dc52 100644 --- a/src/Cassandra/SessionManagement/IInternalCluster.cs +++ b/src/Cassandra/SessionManagement/IInternalCluster.cs @@ -31,12 +31,7 @@ internal interface IInternalCluster : ICluster ISerializerManager SerializerManager { get; } bool AnyOpenConnections(Host host); - - /// - /// Gets the control connection used by the cluster - /// - IControlConnection GetControlConnection(); - + /// /// If contact points are not provided in the builder, the driver will use localhost /// as an implicit contact point. From 4baf9dc4579cfa8ba7d333257f218c946e62c63b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Fri, 26 Jun 2020 15:56:44 +0100 Subject: [PATCH 07/31] add ShutdownAsync to speculative exec policy * Remove IDisposable implementation * Move ControlConnection construction to Metadata * Add Metadata InitializeAsync and ShutdownAsync --- src/Cassandra/Cluster.cs | 2 +- src/Cassandra/Metadata.cs | 6 +++++- .../Policies/ConstantSpeculativeExecutionPolicy.cs | 12 ++++++------ .../Policies/ISpeculativeExecutionPolicy.cs | 10 +++++++--- .../Policies/NoSpeculativeExecutionPolicy.cs | 12 ++++++------ 5 files changed, 25 insertions(+), 17 deletions(-) diff --git a/src/Cassandra/Cluster.cs b/src/Cassandra/Cluster.cs index 15c8e51ac..99caa96e8 100644 --- a/src/Cassandra/Cluster.cs +++ b/src/Cassandra/Cluster.cs @@ -508,7 +508,7 @@ private async Task ShutdownInternalAsync() foreach (var sep in speculativeExecutionPolicies) { - sep.Dispose(); + await sep.ShutdownAsync().ConfigureAwait(false); } } diff --git a/src/Cassandra/Metadata.cs b/src/Cassandra/Metadata.cs index 4039b7133..366b132b0 100644 --- a/src/Cassandra/Metadata.cs +++ b/src/Cassandra/Metadata.cs @@ -103,7 +103,11 @@ public class Metadata internal IReadOnlyTokenMap TokenToReplicasMap => _tokenMap; - internal Metadata(IInternalCluster cluster, Configuration configuration, ISerializerManager serializerManager, IEnumerable parsedContactPoints) + internal Metadata( + IInternalCluster cluster, + Configuration configuration, + ISerializerManager serializerManager, + IEnumerable parsedContactPoints) { _serializerManager = serializerManager; _queryAbortTimeout = configuration.DefaultRequestOptions.QueryAbortTimeout; diff --git a/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs b/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs index 818ea220d..03831dea2 100644 --- a/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs +++ b/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs @@ -50,12 +50,7 @@ public ConstantSpeculativeExecutionPolicy(long delay, int maxSpeculativeExecutio public long Delay { get; } public int MaxSpeculativeExecutions { get; } - - public void Dispose() - { - - } - + public Task InitializeAsync(Metadata metadata) { return TaskHelper.Completed; @@ -66,6 +61,11 @@ public ISpeculativeExecutionPlan NewPlan(string keyspace, IStatement statement) return new ConstantSpeculativeExecutionPlan(Delay, MaxSpeculativeExecutions); } + public Task ShutdownAsync() + { + return TaskHelper.Completed; + } + private class ConstantSpeculativeExecutionPlan : ISpeculativeExecutionPlan { private readonly long _delay; diff --git a/src/Cassandra/Policies/ISpeculativeExecutionPolicy.cs b/src/Cassandra/Policies/ISpeculativeExecutionPolicy.cs index 96f2341af..065c47890 100644 --- a/src/Cassandra/Policies/ISpeculativeExecutionPolicy.cs +++ b/src/Cassandra/Policies/ISpeculativeExecutionPolicy.cs @@ -14,7 +14,6 @@ // limitations under the License. // -using System; using System.Threading.Tasks; // ReSharper disable once CheckNamespace @@ -24,7 +23,7 @@ namespace Cassandra /// The policy that decides if the driver will send speculative queries to the next hosts when the current host takes too long to respond. /// only idempotent statements will be speculatively retried, see for more information. /// - public interface ISpeculativeExecutionPolicy : IDisposable + public interface ISpeculativeExecutionPolicy { /// /// Initializes the policy at cluster startup. @@ -38,5 +37,10 @@ public interface ISpeculativeExecutionPolicy : IDisposable /// the query for which to build a plan. /// ISpeculativeExecutionPlan NewPlan(string keyspace, IStatement statement); + + /// + /// Disposes the policy at cluster shutdown. + /// + Task ShutdownAsync(); } -} +} \ No newline at end of file diff --git a/src/Cassandra/Policies/NoSpeculativeExecutionPolicy.cs b/src/Cassandra/Policies/NoSpeculativeExecutionPolicy.cs index a6f5dbaef..3717ee358 100644 --- a/src/Cassandra/Policies/NoSpeculativeExecutionPolicy.cs +++ b/src/Cassandra/Policies/NoSpeculativeExecutionPolicy.cs @@ -32,12 +32,7 @@ private NoSpeculativeExecutionPolicy() { } - - public void Dispose() - { - - } - + public Task InitializeAsync(Metadata metadata) { return TaskHelper.Completed; @@ -48,6 +43,11 @@ public ISpeculativeExecutionPlan NewPlan(string keyspace, IStatement statement) return Plan; } + public Task ShutdownAsync() + { + return TaskHelper.Completed; + } + private class NoSpeculativeExecutionPlan : ISpeculativeExecutionPlan { public long NextExecution(Host lastQueried) From 5dc87e526082d84b73c513f9d1d7d541bb48b3ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Mon, 29 Jun 2020 17:49:55 +0100 Subject: [PATCH 08/31] introduce metadata internal and make metadata lazy (wip) --- src/Cassandra/Cluster.cs | 66 +- src/Cassandra/ClusterDescription.cs | 48 ++ .../Connections/Control/ControlConnection.cs | 53 +- .../Control/ControlConnectionFactory.cs | 2 +- .../Control/IControlConnectionFactory.cs | 2 +- .../Connections/Control/IInternalMetadata.cs | 228 ++++++ .../Control/IProtocolVersionNegotiator.cs | 11 +- .../ISupportedOptionsInitializerFactory.cs | 2 +- .../Connections/Control/ITopologyRefresher.cs | 2 +- .../Control/ITopologyRefresherFactory.cs | 2 +- .../Connections/Control/InternalMetadata.cs | 685 ++++++++++++++++++ .../Control/ProtocolVersionNegotiator.cs | 4 +- .../Control/SupportedOptionsInitializer.cs | 8 +- .../SupportedOptionsInitializerFactory.cs | 4 +- .../Connections/Control/TopologyRefresher.cs | 56 +- .../Control/TopologyRefresherFactory.cs | 4 +- .../Insights/IInsightsSupportVerifier.cs | 3 +- .../Insights/InsightsSupportVerifier.cs | 5 +- src/Cassandra/ICluster.cs | 20 +- src/Cassandra/KeyspaceMetadata.cs | 64 +- src/Cassandra/Metadata.cs | 663 +++++------------ .../MetadataHelpers/ISchemaParserFactory.cs | 3 +- .../Policies/ILocalDatacenterProvider.cs | 3 +- .../Policies/LocalDatacenterProvider.cs | 12 +- src/Cassandra/Requests/IPrepareHandler.cs | 2 +- src/Cassandra/Requests/PrepareHandler.cs | 28 +- .../SessionManagement/IInternalCluster.cs | 6 +- 27 files changed, 1361 insertions(+), 625 deletions(-) create mode 100644 src/Cassandra/ClusterDescription.cs create mode 100644 src/Cassandra/Connections/Control/IInternalMetadata.cs create mode 100644 src/Cassandra/Connections/Control/InternalMetadata.cs diff --git a/src/Cassandra/Cluster.cs b/src/Cassandra/Cluster.cs index 99caa96e8..503f46ad0 100644 --- a/src/Cassandra/Cluster.cs +++ b/src/Cassandra/Cluster.cs @@ -54,14 +54,16 @@ public class Cluster : IInternalCluster private readonly SemaphoreSlim _sessionCreateLock = new SemaphoreSlim(1, 1); private long _sessionCounter = -1; - private readonly Metadata _metadata; + private readonly IInternalMetadata _internalMetadata; private IReadOnlyList _loadBalancingPolicies; - private readonly Task _initTask; + private readonly Task _initTask; private long _state = Cluster.Initializing; internal IInternalCluster InternalRef => this; + + IInternalMetadata IInternalCluster.InternalMetadata => _internalMetadata; private bool IsDisposed => Interlocked.Read(ref _state) == Cluster.Disposed; @@ -142,14 +144,8 @@ public static int MaxProtocolVersion bool IInternalCluster.ImplicitContactPoint => _implicitContactPoint; /// - public Metadata Metadata => TaskHelper.WaitToComplete(GetMetadataAsync()); - - /// - public Task GetMetadataAsync() - { - return InternalRef.TryInitAndGetMetadataAsync(); - } - + public Metadata Metadata { get; } + private Cluster(IEnumerable contactPoints, Configuration configuration) { Configuration = configuration; @@ -173,13 +169,14 @@ private Cluster(IEnumerable contactPoints, Configuration configuration) var parsedContactPoints = configuration.ContactPointParser.ParseContactPoints(contactPointsList); - _metadata = new Metadata(this, configuration, _serializerManager, parsedContactPoints); + Metadata = new Metadata(this, configuration, _serializerManager, parsedContactPoints); + _internalMetadata = Metadata.InternalMetadata; _initTask = Task.Run(InitAsync); } /// - Task IInternalCluster.TryInitAndGetMetadataAsync() + Task IInternalCluster.TryInitializeAsync() { var currentState = Interlocked.Read(ref _state); if (currentState == Cluster.Initialized) @@ -202,7 +199,7 @@ Task IInternalCluster.TryInitAndGetMetadataAsync() return _initTask; } - private async Task InitAsync() + private async Task InitAsync() { Cluster.Logger.Info("Connecting to cluster using {0}", Cluster.GetAssemblyInfo()); try @@ -219,9 +216,9 @@ private async Task InitAsync() _loadBalancingPolicies = loadBalancingPolicies.ToList(); // Only abort the async operations when at least twice the time for ConnectTimeout per host passed - var initialAbortTimeout = Configuration.SocketOptions.ConnectTimeoutMillis * 2 * _metadata.Hosts.Count; + var initialAbortTimeout = Configuration.SocketOptions.ConnectTimeoutMillis * 2 * _internalMetadata.Hosts.Count; initialAbortTimeout = Math.Max(initialAbortTimeout, Configuration.SocketOptions.MetadataAbortTimeout); - var initTask = _metadata.InitializeAsync(); + var initTask = Metadata.TryInitializeAsync(); try { await initTask.WaitToCompleteAsync(initialAbortTimeout).ConfigureAwait(false); @@ -253,17 +250,17 @@ private async Task InitAsync() } // initialize the local datacenter provider - Configuration.LocalDatacenterProvider.Initialize(this, _metadata); + Configuration.LocalDatacenterProvider.Initialize(this, _internalMetadata); // Initialize policies foreach (var lbp in loadBalancingPolicies) { - await lbp.InitializeAsync(_metadata).ConfigureAwait(false); + await lbp.InitializeAsync(Metadata).ConfigureAwait(false); } foreach (var sep in speculativeExecutionPolicies) { - await sep.InitializeAsync(_metadata).ConfigureAwait(false); + await sep.InitializeAsync(Metadata).ConfigureAwait(false); } InitializeHostDistances(); @@ -272,12 +269,10 @@ private async Task InitAsync() SetMetadataDependentOptions(); Cluster.Logger.Info("Cluster Connected using binary protocol version: [" + _serializerManager.CurrentProtocolVersion + "]"); - _metadata.Hosts.Added += _metadata.OnHostAdded; - _metadata.Hosts.Removed += _metadata.OnHostRemoved; - _metadata.Hosts.Up += OnHostUp; - Cluster.Logger.Info("Cluster [" + _metadata.ClusterName + "] has been initialized."); - - return _metadata; + _internalMetadata.Hosts.Added += _internalMetadata.OnHostAdded; + _internalMetadata.Hosts.Removed += _internalMetadata.OnHostRemoved; + _internalMetadata.Hosts.Up += OnHostUp; + Cluster.Logger.Info("Cluster [" + _internalMetadata.ClusterName + "] has been initialized."); } catch (NoHostAvailableException) { @@ -300,7 +295,7 @@ private async Task InitAsync() private void InitializeHostDistances() { - foreach (var host in _metadata.AllHosts()) + foreach (var host in _internalMetadata.AllHosts()) { InternalRef.RetrieveAndSetDistance(host); } @@ -315,7 +310,7 @@ private static string GetAssemblyInfo() IReadOnlyDictionary> IInternalCluster.GetResolvedEndpoints() { - return _metadata.ResolvedContactPoints; + return _internalMetadata.ResolvedContactPoints; } /// @@ -393,7 +388,7 @@ private long GetAndIncrementSessionCounter() private void SetMetadataDependentOptions() { - if (_metadata.IsDbaas) + if (_internalMetadata.IsDbaas) { Configuration.SetDefaultConsistencyLevel(ConsistencyLevel.LocalQuorum); } @@ -491,12 +486,12 @@ public async Task ShutdownAsync(int timeoutMs = Timeout.Infinite) await ShutdownInternalAsync().ConfigureAwait(false); - Cluster.Logger.Info("Cluster [" + _metadata.ClusterName + "] has been shut down."); + Cluster.Logger.Info("Cluster [" + _internalMetadata.ClusterName + "] has been shut down."); } private async Task ShutdownInternalAsync() { - await _metadata.ShutdownAsync().ConfigureAwait(false); + await Metadata.ShutdownAsync().ConfigureAwait(false); Configuration.Timer.Dispose(); // Dispose policies @@ -535,9 +530,9 @@ HostDistance IInternalCluster.RetrieveAndSetDistance(Host host) async Task IInternalCluster.PrepareAsync( IInternalSession session, string cqlQuery, string keyspace, IDictionary customPayload) { - var metadata = await InternalRef.TryInitAndGetMetadataAsync().ConfigureAwait(false); + await InternalRef.TryInitializeAsync().ConfigureAwait(false); - var serializer = metadata.SerializerManager.GetCurrentSerializer(); + var serializer = _internalMetadata.SerializerManager.GetCurrentSerializer(); var currentVersion = serializer.ProtocolVersion; if (!currentVersion.SupportsKeyspaceInRequest() && keyspace != null) { @@ -548,18 +543,17 @@ async Task IInternalCluster.PrepareAsync( } var request = new PrepareRequest(serializer, cqlQuery, keyspace, customPayload); - return await PrepareAsync(session, metadata, request).ConfigureAwait(false); + return await PrepareAsync(session, request).ConfigureAwait(false); } - private async Task PrepareAsync(IInternalSession session, Metadata metadata, PrepareRequest request) + private async Task PrepareAsync(IInternalSession session, PrepareRequest request) { var lbp = session.Cluster.Configuration.DefaultRequestOptions.LoadBalancingPolicy; var handler = InternalRef.Configuration.PrepareHandlerFactory.CreatePrepareHandler(_serializerManager, this); var ps = await handler.PrepareAsync( request, - session, - metadata, - lbp.NewQueryPlan(_metadata, session.Keyspace, null).GetEnumerator()).ConfigureAwait(false); + session, + lbp.NewQueryPlan(Metadata, session.Keyspace, null).GetEnumerator()).ConfigureAwait(false); var psAdded = InternalRef.PreparedQueries.GetOrAdd(ps.Id, ps); if (ps != psAdded) { diff --git a/src/Cassandra/ClusterDescription.cs b/src/Cassandra/ClusterDescription.cs new file mode 100644 index 000000000..7cf4b4e52 --- /dev/null +++ b/src/Cassandra/ClusterDescription.cs @@ -0,0 +1,48 @@ +// +// Copyright (C) DataStax Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +namespace Cassandra +{ + /// + /// Provides a snapshot of cluster metadata properties. + /// + public class ClusterDescription + { + public ClusterDescription(string clusterName, bool isDbaas, ProtocolVersion protocolVersion) + { + ClusterName = clusterName; + IsDbaas = isDbaas; + ProtocolVersion = protocolVersion; + } + + /// + /// Returns the name of currently connected cluster. + /// + /// the Cassandra name of currently connected cluster. + public string ClusterName { get; } + + /// + /// Determines whether the cluster is provided as a service (DataStax Astra). + /// + public bool IsDbaas { get; } + + /// + /// Gets the Cassandra native binary protocol version that was + /// negotiated between the driver and the Cassandra node. + /// + public ProtocolVersion ProtocolVersion { get; } + } +} \ No newline at end of file diff --git a/src/Cassandra/Connections/Control/ControlConnection.cs b/src/Cassandra/Connections/Control/ControlConnection.cs index 2026d59c6..6e9b08cf5 100644 --- a/src/Cassandra/Connections/Control/ControlConnection.cs +++ b/src/Cassandra/Connections/Control/ControlConnection.cs @@ -33,7 +33,7 @@ namespace Cassandra.Connections.Control internal class ControlConnection : IControlConnection { private readonly IInternalCluster _cluster; - private readonly Metadata _metadata; + private readonly IInternalMetadata _internalMetadata; private volatile Host _host; private volatile IConnectionEndPoint _currentConnectionEndPoint; private volatile IConnection _connection; @@ -71,11 +71,11 @@ internal ControlConnection( IProtocolEventDebouncer eventDebouncer, ISerializerManager serializerManager, Configuration config, - Metadata metadata, + IInternalMetadata internalMetadata, IEnumerable contactPoints) { _cluster = cluster; - _metadata = metadata; + _internalMetadata = internalMetadata; _reconnectionPolicy = config.Policies.ReconnectionPolicy; _reconnectionSchedule = _reconnectionPolicy.NewSchedule(); _reconnectionTimer = new Timer(ReconnectEventHandler, null, Timeout.Infinite, Timeout.Infinite); @@ -83,8 +83,8 @@ internal ControlConnection( _serializer = serializerManager; _eventDebouncer = eventDebouncer; _contactPoints = contactPoints; - _topologyRefresher = config.TopologyRefresherFactory.Create(metadata, config); - _supportedOptionsInitializer = config.SupportedOptionsInitializerFactory.Create(metadata); + _topologyRefresher = config.TopologyRefresherFactory.Create(internalMetadata, config); + _supportedOptionsInitializer = config.SupportedOptionsInitializerFactory.Create(internalMetadata); if (!_config.KeepContactPointsUnresolved) { @@ -106,7 +106,7 @@ public async Task InitAsync() /// /// Resolves the contact points to a read only list of which will be used - /// during initialization. Also sets . + /// during initialization. Also sets . /// private async Task InitialContactPointResolutionAsync() { @@ -116,7 +116,7 @@ private async Task InitialContactPointResolutionAsync() var resolvedContactPoints = tasksDictionary.ToDictionary(t => t.Key, t => t.Value.Result); - _metadata.SetResolvedContactPoints(resolvedContactPoints); + _internalMetadata.SetResolvedContactPoints(resolvedContactPoints); if (!resolvedContactPoints.Any(kvp => kvp.Value.Any())) { @@ -127,7 +127,7 @@ private async Task InitialContactPointResolutionAsync() private bool TotalConnectivityLoss() { - var currentHosts = _metadata.AllHosts(); + var currentHosts = _internalMetadata.AllHosts(); return currentHosts.Count(h => h.IsUp) == 0 || currentHosts.All(h => !_cluster.AnyOpenConnections(h)); } @@ -143,7 +143,7 @@ private async Task> ResolveContactPoint(IContac var endpoints = await contactPoint.GetConnectionEndPointsAsync( _config.KeepContactPointsUnresolved || connectivityLoss).ConfigureAwait(false); - return _metadata.UpdateResolvedContactPoint(contactPoint, endpoints); + return _internalMetadata.UpdateResolvedContactPoint(contactPoint, endpoints); } private async Task> ResolveHostContactPointOrConnectionEndpointAsync( @@ -194,12 +194,11 @@ private IEnumerable>> AllHostsEndPointReso } private IEnumerable>> DefaultLbpHostsEnumerable( - Metadata metadata, ConcurrentDictionary attemptedContactPoints, ConcurrentDictionary attemptedHosts, bool isInitializing) { - foreach (var host in _config.DefaultRequestOptions.LoadBalancingPolicy.NewQueryPlan(metadata, null, null)) + foreach (var host in _config.DefaultRequestOptions.LoadBalancingPolicy.NewQueryPlan(_cluster.Metadata, null, null)) { if (attemptedHosts.TryAdd(host, null)) { @@ -257,7 +256,7 @@ private async Task Connect(bool isInitializing) // start with endpoints from the default LBP if it is already initialized if (!isInitializing) { - endPointResolutionTasksLazyIterator = DefaultLbpHostsEnumerable(_metadata, attemptedContactPoints, attemptedHosts, isInitializing); + endPointResolutionTasksLazyIterator = DefaultLbpHostsEnumerable(attemptedContactPoints, attemptedHosts, isInitializing); } // add contact points next @@ -340,11 +339,11 @@ await _config.ProtocolVersionNegotiator.ChangeProtocolVersion( if (isInitializing) { await _config.ProtocolVersionNegotiator.NegotiateVersionAsync( - _config, _metadata, connection, _serializer).ConfigureAwait(false); + _config, _internalMetadata, connection, _serializer).ConfigureAwait(false); } await _config.ServerEventsSubscriber.SubscribeToServerEvents(connection, OnConnectionCassandraEvent).ConfigureAwait(false); - await _metadata.RebuildTokenMapAsync(false, _config.MetadataSyncOptions.MetadataSyncEnabled).ConfigureAwait(false); + await _internalMetadata.RebuildTokenMapAsync(false, _config.MetadataSyncOptions.MetadataSyncEnabled).ConfigureAwait(false); _host.Down += OnHostDown; @@ -472,7 +471,7 @@ private async Task Refresh() SetCurrentConnection(currentHost, currentEndPoint); - await _metadata.RebuildTokenMapAsync(false, _config.MetadataSyncOptions.MetadataSyncEnabled).ConfigureAwait(false); + await _internalMetadata.RebuildTokenMapAsync(false, _config.MetadataSyncOptions.MetadataSyncEnabled).ConfigureAwait(false); _reconnectionSchedule = _reconnectionPolicy.NewSchedule(); } catch (SocketException ex) @@ -577,18 +576,18 @@ public Task HandleSchemaChangeEvent(SchemaChangeEventArgs ssc, bool processNow) handler = () => { //Can be either a table or a view - _metadata.ClearTable(ssc.Keyspace, ssc.Table); - _metadata.ClearView(ssc.Keyspace, ssc.Table); + _internalMetadata.ClearTable(ssc.Keyspace, ssc.Table); + _internalMetadata.ClearView(ssc.Keyspace, ssc.Table); return TaskHelper.Completed; }; } else if (ssc.FunctionName != null) { - handler = TaskHelper.ActionToAsync(() => _metadata.ClearFunction(ssc.Keyspace, ssc.FunctionName, ssc.Signature)); + handler = TaskHelper.ActionToAsync(() => _internalMetadata.ClearFunction(ssc.Keyspace, ssc.FunctionName, ssc.Signature)); } else if (ssc.AggregateName != null) { - handler = TaskHelper.ActionToAsync(() => _metadata.ClearAggregate(ssc.Keyspace, ssc.AggregateName, ssc.Signature)); + handler = TaskHelper.ActionToAsync(() => _internalMetadata.ClearAggregate(ssc.Keyspace, ssc.AggregateName, ssc.Signature)); } else if (ssc.Type != null) { @@ -596,7 +595,7 @@ public Task HandleSchemaChangeEvent(SchemaChangeEventArgs ssc, bool processNow) } else if (ssc.What == SchemaChangeEventArgs.Reason.Dropped) { - handler = TaskHelper.ActionToAsync(() => _metadata.RemoveKeyspace(ssc.Keyspace)); + handler = TaskHelper.ActionToAsync(() => _internalMetadata.RemoveKeyspace(ssc.Keyspace)); } else { @@ -611,7 +610,7 @@ private void HandleStatusChangeEvent(StatusChangeEventArgs e) //The address in the Cassandra event message needs to be translated var address = TranslateAddress(e.Address); ControlConnection.Logger.Info("Received Node status change event: host {0} is {1}", address, e.What.ToString().ToUpper()); - if (!_metadata.Hosts.TryGet(address, out var host)) + if (!_internalMetadata.Hosts.TryGet(address, out var host)) { ControlConnection.Logger.Info("Received status change event for host {0} but it was not found", address); return; @@ -640,7 +639,7 @@ private void SetCurrentConnection(Host host, IConnectionEndPoint endPoint) { _host = host; _currentConnectionEndPoint = endPoint; - _metadata.SetCassandraVersion(host.CassandraVersion); + _internalMetadata.SetCassandraVersion(host.CassandraVersion); } /// @@ -694,12 +693,12 @@ public Task UnsafeSendQueryRequestAsync(string cqlQuery, QueryProtocol private IEnumerable GetHostEnumerable() { var index = 0; - var hosts = _metadata.Hosts.ToArray(); + var hosts = _internalMetadata.Hosts.ToArray(); while (index < hosts.Length) { yield return hosts[index++]; // Check that the collection changed - var newHosts = _metadata.Hosts.ToCollection(); + var newHosts = _internalMetadata.Hosts.ToCollection(); if (newHosts.Count != hosts.Length) { index = 0; @@ -713,7 +712,7 @@ public async Task HandleKeyspaceRefreshLaterAsync(string keyspace) { var @event = new KeyspaceProtocolEvent(true, keyspace, async () => { - await _metadata.RefreshSingleKeyspace(keyspace).ConfigureAwait(false); + await _internalMetadata.RefreshSingleKeyspaceAsync(keyspace).ConfigureAwait(false); }); await _eventDebouncer.HandleEventAsync(@event, false).ConfigureAwait(false); } @@ -721,7 +720,7 @@ public async Task HandleKeyspaceRefreshLaterAsync(string keyspace) /// public Task ScheduleKeyspaceRefreshAsync(string keyspace, bool processNow) { - var @event = new KeyspaceProtocolEvent(true, keyspace, () => _metadata.RefreshSingleKeyspace(keyspace)); + var @event = new KeyspaceProtocolEvent(true, keyspace, () => _internalMetadata.RefreshSingleKeyspaceAsync(keyspace)); return processNow ? _eventDebouncer.HandleEventAsync(@event, true) : _eventDebouncer.ScheduleEventAsync(@event, false); @@ -743,7 +742,7 @@ private Task ScheduleHostsRefreshAsync() /// public Task ScheduleAllKeyspacesRefreshAsync(bool processNow) { - var @event = new ProtocolEvent(() => _metadata.RebuildTokenMapAsync(false, true)); + var @event = new ProtocolEvent(() => _internalMetadata.RebuildTokenMapAsync(false, true)); return processNow ? _eventDebouncer.HandleEventAsync(@event, true) : _eventDebouncer.ScheduleEventAsync(@event, false); diff --git a/src/Cassandra/Connections/Control/ControlConnectionFactory.cs b/src/Cassandra/Connections/Control/ControlConnectionFactory.cs index ef3b3191f..1f43b08d7 100644 --- a/src/Cassandra/Connections/Control/ControlConnectionFactory.cs +++ b/src/Cassandra/Connections/Control/ControlConnectionFactory.cs @@ -28,7 +28,7 @@ public IControlConnection Create( IProtocolEventDebouncer protocolEventDebouncer, ISerializerManager serializerManager, Configuration config, - Metadata metadata, + IInternalMetadata metadata, IEnumerable contactPoints) { return new ControlConnection( diff --git a/src/Cassandra/Connections/Control/IControlConnectionFactory.cs b/src/Cassandra/Connections/Control/IControlConnectionFactory.cs index 648483c70..a501f03d2 100644 --- a/src/Cassandra/Connections/Control/IControlConnectionFactory.cs +++ b/src/Cassandra/Connections/Control/IControlConnectionFactory.cs @@ -28,7 +28,7 @@ IControlConnection Create( IProtocolEventDebouncer protocolEventDebouncer, ISerializerManager serializerManager, Configuration config, - Metadata metadata, + IInternalMetadata internalMetadata, IEnumerable contactPoints); } } \ No newline at end of file diff --git a/src/Cassandra/Connections/Control/IInternalMetadata.cs b/src/Cassandra/Connections/Control/IInternalMetadata.cs new file mode 100644 index 000000000..b9ec24d5d --- /dev/null +++ b/src/Cassandra/Connections/Control/IInternalMetadata.cs @@ -0,0 +1,228 @@ +// +// Copyright (C) DataStax Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using System; +using System.Collections.Generic; +using System.Net; +using System.Threading.Tasks; +using Cassandra.MetadataHelpers; +using Cassandra.Serialization; + +namespace Cassandra.Connections.Control +{ + internal interface IInternalMetadata + { + /// + /// Gets the configuration associated with this instance. + /// + Configuration Configuration { get; } + + /// + /// Control connection to be used to execute the queries to retrieve the metadata + /// + IControlConnection ControlConnection { get; } + + ISerializerManager SerializerManager { get; } + + ISchemaParser SchemaParser { get; } + + string Partitioner { get; set; } + + Hosts Hosts { get; } + + IReadOnlyDictionary> ResolvedContactPoints { get; } + + IReadOnlyTokenMap TokenToReplicasMap { get; } + + bool IsDbaas { get; } + + string ClusterName { get; } + + ProtocolVersion ProtocolVersion { get; } + + KeyValuePair[] KeyspacesSnapshot { get; } + + Task InitAsync(); + + Task ShutdownAsync(); + + void SetResolvedContactPoints( + IDictionary> resolvedContactPoints); + + void OnHostRemoved(Host h); + + void OnHostAdded(Host h); + + Host GetHost(IPEndPoint address); + + Host AddHost(IPEndPoint address); + + Host AddHost(IPEndPoint address, IContactPoint contactPoint); + + void RemoveHost(IPEndPoint address); + + void FireSchemaChangedEvent(SchemaChangedEventArgs.Kind what, string keyspace, string table, object sender = null); + + void OnHostDown(Host h); + + void OnHostUp(Host h); + + /// + /// Returns all known hosts of this cluster. + /// + /// collection of all known hosts of this cluster. + ICollection AllHosts(); + + IEnumerable AllReplicas(); + + Task RebuildTokenMapAsync(bool retry, bool fetchKeyspaces); + + /// + /// this method should be called by the event debouncer + /// + bool RemoveKeyspaceFromTokenMap(string name); + + Task UpdateTokenMapForKeyspace(string name); + + /// + /// Get the replicas for a given partition key and keyspace + /// + ICollection GetReplicas(string keyspaceName, byte[] partitionKey); + + /// + /// Get the replicas for a given partition key + /// + ICollection GetReplicas(byte[] partitionKey); + + /// + /// Returns metadata of specified keyspace. + /// + /// the name of the keyspace for which metadata should be + /// returned. + /// the metadata of the requested keyspace or null if + /// * keyspace is not a known keyspace. + Task GetKeyspaceAsync(string keyspace); + + /// + /// Returns a collection of all defined keyspaces names. + /// + /// a collection of all defined keyspaces names. + Task> GetKeyspacesAsync(); + + /// + /// Returns names of all tables which are defined within specified keyspace. + /// + /// the name of the keyspace for which all tables metadata should be + /// returned. + /// an ICollection of the metadata for the tables defined in this + /// keyspace. + Task> GetTablesAsync(string keyspace); + + /// + /// Returns TableMetadata for specified table in specified keyspace. + /// + /// name of the keyspace within specified table is defined. + /// name of table for which metadata should be returned. + /// a TableMetadata for the specified table in the specified keyspace. + Task GetTableAsync(string keyspace, string tableName); + + /// + /// Returns the view metadata for the provided view name in the keyspace. + /// + /// name of the keyspace within specified view is defined. + /// name of view. + /// a MaterializedViewMetadata for the view in the specified keyspace. + Task GetMaterializedViewAsync(string keyspace, string name); + + /// + /// Gets the definition associated with a User Defined Type from Cassandra + /// + Task GetUdtDefinitionAsync(string keyspace, string typeName); + + /// + /// Gets the definition associated with a User Defined Function from Cassandra + /// + /// The function metadata or null if not found. + Task GetFunctionAsync(string keyspace, string name, string[] signature); + + /// + /// Gets the definition associated with a aggregate from Cassandra + /// + /// The aggregate metadata or null if not found. + Task GetAggregateAsync(string keyspace, string name, string[] signature); + + /// + /// Gets the query trace. + /// + /// The query trace that contains the id, which properties are going to be populated. + /// + Task GetQueryTraceAsync(QueryTrace trace); + + /// + /// Updates keyspace metadata (including token metadata for token aware routing) for a given keyspace or a specific keyspace table. + /// If no keyspace is provided then this method will update the metadata and token map for all the keyspaces of the cluster. + /// + Task RefreshSchemaAsync(string keyspace = null, string table = null); + + /// + /// this method should be called by the event debouncer + /// + bool RemoveKeyspace(string name); + + /// + /// this method should be called by the event debouncer + /// + Task RefreshSingleKeyspaceAsync(string name); + + void ClearTable(string keyspaceName, string tableName); + + void ClearView(string keyspaceName, string name); + + void ClearFunction(string keyspaceName, string functionName, string[] signature); + + void ClearAggregate(string keyspaceName, string aggregateName, string[] signature); + + /// + /// Initiates a schema agreement check. + /// + /// Schema changes need to be propagated to all nodes in the cluster. + /// Once they have settled on a common version, we say that they are in agreement. + /// + /// This method does not perform retries so + /// does not apply. + /// + /// True if schema agreement was successful and false if it was not successful. + Task CheckSchemaAgreementAsync(); + + /// + /// Waits until that the schema version in all nodes is the same or the waiting time passed. + /// This method blocks the calling thread. + /// + Task WaitForSchemaAgreementAsync(IConnection connection); + + /// + /// Sets the Cassandra version in order to identify how to parse the metadata information + /// + /// + void SetCassandraVersion(Version version); + + void SetProductTypeAsDbaas(); + + void SetClusterName(string clusterName); + + IEnumerable UpdateResolvedContactPoint( + IContactPoint contactPoint, IEnumerable endpoints); + } +} \ No newline at end of file diff --git a/src/Cassandra/Connections/Control/IProtocolVersionNegotiator.cs b/src/Cassandra/Connections/Control/IProtocolVersionNegotiator.cs index 12938263e..41c26db50 100644 --- a/src/Cassandra/Connections/Control/IProtocolVersionNegotiator.cs +++ b/src/Cassandra/Connections/Control/IProtocolVersionNegotiator.cs @@ -20,8 +20,15 @@ namespace Cassandra.Connections.Control { internal interface IProtocolVersionNegotiator { - Task ChangeProtocolVersion(Configuration config, ISerializerManager serializer, ProtocolVersion nextVersion, IConnection previousConnection, UnsupportedProtocolVersionException ex = null, ProtocolVersion? previousVersion = null); + Task ChangeProtocolVersion( + Configuration config, + ISerializerManager serializer, + ProtocolVersion nextVersion, + IConnection previousConnection, + UnsupportedProtocolVersionException ex = null, + ProtocolVersion? previousVersion = null); - Task NegotiateVersionAsync(Configuration config, Metadata metadata, IConnection connection, ISerializerManager serializer); + Task NegotiateVersionAsync( + Configuration config, IInternalMetadata internalMetadata, IConnection connection, ISerializerManager serializer); } } \ No newline at end of file diff --git a/src/Cassandra/Connections/Control/ISupportedOptionsInitializerFactory.cs b/src/Cassandra/Connections/Control/ISupportedOptionsInitializerFactory.cs index d5610f5a7..5950b2b8e 100644 --- a/src/Cassandra/Connections/Control/ISupportedOptionsInitializerFactory.cs +++ b/src/Cassandra/Connections/Control/ISupportedOptionsInitializerFactory.cs @@ -17,6 +17,6 @@ namespace Cassandra.Connections.Control { internal interface ISupportedOptionsInitializerFactory { - ISupportedOptionsInitializer Create(Metadata metadata); + ISupportedOptionsInitializer Create(IInternalMetadata internalMetadata); } } \ No newline at end of file diff --git a/src/Cassandra/Connections/Control/ITopologyRefresher.cs b/src/Cassandra/Connections/Control/ITopologyRefresher.cs index 2f5b7d176..acdd3e56f 100644 --- a/src/Cassandra/Connections/Control/ITopologyRefresher.cs +++ b/src/Cassandra/Connections/Control/ITopologyRefresher.cs @@ -19,7 +19,7 @@ namespace Cassandra.Connections.Control { /// - /// Class that issues system table queries and updates the hosts collection on . + /// Class that issues system table queries and updates the hosts collection on . /// internal interface ITopologyRefresher { diff --git a/src/Cassandra/Connections/Control/ITopologyRefresherFactory.cs b/src/Cassandra/Connections/Control/ITopologyRefresherFactory.cs index 72c1feb32..b6fd2518c 100644 --- a/src/Cassandra/Connections/Control/ITopologyRefresherFactory.cs +++ b/src/Cassandra/Connections/Control/ITopologyRefresherFactory.cs @@ -17,6 +17,6 @@ namespace Cassandra.Connections.Control { internal interface ITopologyRefresherFactory { - ITopologyRefresher Create(Metadata metadata, Configuration config); + ITopologyRefresher Create(IInternalMetadata internalMetadata, Configuration config); } } \ No newline at end of file diff --git a/src/Cassandra/Connections/Control/InternalMetadata.cs b/src/Cassandra/Connections/Control/InternalMetadata.cs new file mode 100644 index 000000000..985e68e7d --- /dev/null +++ b/src/Cassandra/Connections/Control/InternalMetadata.cs @@ -0,0 +1,685 @@ +// +// Copyright (C) DataStax Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Threading.Tasks; + +using Cassandra.Collections; +using Cassandra.MetadataHelpers; +using Cassandra.ProtocolEvents; +using Cassandra.Requests; +using Cassandra.Serialization; +using Cassandra.SessionManagement; + +namespace Cassandra.Connections.Control +{ + internal class InternalMetadata : IInternalMetadata + { + private const string SelectSchemaVersionPeers = "SELECT schema_version FROM system.peers"; + private const string SelectSchemaVersionLocal = "SELECT schema_version FROM system.local"; + + private static readonly Logger Logger = new Logger(typeof(ControlConnection)); + + private readonly Metadata _parent; + private readonly IProtocolEventDebouncer _protocolEventDebouncer; + + private volatile TokenMap _tokenMap; + private volatile ConcurrentDictionary _keyspaces = + new ConcurrentDictionary(); + private volatile ISchemaParser _schemaParser; + private volatile CopyOnWriteDictionary> _resolvedContactPoints = + new CopyOnWriteDictionary>(); + private volatile bool _isDbaas = false; + private volatile string _clusterName; + + /// + public Configuration Configuration { get; } + + /// + public IControlConnection ControlConnection { get; } + + public ISerializerManager SerializerManager { get; } + + public ISchemaParser SchemaParser => _schemaParser; + + public string Partitioner { get; set; } + + public Hosts Hosts { get; } + + public IReadOnlyDictionary> ResolvedContactPoints + => _resolvedContactPoints; + + public IReadOnlyTokenMap TokenToReplicasMap => _tokenMap; + + public bool IsDbaas => _isDbaas; + + public string ClusterName => _clusterName; + + public ProtocolVersion ProtocolVersion => SerializerManager.CurrentProtocolVersion; + + internal InternalMetadata( + IInternalCluster cluster, + Metadata parent, + Configuration configuration, + ISerializerManager serializerManager, + IEnumerable parsedContactPoints) + { + _parent = parent; + SerializerManager = serializerManager; + Configuration = configuration; + Hosts = new Hosts(); + + _protocolEventDebouncer = new ProtocolEventDebouncer( + configuration.TimerFactory, + TimeSpan.FromMilliseconds(configuration.MetadataSyncOptions.RefreshSchemaDelayIncrement), + TimeSpan.FromMilliseconds(configuration.MetadataSyncOptions.MaxTotalRefreshSchemaDelay)); + + ControlConnection = configuration.ControlConnectionFactory.Create( + cluster, + _protocolEventDebouncer, + SerializerManager, + Configuration, + this, + parsedContactPoints); + + Hosts.Down += OnHostDown; + Hosts.Up += OnHostUp; + } + + internal InternalMetadata( + IInternalCluster cluster, + Metadata parent, + Configuration configuration, + ISerializerManager serializerManager, + IEnumerable contactPoints, + SchemaParser schemaParser) + : this(cluster, parent, configuration, serializerManager, contactPoints) + { + _schemaParser = schemaParser; + } + + public Task InitAsync() + { + return ControlConnection.InitAsync(); + } + + public Task ShutdownAsync() + { + ControlConnection.Dispose(); + return _protocolEventDebouncer.ShutdownAsync(); + } + + public void SetResolvedContactPoints( + IDictionary> resolvedContactPoints) + { + _resolvedContactPoints = + new CopyOnWriteDictionary>(resolvedContactPoints); + } + + public void OnHostRemoved(Host h) + { + _parent.OnHostRemoved(h); + } + + public void OnHostAdded(Host h) + { + _parent.OnHostAdded(h); + } + + public Host GetHost(IPEndPoint address) + { + return Hosts.TryGet(address, out var host) ? host : null; + } + + public Host AddHost(IPEndPoint address) + { + return Hosts.Add(address); + } + + public Host AddHost(IPEndPoint address, IContactPoint contactPoint) + { + return Hosts.Add(address, contactPoint); + } + + public void RemoveHost(IPEndPoint address) + { + Hosts.RemoveIfExists(address); + } + + public void FireSchemaChangedEvent(SchemaChangedEventArgs.Kind what, string keyspace, string table, object sender = null) + { + _parent.FireSchemaChangedEvent(what, keyspace, table, sender); + } + + public void OnHostDown(Host h) + { + _parent.OnHostDown(h); + } + + public void OnHostUp(Host h) + { + _parent.OnHostUp(h); + } + + /// + /// Returns all known hosts of this cluster. + /// + /// collection of all known hosts of this cluster. + public ICollection AllHosts() + { + return Hosts.ToCollection(); + } + + public IEnumerable AllReplicas() + { + return Hosts.AllEndPointsToCollection(); + } + + // for tests + public KeyValuePair[] KeyspacesSnapshot => _keyspaces.ToArray(); + + public async Task RebuildTokenMapAsync(bool retry, bool fetchKeyspaces) + { + IEnumerable ksList = null; + if (fetchKeyspaces) + { + InternalMetadata.Logger.Info("Retrieving keyspaces metadata"); + ksList = await _schemaParser.GetKeyspacesAsync(retry).ConfigureAwait(false); + } + + ConcurrentDictionary keyspaces; + if (ksList != null) + { + InternalMetadata.Logger.Info("Updating keyspaces metadata"); + var ksMap = ksList.Select(ks => new KeyValuePair(ks.Name, ks)); + keyspaces = new ConcurrentDictionary(ksMap); + } + else + { + keyspaces = _keyspaces; + } + + InternalMetadata.Logger.Info("Rebuilding token map"); + if (Partitioner == null) + { + throw new DriverInternalError("Partitioner can not be null"); + } + + var tokenMap = TokenMap.Build(Partitioner, Hosts.ToCollection(), keyspaces.Values); + _keyspaces = keyspaces; + _tokenMap = tokenMap; + } + + /// + /// this method should be called by the event debouncer + /// + public bool RemoveKeyspaceFromTokenMap(string name) + { + InternalMetadata.Logger.Verbose("Removing keyspace metadata: " + name); + var dropped = _keyspaces.TryRemove(name, out _); + _tokenMap?.RemoveKeyspace(name); + return dropped; + } + + public async Task UpdateTokenMapForKeyspace(string name) + { + var keyspaceMetadata = await _schemaParser.GetKeyspaceAsync(name).ConfigureAwait(false); + + var dropped = false; + var updated = false; + if (_tokenMap == null) + { + await RebuildTokenMapAsync(false, false).ConfigureAwait(false); + } + + if (keyspaceMetadata == null) + { + InternalMetadata.Logger.Verbose("Removing keyspace metadata: " + name); + dropped = _keyspaces.TryRemove(name, out _); + _tokenMap?.RemoveKeyspace(name); + } + else + { + InternalMetadata.Logger.Verbose("Updating keyspace metadata: " + name); + _keyspaces.AddOrUpdate(keyspaceMetadata.Name, keyspaceMetadata, (k, v) => + { + updated = true; + return keyspaceMetadata; + }); + InternalMetadata.Logger.Info("Rebuilding token map for keyspace {0}", keyspaceMetadata.Name); + if (Partitioner == null) + { + throw new DriverInternalError("Partitioner can not be null"); + } + + _tokenMap.UpdateKeyspace(keyspaceMetadata); + } + + if (Configuration.MetadataSyncOptions.MetadataSyncEnabled) + { + if (dropped) + { + FireSchemaChangedEvent(SchemaChangedEventArgs.Kind.Dropped, name, null, this); + } + else if (updated) + { + FireSchemaChangedEvent(SchemaChangedEventArgs.Kind.Updated, name, null, this); + } + else + { + FireSchemaChangedEvent(SchemaChangedEventArgs.Kind.Created, name, null, this); + } + } + + return keyspaceMetadata; + } + + /// + /// Get the replicas for a given partition key and keyspace + /// + public ICollection GetReplicas(string keyspaceName, byte[] partitionKey) + { + if (_tokenMap == null) + { + InternalMetadata.Logger.Warning("Metadata.GetReplicas was called but there was no token map."); + return new Host[0]; + } + + return _tokenMap.GetReplicas(keyspaceName, _tokenMap.Factory.Hash(partitionKey)); + } + + /// + /// Get the replicas for a given partition key + /// + public ICollection GetReplicas(byte[] partitionKey) + { + return GetReplicas(null, partitionKey); + } + + /// + /// Returns metadata of specified keyspace. + /// + /// the name of the keyspace for which metadata should be + /// returned. + /// the metadata of the requested keyspace or null if + /// * keyspace is not a known keyspace. + public Task GetKeyspaceAsync(string keyspace) + { + if (Configuration.MetadataSyncOptions.MetadataSyncEnabled) + { + //Use local cache + _keyspaces.TryGetValue(keyspace, out var ksInfo); + return Task.FromResult(ksInfo); + } + + return SchemaParser.GetKeyspaceAsync(keyspace); + } + + /// + /// Returns a collection of all defined keyspaces names. + /// + /// a collection of all defined keyspaces names. + public Task> GetKeyspacesAsync() + { + if (Configuration.MetadataSyncOptions.MetadataSyncEnabled) + { + //Use local cache + return Task.FromResult(_keyspaces.Keys); + } + + return SchemaParser.GetKeyspacesNamesAsync(); + } + + /// + /// Returns names of all tables which are defined within specified keyspace. + /// + /// the name of the keyspace for which all tables metadata should be + /// returned. + /// an ICollection of the metadata for the tables defined in this + /// keyspace. + public Task> GetTablesAsync(string keyspace) + { + if (Configuration.MetadataSyncOptions.MetadataSyncEnabled) + { + return !_keyspaces.TryGetValue(keyspace, out var ksMetadata) + ? Task.FromResult>(new string[0]) + : ksMetadata.GetTablesNamesAsync(); + } + + return SchemaParser.GetTableNamesAsync(keyspace); + } + + /// + /// Returns TableMetadata for specified table in specified keyspace. + /// + /// name of the keyspace within specified table is defined. + /// name of table for which metadata should be returned. + /// a TableMetadata for the specified table in the specified keyspace. + public Task GetTableAsync(string keyspace, string tableName) + { + if (Configuration.MetadataSyncOptions.MetadataSyncEnabled) + { + return !_keyspaces.TryGetValue(keyspace, out var ksMetadata) + ? Task.FromResult(null) + : ksMetadata.GetTableMetadataAsync(tableName); + } + + return SchemaParser.GetTableAsync(keyspace, tableName); + } + + /// + /// Returns the view metadata for the provided view name in the keyspace. + /// + /// name of the keyspace within specified view is defined. + /// name of view. + /// a MaterializedViewMetadata for the view in the specified keyspace. + public Task GetMaterializedViewAsync(string keyspace, string name) + { + if (Configuration.MetadataSyncOptions.MetadataSyncEnabled) + { + return !_keyspaces.TryGetValue(keyspace, out var ksMetadata) + ? null + : ksMetadata.GetMaterializedViewMetadataAsync(name); + } + + return SchemaParser.GetViewAsync(keyspace, name); + } + + /// + /// Gets the definition associated with a User Defined Type from Cassandra + /// + public Task GetUdtDefinitionAsync(string keyspace, string typeName) + { + if (Configuration.MetadataSyncOptions.MetadataSyncEnabled) + { + return !_keyspaces.TryGetValue(keyspace, out var ksMetadata) + ? Task.FromResult(null) + : ksMetadata.GetUdtDefinitionAsync(typeName); + } + + return SchemaParser.GetUdtDefinitionAsync(keyspace, typeName); + } + + /// + /// Gets the definition associated with a User Defined Function from Cassandra + /// + /// The function metadata or null if not found. + public Task GetFunctionAsync(string keyspace, string name, string[] signature) + { + if (Configuration.MetadataSyncOptions.MetadataSyncEnabled) + { + return !_keyspaces.TryGetValue(keyspace, out var ksMetadata) + ? Task.FromResult(null) + : ksMetadata.GetFunctionAsync(name, signature); + } + + var signatureString = SchemaParser.ComputeFunctionSignatureString(signature); + return SchemaParser.GetFunctionAsync(keyspace, name, signatureString); + } + + /// + /// Gets the definition associated with a aggregate from Cassandra + /// + /// The aggregate metadata or null if not found. + public Task GetAggregateAsync(string keyspace, string name, string[] signature) + { + if (Configuration.MetadataSyncOptions.MetadataSyncEnabled) + { + return !_keyspaces.TryGetValue(keyspace, out var ksMetadata) + ? Task.FromResult(null) + : ksMetadata.GetAggregateAsync(name, signature); + } + + var signatureString = SchemaParser.ComputeFunctionSignatureString(signature); + return SchemaParser.GetAggregateAsync(keyspace, name, signatureString); + } + + /// + /// Gets the query trace. + /// + /// The query trace that contains the id, which properties are going to be populated. + /// + public Task GetQueryTraceAsync(QueryTrace trace) + { + return _schemaParser.GetQueryTraceAsync(trace, Configuration.Timer); + } + + /// + /// Updates keyspace metadata (including token metadata for token aware routing) for a given keyspace or a specific keyspace table. + /// If no keyspace is provided then this method will update the metadata and token map for all the keyspaces of the cluster. + /// + public async Task RefreshSchemaAsync(string keyspace = null, string table = null) + { + if (keyspace == null) + { + await ControlConnection.ScheduleAllKeyspacesRefreshAsync(true).ConfigureAwait(false); + return true; + } + + await ControlConnection.ScheduleKeyspaceRefreshAsync(keyspace, true).ConfigureAwait(false); + _keyspaces.TryGetValue(keyspace, out var ks); + if (ks == null) + { + return false; + } + + if (table != null) + { + ks.ClearTableMetadata(table); + } + return true; + } + + /// + /// this method should be called by the event debouncer + /// + public bool RemoveKeyspace(string name) + { + var existed = RemoveKeyspaceFromTokenMap(name); + if (!existed) + { + return false; + } + + FireSchemaChangedEvent(SchemaChangedEventArgs.Kind.Dropped, name, null, this); + return true; + } + + /// + /// this method should be called by the event debouncer + /// + public Task RefreshSingleKeyspaceAsync(string name) + { + return UpdateTokenMapForKeyspace(name); + } + + public void ClearTable(string keyspaceName, string tableName) + { + if (_keyspaces.TryGetValue(keyspaceName, out var ksMetadata)) + { + ksMetadata.ClearTableMetadata(tableName); + } + } + + public void ClearView(string keyspaceName, string name) + { + if (_keyspaces.TryGetValue(keyspaceName, out var ksMetadata)) + { + ksMetadata.ClearViewMetadata(name); + } + } + + public void ClearFunction(string keyspaceName, string functionName, string[] signature) + { + if (_keyspaces.TryGetValue(keyspaceName, out var ksMetadata)) + { + ksMetadata.ClearFunction(functionName, signature); + } + } + + public void ClearAggregate(string keyspaceName, string aggregateName, string[] signature) + { + if (_keyspaces.TryGetValue(keyspaceName, out var ksMetadata)) + { + ksMetadata.ClearAggregate(aggregateName, signature); + } + } + + /// + /// Initiates a schema agreement check. + /// + /// Schema changes need to be propagated to all nodes in the cluster. + /// Once they have settled on a common version, we say that they are in agreement. + /// + /// This method does not perform retries so + /// does not apply. + /// + /// True if schema agreement was successful and false if it was not successful. + public async Task CheckSchemaAgreementAsync() + { + if (Hosts.Count == 1) + { + // If there is just one node, the schema is up to date in all nodes :) + return true; + } + + try + { + var queries = new[] + { + ControlConnection.QueryAsync(SelectSchemaVersionLocal), + ControlConnection.QueryAsync(SelectSchemaVersionPeers) + }; + + await Task.WhenAll(queries).ConfigureAwait(false); + + return CheckSchemaVersionResults(queries[0].Result, queries[1].Result); + } + catch (Exception ex) + { + Logger.Error("Error while checking schema agreement.", ex); + } + + return false; + } + + /// + /// Checks if there is only one schema version between the provided query results. + /// + /// + /// Results obtained from a query to system.local table. + /// Must contain the schema_version column. + /// + /// + /// Results obtained from a query to system.peers table. + /// Must contain the schema_version column. + /// + /// True if there is a schema agreement (only 1 schema version). False otherwise. + private static bool CheckSchemaVersionResults( + IEnumerable localVersionQuery, IEnumerable peerVersionsQuery) + { + return new HashSet( + peerVersionsQuery + .Concat(localVersionQuery) + .Select(r => r.GetValue("schema_version"))).Count == 1; + } + + /// + /// Waits until that the schema version in all nodes is the same or the waiting time passed. + /// This method blocks the calling thread. + /// + public async Task WaitForSchemaAgreementAsync(IConnection connection) + { + if (Hosts.Count == 1) + { + //If there is just one node, the schema is up to date in all nodes :) + return true; + } + var start = DateTime.Now; + var waitSeconds = Configuration.ProtocolOptions.MaxSchemaAgreementWaitSeconds; + InternalMetadata.Logger.Info("Waiting for schema agreement"); + try + { + var totalVersions = 0; + while (DateTime.Now.Subtract(start).TotalSeconds < waitSeconds) + { + var serializer = SerializerManager.GetCurrentSerializer(); + var schemaVersionLocalQuery = + new QueryRequest( + serializer, + InternalMetadata.SelectSchemaVersionLocal, + QueryProtocolOptions.Default, + false, + null); + var schemaVersionPeersQuery = + new QueryRequest( + serializer, + InternalMetadata.SelectSchemaVersionPeers, + QueryProtocolOptions.Default, + false, + null); + var queries = new[] { connection.Send(schemaVersionLocalQuery), connection.Send(schemaVersionPeersQuery) }; + // ReSharper disable once CoVariantArrayConversion + await Task.WhenAll(queries); + + if (InternalMetadata.CheckSchemaVersionResults( + Configuration.MetadataRequestHandler.GetRowSet(await queries[0].ConfigureAwait(false)), + Configuration.MetadataRequestHandler.GetRowSet(await queries[1].ConfigureAwait(false)))) + { + return true; + } + + await Task.Delay(500).ConfigureAwait(false); + } + InternalMetadata.Logger.Info($"Waited for schema agreement, still {totalVersions} schema versions in the cluster."); + } + catch (Exception ex) + { + //Exceptions are not fatal + InternalMetadata.Logger.Error("There was an exception while trying to retrieve schema versions", ex); + } + + return false; + } + + /// + /// Sets the Cassandra version in order to identify how to parse the metadata information + /// + /// + public void SetCassandraVersion(Version version) + { + _schemaParser = Configuration.SchemaParserFactory.Create(version, this, GetUdtDefinitionAsync, _schemaParser); + } + + public void SetProductTypeAsDbaas() + { + _isDbaas = true; + } + + public void SetClusterName(string clusterName) + { + _clusterName = clusterName; + } + + public IEnumerable UpdateResolvedContactPoint(IContactPoint contactPoint, IEnumerable endpoints) + { + return _resolvedContactPoints.AddOrUpdate(contactPoint, _ => endpoints, (_, __) => endpoints); + } + } +} \ No newline at end of file diff --git a/src/Cassandra/Connections/Control/ProtocolVersionNegotiator.cs b/src/Cassandra/Connections/Control/ProtocolVersionNegotiator.cs index 47b01644d..81b542a33 100644 --- a/src/Cassandra/Connections/Control/ProtocolVersionNegotiator.cs +++ b/src/Cassandra/Connections/Control/ProtocolVersionNegotiator.cs @@ -22,11 +22,11 @@ internal class ProtocolVersionNegotiator : IProtocolVersionNegotiator { public async Task NegotiateVersionAsync( Configuration config, - Metadata metadata, + IInternalMetadata internalMetadata, IConnection connection, ISerializerManager serializer) { - var commonVersion = serializer.CurrentProtocolVersion.GetHighestCommon(config, metadata.Hosts); + var commonVersion = serializer.CurrentProtocolVersion.GetHighestCommon(config, internalMetadata.Hosts); if (commonVersion != serializer.CurrentProtocolVersion) { // Current connection will be closed and reopened diff --git a/src/Cassandra/Connections/Control/SupportedOptionsInitializer.cs b/src/Cassandra/Connections/Control/SupportedOptionsInitializer.cs index e857a93d7..019f6fa7c 100644 --- a/src/Cassandra/Connections/Control/SupportedOptionsInitializer.cs +++ b/src/Cassandra/Connections/Control/SupportedOptionsInitializer.cs @@ -26,11 +26,11 @@ internal class SupportedOptionsInitializer : ISupportedOptionsInitializer private const string SupportedProductTypeKey = "PRODUCT_TYPE"; private const string SupportedDbaas = "DATASTAX_APOLLO"; - private readonly Metadata _metadata; + private readonly IInternalMetadata _internalMetadata; - public SupportedOptionsInitializer(Metadata metadata) + public SupportedOptionsInitializer(IInternalMetadata internalMetadata) { - _metadata = metadata; + _internalMetadata = internalMetadata; } public async Task ApplySupportedOptionsAsync(IConnection connection) @@ -65,7 +65,7 @@ private void ApplyProductTypeOption(IDictionary options) if (string.Compare(productTypeOptions[0], SupportedOptionsInitializer.SupportedDbaas, StringComparison.OrdinalIgnoreCase) == 0) { - _metadata.SetProductTypeAsDbaas(); + _internalMetadata.SetProductTypeAsDbaas(); } } } diff --git a/src/Cassandra/Connections/Control/SupportedOptionsInitializerFactory.cs b/src/Cassandra/Connections/Control/SupportedOptionsInitializerFactory.cs index ba080b28c..56b479bf5 100644 --- a/src/Cassandra/Connections/Control/SupportedOptionsInitializerFactory.cs +++ b/src/Cassandra/Connections/Control/SupportedOptionsInitializerFactory.cs @@ -17,9 +17,9 @@ namespace Cassandra.Connections.Control { internal class SupportedOptionsInitializerFactory : ISupportedOptionsInitializerFactory { - public ISupportedOptionsInitializer Create(Metadata metadata) + public ISupportedOptionsInitializer Create(IInternalMetadata internalMetadata) { - return new SupportedOptionsInitializer(metadata); + return new SupportedOptionsInitializer(internalMetadata); } } } \ No newline at end of file diff --git a/src/Cassandra/Connections/Control/TopologyRefresher.cs b/src/Cassandra/Connections/Control/TopologyRefresher.cs index 49f386e36..f151a28b5 100644 --- a/src/Cassandra/Connections/Control/TopologyRefresher.cs +++ b/src/Cassandra/Connections/Control/TopologyRefresher.cs @@ -1,12 +1,12 @@ -// +// // Copyright (C) DataStax Inc. -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,9 +18,9 @@ using System.Linq; using System.Net; using System.Threading.Tasks; + using Cassandra.Responses; using Cassandra.Serialization; -using Cassandra.Tasks; namespace Cassandra.Connections.Control { @@ -34,16 +34,16 @@ internal class TopologyRefresher : ITopologyRefresher private static readonly IPAddress BindAllAddress = new IPAddress(new byte[4]); private readonly Configuration _config; - private readonly Metadata _metadata; + private readonly IInternalMetadata _internalMetadata; /// /// Once this is set to false, it will never be set to true again. /// private volatile bool _isPeersV2 = true; - public TopologyRefresher(Metadata metadata, Configuration config) + public TopologyRefresher(IInternalMetadata internalMetadata, Configuration config) { - _metadata = metadata ?? throw new ArgumentNullException(nameof(metadata)); + _internalMetadata = internalMetadata ?? throw new ArgumentNullException(nameof(internalMetadata)); _config = config ?? throw new ArgumentNullException(nameof(config)); } @@ -58,14 +58,14 @@ public async Task RefreshNodeListAsync( var localTask = SendSystemLocalRequestAsync(connection, serializer); var peersTask = SendSystemPeersRequestAsync(localIsPeersV2, connection, serializer); - + await Task.WhenAll(localTask, peersTask).ConfigureAwait(false); var peersResponse = peersTask.Result; localIsPeersV2 = peersResponse.IsPeersV2; var rsPeers = _config.MetadataRequestHandler.GetRowSet(peersResponse.Response); - + var localRow = _config.MetadataRequestHandler.GetRowSet(localTask.Result).FirstOrDefault(); if (localRow == null) { @@ -73,13 +73,13 @@ public async Task RefreshNodeListAsync( throw new DriverInternalError("Local host metadata could not be retrieved"); } - _metadata.Partitioner = localRow.GetValue("partitioner"); + _internalMetadata.Partitioner = localRow.GetValue("partitioner"); var host = GetAndUpdateLocalHost(currentEndPoint, localRow); UpdatePeersInfo(localIsPeersV2, rsPeers, host); ControlConnection.Logger.Info("Node list retrieved successfully"); return host; } - + private Task SendSystemLocalRequestAsync(IConnection connection, ISerializer serializer) { return _config.MetadataRequestHandler.SendMetadataRequestAsync( @@ -89,9 +89,9 @@ private Task SendSystemLocalRequestAsync(IConnection connection, ISeri private Task SendSystemPeersRequestAsync(bool isPeersV2, IConnection connection, ISerializer serializer) { var peersTask = _config.MetadataRequestHandler.SendMetadataRequestAsync( - connection, - serializer, - isPeersV2 ? TopologyRefresher.SelectPeersV2 : TopologyRefresher.SelectPeers, + connection, + serializer, + isPeersV2 ? TopologyRefresher.SelectPeersV2 : TopologyRefresher.SelectPeers, QueryProtocolOptions.Default); return GetPeersResponseAsync(isPeersV2, peersTask, connection, serializer); @@ -134,8 +134,8 @@ private async Task GetPeersResponseAsync( /// private Host GetAndUpdateLocalHost(IConnectionEndPoint endPoint, IRow row) { - var hostIpEndPoint = - endPoint.GetHostIpEndPoint() + var hostIpEndPoint = + endPoint.GetHostIpEndPoint() ?? GetRpcEndPoint(false, row, _config.AddressTranslator, _config.ProtocolOptions.Port); if (hostIpEndPoint == null) @@ -143,14 +143,14 @@ private Host GetAndUpdateLocalHost(IConnectionEndPoint endPoint, IRow row) throw new DriverInternalError("Could not parse the node's ip address from system tables."); } - var host = _metadata.GetHost(hostIpEndPoint) ?? _metadata.AddHost(hostIpEndPoint, endPoint.ContactPoint); + var host = _internalMetadata.GetHost(hostIpEndPoint) ?? _internalMetadata.AddHost(hostIpEndPoint, endPoint.ContactPoint); // Update cluster name, DC and rack for the one node we are connected to var clusterName = row.GetValue("cluster_name"); if (clusterName != null) { - _metadata.ClusterName = clusterName; + _internalMetadata.SetClusterName(clusterName); } host.SetInfo(row); @@ -173,20 +173,20 @@ private void UpdatePeersInfo(bool isPeersV2, IEnumerable peersRs, Host cur } foundPeers.Add(address); - var host = _metadata.GetHost(address) ?? _metadata.AddHost(address); + var host = _internalMetadata.GetHost(address) ?? _internalMetadata.AddHost(address); host.SetInfo(row); } // Removes all those that seems to have been removed (since we lost the control connection or not valid contact point) - foreach (var address in _metadata.AllReplicas()) + foreach (var address in _internalMetadata.AllReplicas()) { if (!address.Equals(currentHost.Address) && !foundPeers.Contains(address)) { - _metadata.RemoveHost(address); + _internalMetadata.RemoveHost(address); } } } - + /// /// Parses address from system table query response and translates it using the provided . /// @@ -225,17 +225,17 @@ internal IPEndPoint GetRpcEndPoint(bool isPeersV2, IRow row, IAddressTranslator return translator.Translate(new IPEndPoint(address, rpcPort)); } - + private IPAddress GetRpcAddressFromPeersV2(IRow row) { return row.GetValue("native_address"); } - + private IPAddress GetRpcAddressFromLocalPeersV1(IRow row) { return row.GetValue("rpc_address"); } - + private int? GetRpcPortFromPeersV2(IRow row) { return row.GetValue("native_port"); @@ -243,9 +243,9 @@ private IPAddress GetRpcAddressFromLocalPeersV1(IRow row) private class PeersResponse { - public bool IsPeersV2 { get; set; } + public bool IsPeersV2 { get; set; } - public Response Response { get; set; } + public Response Response { get; set; } } } } \ No newline at end of file diff --git a/src/Cassandra/Connections/Control/TopologyRefresherFactory.cs b/src/Cassandra/Connections/Control/TopologyRefresherFactory.cs index d6c969fa1..22331e3f2 100644 --- a/src/Cassandra/Connections/Control/TopologyRefresherFactory.cs +++ b/src/Cassandra/Connections/Control/TopologyRefresherFactory.cs @@ -17,9 +17,9 @@ namespace Cassandra.Connections.Control { internal class TopologyRefresherFactory : ITopologyRefresherFactory { - public ITopologyRefresher Create(Metadata metadata, Configuration config) + public ITopologyRefresher Create(IInternalMetadata internalMetadata, Configuration config) { - return new TopologyRefresher(metadata, config); + return new TopologyRefresher(internalMetadata, config); } } } \ No newline at end of file diff --git a/src/Cassandra/DataStax/Insights/IInsightsSupportVerifier.cs b/src/Cassandra/DataStax/Insights/IInsightsSupportVerifier.cs index 7abdc449e..01bba9a81 100644 --- a/src/Cassandra/DataStax/Insights/IInsightsSupportVerifier.cs +++ b/src/Cassandra/DataStax/Insights/IInsightsSupportVerifier.cs @@ -15,12 +15,13 @@ // using System; +using Cassandra.Connections.Control; namespace Cassandra.DataStax.Insights { internal interface IInsightsSupportVerifier { - bool SupportsInsights(Metadata metadata); + bool SupportsInsights(IInternalMetadata internalMetadata); bool DseVersionSupportsInsights(Version dseVersion); } diff --git a/src/Cassandra/DataStax/Insights/InsightsSupportVerifier.cs b/src/Cassandra/DataStax/Insights/InsightsSupportVerifier.cs index 51bbc1489..c66034843 100644 --- a/src/Cassandra/DataStax/Insights/InsightsSupportVerifier.cs +++ b/src/Cassandra/DataStax/Insights/InsightsSupportVerifier.cs @@ -16,6 +16,7 @@ using System; using System.Linq; +using Cassandra.Connections.Control; namespace Cassandra.DataStax.Insights { @@ -25,9 +26,9 @@ internal class InsightsSupportVerifier : IInsightsSupportVerifier private static readonly Version MinDse51Version = new Version(5, 1, 13); private static readonly Version Dse600Version = new Version(6, 0, 0); - public bool SupportsInsights(Metadata metadata) + public bool SupportsInsights(IInternalMetadata internalMetadata) { - var allHosts = metadata.AllHosts(); + var allHosts = internalMetadata.AllHosts(); return allHosts.Count != 0 && allHosts.All(h => DseVersionSupportsInsights(h.DseVersion)); } diff --git a/src/Cassandra/ICluster.cs b/src/Cassandra/ICluster.cs index 2067687eb..392f66998 100644 --- a/src/Cassandra/ICluster.cs +++ b/src/Cassandra/ICluster.cs @@ -44,26 +44,16 @@ namespace Cassandra public interface ICluster : IDisposable { /// - /// This property may block while waiting for the creation of a connection if none has been established yet. - /// Use instead if your application uses the Task Parallel Library (e.g. async/await). + /// + /// Gets an utility class that allows you to fetch metadata about the connected cluster. + /// This includes the known nodes (with their status as seen by the driver) as well as the schema definitions. /// - /// Gets read-only metadata on the connected cluster. - /// This includes the - /// know nodes (with their status as seen by the driver) as well as the schema definitions. + /// + /// It also allows you to subscribe to certain events (e.g. ). /// /// Metadata Metadata { get; } - /// - /// Gets read-only metadata on the connected cluster. - /// This includes the - /// know nodes (with their status as seen by the driver) as well as the schema definitions. - /// - /// This method may trigger the creation of a connection if none has been established yet. - /// - /// - Task GetMetadataAsync(); - /// /// Cluster client configuration /// diff --git a/src/Cassandra/KeyspaceMetadata.cs b/src/Cassandra/KeyspaceMetadata.cs index 13f6ac536..96b8f1117 100644 --- a/src/Cassandra/KeyspaceMetadata.cs +++ b/src/Cassandra/KeyspaceMetadata.cs @@ -127,8 +127,14 @@ public TableMetadata GetTableMetadata(string tableName) return TaskHelper.WaitToComplete( GetTableMetadataAsync(tableName), _parent.Configuration.DefaultRequestOptions.GetQueryAbortTimeout(2)); } - - internal async Task GetTableMetadataAsync(string tableName) + + /// + /// Returns metadata of specified table in this keyspace. + /// + /// the name of table to retrieve + /// the metadata for table tableName in this keyspace if it + /// exists, null otherwise. + public async Task GetTableMetadataAsync(string tableName) { if (_tables.TryGetValue(tableName, out var tableMetadata)) { @@ -159,8 +165,14 @@ public MaterializedViewMetadata GetMaterializedViewMetadata(string viewName) return TaskHelper.WaitToComplete( GetMaterializedViewMetadataAsync(viewName), _parent.Configuration.DefaultRequestOptions.GetQueryAbortTimeout(2)); } - - private async Task GetMaterializedViewMetadataAsync(string viewName) + + /// + /// Returns metadata of specified view in this keyspace. + /// + /// the name of view to retrieve + /// the metadata for view viewName in this keyspace if it + /// exists, null otherwise. + public async Task GetMaterializedViewMetadataAsync(string viewName) { if (_views.TryGetValue(viewName, out var v)) { @@ -218,11 +230,20 @@ internal void ClearAggregate(string name, string[] signature) /// keyspace. public IEnumerable GetTablesMetadata() { - var tableNames = GetTablesNames(); + return TaskHelper.WaitToComplete(GetTablesMetadataAsync()); + } + + /// + /// Returns metadata of all tables defined in this keyspace. + /// + /// an IEnumerable of TableMetadata for the tables defined in this + /// keyspace. + public async Task> GetTablesMetadataAsync() + { + var tableNames = await GetTablesNamesAsync().ConfigureAwait(false); return tableNames.Select(GetTableMetadata); } - - + /// /// Returns names of all tables defined in this keyspace. /// @@ -231,7 +252,18 @@ public IEnumerable GetTablesMetadata() /// keyspace tables names. public ICollection GetTablesNames() { - return TaskHelper.WaitToComplete(_parent.SchemaParser.GetTableNamesAsync(Name)); + return TaskHelper.WaitToComplete(GetTablesNamesAsync()); + } + + /// + /// Returns names of all tables defined in this keyspace. + /// + /// + /// a collection of all, defined in this + /// keyspace tables names. + public Task> GetTablesNamesAsync() + { + return _parent.SchemaParser.GetTableNamesAsync(Name); } /// @@ -305,8 +337,12 @@ public FunctionMetadata GetFunction(string functionName, string[] signature) return TaskHelper.WaitToComplete( GetFunctionAsync(functionName, signature), _parent.Configuration.DefaultRequestOptions.QueryAbortTimeout); } - - private async Task GetFunctionAsync(string functionName, string[] signature) + + /// + /// Gets a CQL function by name and signature + /// + /// The function metadata or null if not found. + public async Task GetFunctionAsync(string functionName, string[] signature) { if (signature == null) { @@ -339,8 +375,12 @@ public AggregateMetadata GetAggregate(string aggregateName, string[] signature) return TaskHelper.WaitToComplete( GetAggregateAsync(aggregateName, signature), _parent.Configuration.DefaultRequestOptions.QueryAbortTimeout); } - - private async Task GetAggregateAsync(string aggregateName, string[] signature) + + /// + /// Gets a CQL aggregate by name and signature + /// + /// The aggregate metadata or null if not found. + public async Task GetAggregateAsync(string aggregateName, string[] signature) { if (signature == null) { diff --git a/src/Cassandra/Metadata.cs b/src/Cassandra/Metadata.cs index 366b132b0..399215ff5 100644 --- a/src/Cassandra/Metadata.cs +++ b/src/Cassandra/Metadata.cs @@ -15,18 +15,12 @@ // using System; -using System.Collections.Concurrent; using System.Collections.Generic; -using System.Linq; using System.Net; using System.Threading; using System.Threading.Tasks; -using Cassandra.Collections; -using Cassandra.Connections; + using Cassandra.Connections.Control; -using Cassandra.MetadataHelpers; -using Cassandra.ProtocolEvents; -using Cassandra.Requests; using Cassandra.Serialization; using Cassandra.SessionManagement; using Cassandra.Tasks; @@ -39,33 +33,23 @@ namespace Cassandra /// public class Metadata { - private const string SelectSchemaVersionPeers = "SELECT schema_version FROM system.peers"; - private const string SelectSchemaVersionLocal = "SELECT schema_version FROM system.local"; - private static readonly Logger Logger = new Logger(typeof(ControlConnection)); - private readonly ISerializerManager _serializerManager; - private volatile TokenMap _tokenMap; - private volatile ConcurrentDictionary _keyspaces = new ConcurrentDictionary(); - private volatile ISchemaParser _schemaParser; - private readonly IProtocolEventDebouncer _protocolEventDebouncer; + private const int Disposed = 10; + private const int Initialized = 5; + private const int Initializing = 1; + private const int NotInitialized = 0; + + private readonly InternalMetadata _internalMetadata; private readonly int _queryAbortTimeout; - private volatile CopyOnWriteDictionary> _resolvedContactPoints = - new CopyOnWriteDictionary>(); + private volatile Task _initTask; + + private long _state = Metadata.NotInitialized; + + internal InternalMetadata InternalMetadata => _internalMetadata; public event HostsEventHandler HostsEvent; public event SchemaChangedEventHandler SchemaChangedEvent; - /// - /// Returns the name of currently connected cluster. - /// - /// the Cassandra name of currently connected cluster. - public string ClusterName { get; internal set; } - - /// - /// Determines whether the cluster is provided as a service (DataStax Astra). - /// - public bool IsDbaas { get; private set; } = false; - /// /// Event that gets triggered when a new host is added to the cluster /// @@ -76,88 +60,79 @@ public class Metadata /// public event Action HostRemoved; - /// - /// Gets the configuration associated with this instance. - /// - internal Configuration Configuration { get; private set; } - - /// - /// Control connection to be used to execute the queries to retrieve the metadata - /// - internal IControlConnection ControlConnection { get; } - - /// - /// Gets the Cassandra native binary protocol version - /// - public ProtocolVersion ProtocolVersion => _serializerManager.GetCurrentSerializer().ProtocolVersion; - - internal ISerializerManager SerializerManager => _serializerManager; - - internal ISchemaParser SchemaParser { get { return _schemaParser; } } - - internal string Partitioner { get; set; } - - internal Hosts Hosts { get; private set; } - - internal IReadOnlyDictionary> ResolvedContactPoints => _resolvedContactPoints; - - internal IReadOnlyTokenMap TokenToReplicasMap => _tokenMap; - internal Metadata( - IInternalCluster cluster, - Configuration configuration, - ISerializerManager serializerManager, + IInternalCluster cluster, + Configuration configuration, + ISerializerManager serializerManager, IEnumerable parsedContactPoints) { - _serializerManager = serializerManager; _queryAbortTimeout = configuration.DefaultRequestOptions.QueryAbortTimeout; - Configuration = configuration; - Hosts = new Hosts(); - - _protocolEventDebouncer = new ProtocolEventDebouncer( - configuration.TimerFactory, - TimeSpan.FromMilliseconds(configuration.MetadataSyncOptions.RefreshSchemaDelayIncrement), - TimeSpan.FromMilliseconds(configuration.MetadataSyncOptions.MaxTotalRefreshSchemaDelay)); - - ControlConnection = configuration.ControlConnectionFactory.Create( - cluster, - _protocolEventDebouncer, - _serializerManager, - Configuration, - this, - parsedContactPoints); - - Hosts.Down += OnHostDown; - Hosts.Up += OnHostUp; + _internalMetadata = new InternalMetadata(cluster, this, configuration, serializerManager, parsedContactPoints); } internal Metadata( IInternalCluster cluster, - Configuration configuration, - ISerializerManager serializerManager, - IEnumerable contactPoints, - SchemaParser schemaParser) - : this(cluster, configuration, serializerManager, contactPoints) + Configuration configuration, + ISerializerManager serializerManager, + IEnumerable parsedContactPoints, + SchemaParser schemaParser) { - _schemaParser = schemaParser; + _queryAbortTimeout = configuration.DefaultRequestOptions.QueryAbortTimeout; + _internalMetadata = new InternalMetadata( + cluster, this, configuration, serializerManager, parsedContactPoints, schemaParser); } - internal Task InitializeAsync() + internal Task TryInitializeAsync() { - return ControlConnection.InitAsync(); + var currentState = Interlocked.Read(ref _state); + if (currentState == Metadata.Initialized) + { + //It was already initialized + return TaskHelper.Completed; + } + + return InitializeAsync(currentState); + } + + private Task InitializeAsync(long currentState) + { + if (currentState == Metadata.Disposed) + { + throw new ObjectDisposedException("This metadata object has been disposed."); + } + + if (Interlocked.CompareExchange(ref _state, Metadata.Initializing, Metadata.NotInitialized) + == Metadata.NotInitialized) + { + _initTask = Task.Run(InitializeInternalAsync); + } + + return _initTask; } - internal Task ShutdownAsync() + private async Task InitializeInternalAsync() { - ControlConnection.Dispose(); - return _protocolEventDebouncer.ShutdownAsync(); + await _internalMetadata.InitAsync().ConfigureAwait(false); + var previousState = Interlocked.CompareExchange(ref _state, Metadata.Initialized, Metadata.Initializing); + if (previousState == Metadata.Disposed) + { + await _internalMetadata.ShutdownAsync().ConfigureAwait(false); + throw new ObjectDisposedException("Metadata instance was disposed before initialization finished."); + } } - internal void SetResolvedContactPoints(IDictionary> resolvedContactPoints) + internal async Task ShutdownAsync() { - _resolvedContactPoints = new CopyOnWriteDictionary>(resolvedContactPoints); + var previousState = Interlocked.Exchange(ref _state, Metadata.Disposed); + + if (previousState != Metadata.Initialized) + { + return; + } + + await _internalMetadata.ShutdownAsync().ConfigureAwait(false); } - + internal void OnHostRemoved(Host h) { HostRemoved?.Invoke(h); @@ -168,26 +143,27 @@ internal void OnHostAdded(Host h) HostAdded?.Invoke(h); } - public Host GetHost(IPEndPoint address) + public async Task GetClusterDescriptionAsync() { - if (Hosts.TryGet(address, out var host)) - return host; - return null; + await TryInitializeAsync().ConfigureAwait(false); + return new ClusterDescription( + _internalMetadata.ClusterName, _internalMetadata.IsDbaas, _internalMetadata.ProtocolVersion); } - internal Host AddHost(IPEndPoint address) + public ClusterDescription GetClusterDescription() { - return Hosts.Add(address); + return TaskHelper.WaitToComplete(GetClusterDescriptionAsync()); } - internal Host AddHost(IPEndPoint address, IContactPoint contactPoint) + public Host GetHost(IPEndPoint address) { - return Hosts.Add(address, contactPoint); + return TaskHelper.WaitToComplete(GetHostAsync(address), _queryAbortTimeout); } - internal void RemoveHost(IPEndPoint address) + public async Task GetHostAsync(IPEndPoint address) { - Hosts.RemoveIfExists(address); + await TryInitializeAsync().ConfigureAwait(false); + return _internalMetadata.GetHost(address); } internal void FireSchemaChangedEvent(SchemaChangedEventArgs.Kind what, string keyspace, string table, object sender = null) @@ -195,12 +171,12 @@ internal void FireSchemaChangedEvent(SchemaChangedEventArgs.Kind what, string ke SchemaChangedEvent?.Invoke(sender ?? this, new SchemaChangedEventArgs { Keyspace = keyspace, What = what, Table = table }); } - private void OnHostDown(Host h) + internal void OnHostDown(Host h) { HostsEvent?.Invoke(this, new HostsEventArgs { Address = h.Address, What = HostsEventArgs.Kind.Down }); } - private void OnHostUp(Host h) + internal void OnHostUp(Host h) { HostsEvent?.Invoke(h, new HostsEventArgs { Address = h.Address, What = HostsEventArgs.Kind.Up }); } @@ -211,129 +187,61 @@ private void OnHostUp(Host h) /// collection of all known hosts of this cluster. public ICollection AllHosts() { - return Hosts.ToCollection(); + return TaskHelper.WaitToComplete(AllHostsAsync(), _queryAbortTimeout); } - public IEnumerable AllReplicas() + /// + /// Returns all known hosts of this cluster. + /// + /// collection of all known hosts of this cluster. + public async Task> AllHostsAsync() { - return Hosts.AllEndPointsToCollection(); + await TryInitializeAsync().ConfigureAwait(false); + return _internalMetadata.AllHosts(); } - // for tests - internal KeyValuePair[] KeyspacesSnapshot => _keyspaces.ToArray(); - - internal async Task RebuildTokenMapAsync(bool retry, bool fetchKeyspaces) + public IEnumerable AllReplicas() { - IEnumerable ksList = null; - if (fetchKeyspaces) - { - Metadata.Logger.Info("Retrieving keyspaces metadata"); - ksList = await _schemaParser.GetKeyspacesAsync(retry).ConfigureAwait(false); - } - - ConcurrentDictionary keyspaces; - if (ksList != null) - { - Metadata.Logger.Info("Updating keyspaces metadata"); - var ksMap = ksList.Select(ks => new KeyValuePair(ks.Name, ks)); - keyspaces = new ConcurrentDictionary(ksMap); - } - else - { - keyspaces = _keyspaces; - } - - Metadata.Logger.Info("Rebuilding token map"); - if (Partitioner == null) - { - throw new DriverInternalError("Partitioner can not be null"); - } + return TaskHelper.WaitToComplete(AllReplicasAsync(), _queryAbortTimeout); + } - var tokenMap = TokenMap.Build(Partitioner, Hosts.ToCollection(), keyspaces.Values); - _keyspaces = keyspaces; - _tokenMap = tokenMap; + public async Task> AllReplicasAsync() + { + await TryInitializeAsync().ConfigureAwait(false); + return _internalMetadata.AllReplicas(); } /// - /// this method should be called by the event debouncer + /// Get the replicas for a given partition key and keyspace /// - internal bool RemoveKeyspaceFromTokenMap(string name) + public ICollection GetReplicas(string keyspaceName, byte[] partitionKey) { - Metadata.Logger.Verbose("Removing keyspace metadata: " + name); - var dropped = _keyspaces.TryRemove(name, out _); - _tokenMap?.RemoveKeyspace(name); - return dropped; + return TaskHelper.WaitToComplete(GetReplicasAsync(keyspaceName, partitionKey)); } - internal async Task UpdateTokenMapForKeyspace(string name) + /// + /// Get the replicas for a given partition key + /// + public ICollection GetReplicas(byte[] partitionKey) { - var keyspaceMetadata = await _schemaParser.GetKeyspaceAsync(name).ConfigureAwait(false); - - var dropped = false; - var updated = false; - if (_tokenMap == null) - { - await RebuildTokenMapAsync(false, false).ConfigureAwait(false); - } - - if (keyspaceMetadata == null) - { - Metadata.Logger.Verbose("Removing keyspace metadata: " + name); - dropped = _keyspaces.TryRemove(name, out _); - _tokenMap?.RemoveKeyspace(name); - } - else - { - Metadata.Logger.Verbose("Updating keyspace metadata: " + name); - _keyspaces.AddOrUpdate(keyspaceMetadata.Name, keyspaceMetadata, (k, v) => - { - updated = true; - return keyspaceMetadata; - }); - Metadata.Logger.Info("Rebuilding token map for keyspace {0}", keyspaceMetadata.Name); - if (Partitioner == null) - { - throw new DriverInternalError("Partitioner can not be null"); - } - - _tokenMap.UpdateKeyspace(keyspaceMetadata); - } - - if (Configuration.MetadataSyncOptions.MetadataSyncEnabled) - { - if (dropped) - { - FireSchemaChangedEvent(SchemaChangedEventArgs.Kind.Dropped, name, null, this); - } - else if (updated) - { - FireSchemaChangedEvent(SchemaChangedEventArgs.Kind.Updated, name, null, this); - } - else - { - FireSchemaChangedEvent(SchemaChangedEventArgs.Kind.Created, name, null, this); - } - } - - return keyspaceMetadata; + return GetReplicas(null, partitionKey); } /// /// Get the replicas for a given partition key and keyspace /// - public ICollection GetReplicas(string keyspaceName, byte[] partitionKey) + public async Task> GetReplicasAsync(string keyspaceName, byte[] partitionKey) { - if (_tokenMap == null) - { - Metadata.Logger.Warning("Metadata.GetReplicas was called but there was no token map."); - return new Host[0]; - } - return _tokenMap.GetReplicas(keyspaceName, _tokenMap.Factory.Hash(partitionKey)); + await TryInitializeAsync().ConfigureAwait(false); + return _internalMetadata.GetReplicas(keyspaceName, partitionKey); } - public ICollection GetReplicas(byte[] partitionKey) + /// + /// Get the replicas for a given partition key + /// + public Task> GetReplicasAsync(byte[] partitionKey) { - return GetReplicas(null, partitionKey); + return GetReplicasAsync(null, partitionKey); } /// @@ -345,14 +253,20 @@ public ICollection GetReplicas(byte[] partitionKey) /// * keyspace is not a known keyspace. public KeyspaceMetadata GetKeyspace(string keyspace) { - if (Configuration.MetadataSyncOptions.MetadataSyncEnabled) - { - //Use local cache - _keyspaces.TryGetValue(keyspace, out var ksInfo); - return ksInfo; - } + return TaskHelper.WaitToComplete(GetKeyspaceAsync(keyspace), _queryAbortTimeout); + } - return TaskHelper.WaitToComplete(SchemaParser.GetKeyspaceAsync(keyspace), _queryAbortTimeout); + /// + /// Returns metadata of specified keyspace. + /// + /// the name of the keyspace for which metadata should be + /// returned. + /// the metadata of the requested keyspace or null if + /// * keyspace is not a known keyspace. + public async Task GetKeyspaceAsync(string keyspace) + { + await TryInitializeAsync().ConfigureAwait(false); + return await _internalMetadata.GetKeyspaceAsync(keyspace).ConfigureAwait(false); } /// @@ -361,13 +275,17 @@ public KeyspaceMetadata GetKeyspace(string keyspace) /// a collection of all defined keyspaces names. public ICollection GetKeyspaces() { - if (Configuration.MetadataSyncOptions.MetadataSyncEnabled) - { - //Use local cache - return _keyspaces.Keys; - } + return TaskHelper.WaitToComplete(GetKeyspacesAsync(), _queryAbortTimeout); + } - return TaskHelper.WaitToComplete(SchemaParser.GetKeyspacesNamesAsync(), _queryAbortTimeout); + /// + /// Returns a collection of all defined keyspaces names. + /// + /// a collection of all defined keyspaces names. + public async Task> GetKeyspacesAsync() + { + await TryInitializeAsync().ConfigureAwait(false); + return await _internalMetadata.GetKeyspacesAsync().ConfigureAwait(false); } /// @@ -379,14 +297,20 @@ public ICollection GetKeyspaces() /// keyspace. public ICollection GetTables(string keyspace) { - if (Configuration.MetadataSyncOptions.MetadataSyncEnabled) - { - return !_keyspaces.TryGetValue(keyspace, out var ksMetadata) - ? new string[0] - : ksMetadata.GetTablesNames(); - } + return TaskHelper.WaitToComplete(GetTablesAsync(keyspace), _queryAbortTimeout); + } - return TaskHelper.WaitToComplete(SchemaParser.GetTableNamesAsync(keyspace), _queryAbortTimeout); + /// + /// Returns names of all tables which are defined within specified keyspace. + /// + /// the name of the keyspace for which all tables metadata should be + /// returned. + /// an ICollection of the metadata for the tables defined in this + /// keyspace. + public async Task> GetTablesAsync(string keyspace) + { + await TryInitializeAsync().ConfigureAwait(false); + return await _internalMetadata.GetTablesAsync(keyspace).ConfigureAwait(false); } /// @@ -400,16 +324,16 @@ public TableMetadata GetTable(string keyspace, string tableName) return TaskHelper.WaitToComplete(GetTableAsync(keyspace, tableName), _queryAbortTimeout * 2); } - internal Task GetTableAsync(string keyspace, string tableName) + /// + /// Returns TableMetadata for specified table in specified keyspace. + /// + /// name of the keyspace within specified table is defined. + /// name of table for which metadata should be returned. + /// a TableMetadata for the specified table in the specified keyspace. + public async Task GetTableAsync(string keyspace, string tableName) { - if (Configuration.MetadataSyncOptions.MetadataSyncEnabled) - { - return !_keyspaces.TryGetValue(keyspace, out var ksMetadata) - ? Task.FromResult(null) - : ksMetadata.GetTableMetadataAsync(tableName); - } - - return SchemaParser.GetTableAsync(keyspace, tableName); + await TryInitializeAsync().ConfigureAwait(false); + return await _internalMetadata.GetTableAsync(keyspace, tableName).ConfigureAwait(false); } /// @@ -420,14 +344,19 @@ internal Task GetTableAsync(string keyspace, string tableName) /// a MaterializedViewMetadata for the view in the specified keyspace. public MaterializedViewMetadata GetMaterializedView(string keyspace, string name) { - if (Configuration.MetadataSyncOptions.MetadataSyncEnabled) - { - return !_keyspaces.TryGetValue(keyspace, out var ksMetadata) - ? null - : ksMetadata.GetMaterializedViewMetadata(name); - } + return TaskHelper.WaitToComplete(GetMaterializedViewAsync(keyspace, name), _queryAbortTimeout * 2); + } - return TaskHelper.WaitToComplete(SchemaParser.GetViewAsync(keyspace, name), _queryAbortTimeout * 2); + /// + /// Returns the view metadata for the provided view name in the keyspace. + /// + /// name of the keyspace within specified view is defined. + /// name of view. + /// a MaterializedViewMetadata for the view in the specified keyspace. + public async Task GetMaterializedViewAsync(string keyspace, string name) + { + await TryInitializeAsync().ConfigureAwait(false); + return await _internalMetadata.GetMaterializedViewAsync(keyspace, name).ConfigureAwait(false); } /// @@ -441,16 +370,10 @@ public UdtColumnInfo GetUdtDefinition(string keyspace, string typeName) /// /// Gets the definition associated with a User Defined Type from Cassandra /// - public Task GetUdtDefinitionAsync(string keyspace, string typeName) + public async Task GetUdtDefinitionAsync(string keyspace, string typeName) { - if (Configuration.MetadataSyncOptions.MetadataSyncEnabled) - { - return !_keyspaces.TryGetValue(keyspace, out var ksMetadata) - ? Task.FromResult(null) - : ksMetadata.GetUdtDefinitionAsync(typeName); - } - - return SchemaParser.GetUdtDefinitionAsync(keyspace, typeName); + await TryInitializeAsync().ConfigureAwait(false); + return await _internalMetadata.GetUdtDefinitionAsync(keyspace, typeName).ConfigureAwait(false); } /// @@ -459,15 +382,17 @@ public Task GetUdtDefinitionAsync(string keyspace, string typeNam /// The function metadata or null if not found. public FunctionMetadata GetFunction(string keyspace, string name, string[] signature) { - if (Configuration.MetadataSyncOptions.MetadataSyncEnabled) - { - return !_keyspaces.TryGetValue(keyspace, out var ksMetadata) - ? null - : ksMetadata.GetFunction(name, signature); - } + return TaskHelper.WaitToComplete(GetFunctionAsync(keyspace, name, signature), _queryAbortTimeout); + } - var signatureString = SchemaParser.ComputeFunctionSignatureString(signature); - return TaskHelper.WaitToComplete(SchemaParser.GetFunctionAsync(keyspace, name, signatureString), _queryAbortTimeout); + /// + /// Gets the definition associated with a User Defined Function from Cassandra + /// + /// The function metadata or null if not found. + public async Task GetFunctionAsync(string keyspace, string name, string[] signature) + { + await TryInitializeAsync().ConfigureAwait(false); + return await _internalMetadata.GetFunctionAsync(keyspace, name, signature).ConfigureAwait(false); } /// @@ -476,15 +401,17 @@ public FunctionMetadata GetFunction(string keyspace, string name, string[] signa /// The aggregate metadata or null if not found. public AggregateMetadata GetAggregate(string keyspace, string name, string[] signature) { - if (Configuration.MetadataSyncOptions.MetadataSyncEnabled) - { - return !_keyspaces.TryGetValue(keyspace, out var ksMetadata) - ? null - : ksMetadata.GetAggregate(name, signature); - } + return TaskHelper.WaitToComplete(GetAggregateAsync(keyspace, name, signature), _queryAbortTimeout); + } - var signatureString = SchemaParser.ComputeFunctionSignatureString(signature); - return TaskHelper.WaitToComplete(SchemaParser.GetAggregateAsync(keyspace, name, signatureString), _queryAbortTimeout); + /// + /// Gets the definition associated with a aggregate from Cassandra + /// + /// The aggregate metadata or null if not found. + public async Task GetAggregateAsync(string keyspace, string name, string[] signature) + { + await TryInitializeAsync().ConfigureAwait(false); + return await _internalMetadata.GetAggregateAsync(keyspace, name, signature).ConfigureAwait(false); } /// @@ -492,99 +419,29 @@ public AggregateMetadata GetAggregate(string keyspace, string name, string[] sig /// /// The query trace that contains the id, which properties are going to be populated. /// - internal Task GetQueryTraceAsync(QueryTrace trace) + internal async Task GetQueryTraceAsync(QueryTrace trace) { - return _schemaParser.GetQueryTraceAsync(trace, Configuration.Timer); + await TryInitializeAsync().ConfigureAwait(false); + return await _internalMetadata.GetQueryTraceAsync(trace).ConfigureAwait(false); } - + /// /// Updates keyspace metadata (including token metadata for token aware routing) for a given keyspace or a specific keyspace table. /// If no keyspace is provided then this method will update the metadata and token map for all the keyspaces of the cluster. /// public bool RefreshSchema(string keyspace = null, string table = null) { - return TaskHelper.WaitToComplete(RefreshSchemaAsync(keyspace, table), Configuration.DefaultRequestOptions.QueryAbortTimeout * 2); + return TaskHelper.WaitToComplete(RefreshSchemaAsync(keyspace, table), _queryAbortTimeout * 2); } - + /// /// Updates keyspace metadata (including token metadata for token aware routing) for a given keyspace or a specific keyspace table. /// If no keyspace is provided then this method will update the metadata and token map for all the keyspaces of the cluster. /// public async Task RefreshSchemaAsync(string keyspace = null, string table = null) { - if (keyspace == null) - { - await ControlConnection.ScheduleAllKeyspacesRefreshAsync(true).ConfigureAwait(false); - return true; - } - - await ControlConnection.ScheduleKeyspaceRefreshAsync(keyspace, true).ConfigureAwait(false); - _keyspaces.TryGetValue(keyspace, out var ks); - if (ks == null) - { - return false; - } - - if (table != null) - { - ks.ClearTableMetadata(table); - } - return true; - } - - /// - /// this method should be called by the event debouncer - /// - internal bool RemoveKeyspace(string name) - { - var existed = RemoveKeyspaceFromTokenMap(name); - if (!existed) - { - return false; - } - - FireSchemaChangedEvent(SchemaChangedEventArgs.Kind.Dropped, name, null, this); - return true; - } - - /// - /// this method should be called by the event debouncer - /// - internal Task RefreshSingleKeyspace(string name) - { - return UpdateTokenMapForKeyspace(name); - } - - internal void ClearTable(string keyspaceName, string tableName) - { - if (_keyspaces.TryGetValue(keyspaceName, out var ksMetadata)) - { - ksMetadata.ClearTableMetadata(tableName); - } - } - - internal void ClearView(string keyspaceName, string name) - { - if (_keyspaces.TryGetValue(keyspaceName, out var ksMetadata)) - { - ksMetadata.ClearViewMetadata(name); - } - } - - internal void ClearFunction(string keyspaceName, string functionName, string[] signature) - { - if (_keyspaces.TryGetValue(keyspaceName, out var ksMetadata)) - { - ksMetadata.ClearFunction(functionName, signature); - } - } - - internal void ClearAggregate(string keyspaceName, string aggregateName, string[] signature) - { - if (_keyspaces.TryGetValue(keyspaceName, out var ksMetadata)) - { - ksMetadata.ClearAggregate(aggregateName, signature); - } + await TryInitializeAsync().ConfigureAwait(false); + return await _internalMetadata.RefreshSchemaAsync(keyspace, table).ConfigureAwait(false); } /// @@ -599,128 +456,8 @@ internal void ClearAggregate(string keyspaceName, string aggregateName, string[] /// True if schema agreement was successful and false if it was not successful. public async Task CheckSchemaAgreementAsync() { - if (Hosts.Count == 1) - { - // If there is just one node, the schema is up to date in all nodes :) - return true; - } - - try - { - var queries = new[] - { - ControlConnection.QueryAsync(SelectSchemaVersionLocal), - ControlConnection.QueryAsync(SelectSchemaVersionPeers) - }; - - await Task.WhenAll(queries).ConfigureAwait(false); - - return CheckSchemaVersionResults(queries[0].Result, queries[1].Result); - } - catch (Exception ex) - { - Logger.Error("Error while checking schema agreement.", ex); - } - - return false; - } - - /// - /// Checks if there is only one schema version between the provided query results. - /// - /// - /// Results obtained from a query to system.local table. - /// Must contain the schema_version column. - /// - /// - /// Results obtained from a query to system.peers table. - /// Must contain the schema_version column. - /// - /// True if there is a schema agreement (only 1 schema version). False otherwise. - private static bool CheckSchemaVersionResults( - IEnumerable localVersionQuery, IEnumerable peerVersionsQuery) - { - return new HashSet( - peerVersionsQuery - .Concat(localVersionQuery) - .Select(r => r.GetValue("schema_version"))).Count == 1; - } - - /// - /// Waits until that the schema version in all nodes is the same or the waiting time passed. - /// This method blocks the calling thread. - /// - internal async Task WaitForSchemaAgreementAsync(IConnection connection) - { - if (Hosts.Count == 1) - { - //If there is just one node, the schema is up to date in all nodes :) - return true; - } - var start = DateTime.Now; - var waitSeconds = Configuration.ProtocolOptions.MaxSchemaAgreementWaitSeconds; - Metadata.Logger.Info("Waiting for schema agreement"); - try - { - var totalVersions = 0; - while (DateTime.Now.Subtract(start).TotalSeconds < waitSeconds) - { - var serializer = _serializerManager.GetCurrentSerializer(); - var schemaVersionLocalQuery = - new QueryRequest( - serializer, - Metadata.SelectSchemaVersionLocal, - QueryProtocolOptions.Default, - false, - null); - var schemaVersionPeersQuery = - new QueryRequest( - serializer, - Metadata.SelectSchemaVersionPeers, - QueryProtocolOptions.Default, - false, - null); - var queries = new[] { connection.Send(schemaVersionLocalQuery), connection.Send(schemaVersionPeersQuery) }; - // ReSharper disable once CoVariantArrayConversion - await Task.WhenAll(queries); - - if (Metadata.CheckSchemaVersionResults( - Configuration.MetadataRequestHandler.GetRowSet(await queries[0].ConfigureAwait(false)), - Configuration.MetadataRequestHandler.GetRowSet(await queries[1].ConfigureAwait(false)))) - { - return true; - } - - await Task.Delay(500).ConfigureAwait(false); - } - Metadata.Logger.Info($"Waited for schema agreement, still {totalVersions} schema versions in the cluster."); - } - catch (Exception ex) - { - //Exceptions are not fatal - Metadata.Logger.Error("There was an exception while trying to retrieve schema versions", ex); - } - - return false; - } - - /// - /// Sets the Cassandra version in order to identify how to parse the metadata information - /// - /// - internal void SetCassandraVersion(Version version) - { - _schemaParser = Configuration.SchemaParserFactory.Create(version, this, GetUdtDefinitionAsync, _schemaParser); - } - - internal void SetProductTypeAsDbaas() - { - IsDbaas = true; - } - - internal IEnumerable UpdateResolvedContactPoint(IContactPoint contactPoint, IEnumerable endpoints) - { - return _resolvedContactPoints.AddOrUpdate(contactPoint, _ => endpoints, (_, __) => endpoints); + await TryInitializeAsync().ConfigureAwait(false); + return await _internalMetadata.CheckSchemaAgreementAsync().ConfigureAwait(false); } } } \ No newline at end of file diff --git a/src/Cassandra/MetadataHelpers/ISchemaParserFactory.cs b/src/Cassandra/MetadataHelpers/ISchemaParserFactory.cs index 5c4cb0089..6848dba10 100644 --- a/src/Cassandra/MetadataHelpers/ISchemaParserFactory.cs +++ b/src/Cassandra/MetadataHelpers/ISchemaParserFactory.cs @@ -15,12 +15,13 @@ using System; using System.Threading.Tasks; +using Cassandra.Connections.Control; namespace Cassandra.MetadataHelpers { internal interface ISchemaParserFactory { - ISchemaParser Create(Version cassandraVersion, Metadata parent, + ISchemaParser Create(Version cassandraVersion, InternalMetadata parent, Func> udtResolver, ISchemaParser currentInstance = null); } diff --git a/src/Cassandra/Policies/ILocalDatacenterProvider.cs b/src/Cassandra/Policies/ILocalDatacenterProvider.cs index 1a9bba535..7be66d2d0 100644 --- a/src/Cassandra/Policies/ILocalDatacenterProvider.cs +++ b/src/Cassandra/Policies/ILocalDatacenterProvider.cs @@ -13,6 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +using Cassandra.Connections.Control; using Cassandra.SessionManagement; namespace Cassandra @@ -30,6 +31,6 @@ internal interface ILocalDatacenterProvider /// /// Should be called after we have an initialized cluster instance. /// - void Initialize(IInternalCluster cluster, Metadata metadata); + void Initialize(IInternalCluster cluster, IInternalMetadata internalMetadata); } } \ No newline at end of file diff --git a/src/Cassandra/Policies/LocalDatacenterProvider.cs b/src/Cassandra/Policies/LocalDatacenterProvider.cs index b35da2d98..19adbe7eb 100644 --- a/src/Cassandra/Policies/LocalDatacenterProvider.cs +++ b/src/Cassandra/Policies/LocalDatacenterProvider.cs @@ -16,7 +16,7 @@ using System; using System.Collections.Generic; using System.Linq; - +using Cassandra.Connections.Control; using Cassandra.SessionManagement; namespace Cassandra @@ -26,16 +26,16 @@ internal class LocalDatacenterProvider : ILocalDatacenterProvider private volatile bool _initialized = false; private volatile IInternalCluster _cluster; - private volatile Metadata _metadata; + private volatile InternalMetadata _internalMetadata; private volatile IEnumerable _availableDcs; private volatile string _availableDcsStr; private volatile string _cachedDatacenter; - public void Initialize(IInternalCluster cluster, Metadata metadata) + public void Initialize(IInternalCluster cluster, InternalMetadata internalMetadata) { _cluster = cluster; - _metadata = metadata; - _availableDcs = metadata.AllHosts().Select(h => h.Datacenter).Where(dc => dc != null).Distinct().ToList(); + _internalMetadata = internalMetadata; + _availableDcs = internalMetadata.AllHosts().Select(h => h.Datacenter).Where(dc => dc != null).Distinct().ToList(); _availableDcsStr = string.Join(", ", _availableDcs); _initialized = true; } @@ -89,7 +89,7 @@ private string ValidateAndReturnDatacenter(string datacenter) private string InferLocalDatacenter() { - var cc = _metadata.ControlConnection; + var cc = _internalMetadata.ControlConnection; if (cc == null) { throw new DriverInternalError("ControlConnection was not correctly set"); diff --git a/src/Cassandra/Requests/IPrepareHandler.cs b/src/Cassandra/Requests/IPrepareHandler.cs index 2e0c92a21..de15aa1fc 100644 --- a/src/Cassandra/Requests/IPrepareHandler.cs +++ b/src/Cassandra/Requests/IPrepareHandler.cs @@ -24,6 +24,6 @@ namespace Cassandra.Requests internal interface IPrepareHandler { Task PrepareAsync( - PrepareRequest request, IInternalSession session, Metadata metadata, IEnumerator queryPlan); + PrepareRequest request, IInternalSession session, IEnumerator queryPlan); } } \ No newline at end of file diff --git a/src/Cassandra/Requests/PrepareHandler.cs b/src/Cassandra/Requests/PrepareHandler.cs index dcc726758..5c355f458 100644 --- a/src/Cassandra/Requests/PrepareHandler.cs +++ b/src/Cassandra/Requests/PrepareHandler.cs @@ -20,7 +20,9 @@ using System.Net; using System.Net.Sockets; using System.Threading.Tasks; + using Cassandra.Connections; +using Cassandra.Connections.Control; using Cassandra.Responses; using Cassandra.Serialization; using Cassandra.SessionManagement; @@ -43,9 +45,9 @@ public PrepareHandler(ISerializerManager serializerManager, IInternalCluster clu } public async Task PrepareAsync( - PrepareRequest request, IInternalSession session, Metadata metadata, IEnumerator queryPlan) + PrepareRequest request, IInternalSession session, IEnumerator queryPlan) { - var prepareResult = await SendRequestToOneNode(session, metadata, queryPlan, request).ConfigureAwait(false); + var prepareResult = await SendRequestToOneNode(session, queryPlan, request).ConfigureAwait(false); if (session.Cluster.Configuration.QueryOptions.IsPrepareOnAllHosts()) { @@ -56,7 +58,7 @@ public async Task PrepareAsync( } private async Task SendRequestToOneNode( - IInternalSession session, Metadata metadata, IEnumerator queryPlan, PrepareRequest request) + IInternalSession session, IEnumerator queryPlan, PrepareRequest request) { var triedHosts = new Dictionary(); @@ -71,9 +73,9 @@ private async Task SendRequestToOneNode( var result = await connection.Send(request).ConfigureAwait(false); return new PrepareResult { - PreparedStatement = + PreparedStatement = await GetPreparedStatement( - result, request, request.Keyspace ?? connection.Keyspace, metadata).ConfigureAwait(false), + result, request, request.Keyspace ?? connection.Keyspace).ConfigureAwait(false), TriedHosts = triedHosts, HostAddress = host.Address }; @@ -130,7 +132,7 @@ private Host GetNextHost(IEnumerator queryPlan, out HostDistance distance) } private async Task GetPreparedStatement( - Response response, PrepareRequest request, string keyspace, Metadata metadata) + Response response, PrepareRequest request, string keyspace) { if (response == null) { @@ -148,20 +150,20 @@ private async Task GetPreparedStatement( } var prepared = (OutputPrepared)output; var ps = new PreparedStatement( - prepared.VariablesRowsMetadata, - prepared.QueryId, + prepared.VariablesRowsMetadata, + prepared.QueryId, new ResultMetadata(prepared.ResultMetadataId, prepared.ResultRowsMetadata), - request.Query, - keyspace, + request.Query, + keyspace, _serializerManager) { IncomingPayload = resultResponse.CustomPayload }; - await FillRoutingInfo(ps, metadata).ConfigureAwait(false); + await FillRoutingInfo(ps, _cluster.InternalMetadata).ConfigureAwait(false); return ps; } - private static async Task FillRoutingInfo(PreparedStatement ps, Metadata metadata) + private static async Task FillRoutingInfo(PreparedStatement ps, InternalMetadata internalMetadata) { var column = ps.Variables.Columns.FirstOrDefault(); if (column?.Keyspace == null) @@ -184,7 +186,7 @@ private static async Task FillRoutingInfo(PreparedStatement ps, Metadata metadat try { const string msgRoutingNotSet = "Routing information could not be set for query \"{0}\""; - var table = await metadata.GetTableAsync(column.Keyspace, column.Table).ConfigureAwait(false); + var table = await internalMetadata.GetTableAsync(column.Keyspace, column.Table).ConfigureAwait(false); if (table == null) { Logger.Info(msgRoutingNotSet, ps.Cql); diff --git a/src/Cassandra/SessionManagement/IInternalCluster.cs b/src/Cassandra/SessionManagement/IInternalCluster.cs index 430d2dc52..ba53b7e82 100644 --- a/src/Cassandra/SessionManagement/IInternalCluster.cs +++ b/src/Cassandra/SessionManagement/IInternalCluster.cs @@ -30,6 +30,8 @@ internal interface IInternalCluster : ICluster { ISerializerManager SerializerManager { get; } + IInternalMetadata InternalMetadata { get; } + bool AnyOpenConnections(Host host); /// @@ -61,8 +63,8 @@ internal interface IInternalCluster : ICluster HostDistance RetrieveAndSetDistance(Host host); /// - /// Initializes once (Thread-safe) the control connection and returns the metadata associated with the Cluster instance + /// Initializes once (Thread-safe) the control connection /// - Task TryInitAndGetMetadataAsync(); + Task TryInitializeAsync(); } } \ No newline at end of file From 0bd3a0335b4e292af90aae65330145012dac10fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Tue, 30 Jun 2020 18:56:50 +0100 Subject: [PATCH 09/31] revamp Metadata - add IMetadata interface and change Metadata to be internal - add *Async methods to IMetadata - change internal references from Metadata to InternalMetadata - add *Snapshot methods to IMetadata --- src/Cassandra/Builder.cs | 4 +- src/Cassandra/Cluster.cs | 99 ++-- src/Cassandra/ClusterDescription.cs | 5 +- src/Cassandra/Configuration.cs | 15 +- .../Control/ProtocolVersionNegotiator.cs | 6 +- src/Cassandra/Data/Linq/SessionExtensions.cs | 2 +- src/Cassandra/Data/Linq/Table.cs | 23 +- src/Cassandra/DataStax/Graph/GraphOptions.cs | 2 +- .../DataStax/Insights/IInsightsClient.cs | 3 +- .../InfoProviders/IInsightsInfoProvider.cs | 3 +- .../AuthProviderInfoProvider.cs | 3 +- .../ConfigAntiPatternsInfoProvider.cs | 31 +- .../StartupMessage/DataCentersInfoProvider.cs | 10 +- .../StartupMessage/DriverInfoProvider.cs | 3 +- .../ExecutionProfileInfoProvider.cs | 6 +- .../StartupMessage/HostnameInfoProvider.cs | 6 +- .../OtherOptionsInfoProvider.cs | 7 +- .../StartupMessage/PlatformInfoProvider.cs | 5 +- .../PoolSizeByHostDistanceInfoProvider.cs | 8 +- .../ReconnectionPolicyInfoProvider.cs | 19 +- .../StatusMessage/NodeStatusInfoProvider.cs | 6 +- .../DataStax/Insights/InsightsClient.cs | 48 +- .../IInsightsMessageFactory.cs | 5 +- .../InsightsStartupMessageFactory.cs | 40 +- .../InsightsStatusMessageFactory.cs | 8 +- src/Cassandra/Extensions.cs | 15 +- src/Cassandra/ICluster.cs | 2 +- src/Cassandra/IMetadata.cs | 274 +++++++++++ src/Cassandra/ISession.cs | 11 +- src/Cassandra/KeyspaceMetadata.cs | 7 +- src/Cassandra/Metadata.cs | 425 ++++++++---------- .../MetadataHelpers/ISchemaParserFactory.cs | 2 +- .../MetadataHelpers/SchemaParserFactory.cs | 3 +- .../ConstantSpeculativeExecutionPolicy.cs | 4 +- .../Policies/DCAwareRoundRobinPolicy.cs | 8 +- .../Policies/DefaultLoadBalancingPolicy.cs | 6 +- .../Policies/ILoadBalancingPolicy.cs | 4 +- .../Policies/ISpeculativeExecutionPolicy.cs | 5 +- .../Policies/LocalDatacenterProvider.cs | 4 +- .../Policies/NoSpeculativeExecutionPolicy.cs | 4 +- .../Policies/RetryLoadBalancingPolicy.cs | 4 +- src/Cassandra/Policies/RoundRobinPolicy.cs | 6 +- src/Cassandra/Policies/TokenAwarePolicy.cs | 8 +- src/Cassandra/ProtocolVersion.cs | 13 +- src/Cassandra/QueryTrace.cs | 7 +- src/Cassandra/Requests/IRequestHandler.cs | 3 +- .../Requests/IRequestHandlerFactory.cs | 7 +- src/Cassandra/Requests/PrepareHandler.cs | 2 +- src/Cassandra/Requests/ReprepareHandler.cs | 2 +- src/Cassandra/Requests/RequestExecution.cs | 6 +- src/Cassandra/Requests/RequestHandler.cs | 23 +- .../Requests/RequestHandlerFactory.cs | 7 +- src/Cassandra/SchemaParser.cs | 11 +- src/Cassandra/Session.cs | 71 +-- .../SessionManagement/IInternalCluster.cs | 15 +- .../SessionManagement/IInternalSession.cs | 5 +- src/Cassandra/SessionState.cs | 5 +- src/Cassandra/UdtMappingDefinitions.cs | 6 +- 58 files changed, 808 insertions(+), 534 deletions(-) create mode 100644 src/Cassandra/IMetadata.cs diff --git a/src/Cassandra/Builder.cs b/src/Cassandra/Builder.cs index 894718cda..6d540c8a7 100644 --- a/src/Cassandra/Builder.cs +++ b/src/Cassandra/Builder.cs @@ -1050,7 +1050,7 @@ public Builder WithExecutionProfiles(Action profileOpt /// specifies what is the default for each option. /// /// - /// In case you disable Metadata synchronization, please ensure you invoke (accessible via ) in order to keep the token metadata up to date + /// In case you disable Metadata synchronization, please ensure you invoke (accessible via ) in order to keep the token metadata up to date /// otherwise you will not be getting everything you can out of token aware routing, i.e. , which is enabled by the default. /// /// @@ -1061,7 +1061,7 @@ public Builder WithExecutionProfiles(Action profileOpt /// /// Token metadata will not be computed and stored. /// This means that token aware routing (, enabled by default) will only work correctly - /// if you keep the token metadata up to date using the method (accessible via ). + /// if you keep the token metadata up to date using the method (accessible via ). /// If you wish to go this route of manually refreshing the metadata then /// it's recommended to refresh only the keyspaces that this application will use, by passing the keyspace parameter. /// diff --git a/src/Cassandra/Cluster.cs b/src/Cassandra/Cluster.cs index 503f46ad0..1d36ea1ea 100644 --- a/src/Cassandra/Cluster.cs +++ b/src/Cassandra/Cluster.cs @@ -28,9 +28,7 @@ using Cassandra.Connections; using Cassandra.Connections.Control; using Cassandra.Helpers; -using Cassandra.ProtocolEvents; using Cassandra.Requests; -using Cassandra.Serialization; using Cassandra.SessionManagement; using Cassandra.Tasks; @@ -45,30 +43,27 @@ public class Cluster : IInternalCluster private static readonly IPEndPoint DefaultContactPoint = new IPEndPoint(IPAddress.Parse("127.0.0.1"), 9042); - private static ProtocolVersion _maxProtocolVersion = ProtocolVersion.MaxSupported; internal static readonly Logger Logger = new Logger(typeof(Cluster)); private readonly CopyOnWriteList _connectedSessions = new CopyOnWriteList(); - private readonly SerializerManager _serializerManager; private readonly bool _implicitContactPoint = false; private volatile Exception _initException; private readonly SemaphoreSlim _sessionCreateLock = new SemaphoreSlim(1, 1); private long _sessionCounter = -1; private readonly IInternalMetadata _internalMetadata; + private readonly Metadata _lazyMetadata; private IReadOnlyList _loadBalancingPolicies; - private readonly Task _initTask; + private readonly Task _initTask; private long _state = Cluster.Initializing; - + internal IInternalCluster InternalRef => this; IInternalMetadata IInternalCluster.InternalMetadata => _internalMetadata; - + private bool IsDisposed => Interlocked.Read(ref _state) == Cluster.Disposed; - ISerializerManager IInternalCluster.SerializerManager => _serializerManager; - Exception IInternalCluster.InitException => _initException; /// @@ -112,53 +107,20 @@ public static Builder Builder() return new Builder(); } - /// - /// Gets or sets the maximum protocol version used by this driver. - /// - /// While property value is maintained for backward-compatibility, - /// use to set the maximum protocol version used by the driver. - /// - /// - /// Protocol version used can not be higher than . - /// - /// - public static int MaxProtocolVersion - { - get { return (int)_maxProtocolVersion; } - set - { - if (value > (int)ProtocolVersion.MaxSupported) - { - // Ignore - return; - } - _maxProtocolVersion = (ProtocolVersion)value; - } - } - /// - public Configuration Configuration { get; private set; } + public Configuration Configuration { get; } /// // ReSharper disable once ConvertToAutoProperty, reviewed bool IInternalCluster.ImplicitContactPoint => _implicitContactPoint; /// - public Metadata Metadata { get; } - + public IMetadata Metadata => _lazyMetadata; + private Cluster(IEnumerable contactPoints, Configuration configuration) { Configuration = configuration; - var protocolVersion = _maxProtocolVersion; - if (Configuration.ProtocolOptions.MaxProtocolVersionValue != null && - Configuration.ProtocolOptions.MaxProtocolVersionValue.Value.IsSupported(configuration)) - { - protocolVersion = Configuration.ProtocolOptions.MaxProtocolVersionValue.Value; - } - - _serializerManager = new SerializerManager(protocolVersion, configuration.TypeSerializers); - var contactPointsList = contactPoints.ToList(); if (contactPointsList.Count == 0) { @@ -168,15 +130,15 @@ private Cluster(IEnumerable contactPoints, Configuration configuration) } var parsedContactPoints = configuration.ContactPointParser.ParseContactPoints(contactPointsList); - - Metadata = new Metadata(this, configuration, _serializerManager, parsedContactPoints); - _internalMetadata = Metadata.InternalMetadata; + + _lazyMetadata = new Metadata(this, configuration, Configuration.SerializerManager, parsedContactPoints); + _internalMetadata = _lazyMetadata.InternalMetadata; _initTask = Task.Run(InitAsync); } /// - Task IInternalCluster.TryInitializeAsync() + Task IInternalCluster.TryInitAndGetMetadataAsync() { var currentState = Interlocked.Read(ref _state); if (currentState == Cluster.Initialized) @@ -189,7 +151,7 @@ Task IInternalCluster.TryInitializeAsync() { throw new ObjectDisposedException("This cluster object has been disposed."); } - + if (_initException != null) { //There was an exception that is not possible to recover from @@ -199,7 +161,7 @@ Task IInternalCluster.TryInitializeAsync() return _initTask; } - private async Task InitAsync() + private async Task InitAsync() { Cluster.Logger.Info("Connecting to cluster using {0}", Cluster.GetAssemblyInfo()); try @@ -218,7 +180,7 @@ private async Task InitAsync() // Only abort the async operations when at least twice the time for ConnectTimeout per host passed var initialAbortTimeout = Configuration.SocketOptions.ConnectTimeoutMillis * 2 * _internalMetadata.Hosts.Count; initialAbortTimeout = Math.Max(initialAbortTimeout, Configuration.SocketOptions.MetadataAbortTimeout); - var initTask = Metadata.TryInitializeAsync(); + var initTask = _lazyMetadata.TryInitializeAsync(); try { await initTask.WaitToCompleteAsync(initialAbortTimeout).ConfigureAwait(false); @@ -268,11 +230,15 @@ private async Task InitAsync() // Set metadata dependent options SetMetadataDependentOptions(); - Cluster.Logger.Info("Cluster Connected using binary protocol version: [" + _serializerManager.CurrentProtocolVersion + "]"); + Cluster.Logger.Info("Cluster Connected using binary protocol version: [" + + Configuration.SerializerManager.CurrentProtocolVersion + + "]"); _internalMetadata.Hosts.Added += _internalMetadata.OnHostAdded; _internalMetadata.Hosts.Removed += _internalMetadata.OnHostRemoved; _internalMetadata.Hosts.Up += OnHostUp; Cluster.Logger.Info("Cluster [" + _internalMetadata.ClusterName + "] has been initialized."); + + return _internalMetadata; } catch (NoHostAvailableException) { @@ -312,7 +278,7 @@ IReadOnlyDictionary> IInternalCl { return _internalMetadata.ResolvedContactPoints; } - + /// /// Creates a new session on this cluster. /// @@ -358,7 +324,6 @@ public async Task ConnectAsync(string keyspace) _connectedSessions.Add(session); Cluster.Logger.Info("Session connected ({0})", session.GetHashCode()); return session; - } finally { @@ -441,7 +406,7 @@ private async void OnHostUp(Host h) "that came UP:" + Environment.NewLine + "{1}", h?.Address?.ToString(), ex.ToString()); } } - + /// public void Shutdown(int timeoutMs = Timeout.Infinite) { @@ -478,7 +443,7 @@ public async Task ShutdownAsync(int timeoutMs = Timeout.Infinite) { Cluster.Logger.Warning("Exception occured while disposing session instances: {0}", ex.ToString()); } - + if (previousState != Cluster.Initialized) { return; @@ -491,7 +456,7 @@ public async Task ShutdownAsync(int timeoutMs = Timeout.Infinite) private async Task ShutdownInternalAsync() { - await Metadata.ShutdownAsync().ConfigureAwait(false); + await _lazyMetadata.ShutdownAsync().ConfigureAwait(false); Configuration.Timer.Dispose(); // Dispose policies @@ -530,7 +495,7 @@ HostDistance IInternalCluster.RetrieveAndSetDistance(Host host) async Task IInternalCluster.PrepareAsync( IInternalSession session, string cqlQuery, string keyspace, IDictionary customPayload) { - await InternalRef.TryInitializeAsync().ConfigureAwait(false); + await InternalRef.TryInitAndGetMetadataAsync().ConfigureAwait(false); var serializer = _internalMetadata.SerializerManager.GetCurrentSerializer(); var currentVersion = serializer.ProtocolVersion; @@ -549,9 +514,9 @@ async Task IInternalCluster.PrepareAsync( private async Task PrepareAsync(IInternalSession session, PrepareRequest request) { var lbp = session.Cluster.Configuration.DefaultRequestOptions.LoadBalancingPolicy; - var handler = InternalRef.Configuration.PrepareHandlerFactory.CreatePrepareHandler(_serializerManager, this); + var handler = InternalRef.Configuration.PrepareHandlerFactory.CreatePrepareHandler(Configuration.SerializerManager, this); var ps = await handler.PrepareAsync( - request, + request, session, lbp.NewQueryPlan(Metadata, session.Keyspace, null).GetEnumerator()).ConfigureAwait(false); var psAdded = InternalRef.PreparedQueries.GetOrAdd(ps.Id, ps); @@ -574,7 +539,7 @@ private async Task ReprepareAllQueries(Host host) { return; } - + // Get the first pool for that host that has open connections var pool = sessions.Select(s => s.GetExistingPool(host.Address)).Where(p => p != null).FirstOrDefault(p => p.HasConnections); if (pool == null) @@ -586,7 +551,7 @@ private async Task ReprepareAllQueries(Host host) PrepareHandler.Logger.Info($"Re-preparing {preparedQueries.Count} queries on {host.Address}"); var tasks = new List(preparedQueries.Count); var handler = InternalRef.Configuration.PrepareHandlerFactory.CreateReprepareHandler(); - var serializer = _serializerManager.GetCurrentSerializer(); + var serializer = Configuration.SerializerManager.GetCurrentSerializer(); using (var semaphore = new SemaphoreSlim(64, 64)) { foreach (var ps in preparedQueries) @@ -594,10 +559,10 @@ private async Task ReprepareAllQueries(Host host) var request = new PrepareRequest(serializer, ps.Cql, ps.Keyspace, null); await semaphore.WaitAsync().ConfigureAwait(false); tasks.Add(Task.Run(() => handler.ReprepareOnSingleNodeAsync( - new KeyValuePair(host, pool), - ps, - request, - semaphore, + new KeyValuePair(host, pool), + ps, + request, + semaphore, true))); } diff --git a/src/Cassandra/ClusterDescription.cs b/src/Cassandra/ClusterDescription.cs index 7cf4b4e52..44de74e8f 100644 --- a/src/Cassandra/ClusterDescription.cs +++ b/src/Cassandra/ClusterDescription.cs @@ -17,11 +17,12 @@ namespace Cassandra { /// - /// Provides a snapshot of cluster metadata properties. + /// Provides a snapshot of cluster metadata properties. /// public class ClusterDescription { - public ClusterDescription(string clusterName, bool isDbaas, ProtocolVersion protocolVersion) + internal ClusterDescription( + string clusterName, bool isDbaas, ProtocolVersion protocolVersion) { ClusterName = clusterName; IsDbaas = isDbaas; diff --git a/src/Cassandra/Configuration.cs b/src/Cassandra/Configuration.cs index e1669f869..516cb689f 100644 --- a/src/Cassandra/Configuration.cs +++ b/src/Cassandra/Configuration.cs @@ -56,6 +56,8 @@ public class Configuration internal const string DefaultExecutionProfileName = "default"; internal const string DefaultSessionName = "s"; + internal static readonly ProtocolVersion MaxProtocolVersion = ProtocolVersion.MaxSupported; + /// /// Gets the policies set for the cluster. /// @@ -140,6 +142,8 @@ public class Configuration /// internal IEnumerable TypeSerializers { get; set; } + internal ISerializerManager SerializerManager { get; } + internal MetadataSyncOptions MetadataSyncOptions { get; } internal IStartupOptionsFactory StartupOptionsFactory { get; } @@ -420,12 +424,21 @@ internal Configuration(Policies policies, EndPointResolver = endPointResolver ?? new EndPointResolver(ServerNameResolver); ContactPointParser = contactPointParser ?? new ContactPointParser(DnsResolver, ProtocolOptions, ServerNameResolver, KeepContactPointsUnresolved); LocalDatacenterProvider = localDatacenterProvider ?? new LocalDatacenterProvider(); - + // Create the buffer pool with 16KB for small buffers and 256Kb for large buffers. // The pool does not eagerly reserve the buffers, so it doesn't take unnecessary memory // to create the instance. BufferPool = new RecyclableMemoryStreamManager(16 * 1024, 256 * 1024, ProtocolOptions.MaximumFrameLength); Timer = new HashedWheelTimer(); + + var protocolVersion = Configuration.MaxProtocolVersion; + if (ProtocolOptions.MaxProtocolVersionValue != null && + ProtocolOptions.MaxProtocolVersionValue.Value.IsSupported(AllowBetaProtocolVersions)) + { + protocolVersion = ProtocolOptions.MaxProtocolVersionValue.Value; + } + + SerializerManager = new SerializerManager(protocolVersion, TypeSerializers); } /// diff --git a/src/Cassandra/Connections/Control/ProtocolVersionNegotiator.cs b/src/Cassandra/Connections/Control/ProtocolVersionNegotiator.cs index 81b542a33..2e2127d49 100644 --- a/src/Cassandra/Connections/Control/ProtocolVersionNegotiator.cs +++ b/src/Cassandra/Connections/Control/ProtocolVersionNegotiator.cs @@ -26,7 +26,7 @@ public async Task NegotiateVersionAsync( IConnection connection, ISerializerManager serializer) { - var commonVersion = serializer.CurrentProtocolVersion.GetHighestCommon(config, internalMetadata.Hosts); + var commonVersion = serializer.CurrentProtocolVersion.GetHighestCommon(config.AllowBetaProtocolVersions, internalMetadata.Hosts); if (commonVersion != serializer.CurrentProtocolVersion) { // Current connection will be closed and reopened @@ -45,9 +45,9 @@ public async Task ChangeProtocolVersion( UnsupportedProtocolVersionException ex = null, ProtocolVersion? previousVersion = null) { - if (!nextVersion.IsSupported(config) || nextVersion == previousVersion) + if (!nextVersion.IsSupported(config.AllowBetaProtocolVersions) || nextVersion == previousVersion) { - nextVersion = nextVersion.GetLowerSupported(config); + nextVersion = nextVersion.GetLowerSupported(config.AllowBetaProtocolVersions); } if (nextVersion == 0) diff --git a/src/Cassandra/Data/Linq/SessionExtensions.cs b/src/Cassandra/Data/Linq/SessionExtensions.cs index 1e6e8f232..57741aac6 100644 --- a/src/Cassandra/Data/Linq/SessionExtensions.cs +++ b/src/Cassandra/Data/Linq/SessionExtensions.cs @@ -77,7 +77,7 @@ public static Task CreateBatchAsync(this ISession session) public static async Task CreateBatchAsync(this ISession session, BatchType batchType) { - var metadata = await session.Cluster.GetMetadataAsync().ConfigureAwait(false); + var metadata = await session.Cluster.Metadata.GetClusterDescriptionAsync().ConfigureAwait(false); if (metadata.ProtocolVersion.SupportsBatch()) { return new BatchV2(session, batchType); diff --git a/src/Cassandra/Data/Linq/Table.cs b/src/Cassandra/Data/Linq/Table.cs index f3c3633fd..c63a9a80d 100644 --- a/src/Cassandra/Data/Linq/Table.cs +++ b/src/Cassandra/Data/Linq/Table.cs @@ -18,9 +18,9 @@ using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; + using Cassandra.Mapping; using Cassandra.Mapping.Statements; -using Cassandra.Tasks; namespace Cassandra.Data.Linq { @@ -69,10 +69,10 @@ public Table(ISession session, MappingConfiguration config, string tableName, st _keyspaceName = keyspaceName; //In case no mapping has been defined for the type, determine if the attributes used are Linq or Cassandra.Mapping //Linq attributes are marked as Obsolete - #pragma warning disable 612 +#pragma warning disable 612 config.MapperFactory.PocoDataFactory.AddDefinitionDefault(typeof(TEntity), () => LinqAttributeBasedTypeDefinition.DetermineAttributes(typeof(TEntity))); - #pragma warning restore 612 +#pragma warning restore 612 var pocoData = config.MapperFactory.GetPocoData(); InternalInitialize(Expression.Constant(this), this, config.MapperFactory, config.StatementFactory, pocoData); } @@ -91,7 +91,6 @@ public Table(ISession session, MappingConfiguration config, string tableName, st public Table(ISession session, MappingConfiguration config, string tableName) : this(session, config, tableName, null) { - } /// @@ -106,7 +105,6 @@ public Table(ISession session, MappingConfiguration config, string tableName) public Table(ISession session, MappingConfiguration config) : this(session, config, null, null) { - } /// @@ -146,7 +144,7 @@ object IQueryProvider.Execute(Expression expression) public Type GetEntityType() { - return typeof (TEntity); + return typeof(TEntity); } public void Create() @@ -168,8 +166,9 @@ public void CreateIfNotExists() public async Task CreateAsync() { - var metadata = await _session.Cluster.GetMetadataAsync().ConfigureAwait(false); - var serializer = metadata.SerializerManager.GetCurrentSerializer(); + // ensure that session is connected before retrieving the current serializer (depends on negotiated protocol version) + await _session.ConnectAsync().ConfigureAwait(false); + var serializer = _session.Cluster.Configuration.SerializerManager.GetCurrentSerializer(); var cqlQueries = CqlGenerator.GetCreate(serializer, PocoData, Name, KeyspaceName, false); foreach (var cql in cqlQueries) { @@ -214,12 +213,12 @@ public CqlInsert Insert(TEntity entity) /// /// The entity to insert /// - /// Determines if the query must be generated using NULL values for null - /// entity members. + /// Determines if the query must be generated using NULL values for null + /// entity members. /// /// Use false if you don't want to consider null values for the INSERT /// operation (recommended). - /// + /// /// /// Use true if you want to override all the values in the table, /// generating tombstones for null values. @@ -230,4 +229,4 @@ public CqlInsert Insert(TEntity entity, bool insertNulls) return new CqlInsert(entity, insertNulls, this, StatementFactory, MapperFactory); } } -} +} \ No newline at end of file diff --git a/src/Cassandra/DataStax/Graph/GraphOptions.cs b/src/Cassandra/DataStax/Graph/GraphOptions.cs index a73e7ed1a..78b62f961 100644 --- a/src/Cassandra/DataStax/Graph/GraphOptions.cs +++ b/src/Cassandra/DataStax/Graph/GraphOptions.cs @@ -343,7 +343,7 @@ private static byte[] ToUtf8Buffer(string value) private static byte[] ToBuffer(long value) { var serializer = Serialization.TypeSerializer.PrimitiveLongSerializer; - return serializer.Serialize((ushort) Cluster.MaxProtocolVersion, value); + return serializer.Serialize((ushort) Configuration.MaxProtocolVersion, value); } } } diff --git a/src/Cassandra/DataStax/Insights/IInsightsClient.cs b/src/Cassandra/DataStax/Insights/IInsightsClient.cs index 3fab45016..6d1ef6655 100644 --- a/src/Cassandra/DataStax/Insights/IInsightsClient.cs +++ b/src/Cassandra/DataStax/Insights/IInsightsClient.cs @@ -16,12 +16,13 @@ using System; using System.Threading.Tasks; +using Cassandra.Connections.Control; namespace Cassandra.DataStax.Insights { internal interface IInsightsClient : IDisposable { - Task InitializeAsync(); + void Initialize(IInternalMetadata internalMetadata); Task ShutdownAsync(); } diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/IInsightsInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/IInsightsInfoProvider.cs index 08a9712d2..e33ff0073 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/IInsightsInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/IInsightsInfoProvider.cs @@ -14,12 +14,13 @@ // limitations under the License. // +using Cassandra.Connections.Control; using Cassandra.SessionManagement; namespace Cassandra.DataStax.Insights.InfoProviders { internal interface IInsightsInfoProvider { - T GetInformation(IInternalCluster cluster, IInternalSession session, Metadata metadata); + T GetInformation(IInternalCluster cluster, IInternalSession session, IInternalMetadata internalMetadata); } } \ No newline at end of file diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/AuthProviderInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/AuthProviderInfoProvider.cs index 539d9ab42..4654a952e 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/AuthProviderInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/AuthProviderInfoProvider.cs @@ -14,6 +14,7 @@ // limitations under the License. // +using Cassandra.Connections.Control; using Cassandra.DataStax.Insights.Schema.StartupMessage; using Cassandra.SessionManagement; @@ -22,7 +23,7 @@ namespace Cassandra.DataStax.Insights.InfoProviders.StartupMessage internal class AuthProviderInfoProvider : IInsightsInfoProvider { public AuthProviderInfo GetInformation( - IInternalCluster cluster, IInternalSession session, Metadata metadata) + IInternalCluster cluster, IInternalSession session, IInternalMetadata internalMetadata) { var type = cluster.Configuration.AuthProvider.GetType(); return new AuthProviderInfo diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ConfigAntiPatternsInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ConfigAntiPatternsInfoProvider.cs index 648ecd5da..7c80f1622 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ConfigAntiPatternsInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ConfigAntiPatternsInfoProvider.cs @@ -12,11 +12,13 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// +// using System; using System.Collections.Generic; using System.Linq; + +using Cassandra.Connections.Control; using Cassandra.SessionManagement; namespace Cassandra.DataStax.Insights.InfoProviders.StartupMessage @@ -27,7 +29,7 @@ static ConfigAntiPatternsInfoProvider() { ConfigAntiPatternsInfoProvider.AntiPatternsProviders = new Dictionary, Dictionary>> { - { + { #pragma warning disable 618 typeof(DowngradingConsistencyRetryPolicy), #pragma warning restore 618 @@ -37,16 +39,16 @@ static ConfigAntiPatternsInfoProvider() return antiPatterns; } }, - { - typeof(DefaultLoadBalancingPolicy), + { + typeof(DefaultLoadBalancingPolicy), (obj, antiPatterns) => { var typedPolicy = (DefaultLoadBalancingPolicy) obj; return ConfigAntiPatternsInfoProvider.AddAntiPatterns(typedPolicy.ChildPolicy, antiPatterns); } }, - { - typeof(RetryLoadBalancingPolicy), + { + typeof(RetryLoadBalancingPolicy), (obj, antiPatterns) => { var typedPolicy = (RetryLoadBalancingPolicy) obj; @@ -54,8 +56,8 @@ static ConfigAntiPatternsInfoProvider() return ConfigAntiPatternsInfoProvider.AddAntiPatterns(typedPolicy.LoadBalancingPolicy, antiPatterns); } }, - { - typeof(TokenAwarePolicy), + { + typeof(TokenAwarePolicy), (obj, antiPatterns) => { var typedPolicy = (TokenAwarePolicy) obj; @@ -92,11 +94,12 @@ static ConfigAntiPatternsInfoProvider() public static IReadOnlyDictionary, Dictionary>> AntiPatternsProviders { get; } - public Dictionary GetInformation(IInternalCluster cluster, IInternalSession session, Metadata metadata) + public Dictionary GetInformation( + IInternalCluster cluster, IInternalSession session, IInternalMetadata internalMetadata) { var antiPatterns = new Dictionary(); - var resolvedContactPoints = metadata.ResolvedContactPoints; + var resolvedContactPoints = internalMetadata.ResolvedContactPoints; var contactPointsEndPoints = resolvedContactPoints .Values @@ -104,9 +107,9 @@ public Dictionary GetInformation(IInternalCluster cluster, IInte .Select(c => c.GetHostIpEndPointWithFallback()) .ToList(); - var contactPointsHosts = metadata + var contactPointsHosts = internalMetadata .AllHosts() - .Where(host => (host.ContactPoint != null && resolvedContactPoints.ContainsKey(host.ContactPoint)) + .Where(host => (host.ContactPoint != null && resolvedContactPoints.ContainsKey(host.ContactPoint)) || contactPointsEndPoints.Contains(host.Address)) .ToList(); @@ -126,8 +129,8 @@ public Dictionary GetInformation(IInternalCluster cluster, IInte private static Dictionary AddAntiPatterns(object obj, Dictionary antiPatterns) { - return ConfigAntiPatternsInfoProvider.AntiPatternsProviders.TryGetValue(obj.GetType(), out var provider) - ? provider.Invoke(obj, antiPatterns) + return ConfigAntiPatternsInfoProvider.AntiPatternsProviders.TryGetValue(obj.GetType(), out var provider) + ? provider.Invoke(obj, antiPatterns) : antiPatterns; } } diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DataCentersInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DataCentersInfoProvider.cs index ea0e1c6bf..c612e94a4 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DataCentersInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DataCentersInfoProvider.cs @@ -12,25 +12,27 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// +// using System.Collections.Generic; + +using Cassandra.Connections.Control; using Cassandra.SessionManagement; namespace Cassandra.DataStax.Insights.InfoProviders.StartupMessage { internal class DataCentersInfoProvider : IInsightsInfoProvider> { - public HashSet GetInformation(IInternalCluster cluster, IInternalSession session, Metadata metadata) + public HashSet GetInformation(IInternalCluster cluster, IInternalSession session, IInternalMetadata internalMetadata) { var dataCenters = new HashSet(); var remoteConnectionsLength = cluster .Configuration - .GetOrCreatePoolingOptions(metadata.ProtocolVersion) + .GetOrCreatePoolingOptions(internalMetadata.ProtocolVersion) .GetCoreConnectionsPerHost(HostDistance.Remote); - foreach (var h in metadata.AllHosts()) + foreach (var h in internalMetadata.AllHosts()) { if (h.Datacenter == null) { diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DriverInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DriverInfoProvider.cs index f31e083ae..4f6e392a2 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DriverInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DriverInfoProvider.cs @@ -14,6 +14,7 @@ // limitations under the License. // +using Cassandra.Connections.Control; using Cassandra.Helpers; using Cassandra.SessionManagement; @@ -22,7 +23,7 @@ namespace Cassandra.DataStax.Insights.InfoProviders.StartupMessage internal class DriverInfoProvider : IInsightsInfoProvider { public DriverInfo GetInformation( - IInternalCluster cluster, IInternalSession session, Metadata metadata) + IInternalCluster cluster, IInternalSession session, IInternalMetadata internalMetadata) { return new DriverInfo { diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ExecutionProfileInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ExecutionProfileInfoProvider.cs index e009fc0a8..186fc00f3 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ExecutionProfileInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ExecutionProfileInfoProvider.cs @@ -16,6 +16,8 @@ using System.Collections.Generic; using System.Linq; + +using Cassandra.Connections.Control; using Cassandra.DataStax.Insights.Schema.Converters; using Cassandra.DataStax.Insights.Schema.StartupMessage; using Cassandra.SessionManagement; @@ -37,9 +39,9 @@ public ExecutionProfileInfoProvider( _speculativeExecutionPolicyInfoProvider = speculativeExecutionPolicyInfoProvider; _retryPolicyInfoProvider = retryPolicyInfoProvider; } - + public Dictionary GetInformation( - IInternalCluster cluster, IInternalSession session, Metadata metadata) + IInternalCluster cluster, IInternalSession session, IInternalMetadata internalMetadata) { // add default first so that it is on top var dict = new Dictionary diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/HostnameInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/HostnameInfoProvider.cs index cbe5a0c7c..0b1933423 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/HostnameInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/HostnameInfoProvider.cs @@ -12,16 +12,18 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// +// using System.Net; + +using Cassandra.Connections.Control; using Cassandra.SessionManagement; namespace Cassandra.DataStax.Insights.InfoProviders.StartupMessage { internal class HostnameInfoProvider : IInsightsInfoProvider { - public string GetInformation(IInternalCluster cluster, IInternalSession session, Metadata metadata) + public string GetInformation(IInternalCluster cluster, IInternalSession session, IInternalMetadata internalMetadata) { return Dns.GetHostName(); } diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/OtherOptionsInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/OtherOptionsInfoProvider.cs index a157338f6..732b80448 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/OtherOptionsInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/OtherOptionsInfoProvider.cs @@ -12,16 +12,19 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// +// using System.Collections.Generic; + +using Cassandra.Connections.Control; using Cassandra.SessionManagement; namespace Cassandra.DataStax.Insights.InfoProviders.StartupMessage { internal class OtherOptionsInfoProvider : IInsightsInfoProvider> { - public Dictionary GetInformation(IInternalCluster cluster, IInternalSession session, Metadata metadata) + public Dictionary GetInformation( + IInternalCluster cluster, IInternalSession session, IInternalMetadata internalMetadata) { return null; } diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/PlatformInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/PlatformInfoProvider.cs index 4068a55ee..01015ed12 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/PlatformInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/PlatformInfoProvider.cs @@ -18,6 +18,8 @@ using System.Linq; using System.Reflection; using System.Runtime.InteropServices; + +using Cassandra.Connections.Control; using Cassandra.DataStax.Insights.Schema.StartupMessage; using Cassandra.Helpers; using Cassandra.SessionManagement; @@ -26,7 +28,8 @@ namespace Cassandra.DataStax.Insights.InfoProviders.StartupMessage { internal class PlatformInfoProvider : IInsightsInfoProvider { - public InsightsPlatformInfo GetInformation(IInternalCluster cluster, IInternalSession session, Metadata metadata) + public InsightsPlatformInfo GetInformation( + IInternalCluster cluster, IInternalSession session, IInternalMetadata internalMetadata) { var cpuInfo = PlatformHelper.GetCpuInfo(); var dependencies = typeof(PlatformInfoProvider).GetTypeInfo().Assembly.GetReferencedAssemblies().Select(name => diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/PoolSizeByHostDistanceInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/PoolSizeByHostDistanceInfoProvider.cs index 64f7c4a3d..3c6bdc1cf 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/PoolSizeByHostDistanceInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/PoolSizeByHostDistanceInfoProvider.cs @@ -14,6 +14,7 @@ // limitations under the License. // +using Cassandra.Connections.Control; using Cassandra.DataStax.Insights.Schema.StartupMessage; using Cassandra.SessionManagement; @@ -21,17 +22,18 @@ namespace Cassandra.DataStax.Insights.InfoProviders.StartupMessage { internal class PoolSizeByHostDistanceInfoProvider : IInsightsInfoProvider { - public PoolSizeByHostDistance GetInformation(IInternalCluster cluster, IInternalSession session, Metadata metadata) + public PoolSizeByHostDistance GetInformation( + IInternalCluster cluster, IInternalSession session, IInternalMetadata internalMetadata) { return new PoolSizeByHostDistance { Local = cluster .Configuration - .GetOrCreatePoolingOptions(metadata.ProtocolVersion) + .GetOrCreatePoolingOptions(internalMetadata.ProtocolVersion) .GetCoreConnectionsPerHost(HostDistance.Local), Remote = cluster .Configuration - .GetOrCreatePoolingOptions(metadata.ProtocolVersion) + .GetOrCreatePoolingOptions(internalMetadata.ProtocolVersion) .GetCoreConnectionsPerHost(HostDistance.Remote) }; } diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ReconnectionPolicyInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ReconnectionPolicyInfoProvider.cs index 1822e358d..7d589c90a 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ReconnectionPolicyInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/ReconnectionPolicyInfoProvider.cs @@ -12,10 +12,12 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// +// using System; using System.Collections.Generic; + +using Cassandra.Connections.Control; using Cassandra.DataStax.Insights.Schema.StartupMessage; using Cassandra.SessionManagement; @@ -27,24 +29,24 @@ static ReconnectionPolicyInfoProvider() { ReconnectionPolicyInfoProvider.PolicyOptionsProviders = new Dictionary>> { - { - typeof(ConstantReconnectionPolicy), + { + typeof(ConstantReconnectionPolicy), policy => { var typedPolicy = (ConstantReconnectionPolicy) policy; return new Dictionary {{ "constantDelayMs", typedPolicy.ConstantDelayMs }}; } }, - { - typeof(ExponentialReconnectionPolicy), + { + typeof(ExponentialReconnectionPolicy), policy => { var typedPolicy = (ExponentialReconnectionPolicy) policy; return new Dictionary {{ "baseDelayMs", typedPolicy.BaseDelayMs }, { "maxDelayMs", typedPolicy.MaxDelayMs }}; } }, - { - typeof(FixedReconnectionPolicy), + { + typeof(FixedReconnectionPolicy), policy => { var typedPolicy = (FixedReconnectionPolicy) policy; @@ -56,7 +58,8 @@ static ReconnectionPolicyInfoProvider() public static IReadOnlyDictionary>> PolicyOptionsProviders { get; } - public PolicyInfo GetInformation(IInternalCluster cluster, IInternalSession session, Metadata metadata) + public PolicyInfo GetInformation( + IInternalCluster cluster, IInternalSession session, IInternalMetadata internalMetadata) { var policy = cluster.Configuration.Policies.ReconnectionPolicy; var type = policy.GetType(); diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StatusMessage/NodeStatusInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StatusMessage/NodeStatusInfoProvider.cs index ed33a1113..c87024fce 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StatusMessage/NodeStatusInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StatusMessage/NodeStatusInfoProvider.cs @@ -15,6 +15,8 @@ // using System.Collections.Generic; + +using Cassandra.Connections.Control; using Cassandra.DataStax.Insights.Schema.StatusMessage; using Cassandra.SessionManagement; @@ -23,10 +25,10 @@ namespace Cassandra.DataStax.Insights.InfoProviders.StatusMessage internal class NodeStatusInfoProvider : IInsightsInfoProvider> { public Dictionary GetInformation( - IInternalCluster cluster, IInternalSession session, Metadata metadata) + IInternalCluster cluster, IInternalSession session, IInternalMetadata internalMetadata) { var nodeStatusDictionary = new Dictionary(); - var state = session.GetState(metadata); + var state = session.GetState(internalMetadata); var connectedHosts = state.GetConnectedHosts(); foreach (var h in connectedHosts) diff --git a/src/Cassandra/DataStax/Insights/InsightsClient.cs b/src/Cassandra/DataStax/Insights/InsightsClient.cs index a170d9e96..a44bcb5a5 100644 --- a/src/Cassandra/DataStax/Insights/InsightsClient.cs +++ b/src/Cassandra/DataStax/Insights/InsightsClient.cs @@ -17,12 +17,15 @@ using System; using System.Threading; using System.Threading.Tasks; + +using Cassandra.Connections.Control; using Cassandra.DataStax.Insights.MessageFactories; using Cassandra.DataStax.Insights.Schema.StartupMessage; using Cassandra.DataStax.Insights.Schema.StatusMessage; using Cassandra.Responses; using Cassandra.SessionManagement; using Cassandra.Tasks; + using Newtonsoft.Json; namespace Cassandra.DataStax.Insights @@ -59,19 +62,19 @@ public InsightsClient( private bool Initialized => _insightsTask != null; - private async Task SendStartupMessageAsync(Metadata metadata) + private async Task SendStartupMessageAsync(IInternalMetadata internalMetadata) { try { await SendJsonMessageAsync( - _startupMessageFactory.CreateMessage(_cluster, _session, metadata), - metadata).ConfigureAwait(false); + _startupMessageFactory.CreateMessage(_cluster, _session, internalMetadata), + internalMetadata).ConfigureAwait(false); _errorCount = 0; return true; } catch (Exception ex) { - if (_cancellationTokenSource.IsCancellationRequested || + if (_cancellationTokenSource.IsCancellationRequested || _errorCount >= InsightsClient.ErrorCountThresholdForLogging) { return false; @@ -83,19 +86,19 @@ await SendJsonMessageAsync( } } - private async Task SendStatusMessageAsync(Metadata metadata) + private async Task SendStatusMessageAsync(IInternalMetadata internalMetadata) { try { await SendJsonMessageAsync( - _statusMessageFactory.CreateMessage(_cluster, _session, metadata), - metadata).ConfigureAwait(false); + _statusMessageFactory.CreateMessage(_cluster, _session, internalMetadata), + internalMetadata).ConfigureAwait(false); _errorCount = 0; return true; } catch (Exception ex) { - if (_cancellationTokenSource.IsCancellationRequested || + if (_cancellationTokenSource.IsCancellationRequested || _errorCount >= InsightsClient.ErrorCountThresholdForLogging) { return false; @@ -107,17 +110,16 @@ await SendJsonMessageAsync( } } - public async Task InitializeAsync() + public void Initialize(IInternalMetadata internalMetadata) { - var metadata = await _cluster.GetMetadataAsync().ConfigureAwait(false); - if (!ShouldStartInsightsTask(metadata)) + if (!ShouldStartInsightsTask(internalMetadata)) { _insightsTask = null; return; } _cancellationTokenSource = new CancellationTokenSource(); - _insightsTask = Task.Run(() => MainLoopAsync(metadata)); + _insightsTask = Task.Run(() => MainLoopAsync(internalMetadata)); } public Task ShutdownAsync() @@ -136,13 +138,13 @@ public void Dispose() ShutdownAsync().GetAwaiter().GetResult(); } - private bool ShouldStartInsightsTask(Metadata metadata) + private bool ShouldStartInsightsTask(IInternalMetadata internalMetadata) { - return _monitorReportingOptions.MonitorReportingEnabled - && _cluster.Configuration.InsightsSupportVerifier.SupportsInsights(metadata); + return _monitorReportingOptions.MonitorReportingEnabled + && _cluster.Configuration.InsightsSupportVerifier.SupportsInsights(internalMetadata); } - private async Task MainLoopAsync(Metadata metadata) + private async Task MainLoopAsync(IInternalMetadata metadata) { try { @@ -152,9 +154,9 @@ private async Task MainLoopAsync(Metadata metadata) // The initial delay should contain some random portion // Initial delay should be statusEventDelay - (0 to 10%) var percentageToSubtract = new Random(Guid.NewGuid().GetHashCode()).NextDouble() * 0.1; - var delay = _monitorReportingOptions.StatusEventDelayMilliseconds - + var delay = _monitorReportingOptions.StatusEventDelayMilliseconds - (_monitorReportingOptions.StatusEventDelayMilliseconds * percentageToSubtract); - + while (!_cancellationTokenSource.IsCancellationRequested) { if (!startupSent) @@ -165,7 +167,7 @@ private async Task MainLoopAsync(Metadata metadata) { await SendStatusMessageAsync(metadata).ConfigureAwait(false); } - + await TaskHelper.DelayWithCancellation( TimeSpan.FromMilliseconds(delay), _cancellationTokenSource.Token).ConfigureAwait(false); @@ -184,7 +186,7 @@ await TaskHelper.DelayWithCancellation( InsightsClient.Logger.Verbose("Insights task is ending."); } - private async Task SendJsonMessageAsync(T message, Metadata metadata) + private async Task SendJsonMessageAsync(T message, IInternalMetadata internalMetadata) { var queryProtocolOptions = new QueryProtocolOptions( ConsistencyLevel.One, @@ -194,9 +196,9 @@ private async Task SendJsonMessageAsync(T message, Metadata metadata) null, ConsistencyLevel.Any); - var response = await RunWithTokenAsync(() => - metadata.ControlConnection.UnsafeSendQueryRequestAsync( - InsightsClient.ReportInsightRpc, + var response = await RunWithTokenAsync(() => + internalMetadata.ControlConnection.UnsafeSendQueryRequestAsync( + InsightsClient.ReportInsightRpc, queryProtocolOptions)).ConfigureAwait(false); if (response == null) diff --git a/src/Cassandra/DataStax/Insights/MessageFactories/IInsightsMessageFactory.cs b/src/Cassandra/DataStax/Insights/MessageFactories/IInsightsMessageFactory.cs index b81d3d596..45c98e5fc 100644 --- a/src/Cassandra/DataStax/Insights/MessageFactories/IInsightsMessageFactory.cs +++ b/src/Cassandra/DataStax/Insights/MessageFactories/IInsightsMessageFactory.cs @@ -12,8 +12,9 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// +// +using Cassandra.Connections.Control; using Cassandra.DataStax.Insights.Schema; using Cassandra.SessionManagement; @@ -21,6 +22,6 @@ namespace Cassandra.DataStax.Insights.MessageFactories { internal interface IInsightsMessageFactory { - Insight CreateMessage(IInternalCluster cluster, IInternalSession session, Metadata metadata); + Insight CreateMessage(IInternalCluster cluster, IInternalSession session, IInternalMetadata internalMetadata); } } \ No newline at end of file diff --git a/src/Cassandra/DataStax/Insights/MessageFactories/InsightsStartupMessageFactory.cs b/src/Cassandra/DataStax/Insights/MessageFactories/InsightsStartupMessageFactory.cs index 6cafcbd6b..13bec92f0 100644 --- a/src/Cassandra/DataStax/Insights/MessageFactories/InsightsStartupMessageFactory.cs +++ b/src/Cassandra/DataStax/Insights/MessageFactories/InsightsStartupMessageFactory.cs @@ -15,6 +15,8 @@ // using System.Linq; + +using Cassandra.Connections.Control; using Cassandra.DataStax.Insights.InfoProviders; using Cassandra.DataStax.Insights.Schema; using Cassandra.DataStax.Insights.Schema.StartupMessage; @@ -26,7 +28,7 @@ internal class InsightsStartupMessageFactory : IInsightsMessageFactory CreateMessage(IInternalCluster cluster, IInternalSession session, Metadata metadata) + public Insight CreateMessage(IInternalCluster cluster, IInternalSession session, IInternalMetadata internalMetadata) { var insightsMetadata = _metadataFactory.CreateInsightsMetadata( InsightsStartupMessageFactory.StartupMessageName, InsightsStartupMessageFactory.StartupV1MappingId, InsightType.Event); - var driverInfo = _infoProviders.DriverInfoProvider.GetInformation(cluster, session, metadata); + var driverInfo = _infoProviders.DriverInfoProvider.GetInformation(cluster, session, internalMetadata); var startupData = new InsightsStartupData { ClientId = cluster.Configuration.ClusterId.ToString(), @@ -51,28 +53,28 @@ public Insight CreateMessage(IInternalCluster cluster, IInt ApplicationName = cluster.Configuration.ApplicationName, ApplicationVersion = cluster.Configuration.ApplicationVersion, ApplicationNameWasGenerated = cluster.Configuration.ApplicationNameWasGenerated, - ContactPoints = - metadata.ResolvedContactPoints.ToDictionary( + ContactPoints = + internalMetadata.ResolvedContactPoints.ToDictionary( kvp => kvp.Key.StringRepresentation, kvp => kvp.Value.Select(ipEndPoint => ipEndPoint.GetHostIpEndPointWithFallback().ToString()).ToList()), - DataCenters = _infoProviders.DataCentersInfoProvider.GetInformation(cluster, session, metadata), - InitialControlConnection = metadata.ControlConnection.EndPoint?.GetHostIpEndPointWithFallback().ToString(), - LocalAddress = metadata.ControlConnection.LocalAddress?.ToString(), - HostName = _infoProviders.HostnameProvider.GetInformation(cluster, session, metadata), - ProtocolVersion = (byte)metadata.ProtocolVersion, - ExecutionProfiles = _infoProviders.ExecutionProfileInfoProvider.GetInformation(cluster, session, metadata), - PoolSizeByHostDistance = _infoProviders.PoolSizeByHostDistanceInfoProvider.GetInformation(cluster, session, metadata), - HeartbeatInterval = + DataCenters = _infoProviders.DataCentersInfoProvider.GetInformation(cluster, session, internalMetadata), + InitialControlConnection = internalMetadata.ControlConnection.EndPoint?.GetHostIpEndPointWithFallback().ToString(), + LocalAddress = internalMetadata.ControlConnection.LocalAddress?.ToString(), + HostName = _infoProviders.HostnameProvider.GetInformation(cluster, session, internalMetadata), + ProtocolVersion = (byte)internalMetadata.ProtocolVersion, + ExecutionProfiles = _infoProviders.ExecutionProfileInfoProvider.GetInformation(cluster, session, internalMetadata), + PoolSizeByHostDistance = _infoProviders.PoolSizeByHostDistanceInfoProvider.GetInformation(cluster, session, internalMetadata), + HeartbeatInterval = cluster .Configuration - .GetOrCreatePoolingOptions(metadata.ProtocolVersion) + .GetOrCreatePoolingOptions(internalMetadata.ProtocolVersion) .GetHeartBeatInterval() ?? 0, Compression = cluster.Configuration.ProtocolOptions.Compression, - ReconnectionPolicy = _infoProviders.ReconnectionPolicyInfoProvider.GetInformation(cluster, session, metadata), + ReconnectionPolicy = _infoProviders.ReconnectionPolicyInfoProvider.GetInformation(cluster, session, internalMetadata), Ssl = new SslInfo { Enabled = cluster.Configuration.ProtocolOptions.SslOptions != null }, - AuthProvider = _infoProviders.AuthProviderInfoProvider.GetInformation(cluster, session, metadata), - OtherOptions = _infoProviders.OtherOptionsInfoProvider.GetInformation(cluster, session, metadata), - PlatformInfo = _infoProviders.PlatformInfoProvider.GetInformation(cluster, session, metadata), - ConfigAntiPatterns = _infoProviders.ConfigAntiPatternsInfoProvider.GetInformation(cluster, session, metadata), + AuthProvider = _infoProviders.AuthProviderInfoProvider.GetInformation(cluster, session, internalMetadata), + OtherOptions = _infoProviders.OtherOptionsInfoProvider.GetInformation(cluster, session, internalMetadata), + PlatformInfo = _infoProviders.PlatformInfoProvider.GetInformation(cluster, session, internalMetadata), + ConfigAntiPatterns = _infoProviders.ConfigAntiPatternsInfoProvider.GetInformation(cluster, session, internalMetadata), PeriodicStatusInterval = cluster.Configuration.MonitorReportingOptions.StatusEventDelayMilliseconds / 1000 }; diff --git a/src/Cassandra/DataStax/Insights/MessageFactories/InsightsStatusMessageFactory.cs b/src/Cassandra/DataStax/Insights/MessageFactories/InsightsStatusMessageFactory.cs index c52272624..98482774b 100644 --- a/src/Cassandra/DataStax/Insights/MessageFactories/InsightsStatusMessageFactory.cs +++ b/src/Cassandra/DataStax/Insights/MessageFactories/InsightsStatusMessageFactory.cs @@ -15,6 +15,8 @@ // using System.Collections.Generic; + +using Cassandra.Connections.Control; using Cassandra.DataStax.Insights.InfoProviders; using Cassandra.DataStax.Insights.Schema; using Cassandra.DataStax.Insights.Schema.StatusMessage; @@ -38,7 +40,7 @@ public InsightsStatusMessageFactory( _connectedNodesInfoProvider = connectedNodesInfoProvider; } - public Insight CreateMessage(IInternalCluster cluster, IInternalSession session, Metadata metadata) + public Insight CreateMessage(IInternalCluster cluster, IInternalSession session, IInternalMetadata internalMetadata) { var insightsMetadata = _insightsMetadataFactory.CreateInsightsMetadata( InsightsStatusMessageFactory.StatusMessageName, InsightsStatusMessageFactory.StatusV1MappingId, InsightType.Event); @@ -47,8 +49,8 @@ public Insight CreateMessage(IInternalCluster cluster, IInte { ClientId = cluster.Configuration.ClusterId.ToString(), SessionId = session.InternalSessionId.ToString(), - ControlConnection = metadata.ControlConnection.EndPoint?.GetHostIpEndPointWithFallback().ToString(), - ConnectedNodes = _connectedNodesInfoProvider.GetInformation(cluster, session, metadata) + ControlConnection = internalMetadata.ControlConnection.EndPoint?.GetHostIpEndPointWithFallback().ToString(), + ConnectedNodes = _connectedNodesInfoProvider.GetInformation(cluster, session, internalMetadata) }; return new Insight diff --git a/src/Cassandra/Extensions.cs b/src/Cassandra/Extensions.cs index 29a204fd4..83686d239 100644 --- a/src/Cassandra/Extensions.cs +++ b/src/Cassandra/Extensions.cs @@ -15,6 +15,7 @@ // using System.Threading.Tasks; +using Cassandra.Connections.Control; using Cassandra.SessionManagement; using Cassandra.Tasks; @@ -62,13 +63,19 @@ public static ISessionState GetState(this ISession instance) public static async Task GetStateAsync(this ISession instance) { var session = instance as IInternalSession; - var metadata = await instance.Cluster.GetMetadataAsync().ConfigureAwait(false); - return session == null ? SessionState.Empty() : SessionState.From(session, metadata); + + if (session == null) + { + return SessionState.Empty(); + } + + var metadata = await session.TryInitAndGetMetadataAsync().ConfigureAwait(false); + return SessionState.From(session, metadata); } - internal static ISessionState GetState(this IInternalSession instance, Metadata metadata) + internal static ISessionState GetState(this IInternalSession instance, IInternalMetadata internalMetadata) { - return SessionState.From(instance, metadata); + return SessionState.From(instance, internalMetadata); } } } \ No newline at end of file diff --git a/src/Cassandra/ICluster.cs b/src/Cassandra/ICluster.cs index 392f66998..8014c359c 100644 --- a/src/Cassandra/ICluster.cs +++ b/src/Cassandra/ICluster.cs @@ -52,7 +52,7 @@ public interface ICluster : IDisposable /// It also allows you to subscribe to certain events (e.g. ). /// /// - Metadata Metadata { get; } + IMetadata Metadata { get; } /// /// Cluster client configuration diff --git a/src/Cassandra/IMetadata.cs b/src/Cassandra/IMetadata.cs new file mode 100644 index 000000000..8793a402d --- /dev/null +++ b/src/Cassandra/IMetadata.cs @@ -0,0 +1,274 @@ +// +// Copyright (C) DataStax Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using System; +using System.Collections.Generic; +using System.Net; +using System.Threading.Tasks; + +namespace Cassandra +{ + /// + /// Allows for fetching of metadata about the connected cluster, including known nodes and schema definitions. + /// + public interface IMetadata + { + event HostsEventHandler HostsEvent; + + event SchemaChangedEventHandler SchemaChangedEvent; + + /// + /// Event that gets triggered when a new host is added to the cluster + /// + event Action HostAdded; + + /// + /// Event that gets triggered when a host has been removed from the cluster + /// + event Action HostRemoved; + + Configuration Configuration { get; } + + Task GetClusterDescriptionAsync(); + + ClusterDescription GetClusterDescription(); + + /// + /// + /// Returns all known hosts of this cluster from the driver's cache. The driver's cache + /// is kept up to date using server protocol events so it will not be populated until the initialization is done + /// and a connection is open. + /// + /// + /// This method might return an empty collection if the initialization has not finished yet. + /// + /// + ICollection AllHostsSnapshot(); + + /// + /// + /// Get the replicas without performing any I/O (it will use the driver's cache). The driver's cache + /// is kept up to date using server protocol events so it will not be populated until the initialization is done + /// and a connection is open. + /// + /// + /// This method might return an empty collection if the initialization has not finished yet. + /// + /// + IEnumerable AllReplicasSnapshot(); + + /// + /// + /// Get the replicas for a given keyspace and partition key without performing any I/O (it will use the driver's cache). + /// The driver's cache is kept up to date using server protocol events so it will not be populated + /// until the initialization is done and a connection is open. + /// + /// + /// This method might return an empty collection if the initialization has not finished yet. + /// + /// + ICollection GetReplicasSnapshot(string keyspaceName, byte[] partitionKey); + + /// + /// + /// Get the replicas for a partition key without performing any I/O (it will use the driver's cache). + /// The driver's cache is kept up to date using server protocol events so it will not be populated + /// until the initialization is done and a connection is open. + /// + /// + /// This method might return an empty collection if the initialization has not finished yet. + /// + /// + ICollection GetReplicasSnapshot(byte[] partitionKey); + + Host GetHost(IPEndPoint address); + + Task GetHostAsync(IPEndPoint address); + + /// + /// Returns all known hosts of this cluster. + /// + /// collection of all known hosts of this cluster. + ICollection AllHosts(); + + /// + /// Returns all known hosts of this cluster. + /// + /// collection of all known hosts of this cluster. + Task> AllHostsAsync(); + + IEnumerable AllReplicas(); + + Task> AllReplicasAsync(); + + /// + /// Get the replicas for a given partition key and keyspace + /// + ICollection GetReplicas(string keyspaceName, byte[] partitionKey); + + /// + /// Get the replicas for a given partition key + /// + ICollection GetReplicas(byte[] partitionKey); + + /// + /// Get the replicas for a given partition key and keyspace + /// + Task> GetReplicasAsync(string keyspaceName, byte[] partitionKey); + + /// + /// Get the replicas for a given partition key + /// + Task> GetReplicasAsync(byte[] partitionKey); + + /// + /// Returns metadata of specified keyspace. + /// + /// the name of the keyspace for which metadata should be + /// returned. + /// the metadata of the requested keyspace or null if + /// * keyspace is not a known keyspace. + KeyspaceMetadata GetKeyspace(string keyspace); + + /// + /// Returns metadata of specified keyspace. + /// + /// the name of the keyspace for which metadata should be + /// returned. + /// the metadata of the requested keyspace or null if + /// * keyspace is not a known keyspace. + Task GetKeyspaceAsync(string keyspace); + + /// + /// Returns a collection of all defined keyspaces names. + /// + /// a collection of all defined keyspaces names. + ICollection GetKeyspaces(); + + /// + /// Returns a collection of all defined keyspaces names. + /// + /// a collection of all defined keyspaces names. + Task> GetKeyspacesAsync(); + + /// + /// Returns names of all tables which are defined within specified keyspace. + /// + /// the name of the keyspace for which all tables metadata should be + /// returned. + /// an ICollection of the metadata for the tables defined in this + /// keyspace. + ICollection GetTables(string keyspace); + + /// + /// Returns names of all tables which are defined within specified keyspace. + /// + /// the name of the keyspace for which all tables metadata should be + /// returned. + /// an ICollection of the metadata for the tables defined in this + /// keyspace. + Task> GetTablesAsync(string keyspace); + + /// + /// Returns TableMetadata for specified table in specified keyspace. + /// + /// name of the keyspace within specified table is defined. + /// name of table for which metadata should be returned. + /// a TableMetadata for the specified table in the specified keyspace. + TableMetadata GetTable(string keyspace, string tableName); + + /// + /// Returns TableMetadata for specified table in specified keyspace. + /// + /// name of the keyspace within specified table is defined. + /// name of table for which metadata should be returned. + /// a TableMetadata for the specified table in the specified keyspace. + Task GetTableAsync(string keyspace, string tableName); + + /// + /// Returns the view metadata for the provided view name in the keyspace. + /// + /// name of the keyspace within specified view is defined. + /// name of view. + /// a MaterializedViewMetadata for the view in the specified keyspace. + MaterializedViewMetadata GetMaterializedView(string keyspace, string name); + + /// + /// Returns the view metadata for the provided view name in the keyspace. + /// + /// name of the keyspace within specified view is defined. + /// name of view. + /// a MaterializedViewMetadata for the view in the specified keyspace. + Task GetMaterializedViewAsync(string keyspace, string name); + + /// + /// Gets the definition associated with a User Defined Type from Cassandra + /// + UdtColumnInfo GetUdtDefinition(string keyspace, string typeName); + + /// + /// Gets the definition associated with a User Defined Type from Cassandra + /// + Task GetUdtDefinitionAsync(string keyspace, string typeName); + + /// + /// Gets the definition associated with a User Defined Function from Cassandra + /// + /// The function metadata or null if not found. + FunctionMetadata GetFunction(string keyspace, string name, string[] signature); + + /// + /// Gets the definition associated with a User Defined Function from Cassandra + /// + /// The function metadata or null if not found. + Task GetFunctionAsync(string keyspace, string name, string[] signature); + + /// + /// Gets the definition associated with a aggregate from Cassandra + /// + /// The aggregate metadata or null if not found. + AggregateMetadata GetAggregate(string keyspace, string name, string[] signature); + + /// + /// Gets the definition associated with a aggregate from Cassandra + /// + /// The aggregate metadata or null if not found. + Task GetAggregateAsync(string keyspace, string name, string[] signature); + + /// + /// Updates keyspace metadata (including token metadata for token aware routing) for a given keyspace or a specific keyspace table. + /// If no keyspace is provided then this method will update the metadata and token map for all the keyspaces of the cluster. + /// + bool RefreshSchema(string keyspace = null, string table = null); + + /// + /// Updates keyspace metadata (including token metadata for token aware routing) for a given keyspace or a specific keyspace table. + /// If no keyspace is provided then this method will update the metadata and token map for all the keyspaces of the cluster. + /// + Task RefreshSchemaAsync(string keyspace = null, string table = null); + + /// + /// Initiates a schema agreement check. + /// + /// Schema changes need to be propagated to all nodes in the cluster. + /// Once they have settled on a common version, we say that they are in agreement. + /// + /// This method does not perform retries so + /// does not apply. + /// + /// True if schema agreement was successful and false if it was not successful. + Task CheckSchemaAgreementAsync(); + } +} \ No newline at end of file diff --git a/src/Cassandra/ISession.cs b/src/Cassandra/ISession.cs index b53ade1e1..6e9053270 100644 --- a/src/Cassandra/ISession.cs +++ b/src/Cassandra/ISession.cs @@ -67,7 +67,9 @@ public interface ISession: IDisposable /// /// - /// Waits until the initialization task is finished (this task is started when the Session is created). + /// Waits until the initialization task is finished (this task is started when the Session is created). + /// If the session is already initialized, this method returns without blocking. + /// /// /// It is not necessary to call this method but you can use it if you want the initialization to happen /// in a specific state of your application (e.g. during startup before your application listens for requests). @@ -83,8 +85,11 @@ public interface ISession: IDisposable /// /// - /// Waits until the initialization task is finished (this task is started when the Session is created). - /// It is not necessary to call this method but you can use it if you want the initialization to happen + /// Waits until the initialization task is finished (this task is started when the Session is created). + /// If the session is already initialized, this method returns a completed Task. + /// + /// + /// It is not necessary to call this method but you can use it if you want the initialization to happen /// in a specific state of your application (e.g. during startup before your application listens for requests). /// /// diff --git a/src/Cassandra/KeyspaceMetadata.cs b/src/Cassandra/KeyspaceMetadata.cs index 96b8f1117..ce9e84cb1 100644 --- a/src/Cassandra/KeyspaceMetadata.cs +++ b/src/Cassandra/KeyspaceMetadata.cs @@ -20,6 +20,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using Cassandra.Connections.Control; using Cassandra.MetadataHelpers; using Cassandra.Tasks; @@ -31,7 +32,7 @@ public class KeyspaceMetadata private readonly ConcurrentDictionary _views = new ConcurrentDictionary(); private readonly ConcurrentDictionary, FunctionMetadata> _functions = new ConcurrentDictionary, FunctionMetadata>(); private readonly ConcurrentDictionary, AggregateMetadata> _aggregates = new ConcurrentDictionary, AggregateMetadata>(); - private readonly Metadata _parent; + private readonly IInternalMetadata _parent; /// /// Gets the name of this keyspace. @@ -73,14 +74,14 @@ public class KeyspaceMetadata internal IReplicationStrategy Strategy { get; } - internal KeyspaceMetadata(Metadata parent, string name, bool durableWrites, string strategyClass, + internal KeyspaceMetadata(IInternalMetadata parent, string name, bool durableWrites, string strategyClass, IDictionary replicationOptions, bool isVirtual = false) : this(parent, name, durableWrites, strategyClass, replicationOptions, new ReplicationStrategyFactory(), isVirtual) { } internal KeyspaceMetadata( - Metadata parent, + IInternalMetadata parent, string name, bool durableWrites, string strategyClass, diff --git a/src/Cassandra/Metadata.cs b/src/Cassandra/Metadata.cs index 399215ff5..433b658ad 100644 --- a/src/Cassandra/Metadata.cs +++ b/src/Cassandra/Metadata.cs @@ -27,38 +27,21 @@ namespace Cassandra { - /// - /// Keeps metadata on the connected cluster, including known nodes and schema - /// definitions. - /// - public class Metadata + /// + internal class Metadata : IMetadata { private const int Disposed = 10; private const int Initialized = 5; private const int Initializing = 1; private const int NotInitialized = 0; - private readonly InternalMetadata _internalMetadata; private readonly int _queryAbortTimeout; + private volatile Task _initTask; private long _state = Metadata.NotInitialized; - internal InternalMetadata InternalMetadata => _internalMetadata; - - public event HostsEventHandler HostsEvent; - - public event SchemaChangedEventHandler SchemaChangedEvent; - - /// - /// Event that gets triggered when a new host is added to the cluster - /// - public event Action HostAdded; - - /// - /// Event that gets triggered when a host has been removed from the cluster - /// - public event Action HostRemoved; + internal InternalMetadata InternalMetadata { get; } internal Metadata( IInternalCluster cluster, @@ -67,7 +50,8 @@ internal Metadata( IEnumerable parsedContactPoints) { _queryAbortTimeout = configuration.DefaultRequestOptions.QueryAbortTimeout; - _internalMetadata = new InternalMetadata(cluster, this, configuration, serializerManager, parsedContactPoints); + Configuration = configuration; + InternalMetadata = new InternalMetadata(cluster, this, configuration, serializerManager, parsedContactPoints); } internal Metadata( @@ -78,386 +62,347 @@ internal Metadata( SchemaParser schemaParser) { _queryAbortTimeout = configuration.DefaultRequestOptions.QueryAbortTimeout; - _internalMetadata = new InternalMetadata( + Configuration = configuration; + InternalMetadata = new InternalMetadata( cluster, this, configuration, serializerManager, parsedContactPoints, schemaParser); } - internal Task TryInitializeAsync() - { - var currentState = Interlocked.Read(ref _state); - if (currentState == Metadata.Initialized) - { - //It was already initialized - return TaskHelper.Completed; - } + public Configuration Configuration { get; } - return InitializeAsync(currentState); - } - - private Task InitializeAsync(long currentState) - { - if (currentState == Metadata.Disposed) - { - throw new ObjectDisposedException("This metadata object has been disposed."); - } - - if (Interlocked.CompareExchange(ref _state, Metadata.Initializing, Metadata.NotInitialized) - == Metadata.NotInitialized) - { - _initTask = Task.Run(InitializeInternalAsync); - } - - return _initTask; - } - - private async Task InitializeInternalAsync() - { - await _internalMetadata.InitAsync().ConfigureAwait(false); - var previousState = Interlocked.CompareExchange(ref _state, Metadata.Initialized, Metadata.Initializing); - if (previousState == Metadata.Disposed) - { - await _internalMetadata.ShutdownAsync().ConfigureAwait(false); - throw new ObjectDisposedException("Metadata instance was disposed before initialization finished."); - } - } + /// + public event HostsEventHandler HostsEvent; - internal async Task ShutdownAsync() - { - var previousState = Interlocked.Exchange(ref _state, Metadata.Disposed); + /// + public event SchemaChangedEventHandler SchemaChangedEvent; - if (previousState != Metadata.Initialized) - { - return; - } + /// + public event Action HostAdded; - await _internalMetadata.ShutdownAsync().ConfigureAwait(false); - } + /// + public event Action HostRemoved; - internal void OnHostRemoved(Host h) + /// + public async Task GetClusterDescriptionAsync() { - HostRemoved?.Invoke(h); + await TryInitializeAsync().ConfigureAwait(false); + return GetClusterDescriptionInternal(); } - internal void OnHostAdded(Host h) + /// + public ClusterDescription GetClusterDescription() { - HostAdded?.Invoke(h); + TryInitialize(); + return GetClusterDescriptionInternal(); } - public async Task GetClusterDescriptionAsync() + /// + public ICollection AllHostsSnapshot() { - await TryInitializeAsync().ConfigureAwait(false); - return new ClusterDescription( - _internalMetadata.ClusterName, _internalMetadata.IsDbaas, _internalMetadata.ProtocolVersion); + return InternalMetadata.AllHosts(); } - public ClusterDescription GetClusterDescription() + /// + public IEnumerable AllReplicasSnapshot() { - return TaskHelper.WaitToComplete(GetClusterDescriptionAsync()); + return InternalMetadata.AllReplicas(); } - public Host GetHost(IPEndPoint address) + /// + public ICollection GetReplicasSnapshot(string keyspaceName, byte[] partitionKey) { - return TaskHelper.WaitToComplete(GetHostAsync(address), _queryAbortTimeout); + return InternalMetadata.GetReplicas(keyspaceName, partitionKey); } - public async Task GetHostAsync(IPEndPoint address) + /// + public ICollection GetReplicasSnapshot(byte[] partitionKey) { - await TryInitializeAsync().ConfigureAwait(false); - return _internalMetadata.GetHost(address); + return GetReplicasSnapshot(null, partitionKey); } - internal void FireSchemaChangedEvent(SchemaChangedEventArgs.Kind what, string keyspace, string table, object sender = null) + private ClusterDescription GetClusterDescriptionInternal() { - SchemaChangedEvent?.Invoke(sender ?? this, new SchemaChangedEventArgs { Keyspace = keyspace, What = what, Table = table }); + return new ClusterDescription( + InternalMetadata.ClusterName, InternalMetadata.IsDbaas, InternalMetadata.ProtocolVersion); } - internal void OnHostDown(Host h) + /// + public Host GetHost(IPEndPoint address) { - HostsEvent?.Invoke(this, new HostsEventArgs { Address = h.Address, What = HostsEventArgs.Kind.Down }); + TryInitialize(); + return InternalMetadata.GetHost(address); } - internal void OnHostUp(Host h) + /// + public async Task GetHostAsync(IPEndPoint address) { - HostsEvent?.Invoke(h, new HostsEventArgs { Address = h.Address, What = HostsEventArgs.Kind.Up }); + await TryInitializeAsync().ConfigureAwait(false); + return InternalMetadata.GetHost(address); } - /// - /// Returns all known hosts of this cluster. - /// - /// collection of all known hosts of this cluster. + /// public ICollection AllHosts() { - return TaskHelper.WaitToComplete(AllHostsAsync(), _queryAbortTimeout); + TryInitialize(); + return InternalMetadata.AllHosts(); } - /// - /// Returns all known hosts of this cluster. - /// - /// collection of all known hosts of this cluster. + /// public async Task> AllHostsAsync() { await TryInitializeAsync().ConfigureAwait(false); - return _internalMetadata.AllHosts(); + return InternalMetadata.AllHosts(); } + /// public IEnumerable AllReplicas() { - return TaskHelper.WaitToComplete(AllReplicasAsync(), _queryAbortTimeout); + TryInitialize(); + return InternalMetadata.AllReplicas(); } + /// public async Task> AllReplicasAsync() { await TryInitializeAsync().ConfigureAwait(false); - return _internalMetadata.AllReplicas(); + return InternalMetadata.AllReplicas(); } - /// - /// Get the replicas for a given partition key and keyspace - /// + /// public ICollection GetReplicas(string keyspaceName, byte[] partitionKey) { - return TaskHelper.WaitToComplete(GetReplicasAsync(keyspaceName, partitionKey)); + TryInitialize(); + return InternalMetadata.GetReplicas(keyspaceName, partitionKey); } - /// - /// Get the replicas for a given partition key - /// + /// public ICollection GetReplicas(byte[] partitionKey) { return GetReplicas(null, partitionKey); } - /// - /// Get the replicas for a given partition key and keyspace - /// + /// public async Task> GetReplicasAsync(string keyspaceName, byte[] partitionKey) { await TryInitializeAsync().ConfigureAwait(false); - return _internalMetadata.GetReplicas(keyspaceName, partitionKey); + return InternalMetadata.GetReplicas(keyspaceName, partitionKey); } - /// - /// Get the replicas for a given partition key - /// + /// public Task> GetReplicasAsync(byte[] partitionKey) { return GetReplicasAsync(null, partitionKey); } - /// - /// Returns metadata of specified keyspace. - /// - /// the name of the keyspace for which metadata should be - /// returned. - /// the metadata of the requested keyspace or null if - /// * keyspace is not a known keyspace. + /// public KeyspaceMetadata GetKeyspace(string keyspace) { return TaskHelper.WaitToComplete(GetKeyspaceAsync(keyspace), _queryAbortTimeout); } - /// - /// Returns metadata of specified keyspace. - /// - /// the name of the keyspace for which metadata should be - /// returned. - /// the metadata of the requested keyspace or null if - /// * keyspace is not a known keyspace. + /// public async Task GetKeyspaceAsync(string keyspace) { await TryInitializeAsync().ConfigureAwait(false); - return await _internalMetadata.GetKeyspaceAsync(keyspace).ConfigureAwait(false); + return await InternalMetadata.GetKeyspaceAsync(keyspace).ConfigureAwait(false); } - /// - /// Returns a collection of all defined keyspaces names. - /// - /// a collection of all defined keyspaces names. + /// public ICollection GetKeyspaces() { return TaskHelper.WaitToComplete(GetKeyspacesAsync(), _queryAbortTimeout); } - /// - /// Returns a collection of all defined keyspaces names. - /// - /// a collection of all defined keyspaces names. + /// public async Task> GetKeyspacesAsync() { await TryInitializeAsync().ConfigureAwait(false); - return await _internalMetadata.GetKeyspacesAsync().ConfigureAwait(false); + return await InternalMetadata.GetKeyspacesAsync().ConfigureAwait(false); } - /// - /// Returns names of all tables which are defined within specified keyspace. - /// - /// the name of the keyspace for which all tables metadata should be - /// returned. - /// an ICollection of the metadata for the tables defined in this - /// keyspace. + /// public ICollection GetTables(string keyspace) { return TaskHelper.WaitToComplete(GetTablesAsync(keyspace), _queryAbortTimeout); } - /// - /// Returns names of all tables which are defined within specified keyspace. - /// - /// the name of the keyspace for which all tables metadata should be - /// returned. - /// an ICollection of the metadata for the tables defined in this - /// keyspace. + /// public async Task> GetTablesAsync(string keyspace) { await TryInitializeAsync().ConfigureAwait(false); - return await _internalMetadata.GetTablesAsync(keyspace).ConfigureAwait(false); + return await InternalMetadata.GetTablesAsync(keyspace).ConfigureAwait(false); } - /// - /// Returns TableMetadata for specified table in specified keyspace. - /// - /// name of the keyspace within specified table is defined. - /// name of table for which metadata should be returned. - /// a TableMetadata for the specified table in the specified keyspace. + /// public TableMetadata GetTable(string keyspace, string tableName) { return TaskHelper.WaitToComplete(GetTableAsync(keyspace, tableName), _queryAbortTimeout * 2); } - /// - /// Returns TableMetadata for specified table in specified keyspace. - /// - /// name of the keyspace within specified table is defined. - /// name of table for which metadata should be returned. - /// a TableMetadata for the specified table in the specified keyspace. + /// public async Task GetTableAsync(string keyspace, string tableName) { await TryInitializeAsync().ConfigureAwait(false); - return await _internalMetadata.GetTableAsync(keyspace, tableName).ConfigureAwait(false); + return await InternalMetadata.GetTableAsync(keyspace, tableName).ConfigureAwait(false); } - /// - /// Returns the view metadata for the provided view name in the keyspace. - /// - /// name of the keyspace within specified view is defined. - /// name of view. - /// a MaterializedViewMetadata for the view in the specified keyspace. + /// public MaterializedViewMetadata GetMaterializedView(string keyspace, string name) { return TaskHelper.WaitToComplete(GetMaterializedViewAsync(keyspace, name), _queryAbortTimeout * 2); } - /// - /// Returns the view metadata for the provided view name in the keyspace. - /// - /// name of the keyspace within specified view is defined. - /// name of view. - /// a MaterializedViewMetadata for the view in the specified keyspace. + /// public async Task GetMaterializedViewAsync(string keyspace, string name) { await TryInitializeAsync().ConfigureAwait(false); - return await _internalMetadata.GetMaterializedViewAsync(keyspace, name).ConfigureAwait(false); + return await InternalMetadata.GetMaterializedViewAsync(keyspace, name).ConfigureAwait(false); } - - /// - /// Gets the definition associated with a User Defined Type from Cassandra - /// + + /// public UdtColumnInfo GetUdtDefinition(string keyspace, string typeName) { return TaskHelper.WaitToComplete(GetUdtDefinitionAsync(keyspace, typeName), _queryAbortTimeout); } - /// - /// Gets the definition associated with a User Defined Type from Cassandra - /// + /// public async Task GetUdtDefinitionAsync(string keyspace, string typeName) { await TryInitializeAsync().ConfigureAwait(false); - return await _internalMetadata.GetUdtDefinitionAsync(keyspace, typeName).ConfigureAwait(false); + return await InternalMetadata.GetUdtDefinitionAsync(keyspace, typeName).ConfigureAwait(false); } - /// - /// Gets the definition associated with a User Defined Function from Cassandra - /// - /// The function metadata or null if not found. + /// public FunctionMetadata GetFunction(string keyspace, string name, string[] signature) { return TaskHelper.WaitToComplete(GetFunctionAsync(keyspace, name, signature), _queryAbortTimeout); } - /// - /// Gets the definition associated with a User Defined Function from Cassandra - /// - /// The function metadata or null if not found. + /// public async Task GetFunctionAsync(string keyspace, string name, string[] signature) { await TryInitializeAsync().ConfigureAwait(false); - return await _internalMetadata.GetFunctionAsync(keyspace, name, signature).ConfigureAwait(false); + return await InternalMetadata.GetFunctionAsync(keyspace, name, signature).ConfigureAwait(false); } - /// - /// Gets the definition associated with a aggregate from Cassandra - /// - /// The aggregate metadata or null if not found. + /// public AggregateMetadata GetAggregate(string keyspace, string name, string[] signature) { return TaskHelper.WaitToComplete(GetAggregateAsync(keyspace, name, signature), _queryAbortTimeout); } - /// - /// Gets the definition associated with a aggregate from Cassandra - /// - /// The aggregate metadata or null if not found. + /// public async Task GetAggregateAsync(string keyspace, string name, string[] signature) { await TryInitializeAsync().ConfigureAwait(false); - return await _internalMetadata.GetAggregateAsync(keyspace, name, signature).ConfigureAwait(false); - } - - /// - /// Gets the query trace. - /// - /// The query trace that contains the id, which properties are going to be populated. - /// - internal async Task GetQueryTraceAsync(QueryTrace trace) - { - await TryInitializeAsync().ConfigureAwait(false); - return await _internalMetadata.GetQueryTraceAsync(trace).ConfigureAwait(false); + return await InternalMetadata.GetAggregateAsync(keyspace, name, signature).ConfigureAwait(false); } - /// - /// Updates keyspace metadata (including token metadata for token aware routing) for a given keyspace or a specific keyspace table. - /// If no keyspace is provided then this method will update the metadata and token map for all the keyspaces of the cluster. - /// + /// public bool RefreshSchema(string keyspace = null, string table = null) { return TaskHelper.WaitToComplete(RefreshSchemaAsync(keyspace, table), _queryAbortTimeout * 2); } - /// - /// Updates keyspace metadata (including token metadata for token aware routing) for a given keyspace or a specific keyspace table. - /// If no keyspace is provided then this method will update the metadata and token map for all the keyspaces of the cluster. - /// + /// public async Task RefreshSchemaAsync(string keyspace = null, string table = null) { await TryInitializeAsync().ConfigureAwait(false); - return await _internalMetadata.RefreshSchemaAsync(keyspace, table).ConfigureAwait(false); - } - - /// - /// Initiates a schema agreement check. - /// - /// Schema changes need to be propagated to all nodes in the cluster. - /// Once they have settled on a common version, we say that they are in agreement. - /// - /// This method does not perform retries so - /// does not apply. - /// - /// True if schema agreement was successful and false if it was not successful. + return await InternalMetadata.RefreshSchemaAsync(keyspace, table).ConfigureAwait(false); + } + + /// public async Task CheckSchemaAgreementAsync() { await TryInitializeAsync().ConfigureAwait(false); - return await _internalMetadata.CheckSchemaAgreementAsync().ConfigureAwait(false); + return await InternalMetadata.CheckSchemaAgreementAsync().ConfigureAwait(false); + } + + internal Task TryInitializeAsync() + { + var currentState = Interlocked.Read(ref _state); + if (currentState == Metadata.Initialized) + { + //It was already initialized + return TaskHelper.Completed; + } + + return InitializeAsync(currentState); + } + + internal void TryInitialize() + { + var currentState = Interlocked.Read(ref _state); + if (currentState == Metadata.Initialized) + { + //It was already initialized + return; + } + + TaskHelper.WaitToComplete(InitializeAsync(currentState), _queryAbortTimeout); + } + + private Task InitializeAsync(long currentState) + { + if (currentState == Metadata.Disposed) + { + throw new ObjectDisposedException("This metadata object has been disposed."); + } + + if (Interlocked.CompareExchange(ref _state, Metadata.Initializing, Metadata.NotInitialized) + == Metadata.NotInitialized) + { + _initTask = Task.Run(InitializeInternalAsync); + } + + return _initTask; + } + + private async Task InitializeInternalAsync() + { + await InternalMetadata.InitAsync().ConfigureAwait(false); + var previousState = Interlocked.CompareExchange(ref _state, Metadata.Initialized, Metadata.Initializing); + if (previousState == Metadata.Disposed) + { + await InternalMetadata.ShutdownAsync().ConfigureAwait(false); + throw new ObjectDisposedException("Metadata instance was disposed before initialization finished."); + } + } + + internal async Task ShutdownAsync() + { + var previousState = Interlocked.Exchange(ref _state, Metadata.Disposed); + + if (previousState != Metadata.Initialized) + { + return; + } + + await InternalMetadata.ShutdownAsync().ConfigureAwait(false); + } + + internal void OnHostRemoved(Host h) + { + HostRemoved?.Invoke(h); + } + + internal void OnHostAdded(Host h) + { + HostAdded?.Invoke(h); + } + + internal void FireSchemaChangedEvent(SchemaChangedEventArgs.Kind what, string keyspace, string table, object sender = null) + { + SchemaChangedEvent?.Invoke(sender ?? this, new SchemaChangedEventArgs { Keyspace = keyspace, What = what, Table = table }); + } + + internal void OnHostDown(Host h) + { + HostsEvent?.Invoke(this, new HostsEventArgs { Address = h.Address, What = HostsEventArgs.Kind.Down }); + } + + internal void OnHostUp(Host h) + { + HostsEvent?.Invoke(h, new HostsEventArgs { Address = h.Address, What = HostsEventArgs.Kind.Up }); } } } \ No newline at end of file diff --git a/src/Cassandra/MetadataHelpers/ISchemaParserFactory.cs b/src/Cassandra/MetadataHelpers/ISchemaParserFactory.cs index 6848dba10..20ff257b6 100644 --- a/src/Cassandra/MetadataHelpers/ISchemaParserFactory.cs +++ b/src/Cassandra/MetadataHelpers/ISchemaParserFactory.cs @@ -21,7 +21,7 @@ namespace Cassandra.MetadataHelpers { internal interface ISchemaParserFactory { - ISchemaParser Create(Version cassandraVersion, InternalMetadata parent, + ISchemaParser Create(Version cassandraVersion, IInternalMetadata parent, Func> udtResolver, ISchemaParser currentInstance = null); } diff --git a/src/Cassandra/MetadataHelpers/SchemaParserFactory.cs b/src/Cassandra/MetadataHelpers/SchemaParserFactory.cs index bba51c33e..965293b2d 100644 --- a/src/Cassandra/MetadataHelpers/SchemaParserFactory.cs +++ b/src/Cassandra/MetadataHelpers/SchemaParserFactory.cs @@ -15,6 +15,7 @@ using System; using System.Threading.Tasks; +using Cassandra.Connections.Control; namespace Cassandra.MetadataHelpers { @@ -27,7 +28,7 @@ internal class SchemaParserFactory : ISchemaParserFactory /// /// Creates a new instance if the currentInstance is not valid for the given Cassandra version /// - public ISchemaParser Create(Version cassandraVersion, Metadata parent, + public ISchemaParser Create(Version cassandraVersion, IInternalMetadata parent, Func> udtResolver, ISchemaParser currentInstance = null) { diff --git a/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs b/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs index 03831dea2..c57ee3aae 100644 --- a/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs +++ b/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs @@ -51,12 +51,12 @@ public ConstantSpeculativeExecutionPolicy(long delay, int maxSpeculativeExecutio public int MaxSpeculativeExecutions { get; } - public Task InitializeAsync(Metadata metadata) + public Task InitializeAsync(IMetadata metadata) { return TaskHelper.Completed; } - public ISpeculativeExecutionPlan NewPlan(string keyspace, IStatement statement) + public ISpeculativeExecutionPlan NewPlan(IMetadata metadata, string keyspace, IStatement statement) { return new ConstantSpeculativeExecutionPlan(Delay, MaxSpeculativeExecutions); } diff --git a/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs b/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs index 7a1818b3e..7ee2aed15 100644 --- a/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs +++ b/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs @@ -78,7 +78,7 @@ public DCAwareRoundRobinPolicy(string localDc) : this(inferLocalDc: false) /// public string LocalDc { get; private set; } - public Task InitializeAsync(Metadata metadata) + public Task InitializeAsync(IMetadata metadata) { //When the pool changes, it should clear the local cache metadata.HostAdded += _ => ClearHosts(); @@ -117,7 +117,7 @@ public HostDistance Distance(Host host) /// the query for which to build the plan. /// a new query plan, i.e. an iterator indicating which host to try /// first for querying, which one to use as failover, etc... - public IEnumerable NewQueryPlan(Metadata metadata, string keyspace, IStatement query) + public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) { var startIndex = Interlocked.Increment(ref _index); @@ -149,7 +149,7 @@ private string GetDatacenter(Host host) /// /// Gets a tuple containing the list of local and remote nodes /// - internal List GetHosts(Metadata metadata) + internal List GetHosts(IMetadata metadata) { var hosts = _hosts; if (hosts != null) @@ -167,7 +167,7 @@ internal List GetHosts(Metadata metadata) } //shallow copy the nodes - var allNodes = metadata.AllHosts().ToArray(); + var allNodes = metadata.AllHostsSnapshot(); hosts = allNodes.Where(h => GetDatacenter(h) == LocalDc).ToList(); _hosts = hosts; diff --git a/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs b/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs index e8e01155b..7b4237197 100644 --- a/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs +++ b/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs @@ -85,7 +85,7 @@ public HostDistance Distance(Host host) /// /// Initializes the policy. /// - public Task InitializeAsync(Metadata metadata) + public Task InitializeAsync(IMetadata metadata) { return ChildPolicy.InitializeAsync(metadata); } @@ -93,7 +93,7 @@ public Task InitializeAsync(Metadata metadata) /// /// Returns the hosts to used for a query. /// - public IEnumerable NewQueryPlan(Metadata metadata, string keyspace, IStatement statement) + public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement statement) { if (statement is TargettedSimpleStatement targetedStatement && targetedStatement.PreferredHost != null) { @@ -104,7 +104,7 @@ public IEnumerable NewQueryPlan(Metadata metadata, string keyspace, IState return ChildPolicy.NewQueryPlan(metadata, keyspace, statement); } - private IEnumerable YieldPreferred(Metadata metadata, string keyspace, TargettedSimpleStatement statement) + private IEnumerable YieldPreferred(IMetadata metadata, string keyspace, TargettedSimpleStatement statement) { yield return statement.PreferredHost; foreach (var h in ChildPolicy.NewQueryPlan(metadata, keyspace, statement)) diff --git a/src/Cassandra/Policies/ILoadBalancingPolicy.cs b/src/Cassandra/Policies/ILoadBalancingPolicy.cs index 00210c81c..dca459aba 100644 --- a/src/Cassandra/Policies/ILoadBalancingPolicy.cs +++ b/src/Cassandra/Policies/ILoadBalancingPolicy.cs @@ -39,7 +39,7 @@ public interface ILoadBalancingPolicy /// /// /// The information about the session instance for which the policy is created. - Task InitializeAsync(Metadata metadata); + Task InitializeAsync(IMetadata metadata); /// /// Returns the distance assigned by this policy to the provided host.

The @@ -70,6 +70,6 @@ public interface ILoadBalancingPolicy /// An iterator of Host. The query is tried against the hosts returned /// by this iterator in order, until the query has been sent successfully to one /// of the host. - IEnumerable NewQueryPlan(Metadata metadata, string keyspace, IStatement query); + IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query); } } diff --git a/src/Cassandra/Policies/ISpeculativeExecutionPolicy.cs b/src/Cassandra/Policies/ISpeculativeExecutionPolicy.cs index 065c47890..9d280793c 100644 --- a/src/Cassandra/Policies/ISpeculativeExecutionPolicy.cs +++ b/src/Cassandra/Policies/ISpeculativeExecutionPolicy.cs @@ -28,15 +28,16 @@ public interface ISpeculativeExecutionPolicy ///

/// Initializes the policy at cluster startup. /// - Task InitializeAsync(Metadata metadata); + Task InitializeAsync(IMetadata metadata); /// /// Returns the plan to use for a new query. /// + /// the metadata instance for the current session. /// the currently logged keyspace /// the query for which to build a plan. /// - ISpeculativeExecutionPlan NewPlan(string keyspace, IStatement statement); + ISpeculativeExecutionPlan NewPlan(IMetadata metadata, string keyspace, IStatement statement); /// /// Disposes the policy at cluster shutdown. diff --git a/src/Cassandra/Policies/LocalDatacenterProvider.cs b/src/Cassandra/Policies/LocalDatacenterProvider.cs index 19adbe7eb..a1e2b9a2d 100644 --- a/src/Cassandra/Policies/LocalDatacenterProvider.cs +++ b/src/Cassandra/Policies/LocalDatacenterProvider.cs @@ -26,12 +26,12 @@ internal class LocalDatacenterProvider : ILocalDatacenterProvider private volatile bool _initialized = false; private volatile IInternalCluster _cluster; - private volatile InternalMetadata _internalMetadata; + private volatile IInternalMetadata _internalMetadata; private volatile IEnumerable _availableDcs; private volatile string _availableDcsStr; private volatile string _cachedDatacenter; - public void Initialize(IInternalCluster cluster, InternalMetadata internalMetadata) + public void Initialize(IInternalCluster cluster, IInternalMetadata internalMetadata) { _cluster = cluster; _internalMetadata = internalMetadata; diff --git a/src/Cassandra/Policies/NoSpeculativeExecutionPolicy.cs b/src/Cassandra/Policies/NoSpeculativeExecutionPolicy.cs index 3717ee358..9adfd630a 100644 --- a/src/Cassandra/Policies/NoSpeculativeExecutionPolicy.cs +++ b/src/Cassandra/Policies/NoSpeculativeExecutionPolicy.cs @@ -33,12 +33,12 @@ private NoSpeculativeExecutionPolicy() } - public Task InitializeAsync(Metadata metadata) + public Task InitializeAsync(IMetadata metadata) { return TaskHelper.Completed; } - public ISpeculativeExecutionPlan NewPlan(string keyspace, IStatement statement) + public ISpeculativeExecutionPlan NewPlan(IMetadata metadata, string keyspace, IStatement statement) { return Plan; } diff --git a/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs b/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs index a89bdc77c..8bfc38c93 100644 --- a/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs +++ b/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs @@ -35,7 +35,7 @@ public RetryLoadBalancingPolicy(ILoadBalancingPolicy loadBalancingPolicy, IRecon public ILoadBalancingPolicy LoadBalancingPolicy { get; } - public Task InitializeAsync(Metadata metadata) + public Task InitializeAsync(IMetadata metadata) { return LoadBalancingPolicy.InitializeAsync(metadata); } @@ -45,7 +45,7 @@ public HostDistance Distance(Host host) return LoadBalancingPolicy.Distance(host); } - public IEnumerable NewQueryPlan(Metadata metadata, string keyspace, IStatement query) + public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) { IReconnectionSchedule schedule = ReconnectionPolicy.NewSchedule(); while (true) diff --git a/src/Cassandra/Policies/RoundRobinPolicy.cs b/src/Cassandra/Policies/RoundRobinPolicy.cs index 422814ee9..0663349dd 100644 --- a/src/Cassandra/Policies/RoundRobinPolicy.cs +++ b/src/Cassandra/Policies/RoundRobinPolicy.cs @@ -38,7 +38,7 @@ public class RoundRobinPolicy : ILoadBalancingPolicy { private int _index; - public Task InitializeAsync(Metadata metadata) + public Task InitializeAsync(IMetadata metadata) { return TaskHelper.Completed; } @@ -67,10 +67,10 @@ public HostDistance Distance(Host host) /// the query for which to build the plan. /// a new query plan, i.e. an iterator indicating which host to try /// first for querying, which one to use as failover, etc... - public IEnumerable NewQueryPlan(Metadata metadata, string keyspace, IStatement query) + public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) { //shallow copy the all hosts - var hosts = (from h in metadata.AllHosts() select h).ToArray(); + var hosts = (from h in metadata.AllHostsSnapshot() select h).ToArray(); var startIndex = Interlocked.Increment(ref _index); //Simplified overflow protection diff --git a/src/Cassandra/Policies/TokenAwarePolicy.cs b/src/Cassandra/Policies/TokenAwarePolicy.cs index b3bc0bb51..a97bb8de3 100644 --- a/src/Cassandra/Policies/TokenAwarePolicy.cs +++ b/src/Cassandra/Policies/TokenAwarePolicy.cs @@ -28,7 +28,7 @@ namespace Cassandra /// /// /// The method is inherited from the child policy. - /// The host yielded by the method will first return the + /// The host yielded by the method will first return the /// replicas for the statement, based on the . /// /// @@ -52,7 +52,7 @@ public TokenAwarePolicy(ILoadBalancingPolicy childPolicy) public ILoadBalancingPolicy ChildPolicy { get; } - public Task InitializeAsync(Metadata metadata) + public Task InitializeAsync(IMetadata metadata) { return ChildPolicy.InitializeAsync(metadata); } @@ -80,7 +80,7 @@ public HostDistance Distance(Host host) /// Keyspace on which the query is going to be executed /// the query for which to build the plan. /// the new query plan. - public IEnumerable NewQueryPlan(Metadata metadata, string loggedKeyspace, IStatement query) + public IEnumerable NewQueryPlan(IMetadata metadata, string loggedKeyspace, IStatement query) { var routingKey = query?.RoutingKey; IEnumerable childIterator; @@ -95,7 +95,7 @@ public IEnumerable NewQueryPlan(Metadata metadata, string loggedKeyspace, } var keyspace = query.Keyspace ?? loggedKeyspace; - var replicas = metadata.GetReplicas(keyspace, routingKey.RawRoutingKey); + var replicas = metadata.GetReplicasSnapshot(keyspace, routingKey.RawRoutingKey); var localReplicaSet = new HashSet(); var localReplicaList = new List(replicas.Count); diff --git a/src/Cassandra/ProtocolVersion.cs b/src/Cassandra/ProtocolVersion.cs index 4b2e18e29..560230d09 100644 --- a/src/Cassandra/ProtocolVersion.cs +++ b/src/Cassandra/ProtocolVersion.cs @@ -79,11 +79,11 @@ internal static class ProtocolVersionExtensions /// /// Determines if the protocol version is supported by this driver. /// - public static bool IsSupported(this ProtocolVersion version, Configuration config) + public static bool IsSupported(this ProtocolVersion version, bool allowBetaProtocolVersions) { if (version.IsBeta()) { - return config.AllowBetaProtocolVersions; + return allowBetaProtocolVersions; } return version >= ProtocolVersion.MinSupported && version <= ProtocolVersion.MaxSupported; @@ -94,7 +94,7 @@ public static bool IsSupported(this ProtocolVersion version, Configuration confi /// Returns zero when there isn't a lower supported version. /// /// - public static ProtocolVersion GetLowerSupported(this ProtocolVersion version, Configuration config) + public static ProtocolVersion GetLowerSupported(this ProtocolVersion version, bool allowBetaProtocolVersions) { var lowerVersion = version; do @@ -111,7 +111,7 @@ public static ProtocolVersion GetLowerSupported(this ProtocolVersion version, Co { lowerVersion = lowerVersion - 1; } - } while (lowerVersion > 0 && !lowerVersion.IsSupported(config)); + } while (lowerVersion > 0 && !lowerVersion.IsSupported(allowBetaProtocolVersions)); return lowerVersion; } @@ -119,7 +119,8 @@ public static ProtocolVersion GetLowerSupported(this ProtocolVersion version, Co /// /// Gets the highest supported protocol version collectively by the given hosts. /// - public static ProtocolVersion GetHighestCommon(this ProtocolVersion version, Configuration config, IEnumerable hosts) + public static ProtocolVersion GetHighestCommon( + this ProtocolVersion version, bool allowBetaProtocolVersions, IEnumerable hosts) { var maxVersion = (byte)version; var v3Requirement = false; @@ -141,7 +142,7 @@ public static ProtocolVersion GetHighestCommon(this ProtocolVersion version, Con { // Anything 4.0.0+ has a max protocol version of V5 and requires at least V3. v3Requirement = true; - maxVersion = config.AllowBetaProtocolVersions + maxVersion = allowBetaProtocolVersions ? Math.Min((byte)ProtocolVersion.V5, maxVersion) : Math.Min((byte)ProtocolVersion.V4, maxVersion); maxVersionWith3OrMore = maxVersion; diff --git a/src/Cassandra/QueryTrace.cs b/src/Cassandra/QueryTrace.cs index c3df980f0..cd9ac9ef4 100644 --- a/src/Cassandra/QueryTrace.cs +++ b/src/Cassandra/QueryTrace.cs @@ -18,6 +18,7 @@ using System.Collections.Generic; using System.Net; using System.Threading.Tasks; +using Cassandra.SessionManagement; using Cassandra.Tasks; namespace Cassandra @@ -34,7 +35,7 @@ public class QueryTrace { private readonly object _fetchLock = new object(); private readonly Guid _traceId; - private readonly ISession _session; + private readonly IInternalSession _session; private IPAddress _coordinator; private int _duration = int.MinValue; private List _events; @@ -164,7 +165,7 @@ public IPAddress ClientAddress internal set { _clientAddress = value; } } - public QueryTrace(Guid traceId, ISession session) + internal QueryTrace(Guid traceId, IInternalSession session) { if (session == null) { @@ -232,7 +233,7 @@ internal async Task LoadAsync() // mark as disconnected, guaranteeing that it wont make metadata fetches triggered by a property get // ReSharper disable once InconsistentlySynchronizedField : Can be both async and sync, don't mind _isDisconnected = false; - var metadata = await _session.Cluster.GetMetadataAsync().ConfigureAwait(false); + var metadata = await _session.TryInitAndGetMetadataAsync().ConfigureAwait(false); return await metadata.GetQueryTraceAsync(this).ConfigureAwait(false); } diff --git a/src/Cassandra/Requests/IRequestHandler.cs b/src/Cassandra/Requests/IRequestHandler.cs index 3ad0f0d92..eb4c8c524 100644 --- a/src/Cassandra/Requests/IRequestHandler.cs +++ b/src/Cassandra/Requests/IRequestHandler.cs @@ -19,6 +19,7 @@ using System.Net; using System.Threading.Tasks; using Cassandra.Connections; +using Cassandra.Connections.Control; using Cassandra.ExecutionProfiles; using Cassandra.Serialization; @@ -29,7 +30,7 @@ namespace Cassandra.Requests /// internal interface IRequestHandler { - Metadata Metadata { get; } + IInternalMetadata InternalMetadata { get; } IRequestOptions RequestOptions { get; } diff --git a/src/Cassandra/Requests/IRequestHandlerFactory.cs b/src/Cassandra/Requests/IRequestHandlerFactory.cs index 2a48e85ef..b7d08f608 100644 --- a/src/Cassandra/Requests/IRequestHandlerFactory.cs +++ b/src/Cassandra/Requests/IRequestHandlerFactory.cs @@ -14,6 +14,7 @@ // limitations under the License. // +using Cassandra.Connections.Control; using Cassandra.ExecutionProfiles; using Cassandra.Serialization; using Cassandra.SessionManagement; @@ -24,15 +25,15 @@ internal interface IRequestHandlerFactory { IRequestHandler Create( IInternalSession session, - Metadata metadata, + IInternalMetadata internalMetadata, ISerializer serializer, IRequest request, IStatement statement, IRequestOptions options); IRequestHandler Create( - IInternalSession session, Metadata metadata, ISerializer serializer, IStatement statement, IRequestOptions options); + IInternalSession session, IInternalMetadata internalMetadata, ISerializer serializer, IStatement statement, IRequestOptions options); - IRequestHandler Create(IInternalSession session, Metadata metadata, ISerializer serializer); + IRequestHandler Create(IInternalSession session, IInternalMetadata internalMetadata, ISerializer serializer); } } \ No newline at end of file diff --git a/src/Cassandra/Requests/PrepareHandler.cs b/src/Cassandra/Requests/PrepareHandler.cs index 5c355f458..52794483a 100644 --- a/src/Cassandra/Requests/PrepareHandler.cs +++ b/src/Cassandra/Requests/PrepareHandler.cs @@ -163,7 +163,7 @@ private async Task GetPreparedStatement( return ps; } - private static async Task FillRoutingInfo(PreparedStatement ps, InternalMetadata internalMetadata) + private static async Task FillRoutingInfo(PreparedStatement ps, IInternalMetadata internalMetadata) { var column = ps.Variables.Columns.FirstOrDefault(); if (column?.Keyspace == null) diff --git a/src/Cassandra/Requests/ReprepareHandler.cs b/src/Cassandra/Requests/ReprepareHandler.cs index b7d0618b1..3eb7357ab 100644 --- a/src/Cassandra/Requests/ReprepareHandler.cs +++ b/src/Cassandra/Requests/ReprepareHandler.cs @@ -31,7 +31,7 @@ public async Task ReprepareOnAllNodesWithExistingConnections( IInternalSession session, PrepareRequest request, PrepareResult prepareResult) { var pools = session.GetPools(); - var metadata = await session.Cluster.GetMetadataAsync().ConfigureAwait(false); + var metadata = await session.TryInitAndGetMetadataAsync().ConfigureAwait(false); var hosts = metadata.AllHosts(); var poolsByHosts = pools.Join( hosts, po => po.Key, diff --git a/src/Cassandra/Requests/RequestExecution.cs b/src/Cassandra/Requests/RequestExecution.cs index 6f2dbce74..0476a9617 100644 --- a/src/Cassandra/Requests/RequestExecution.cs +++ b/src/Cassandra/Requests/RequestExecution.cs @@ -245,11 +245,11 @@ private void HandleSchemaChangeAsync(ResultResponse response, OutputSchemaChange result, async () => { - var schemaAgreed = await _parent.Metadata.WaitForSchemaAgreementAsync(_connection).ConfigureAwait(false); + var schemaAgreed = await _parent.InternalMetadata.WaitForSchemaAgreementAsync(_connection).ConfigureAwait(false); result.Info.SetSchemaInAgreement(schemaAgreed); try { - await _parent.Metadata.ControlConnection + await _parent.InternalMetadata.ControlConnection .HandleSchemaChangeEvent(schemaChange.SchemaChangeEventArgs, true) .WaitToCompleteAsync( _session.Cluster.Configuration.ProtocolOptions.MaxSchemaAgreementWaitSeconds * 1000) @@ -329,7 +329,7 @@ private void SetAutoPage(RowSet rs, IInternalSession session) var request = (IQueryRequest)_parent.BuildRequest(); request.PagingState = pagingState; return _session.Cluster.Configuration.RequestHandlerFactory.Create( - session, _parent.Metadata, _parent.Serializer, request, statement, _parent.RequestOptions).SendAsync(); + session, _parent.InternalMetadata, _parent.Serializer, request, statement, _parent.RequestOptions).SendAsync(); }, _parent.RequestOptions.QueryAbortTimeout, _session.MetricsManager); } } diff --git a/src/Cassandra/Requests/RequestHandler.cs b/src/Cassandra/Requests/RequestHandler.cs index 36b469a9b..0ed9731b0 100644 --- a/src/Cassandra/Requests/RequestHandler.cs +++ b/src/Cassandra/Requests/RequestHandler.cs @@ -24,6 +24,7 @@ using Cassandra.Collections; using Cassandra.Connections; +using Cassandra.Connections.Control; using Cassandra.ExecutionProfiles; using Cassandra.Observers.Abstractions; using Cassandra.Serialization; @@ -58,21 +59,21 @@ internal class RequestHandler : IRequestHandler public IRequestOptions RequestOptions { get; } - public Metadata Metadata { get; } + public IInternalMetadata InternalMetadata { get; } /// /// Creates a new instance using a request, the statement and the execution profile. /// public RequestHandler( IInternalSession session, - Metadata metadata, + IInternalMetadata internalMetadata, ISerializer serializer, IRequest request, IStatement statement, IRequestOptions requestOptions) { _session = session ?? throw new ArgumentNullException(nameof(session)); - Metadata = metadata ?? throw new ArgumentNullException(nameof(metadata)); + InternalMetadata = internalMetadata ?? throw new ArgumentNullException(nameof(internalMetadata)); _requestObserver = session.ObserverFactory.CreateRequestObserver(); _requestResultHandler = new TcsMetricsRequestResultHandler(_requestObserver); _request = request; @@ -87,7 +88,8 @@ public RequestHandler( RetryPolicy = statement.RetryPolicy.Wrap(RetryPolicy); } - _queryPlan = RequestHandler.GetQueryPlan(session, metadata, statement, RequestOptions.LoadBalancingPolicy).GetEnumerator(); + _queryPlan = RequestHandler.GetQueryPlan( + session, _session.Cluster.Metadata, statement, RequestOptions.LoadBalancingPolicy).GetEnumerator(); } /// @@ -96,13 +98,13 @@ public RequestHandler( /// public RequestHandler( IInternalSession session, - Metadata metadata, + IInternalMetadata internalMetadata, ISerializer serializer, IStatement statement, IRequestOptions requestOptions) : this( session, - metadata, + internalMetadata, serializer, RequestHandler.GetRequest(statement, serializer, requestOptions), statement, @@ -113,8 +115,8 @@ public RequestHandler( /// /// Creates a new instance with no request, suitable for getting a connection. /// - public RequestHandler(IInternalSession session, Metadata metadata, ISerializer serializer) - : this(session, metadata, serializer, null, null, session.Cluster.Configuration.DefaultRequestOptions) + public RequestHandler(IInternalSession session, IInternalMetadata internalMetadata, ISerializer serializer) + : this(session, internalMetadata, serializer, null, null, session.Cluster.Configuration.DefaultRequestOptions) { } @@ -123,7 +125,7 @@ public RequestHandler(IInternalSession session, Metadata metadata, ISerializer s /// In the special case when a Host is provided at Statement level, it will return a query plan with a single /// host. /// - private static IEnumerable GetQueryPlan(ISession session, Metadata metadata, IStatement statement, ILoadBalancingPolicy lbp) + private static IEnumerable GetQueryPlan(ISession session, IMetadata metadata, IStatement statement, ILoadBalancingPolicy lbp) { // Single host iteration var host = (statement as Statement)?.Host; @@ -523,7 +525,8 @@ private void ScheduleNext(Host currentHost) } if (_executionPlan == null) { - _executionPlan = RequestOptions.SpeculativeExecutionPolicy.NewPlan(_session.Keyspace, Statement); + _executionPlan = RequestOptions.SpeculativeExecutionPolicy.NewPlan( + _session.Cluster.Metadata, _session.Keyspace, Statement); } var delay = _executionPlan.NextExecution(currentHost); if (delay <= 0) diff --git a/src/Cassandra/Requests/RequestHandlerFactory.cs b/src/Cassandra/Requests/RequestHandlerFactory.cs index 5a85d52a0..c6473aecb 100644 --- a/src/Cassandra/Requests/RequestHandlerFactory.cs +++ b/src/Cassandra/Requests/RequestHandlerFactory.cs @@ -14,6 +14,7 @@ // limitations under the License. // +using Cassandra.Connections.Control; using Cassandra.ExecutionProfiles; using Cassandra.Serialization; using Cassandra.SessionManagement; @@ -24,7 +25,7 @@ internal class RequestHandlerFactory : IRequestHandlerFactory { public IRequestHandler Create( IInternalSession session, - Metadata metadata, + IInternalMetadata metadata, ISerializer serializer, IRequest request, IStatement statement, @@ -34,12 +35,12 @@ public IRequestHandler Create( } public IRequestHandler Create( - IInternalSession session, Metadata metadata, ISerializer serializer, IStatement statement, IRequestOptions options) + IInternalSession session, IInternalMetadata metadata, ISerializer serializer, IStatement statement, IRequestOptions options) { return new RequestHandler(session, metadata, serializer, statement, options); } - public IRequestHandler Create(IInternalSession session, Metadata metadata, ISerializer serializer) + public IRequestHandler Create(IInternalSession session, IInternalMetadata metadata, ISerializer serializer) { return new RequestHandler(session, metadata, serializer); } diff --git a/src/Cassandra/SchemaParser.cs b/src/Cassandra/SchemaParser.cs index d8d59fa4c..d4c7aa347 100644 --- a/src/Cassandra/SchemaParser.cs +++ b/src/Cassandra/SchemaParser.cs @@ -19,6 +19,7 @@ using System.Linq; using System.Net; using System.Threading.Tasks; +using Cassandra.Connections.Control; using Cassandra.Serialization; using Cassandra.Tasks; using SortOrder = Cassandra.DataCollectionMetadata.SortOrder; @@ -34,13 +35,13 @@ internal abstract class SchemaParser : ISchemaParser private const string SelectTraceEvents = "SELECT * FROM system_traces.events WHERE session_id = {0}"; protected readonly IMetadataQueryProvider Cc; - protected readonly Metadata Parent; + protected readonly IInternalMetadata Parent; protected abstract string SelectAggregates { get; } protected abstract string SelectFunctions { get; } protected abstract string SelectTables { get; } protected abstract string SelectUdts { get; } - protected SchemaParser(Metadata parent) + protected SchemaParser(IInternalMetadata parent) { Cc = parent.ControlConnection; Parent = parent; @@ -165,7 +166,7 @@ internal class SchemaParserV1 : SchemaParser protected override string SelectUdts => "SELECT * FROM system.schema_usertypes WHERE keyspace_name='{0}' AND type_name = '{1}'"; - internal SchemaParserV1(Metadata parent) : base(parent) + internal SchemaParserV1(IInternalMetadata parent) : base(parent) { } @@ -536,7 +537,7 @@ internal class SchemaParserV2 : SchemaParser protected override string SelectUdts => "SELECT * FROM system_schema.types WHERE keyspace_name='{0}' AND type_name = '{1}'"; - internal SchemaParserV2(Metadata parent, Func> udtResolver) + internal SchemaParserV2(IInternalMetadata parent, Func> udtResolver) : base(parent) { _udtResolver = udtResolver; @@ -914,7 +915,7 @@ internal class SchemaParserV3 : SchemaParserV2 "SELECT * FROM system_virtual_schema.columns WHERE keyspace_name = '{0}' AND table_name='{1}'"; private const string SelectVirtualKeyspaceNames = "SELECT keyspace_name FROM system_virtual_schema.keyspaces"; - internal SchemaParserV3(Metadata parent, Func> udtResolver) + internal SchemaParserV3(IInternalMetadata parent, Func> udtResolver) : base(parent, udtResolver) { diff --git a/src/Cassandra/Session.cs b/src/Cassandra/Session.cs index 815b397dd..3dbfef0d3 100644 --- a/src/Cassandra/Session.cs +++ b/src/Cassandra/Session.cs @@ -23,6 +23,7 @@ using Cassandra.Collections; using Cassandra.Connections; +using Cassandra.Connections.Control; using Cassandra.DataStax.Graph; using Cassandra.DataStax.Insights; using Cassandra.ExecutionProfiles; @@ -48,10 +49,9 @@ public class Session : IInternalSession private readonly IObserverFactory _observerFactory; private readonly IInsightsClient _insightsClient; - private readonly Task _initTask; + private readonly Task _initTask; private long _state = Session.Initializing; - private volatile Metadata _initializedMetadata; private volatile string _keyspace; internal IInternalSession InternalRef => this; @@ -101,7 +101,7 @@ string IInternalSession.Keyspace /// public void Connect() { - TaskHelper.WaitToComplete(ConnectAsync()); + InternalRef.TryInit(); } /// @@ -228,8 +228,7 @@ private async Task ShutdownInternalAsync() _metricsManager?.Dispose(); - var metadata = _initializedMetadata; - metadata.HostRemoved -= OnHostRemoved; + _cluster.Metadata.HostRemoved -= OnHostRemoved; var pools = _connectionPool.ToArray(); foreach (var pool in pools) @@ -238,14 +237,35 @@ private async Task ShutdownInternalAsync() } } - Task IInternalSession.TryInitAndGetMetadataAsync() + Task IInternalSession.TryInitAndGetMetadataAsync() + { + ValidateState(); + return _initTask; + } + + void IInternalSession.TryInit() + { + if (ValidateState()) + { + return; + } + + TaskHelper.WaitToComplete(_initTask); + } + + /// + /// Validates if the session is not disposed and checks whether it is already initialized. + /// Throws the initialization exception if the initialization failed. + /// + /// true if session is initialized, false otherwise + private bool ValidateState() { var currentState = Interlocked.Read(ref _state); if (currentState == Session.Initialized) { //It was already initialized - return _initTask; + return true; } if (currentState == Session.Disposed) @@ -259,32 +279,32 @@ Task IInternalSession.TryInitAndGetMetadataAsync() throw _cluster.InitException; } - return _initTask; + return false; } - - private async Task InitInternalAsync() + + private async Task InitInternalAsync() { - var metadata = await InternalRef.InternalCluster.TryInitAndGetMetadataAsync().ConfigureAwait(false); - metadata.HostRemoved += OnHostRemoved; + var internalMetadata = await InternalRef.InternalCluster.TryInitAndGetMetadataAsync().ConfigureAwait(false); + + InternalRef.InternalCluster.Metadata.HostRemoved += OnHostRemoved; _metricsManager.InitializeMetrics(this); - var serializerManager = _cluster.SerializerManager; + var serializerManager = _cluster.Configuration.SerializerManager; if (Configuration.GetOrCreatePoolingOptions(serializerManager.CurrentProtocolVersion).GetWarmup()) { - await WarmupAsync().ConfigureAwait(false); + await WarmupAsync(internalMetadata).ConfigureAwait(false); } if (Keyspace != null) { // Borrow a connection, trying to fail fast - var handler = Configuration.RequestHandlerFactory.Create(this, metadata, serializerManager.GetCurrentSerializer()); + var handler = Configuration.RequestHandlerFactory.Create(this, internalMetadata, serializerManager.GetCurrentSerializer()); await handler.GetNextConnectionAsync(new Dictionary()).ConfigureAwait(false); } - await _insightsClient.InitializeAsync().ConfigureAwait(false); + _insightsClient.Initialize(internalMetadata); - _initializedMetadata = metadata; var previousState = Interlocked.CompareExchange(ref _state, Session.Initialized, Session.Initializing); if (previousState == Session.Disposed) { @@ -292,7 +312,7 @@ private async Task InitInternalAsync() throw new ObjectDisposedException("Session instance was disposed before initialization finished."); } - return metadata; + return internalMetadata; } /// @@ -300,9 +320,8 @@ private async Task InitInternalAsync() /// Returns a Task that is marked as completed after all pools were warmed up. /// In case, all the host pool warmup fail, it logs an error. /// - private async Task WarmupAsync() + private async Task WarmupAsync(IInternalMetadata metadata) { - var metadata = await _cluster.GetMetadataAsync().ConfigureAwait(false); var hosts = metadata.AllHosts().Where(h => _cluster.RetrieveAndSetDistance(h) == HostDistance.Local).ToArray(); var tasks = new Task[hosts.Length]; for (var i = 0; i < hosts.Length; i++) @@ -401,7 +420,7 @@ private async Task ExecuteAsync(IStatement statement, IRequestOptions re return await ExecuteAsync(metadata, statement, requestOptions).ConfigureAwait(false); } - private Task ExecuteAsync(Metadata metadata, IStatement statement, IRequestOptions requestOptions) + private Task ExecuteAsync(IInternalMetadata metadata, IStatement statement, IRequestOptions requestOptions) { return Configuration.RequestHandlerFactory .Create(this, metadata, metadata.SerializerManager.GetCurrentSerializer(), statement, requestOptions) @@ -414,7 +433,7 @@ IHostConnectionPool IInternalSession.GetOrCreateConnectionPool(Host host, HostDi var hostPool = _connectionPool.GetOrAdd(host.Address, address => { var newPool = Configuration.HostConnectionPoolFactory.Create( - host, Configuration, _cluster.SerializerManager, _observerFactory); + host, Configuration, _cluster.Configuration.SerializerManager, _observerFactory); newPool.AllConnectionClosed += InternalRef.OnAllConnectionClosed; newPool.SetDistance(distance); _metricsManager.GetOrCreateNodeMetrics(host).InitializePoolGauges(newPool); @@ -582,7 +601,7 @@ public async Task ExecuteGraphAsync(IGraphStatement graphStateme } private async Task GetAnalyticsPrimary( - Metadata metadata, IStatement statement, IGraphStatement graphStatement, IRequestOptions requestOptions) + IInternalMetadata internalMetadata, IStatement statement, IGraphStatement graphStatement, IRequestOptions requestOptions) { if (!(statement is TargettedSimpleStatement) || !requestOptions.GraphOptions.IsAnalyticsQuery(graphStatement)) { @@ -603,10 +622,10 @@ private async Task GetAnalyticsPrimary( return statement; } - return AdaptRpcPrimaryResult(metadata, rs, targetedSimpleStatement); + return AdaptRpcPrimaryResult(internalMetadata, rs, targetedSimpleStatement); } - private IStatement AdaptRpcPrimaryResult(Metadata metadata, RowSet rowSet, TargettedSimpleStatement statement) + private IStatement AdaptRpcPrimaryResult(IInternalMetadata internalMetadata, RowSet rowSet, TargettedSimpleStatement statement) { var row = rowSet.FirstOrDefault(); if (row == null) @@ -624,7 +643,7 @@ private IStatement AdaptRpcPrimaryResult(Metadata metadata, RowSet rowSet, Targe var hostName = location.Substring(0, location.LastIndexOf(':')); var address = Configuration.AddressTranslator.Translate( new IPEndPoint(IPAddress.Parse(hostName), Configuration.ProtocolOptions.Port)); - var host = metadata.GetHost(address); + var host = internalMetadata.GetHost(address); statement.PreferredHost = host; return statement; } diff --git a/src/Cassandra/SessionManagement/IInternalCluster.cs b/src/Cassandra/SessionManagement/IInternalCluster.cs index ba53b7e82..b92c4e120 100644 --- a/src/Cassandra/SessionManagement/IInternalCluster.cs +++ b/src/Cassandra/SessionManagement/IInternalCluster.cs @@ -18,22 +18,19 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Threading.Tasks; + using Cassandra.Connections; using Cassandra.Connections.Control; -using Cassandra.Requests; -using Cassandra.Serialization; namespace Cassandra.SessionManagement { /// internal interface IInternalCluster : ICluster { - ISerializerManager SerializerManager { get; } - IInternalMetadata InternalMetadata { get; } bool AnyOpenConnections(Host host); - + /// /// If contact points are not provided in the builder, the driver will use localhost /// as an implicit contact point. @@ -54,17 +51,17 @@ internal interface IInternalCluster : ICluster /// In case the statement was already in the prepared statements cache, logs an warning but prepares it anyway. /// Task PrepareAsync(IInternalSession session, string cqlQuery, string keyspace, IDictionary customPayload); - + IReadOnlyDictionary> GetResolvedEndpoints(); /// /// Helper method to retrieve the aggregate distance from all configured LoadBalancingPolicies and set it at Host level. /// HostDistance RetrieveAndSetDistance(Host host); - + /// - /// Initializes once (Thread-safe) the control connection + /// Initializes once (Thread-safe) the control connection and retrieve the internal metadata object. /// - Task TryInitializeAsync(); + Task TryInitAndGetMetadataAsync(); } } \ No newline at end of file diff --git a/src/Cassandra/SessionManagement/IInternalSession.cs b/src/Cassandra/SessionManagement/IInternalSession.cs index 5629a7770..96b143dd8 100644 --- a/src/Cassandra/SessionManagement/IInternalSession.cs +++ b/src/Cassandra/SessionManagement/IInternalSession.cs @@ -20,6 +20,7 @@ using System.Threading.Tasks; using Cassandra.Connections; +using Cassandra.Connections.Control; using Cassandra.ExecutionProfiles; using Cassandra.Metrics.Internal; using Cassandra.Observers.Abstractions; @@ -35,8 +36,10 @@ internal interface IInternalSession : ISession /// Unique Session ID generated by the driver. /// Guid InternalSessionId { get; } + + void TryInit(); - Task TryInitAndGetMetadataAsync(); + Task TryInitAndGetMetadataAsync(); /// /// Gets or creates the connection pool for a given host diff --git a/src/Cassandra/SessionState.cs b/src/Cassandra/SessionState.cs index 858261623..6da030447 100644 --- a/src/Cassandra/SessionState.cs +++ b/src/Cassandra/SessionState.cs @@ -18,6 +18,7 @@ using System.Text; using Cassandra.Collections; using Cassandra.Connections; +using Cassandra.Connections.Control; using Cassandra.SessionManagement; namespace Cassandra @@ -62,13 +63,13 @@ public override string ToString() return builder.ToString(); } - internal static SessionState From(IInternalSession session, Metadata metadata) + internal static SessionState From(IInternalSession session, IInternalMetadata internalMetadata) { var pools = session.GetPools(); var result = new Dictionary(); foreach (var kv in pools) { - var host = metadata.GetHost(kv.Key); + var host = internalMetadata.GetHost(kv.Key); if (host == null) { continue; diff --git a/src/Cassandra/UdtMappingDefinitions.cs b/src/Cassandra/UdtMappingDefinitions.cs index 2a1c25d6d..3f7ba38ac 100644 --- a/src/Cassandra/UdtMappingDefinitions.cs +++ b/src/Cassandra/UdtMappingDefinitions.cs @@ -18,7 +18,7 @@ using System.Collections.Concurrent; using System.Linq; using System.Threading.Tasks; - +using Cassandra.Connections.Control; using Cassandra.SessionManagement; using Cassandra.Tasks; @@ -59,7 +59,7 @@ public async Task DefineAsync(params UdtMap[] udtMaps) { throw new ArgumentNullException("udtMaps"); } - var metadata = await _cluster.GetMetadataAsync().ConfigureAwait(false); + var metadata = await _session.TryInitAndGetMetadataAsync().ConfigureAwait(false); var sessionKeyspace = _session.Keyspace; if (string.IsNullOrEmpty(sessionKeyspace) && udtMaps.Any(map => map.Keyspace == null)) { @@ -86,7 +86,7 @@ public async Task DefineAsync(params UdtMap[] udtMaps) /// Gets the definition and validates the fields /// /// - private async Task GetDefinitionAsync(string keyspace, UdtMap map, Metadata metadata) + private async Task GetDefinitionAsync(string keyspace, UdtMap map, IInternalMetadata metadata) { var caseSensitiveUdtName = map.UdtName; if (map.IgnoreCase) From 5af864c2edce849597a4a39e7e2c11b153386f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Wed, 1 Jul 2020 19:32:02 +0100 Subject: [PATCH 10/31] add Metadata parameter to LBP.Distance --- src/Cassandra/Cluster.cs | 4 ++-- src/Cassandra/ClusterDescription.cs | 10 ++++++---- src/Cassandra/Configuration.cs | 5 +++-- src/Cassandra/Connections/Control/IInternalMetadata.cs | 4 +++- src/Cassandra/Connections/Control/InternalMetadata.cs | 8 +++++++- src/Cassandra/Connections/Control/TopologyRefresher.cs | 2 +- .../StartupMessage/DataCentersInfoProvider.cs | 5 +++-- src/Cassandra/Metadata.cs | 5 ++--- src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs | 3 ++- src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs | 5 +++-- src/Cassandra/Policies/ILoadBalancingPolicy.cs | 7 ++++--- src/Cassandra/Policies/RetryLoadBalancingPolicy.cs | 4 ++-- src/Cassandra/Policies/RoundRobinPolicy.cs | 3 ++- src/Cassandra/Policies/TokenAwarePolicy.cs | 9 +++++---- 14 files changed, 45 insertions(+), 29 deletions(-) diff --git a/src/Cassandra/Cluster.cs b/src/Cassandra/Cluster.cs index 1d36ea1ea..bb783c145 100644 --- a/src/Cassandra/Cluster.cs +++ b/src/Cassandra/Cluster.cs @@ -475,12 +475,12 @@ private async Task ShutdownInternalAsync() /// HostDistance IInternalCluster.RetrieveAndSetDistance(Host host) { - var distance = _loadBalancingPolicies[0].Distance(host); + var distance = _loadBalancingPolicies[0].Distance(Metadata, host); for (var i = 1; i < _loadBalancingPolicies.Count; i++) { var lbp = _loadBalancingPolicies[i]; - var lbpDistance = lbp.Distance(host); + var lbpDistance = lbp.Distance(Metadata, host); if (lbpDistance < distance) { distance = lbpDistance; diff --git a/src/Cassandra/ClusterDescription.cs b/src/Cassandra/ClusterDescription.cs index 44de74e8f..d7e161c3c 100644 --- a/src/Cassandra/ClusterDescription.cs +++ b/src/Cassandra/ClusterDescription.cs @@ -14,6 +14,8 @@ // limitations under the License. // +using Cassandra.Connections.Control; + namespace Cassandra { /// @@ -22,11 +24,11 @@ namespace Cassandra public class ClusterDescription { internal ClusterDescription( - string clusterName, bool isDbaas, ProtocolVersion protocolVersion) + IInternalMetadata internalMetadata) { - ClusterName = clusterName; - IsDbaas = isDbaas; - ProtocolVersion = protocolVersion; + ClusterName = internalMetadata.ClusterName; + IsDbaas = internalMetadata.IsDbaas; + ProtocolVersion = internalMetadata.ProtocolVersion; } /// diff --git a/src/Cassandra/Configuration.cs b/src/Cassandra/Configuration.cs index 516cb689f..db5bc479f 100644 --- a/src/Cassandra/Configuration.cs +++ b/src/Cassandra/Configuration.cs @@ -366,7 +366,8 @@ internal Configuration(Policies policies, ISupportedOptionsInitializerFactory supportedOptionsInitializerFactory = null, IProtocolVersionNegotiator protocolVersionNegotiator = null, IServerEventsSubscriber serverEventsSubscriber = null, - ILocalDatacenterProvider localDatacenterProvider = null) + ILocalDatacenterProvider localDatacenterProvider = null, + ISerializerManager serializerManager = null) { AddressTranslator = addressTranslator ?? throw new ArgumentNullException(nameof(addressTranslator)); QueryOptions = queryOptions ?? throw new ArgumentNullException(nameof(queryOptions)); @@ -438,7 +439,7 @@ internal Configuration(Policies policies, protocolVersion = ProtocolOptions.MaxProtocolVersionValue.Value; } - SerializerManager = new SerializerManager(protocolVersion, TypeSerializers); + SerializerManager = serializerManager ?? new SerializerManager(protocolVersion, TypeSerializers); } /// diff --git a/src/Cassandra/Connections/Control/IInternalMetadata.cs b/src/Cassandra/Connections/Control/IInternalMetadata.cs index b9ec24d5d..8b6cbae88 100644 --- a/src/Cassandra/Connections/Control/IInternalMetadata.cs +++ b/src/Cassandra/Connections/Control/IInternalMetadata.cs @@ -38,7 +38,7 @@ internal interface IInternalMetadata ISchemaParser SchemaParser { get; } - string Partitioner { get; set; } + string Partitioner { get; } Hosts Hosts { get; } @@ -222,6 +222,8 @@ void SetResolvedContactPoints( void SetClusterName(string clusterName); + void SetPartitioner(string partitioner); + IEnumerable UpdateResolvedContactPoint( IContactPoint contactPoint, IEnumerable endpoints); } diff --git a/src/Cassandra/Connections/Control/InternalMetadata.cs b/src/Cassandra/Connections/Control/InternalMetadata.cs index 985e68e7d..0a0d4fa8a 100644 --- a/src/Cassandra/Connections/Control/InternalMetadata.cs +++ b/src/Cassandra/Connections/Control/InternalMetadata.cs @@ -47,6 +47,7 @@ internal class InternalMetadata : IInternalMetadata new CopyOnWriteDictionary>(); private volatile bool _isDbaas = false; private volatile string _clusterName; + private volatile string _partitioner; /// public Configuration Configuration { get; } @@ -58,7 +59,7 @@ internal class InternalMetadata : IInternalMetadata public ISchemaParser SchemaParser => _schemaParser; - public string Partitioner { get; set; } + public string Partitioner => _partitioner; public Hosts Hosts { get; } @@ -677,6 +678,11 @@ public void SetClusterName(string clusterName) _clusterName = clusterName; } + public void SetPartitioner(string partitioner) + { + _partitioner = partitioner; + } + public IEnumerable UpdateResolvedContactPoint(IContactPoint contactPoint, IEnumerable endpoints) { return _resolvedContactPoints.AddOrUpdate(contactPoint, _ => endpoints, (_, __) => endpoints); diff --git a/src/Cassandra/Connections/Control/TopologyRefresher.cs b/src/Cassandra/Connections/Control/TopologyRefresher.cs index f151a28b5..2252f4731 100644 --- a/src/Cassandra/Connections/Control/TopologyRefresher.cs +++ b/src/Cassandra/Connections/Control/TopologyRefresher.cs @@ -73,7 +73,7 @@ public async Task RefreshNodeListAsync( throw new DriverInternalError("Local host metadata could not be retrieved"); } - _internalMetadata.Partitioner = localRow.GetValue("partitioner"); + _internalMetadata.SetPartitioner(localRow.GetValue("partitioner")); var host = GetAndUpdateLocalHost(currentEndPoint, localRow); UpdatePeersInfo(localIsPeersV2, rsPeers, host); ControlConnection.Logger.Info("Node list retrieved successfully"); diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DataCentersInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DataCentersInfoProvider.cs index c612e94a4..78ce92b7c 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DataCentersInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DataCentersInfoProvider.cs @@ -23,7 +23,8 @@ namespace Cassandra.DataStax.Insights.InfoProviders.StartupMessage { internal class DataCentersInfoProvider : IInsightsInfoProvider> { - public HashSet GetInformation(IInternalCluster cluster, IInternalSession session, IInternalMetadata internalMetadata) + public HashSet GetInformation( + IInternalCluster cluster, IInternalSession session, IInternalMetadata internalMetadata) { var dataCenters = new HashSet(); var remoteConnectionsLength = @@ -39,7 +40,7 @@ public HashSet GetInformation(IInternalCluster cluster, IInternalSession continue; } - var distance = cluster.Configuration.Policies.LoadBalancingPolicy.Distance(h); + var distance = cluster.Configuration.Policies.LoadBalancingPolicy.Distance(cluster.Metadata, h); if (distance == HostDistance.Local || (distance == HostDistance.Remote && remoteConnectionsLength > 0)) { dataCenters.Add(h.Datacenter); diff --git a/src/Cassandra/Metadata.cs b/src/Cassandra/Metadata.cs index 433b658ad..3e9b86b61 100644 --- a/src/Cassandra/Metadata.cs +++ b/src/Cassandra/Metadata.cs @@ -41,7 +41,7 @@ internal class Metadata : IMetadata private long _state = Metadata.NotInitialized; - internal InternalMetadata InternalMetadata { get; } + internal IInternalMetadata InternalMetadata { get; } internal Metadata( IInternalCluster cluster, @@ -121,8 +121,7 @@ public ICollection GetReplicasSnapshot(byte[] partitionKey) private ClusterDescription GetClusterDescriptionInternal() { - return new ClusterDescription( - InternalMetadata.ClusterName, InternalMetadata.IsDbaas, InternalMetadata.ProtocolVersion); + return new ClusterDescription(InternalMetadata); } /// diff --git a/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs b/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs index 7ee2aed15..fdd171d72 100644 --- a/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs +++ b/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs @@ -97,9 +97,10 @@ public Task InitializeAsync(IMetadata metadata) /// is Ignored.

To configure how many host in each remote /// datacenter is considered Remote.

/// + /// The information about the session instance for which the policy is created. /// the host of which to return the distance of. /// the HostDistance to host. - public HostDistance Distance(Host host) + public HostDistance Distance(IMetadata metadata, Host host) { var dc = GetDatacenter(host); return dc == LocalDc ? HostDistance.Local : HostDistance.Remote; diff --git a/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs b/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs index 7b4237197..8524b7e07 100644 --- a/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs +++ b/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs @@ -67,9 +67,10 @@ public DefaultLoadBalancingPolicy(string localDc) /// in the local datacenter as Local and the rest /// is Ignored. /// + /// The information about the session instance for which the policy is created. /// the host of which to return the distance of. /// the HostDistance to host. - public HostDistance Distance(Host host) + public HostDistance Distance(IMetadata metadata, Host host) { var lastPreferredHost = _lastPreferredHost; if (lastPreferredHost != null && host == lastPreferredHost) @@ -79,7 +80,7 @@ public HostDistance Distance(Host host) return HostDistance.Local; } - return ChildPolicy.Distance(host); + return ChildPolicy.Distance(metadata, host); } /// diff --git a/src/Cassandra/Policies/ILoadBalancingPolicy.cs b/src/Cassandra/Policies/ILoadBalancingPolicy.cs index dca459aba..c5d7185d9 100644 --- a/src/Cassandra/Policies/ILoadBalancingPolicy.cs +++ b/src/Cassandra/Policies/ILoadBalancingPolicy.cs @@ -38,7 +38,7 @@ public interface ILoadBalancingPolicy /// before any call to another of the methods of the policy. /// /// - /// The information about the session instance for which the policy is created. + /// Metadata instance of the session for which the policy is created. Task InitializeAsync(IMetadata metadata); /// @@ -52,10 +52,11 @@ public interface ILoadBalancingPolicy /// host in remote datacenters when the policy itself always picks host in the /// local datacenter first.

/// + /// Metadata instance of the session for which the policy is created. /// the host of which to return the distance of. /// /// the HostDistance to host. - HostDistance Distance(Host host); + HostDistance Distance(IMetadata metadata, Host host); /// /// Returns the hosts to use for a new query.

Each new query will call this @@ -64,7 +65,7 @@ public interface ILoadBalancingPolicy /// be so), the next host will be used. If all hosts of the returned /// Iterator are down, the query will fail.

/// - /// The information about the session instance for which the policy is created. + /// Metadata instance of the session for which the policy is created. /// The query for which to build a plan, it can be null. /// Keyspace on which the query is going to be executed, it can be null. /// An iterator of Host. The query is tried against the hosts returned diff --git a/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs b/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs index 8bfc38c93..ff255336e 100644 --- a/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs +++ b/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs @@ -40,9 +40,9 @@ public Task InitializeAsync(IMetadata metadata) return LoadBalancingPolicy.InitializeAsync(metadata); } - public HostDistance Distance(Host host) + public HostDistance Distance(IMetadata metadata, Host host) { - return LoadBalancingPolicy.Distance(host); + return LoadBalancingPolicy.Distance(metadata, host); } public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) diff --git a/src/Cassandra/Policies/RoundRobinPolicy.cs b/src/Cassandra/Policies/RoundRobinPolicy.cs index 0663349dd..54b517533 100644 --- a/src/Cassandra/Policies/RoundRobinPolicy.cs +++ b/src/Cassandra/Policies/RoundRobinPolicy.cs @@ -49,9 +49,10 @@ public Task InitializeAsync(IMetadata metadata) /// datacenter deployment. If you use multiple datacenter, see /// DCAwareRoundRobinPolicy instead.

/// + /// The information about the session instance for which the policy is created. /// the host of which to return the distance of. /// the HostDistance to host. - public HostDistance Distance(Host host) + public HostDistance Distance(IMetadata metadata, Host host) { return HostDistance.Local; } diff --git a/src/Cassandra/Policies/TokenAwarePolicy.cs b/src/Cassandra/Policies/TokenAwarePolicy.cs index a97bb8de3..8e40437cc 100644 --- a/src/Cassandra/Policies/TokenAwarePolicy.cs +++ b/src/Cassandra/Policies/TokenAwarePolicy.cs @@ -27,7 +27,7 @@ namespace Cassandra /// This policy encapsulates another policy. The resulting policy works in the following way: /// /// - /// The method is inherited from the child policy. + /// The method is inherited from the child policy. /// The host yielded by the method will first return the /// replicas for the statement, based on the . /// @@ -60,13 +60,14 @@ public Task InitializeAsync(IMetadata metadata) /// /// Return the HostDistance for the provided host. /// + /// The information about the session instance for which the policy is created. /// the host of which to return the distance of. /// /// the HostDistance to host as returned by the wrapped /// policy. - public HostDistance Distance(Host host) + public HostDistance Distance(IMetadata metadata, Host host) { - return ChildPolicy.Distance(host); + return ChildPolicy.Distance(metadata, host); } /// @@ -100,7 +101,7 @@ public IEnumerable NewQueryPlan(IMetadata metadata, string loggedKeyspace, var localReplicaSet = new HashSet(); var localReplicaList = new List(replicas.Count); // We can't do it lazily as we need to balance the load between local replicas - foreach (var localReplica in replicas.Where(h => ChildPolicy.Distance(h) == HostDistance.Local)) + foreach (var localReplica in replicas.Where(h => ChildPolicy.Distance(metadata, h) == HostDistance.Local)) { localReplicaSet.Add(localReplica); localReplicaList.Add(localReplica); From 8e07076887f3014ad35170c24fd86ceb1517b327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Wed, 1 Jul 2020 19:34:09 +0100 Subject: [PATCH 11/31] wip on tests --- .../Core/ClusterTests.cs | 32 +++---- .../Core/PoolShortTests.cs | 71 ++++++++------- .../Linq/LinqTable/CreateTable.cs | 4 +- src/Cassandra.Tests/BaseUnitTest.cs | 9 +- src/Cassandra.Tests/BuilderTests.cs | 2 +- src/Cassandra.Tests/ClusterTests.cs | 17 ++-- .../Control/ControlConnectionTests.cs | 67 ++++++-------- .../Control/TopologyRefresherTests.cs | 43 +++++---- .../Connections/HostConnectionPoolTests.cs | 2 +- .../FakeControlConnectionFactory.cs | 8 +- .../FakeProtocolVersionNegotiator.cs | 12 ++- .../FakeSupportedOptionsInitializer.cs | 6 +- .../FakeSupportedOptionsInitializerFactory.cs | 4 +- .../TestHelpers/FakeTopologyRefresher.cs | 20 ++-- .../FakeTopologyRefresherFactory.cs | 4 +- .../DataStax/Insights/InsightsClientTests.cs | 63 ++++++------- .../Insights/InsightsSupportVerifierTests.cs | 91 ++++++++++--------- .../InsightsMessageFactoryTests.cs | 39 ++++---- .../ExecutionProfiles/ClusterTests.cs | 21 +++-- .../ExecutionProfiles/RequestHandlerTests.cs | 24 +++-- .../ExecutionProfiles/SessionTests.cs | 25 +++-- .../Mapping/Linq/LinqEntryPointsTests.cs | 21 ++--- .../Mapping/Linq/LinqMappingUnitTests.cs | 15 ++- .../Mapping/Linq/LinqToCqlUnitTests.cs | 12 +-- .../TestHelpers/FakeSchemaParserFactory.cs | 12 ++- src/Cassandra.Tests/ProtocolTests.cs | 19 ++-- src/Cassandra.Tests/RequestExecutionTests.cs | 5 + src/Cassandra.Tests/RequestHandlerTests.cs | 12 +-- .../Requests/FakeRequestHandlerFactory.cs | 23 ++++- .../Requests/PrepareHandlerTests.cs | 10 +- .../TestConfigurationBuilder.cs | 5 +- src/Cassandra.Tests/TestHelper.cs | 37 ++++---- 32 files changed, 389 insertions(+), 346 deletions(-) diff --git a/src/Cassandra.IntegrationTests/Core/ClusterTests.cs b/src/Cassandra.IntegrationTests/Core/ClusterTests.cs index 5906e2408..a8e3db90b 100644 --- a/src/Cassandra.IntegrationTests/Core/ClusterTests.cs +++ b/src/Cassandra.IntegrationTests/Core/ClusterTests.cs @@ -24,6 +24,7 @@ using Cassandra.SessionManagement; using Cassandra.IntegrationTests.TestClusterManagement; using Cassandra.IntegrationTests.TestClusterManagement.Simulacron; +using Cassandra.Tasks; using Cassandra.Tests; using NUnit.Framework; @@ -115,7 +116,7 @@ public async Task Cluster_Should_Honor_MaxProtocolVersion_Set(bool asyncConnect) .AddContactPoint(_testCluster.InitialContactPoint) .Build()) { - Assert.AreEqual(Cluster.MaxProtocolVersion, clusterDefault.Configuration.ProtocolOptions.MaxProtocolVersion); + Assert.AreEqual(Configuration.MaxProtocolVersion, clusterDefault.Configuration.ProtocolOptions.MaxProtocolVersion); // MaxProtocolVersion set var clusterMax = ClusterBuilder() @@ -126,9 +127,9 @@ public async Task Cluster_Should_Honor_MaxProtocolVersion_Set(bool asyncConnect) await Connect(clusterMax, asyncConnect, session => { if (TestClusterManager.CheckCassandraVersion(false, Version.Parse("2.1"), Comparison.LessThan)) - Assert.AreEqual(2, session.BinaryProtocolVersion); + Assert.AreEqual(2, session.Cluster.Metadata.GetClusterDescription().ProtocolVersion); else - Assert.AreEqual(3, session.BinaryProtocolVersion); + Assert.AreEqual(3, session.Cluster.Metadata.GetClusterDescription().ProtocolVersion); }).ConfigureAwait(false); // Arbitary MaxProtocolVersion set, will negotiate down upon connect @@ -163,7 +164,7 @@ public async Task Should_Add_And_Query_Newly_Bootstrapped_Node() { await Connect(cluster, false, session => { - Assert.AreEqual(1, cluster.AllHosts().Count); + Assert.AreEqual(1, cluster.Metadata.AllHosts().Count); _realCluster.BootstrapNode(2); Trace.TraceInformation("Node bootstrapped"); var newNodeAddress = _realCluster.ClusterIpPrefix + 2; @@ -172,8 +173,8 @@ await Connect(cluster, false, session => { Assert.True(TestUtils.IsNodeReachable(newNodeIpAddress)); //New node should be part of the metadata - Assert.AreEqual(2, cluster.AllHosts().Count); - var host = cluster.AllHosts().FirstOrDefault(h => h.Address.Address.Equals(newNodeIpAddress)); + Assert.AreEqual(2, cluster.Metadata.AllHosts().Count); + var host = cluster.Metadata.AllHosts().FirstOrDefault(h => h.Address.Address.Equals(newNodeIpAddress)); Assert.IsNotNull(host); }, 2000, @@ -200,7 +201,7 @@ public async Task Should_Remove_Decommissioned_Node() { await Connect(cluster, false, session => { - Assert.AreEqual(numberOfNodes, cluster.AllHosts().Count); + Assert.AreEqual(numberOfNodes, cluster.Metadata.AllHosts().Count); if (TestClusterManager.SupportsDecommissionForcefully()) { _realCluster.DecommissionNodeForcefully(numberOfNodes); @@ -217,7 +218,7 @@ await Connect(cluster, false, session => decommisionedNode = _realCluster.ClusterIpPrefix + 2; Assert.False(TestUtils.IsNodeReachable(IPAddress.Parse(decommisionedNode))); //New node should be part of the metadata - Assert.AreEqual(1, cluster.AllHosts().Count); + Assert.AreEqual(1, cluster.Metadata.AllHosts().Count); }, 100, 100); var queried = false; for (var i = 0; i < 10; i++) @@ -234,25 +235,24 @@ await Connect(cluster, false, session => } } - private class TestLoadBalancingPolicy : ILoadBalancingPolicy + private class TestLoadBalancingPolicy : ILoadBalancingPolicy { - private ICluster _cluster; public Host ControlConnectionHost { get; private set; } - public void Initialize(ICluster cluster) + public Task InitializeAsync(IMetadata metadata) { - _cluster = cluster; - ControlConnectionHost = ((IInternalCluster)cluster).GetControlConnection().Host; + ControlConnectionHost = ((Metadata)metadata).InternalMetadata.ControlConnection.Host; + return TaskHelper.Completed; } - public HostDistance Distance(Host host) + public HostDistance Distance(IMetadata metadata, Host host) { return HostDistance.Local; } - public IEnumerable NewQueryPlan(string keyspace, IStatement query) + public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) { - return _cluster.AllHosts(); + return metadata.AllHosts(); } } } diff --git a/src/Cassandra.IntegrationTests/Core/PoolShortTests.cs b/src/Cassandra.IntegrationTests/Core/PoolShortTests.cs index 3cc51c4dd..0ddc1b520 100644 --- a/src/Cassandra.IntegrationTests/Core/PoolShortTests.cs +++ b/src/Cassandra.IntegrationTests/Core/PoolShortTests.cs @@ -67,7 +67,7 @@ public void StopForce_With_Inflight_Requests(bool useStreamMode) Assert.AreEqual(2, t.Result.Length, "The 2 hosts must have been used"); // Wait for all connections to be opened Thread.Sleep(1000); - var hosts = cluster.AllHosts().ToArray(); + var hosts = cluster.Metadata.AllHosts().ToArray(); TestHelper.WaitUntil(() => hosts.Sum(h => session .GetOrCreateConnectionPool(h, HostDistance.Local) @@ -150,7 +150,7 @@ public async Task MarkHostDown_PartialPoolConnection() using (var cluster = builder.Build()) { var session = (IInternalSession)cluster.Connect(); - var allHosts = cluster.AllHosts(); + var allHosts = cluster.Metadata.AllHosts(); TestHelper.WaitUntil(() => allHosts.Sum(h => session @@ -256,7 +256,7 @@ public void Connect_With_Ssl_Test() [TestCase(ProtocolVersion.V2, 2)] public async Task PoolingOptions_Create_Based_On_Protocol(ProtocolVersion protocolVersion, int coreConnectionLength) { - var options1 = PoolingOptions.Get(protocolVersion); + var options1 = PoolingOptions.Create(protocolVersion); using (var sCluster = SimulacronCluster.CreateNew(new SimulacronOptions())) using (var cluster = ClusterBuilder() .AddContactPoint(sCluster.InitialContactPoint) @@ -264,7 +264,7 @@ public async Task PoolingOptions_Create_Based_On_Protocol(ProtocolVersion protoc .Build()) { var session = (IInternalSession)cluster.Connect(); - var allHosts = cluster.AllHosts(); + var allHosts = cluster.Metadata.AllHosts(); var host = allHosts.First(); var pool = session.GetOrCreateConnectionPool(host, HostDistance.Local); @@ -284,7 +284,7 @@ await TestHelper.RetryAssertAsync(async () => public async Task Should_Create_Core_Connections_To_Hosts_In_Local_Dc_When_Warmup_Is_Enabled() { const int nodeLength = 4; - var poolingOptions = PoolingOptions.Get().SetCoreConnectionsPerHost(HostDistance.Local, 5); + var poolingOptions = PoolingOptions.Create().SetCoreConnectionsPerHost(HostDistance.Local, 5); // Use multiple DCs: 4 nodes in first DC and 3 nodes in second DC using (var testCluster = SimulacronCluster.CreateNew(new SimulacronOptions { Nodes = $"{nodeLength},3" })) @@ -319,7 +319,7 @@ public async Task ControlConnection_Should_Reconnect_To_Up_Host() using (var cluster = builder.AddContactPoint(testCluster.InitialContactPoint).Build()) { var session = (Session)cluster.Connect(); - var allHosts = cluster.AllHosts(); + var allHosts = cluster.Metadata.AllHosts(); Assert.AreEqual(3, allHosts.Count); await TestHelper.TimesLimit(() => session.ExecuteAsync(new SimpleStatement("SELECT * FROM system.local")), 100, 16).ConfigureAwait(false); @@ -330,27 +330,28 @@ await TestHelper.RetryAssertAsync(async () => Assert.AreEqual(4, (await testCluster.GetConnectedPortsAsync().ConfigureAwait(false)).Count); }, 100, 200).ConfigureAwait(false); - var ccAddress = cluster.InternalRef.GetControlConnection().EndPoint.GetHostIpEndPointWithFallback(); + var cc = cluster.InternalRef.InternalMetadata.ControlConnection; + var ccAddress = cc.EndPoint.GetHostIpEndPointWithFallback(); Assert.NotNull(ccAddress); var simulacronNode = testCluster.GetNode(ccAddress); // Disable new connections to the first host await simulacronNode.Stop().ConfigureAwait(false); - TestHelper.WaitUntil(() => !cluster.GetHost(ccAddress).IsUp); + TestHelper.WaitUntil(() => !cluster.Metadata.GetHost(ccAddress).IsUp); - Assert.False(cluster.GetHost(ccAddress).IsUp); + Assert.False(cluster.Metadata.GetHost(ccAddress).IsUp); - TestHelper.WaitUntil(() => !cluster.InternalRef.GetControlConnection().EndPoint.GetHostIpEndPointWithFallback().Address.Equals(ccAddress.Address)); - Assert.NotNull(cluster.InternalRef.GetControlConnection().EndPoint.GetHostIpEndPointWithFallback()); - Assert.AreNotEqual(ccAddress.Address, cluster.InternalRef.GetControlConnection().EndPoint.GetHostIpEndPointWithFallback().Address); + TestHelper.WaitUntil(() => !cc.EndPoint.GetHostIpEndPointWithFallback().Address.Equals(ccAddress.Address)); + Assert.NotNull(cc.EndPoint.GetHostIpEndPointWithFallback()); + Assert.AreNotEqual(ccAddress.Address, cc.EndPoint.GetHostIpEndPointWithFallback().Address); // Previous host is still DOWN - Assert.False(cluster.GetHost(ccAddress).IsUp); + Assert.False(cluster.Metadata.GetHost(ccAddress).IsUp); // New host is UP - ccAddress = cluster.InternalRef.GetControlConnection().EndPoint.GetHostIpEndPointWithFallback(); - Assert.True(cluster.GetHost(ccAddress).IsUp); + ccAddress = cc.EndPoint.GetHostIpEndPointWithFallback(); + Assert.True(cluster.Metadata.GetHost(ccAddress).IsUp); } } @@ -368,7 +369,7 @@ public async Task ControlConnection_Should_Reconnect_After_Failed_Attemps() using (var cluster = builder.AddContactPoint(testCluster.InitialContactPoint).Build()) { var session = (Session)cluster.Connect(); - var allHosts = cluster.AllHosts(); + var allHosts = cluster.Metadata.AllHosts(); Assert.AreEqual(3, allHosts.Count); await TestHelper.TimesLimit(() => session.ExecuteAsync(new SimpleStatement("SELECT * FROM system.local")), 100, 16).ConfigureAwait(false); @@ -385,7 +386,7 @@ await TestHelper.RetryAssertAsync(async () => // Disable all connections await testCluster.DisableConnectionListener().ConfigureAwait(false); - var ccAddress = cluster.InternalRef.GetControlConnection().EndPoint.GetHostIpEndPointWithFallback(); + var ccAddress = cluster.InternalRef.InternalMetadata.ControlConnection.EndPoint.GetHostIpEndPointWithFallback(); // Drop all connections to hosts foreach (var connection in serverConnections) @@ -393,20 +394,20 @@ await TestHelper.RetryAssertAsync(async () => await testCluster.DropConnection(connection).ConfigureAwait(false); } - TestHelper.WaitUntil(() => !cluster.GetHost(ccAddress).IsUp); + TestHelper.WaitUntil(() => !cluster.Metadata.GetHost(ccAddress).IsUp); // All host should be down by now - TestHelper.WaitUntil(() => cluster.AllHosts().All(h => !h.IsUp)); + TestHelper.WaitUntil(() => cluster.Metadata.AllHosts().All(h => !h.IsUp)); - Assert.False(cluster.GetHost(ccAddress).IsUp); + Assert.False(cluster.Metadata.GetHost(ccAddress).IsUp); // Allow new connections to be created await testCluster.EnableConnectionListener().ConfigureAwait(false); - TestHelper.WaitUntil(() => cluster.AllHosts().All(h => h.IsUp)); + TestHelper.WaitUntil(() => cluster.Metadata.AllHosts().All(h => h.IsUp)); - ccAddress = cluster.InternalRef.GetControlConnection().EndPoint.GetHostIpEndPointWithFallback(); - Assert.True(cluster.GetHost(ccAddress).IsUp); + ccAddress = cluster.InternalRef.InternalMetadata.ControlConnection.EndPoint.GetHostIpEndPointWithFallback(); + Assert.True(cluster.Metadata.GetHost(ccAddress).IsUp); // Once all connections are created, the control connection should be usable await TestHelper.RetryAssertAsync(async () => @@ -418,7 +419,7 @@ await TestHelper.RetryAssertAsync(async () => TestHelper.RetryAssert(() => { - Assert.DoesNotThrowAsync(() => cluster.InternalRef.GetControlConnection().QueryAsync("SELECT * FROM system.local")); + Assert.DoesNotThrowAsync(() => cluster.InternalRef.InternalMetadata.ControlConnection.QueryAsync("SELECT * FROM system.local")); }, 100, 100); } } @@ -430,7 +431,7 @@ public async Task Should_Use_Next_Host_When_First_Host_Is_Busy() const int maxRequestsPerConnection = 100; var builder = ClusterBuilder() .WithPoolingOptions( - PoolingOptions.Get() + PoolingOptions.Create() .SetCoreConnectionsPerHost(HostDistance.Local, connectionLength) .SetMaxConnectionsPerHost(HostDistance.Local, connectionLength) .SetHeartBeatInterval(0) @@ -443,7 +444,7 @@ public async Task Should_Use_Next_Host_When_First_Host_Is_Busy() testCluster.PrimeFluent(b => b.WhenQuery(query).ThenVoidSuccess().WithDelayInMs(3000)); var session = await cluster.ConnectAsync().ConfigureAwait(false); - var hosts = cluster.AllHosts().ToArray(); + var hosts = cluster.Metadata.AllHosts().ToArray(); // Wait until all connections to first host are created await TestHelper.WaitUntilAsync(() => @@ -480,7 +481,7 @@ public async Task Should_Throw_NoHostAvailableException_When_All_Host_Are_Busy() var builder = ClusterBuilder() .WithPoolingOptions( - PoolingOptions.Get() + PoolingOptions.Create() .SetCoreConnectionsPerHost(HostDistance.Local, connectionLength) .SetMaxConnectionsPerHost(HostDistance.Local, connectionLength) .SetHeartBeatInterval(0) @@ -495,7 +496,7 @@ public async Task Should_Throw_NoHostAvailableException_When_All_Host_Are_Busy() testCluster.PrimeFluent(b => b.WhenQuery(query).ThenVoidSuccess().WithDelayInMs(3000)); var session = await cluster.ConnectAsync().ConfigureAwait(false); - var hosts = cluster.AllHosts().ToArray(); + var hosts = cluster.Metadata.AllHosts().ToArray(); await TestHelper.TimesLimit(() => session.ExecuteAsync(new SimpleStatement("SELECT key FROM system.local")), 100, 16).ConfigureAwait(false); @@ -562,8 +563,8 @@ public async Task Should_Use_Single_Host_When_Configured_At_Statement_Level() using (var cluster = builder.AddContactPoint(testCluster.InitialContactPoint).Build()) { var session = await cluster.ConnectAsync().ConfigureAwait(false); - var firstHost = cluster.AllHosts().First(); - var lastHost = cluster.AllHosts().Last(); + var firstHost = cluster.Metadata.AllHosts().First(); + var lastHost = cluster.Metadata.AllHosts().Last(); // The test load-balancing policy targets always the first host await TestHelper.TimesLimit(async () => @@ -599,7 +600,7 @@ public void Should_Throw_NoHostAvailableException_When_Targeting_Single_Ignored_ using (var cluster = builder.AddContactPoint(testCluster.InitialContactPoint).Build()) { var session = cluster.Connect(); - var lastHost = cluster.AllHosts().Last(); + var lastHost = cluster.Metadata.AllHosts().Last(); // Use the last host var statement = new SimpleStatement(query).SetHost(lastHost); @@ -620,7 +621,7 @@ public async Task Should_Throw_NoHostAvailableException_When_Targeting_Single_Ho using (var cluster = builder.AddContactPoint(testCluster.InitialContactPoint).Build()) { var session = await cluster.ConnectAsync().ConfigureAwait(false); - var lastHost = cluster.AllHosts().Last(); + var lastHost = cluster.Metadata.AllHosts().Last(); // 1 for the control connection and 1 connection per each host await TestHelper.RetryAssertAsync(async () => @@ -650,7 +651,7 @@ await TestHelper.RetryAssertAsync(async () => TestHelper.RetryAssert(() => { - var openConnections = session.GetState().GetOpenConnections(session.Cluster.GetHost(simulacronNode.IpEndPoint)); + var openConnections = session.GetState().GetOpenConnections(session.Cluster.Metadata.GetHost(simulacronNode.IpEndPoint)); Assert.AreEqual(0, openConnections); }, 100, 200); @@ -684,7 +685,7 @@ public void The_Query_Plan_Should_Contain_A_Single_Host_When_Targeting_Single_Ho testCluster.PrimeFluent(b => b.WhenQuery(query).ThenOverloaded("Test overloaded error")); var session = cluster.Connect(); - var host = cluster.AllHosts().Last(); + var host = cluster.Metadata.AllHosts().Last(); var statement = new SimpleStatement(query).SetHost(host).SetIdempotence(true); @@ -714,7 +715,7 @@ public async Task Should_Not_Use_The_LoadBalancingPolicy_When_Targeting_Single_H using (var cluster = builder.AddContactPoint(testCluster.InitialContactPoint).Build()) { var session = await cluster.ConnectAsync().ConfigureAwait(false); - var host = cluster.AllHosts().Last(); + var host = cluster.Metadata.AllHosts().Last(); Interlocked.Exchange(ref queryPlanCounter, 0); await TestHelper.TimesLimit(() => diff --git a/src/Cassandra.IntegrationTests/Linq/LinqTable/CreateTable.cs b/src/Cassandra.IntegrationTests/Linq/LinqTable/CreateTable.cs index 7307f4f5b..16066b198 100644 --- a/src/Cassandra.IntegrationTests/Linq/LinqTable/CreateTable.cs +++ b/src/Cassandra.IntegrationTests/Linq/LinqTable/CreateTable.cs @@ -546,7 +546,7 @@ public void CreateTable_With_Frozen_Tuple() new StubTableColumn("t", StubColumnKind.Regular, DataType.Frozen(DataType.Tuple(DataType.BigInt, DataType.BigInt, DataType.Text))) }); - SessionCluster.RefreshSchema(_uniqueKsName, "tbl_frozen_tuple"); + SessionCluster.Metadata.RefreshSchema(_uniqueKsName, "tbl_frozen_tuple"); var tableMeta = SessionCluster.Metadata.GetTable(_uniqueKsName, "tbl_frozen_tuple"); Assert.NotNull(tableMeta); @@ -590,7 +590,7 @@ public void CreateTable_With_Counter_Static() new StubTableColumn("id2", StubColumnKind.ClusteringKey, DataType.Text) }); - SessionCluster.RefreshSchema(_uniqueKsName, "tbl_with_counter_static"); + SessionCluster.Metadata.RefreshSchema(_uniqueKsName, "tbl_with_counter_static"); var tableMeta = SessionCluster.Metadata.GetTable(_uniqueKsName, "tbl_with_counter_static"); Assert.AreEqual(4, tableMeta.TableColumns.Length); diff --git a/src/Cassandra.Tests/BaseUnitTest.cs b/src/Cassandra.Tests/BaseUnitTest.cs index fed7c9b55..1311d6fe0 100644 --- a/src/Cassandra.Tests/BaseUnitTest.cs +++ b/src/Cassandra.Tests/BaseUnitTest.cs @@ -18,6 +18,7 @@ using System.Linq; using System.Net; using System.Threading.Tasks; +using Cassandra.Tasks; using NUnit.Framework; namespace Cassandra.Tests @@ -69,17 +70,17 @@ public TestLoadBalancingPolicy(HostDistance distance = HostDistance.Local) _distance = distance; } - public void Initialize(ICluster cluster) + public Task InitializeAsync(IMetadata metadata) { - + return TaskHelper.Completed; } - public HostDistance Distance(Host host) + public HostDistance Distance(IMetadata metadata, Host host) { return _distance; } - public IEnumerable NewQueryPlan(string keyspace, IStatement query) + public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) { return new[] { diff --git a/src/Cassandra.Tests/BuilderTests.cs b/src/Cassandra.Tests/BuilderTests.cs index 0fb48e36d..5691e520f 100644 --- a/src/Cassandra.Tests/BuilderTests.cs +++ b/src/Cassandra.Tests/BuilderTests.cs @@ -146,7 +146,7 @@ public void MaxProtocolVersion_Defaults_To_Cluster_Max() var builder = Cluster.Builder() .AddContactPoint("192.168.1.10"); var cluster = builder.Build(); - Assert.AreEqual(Cluster.MaxProtocolVersion, cluster.Configuration.ProtocolOptions.MaxProtocolVersion); + Assert.AreEqual(Configuration.MaxProtocolVersion, cluster.Configuration.ProtocolOptions.MaxProtocolVersion); //Defaults to null Assert.Null(new ProtocolOptions().MaxProtocolVersion); } diff --git a/src/Cassandra.Tests/ClusterTests.cs b/src/Cassandra.Tests/ClusterTests.cs index 5fb203b35..ed4f7e129 100644 --- a/src/Cassandra.Tests/ClusterTests.cs +++ b/src/Cassandra.Tests/ClusterTests.cs @@ -19,7 +19,9 @@ using System.Diagnostics; using System.Linq; using System.Net; +using System.Threading.Tasks; using Cassandra.ExecutionProfiles; +using Cassandra.Tasks; using Cassandra.Tests.Connections.TestHelpers; using Moq; using NUnit.Framework; @@ -76,7 +78,7 @@ public void ClusterAllHostsReturnsZeroHostsOnDisconnectedCluster() .AddContactPoint(ip) .Build(); //No ring was discovered - Assert.AreEqual(0, cluster.AllHosts().Count); + Assert.AreEqual(0, cluster.Metadata.AllHosts().Count); } [Test] @@ -233,7 +235,7 @@ as IExecutionProfile cluster.Connect(); cluster.Dispose(); - foreach (var h in cluster.AllHosts()) + foreach (var h in cluster.Metadata.AllHosts()) { Assert.AreEqual(expected[h.Address.Address.ToString()], h.GetDistanceUnsafe()); } @@ -242,26 +244,25 @@ as IExecutionProfile internal class FakeHostDistanceLbp : ILoadBalancingPolicy { private readonly IDictionary _distances; - private ICluster _cluster; public FakeHostDistanceLbp(IDictionary distances) { _distances = distances; } - public void Initialize(ICluster cluster) + public Task InitializeAsync(IMetadata metadata) { - _cluster = cluster; + return TaskHelper.Completed; } - public HostDistance Distance(Host host) + public HostDistance Distance(IMetadata metadata, Host host) { return _distances[host.Address.Address.ToString()]; } - public IEnumerable NewQueryPlan(string keyspace, IStatement query) + public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) { - return _cluster.AllHosts().OrderBy(h => Guid.NewGuid().GetHashCode()).Take(_distances.Count); + return metadata.AllHosts().OrderBy(h => Guid.NewGuid().GetHashCode()).Take(_distances.Count); } } } diff --git a/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs b/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs index db3b8f8a6..4714851eb 100644 --- a/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs +++ b/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs @@ -24,6 +24,7 @@ using Cassandra.Connections; using Cassandra.Connections.Control; using Cassandra.ProtocolEvents; +using Cassandra.Serialization; using Cassandra.SessionManagement; using Cassandra.Tests.Connections.TestHelpers; using Cassandra.Tests.MetadataHelpers.TestHelpers; @@ -103,10 +104,17 @@ private ControlConnectionCreateResult NewInstance( } Mock.Get(cluster).SetupGet(c => c.Configuration).Returns(config); - + var contactPoints = new List + { + new IpLiteralContactPoint( + IPAddress.Parse("127.0.0.1"), + config.ProtocolOptions, + config.ServerNameResolver) + }; + if (metadata == null) { - metadata = new Metadata(config); + metadata = new Metadata(cluster, config, config.SerializerManager, contactPoints); } return new ControlConnectionCreateResult @@ -115,19 +123,7 @@ private ControlConnectionCreateResult NewInstance( Metadata = metadata, Cluster = cluster, Config = config, - ControlConnection = new ControlConnection( - cluster, - GetEventDebouncer(config), - ProtocolVersion.MaxSupported, - config, - metadata, - new List - { - new IpLiteralContactPoint( - IPAddress.Parse("127.0.0.1"), - config.ProtocolOptions, - config.ServerNameResolver) - }) + ControlConnection = (ControlConnection)metadata.InternalMetadata.ControlConnection }; } @@ -211,9 +207,8 @@ public void Should_NotAttemptDownOrIgnoredHosts() Mock.Get(cluster) .Setup(c => c.RetrieveAndSetDistance(It.IsAny())) - .Returns(h => config.Policies.LoadBalancingPolicy.Distance(h)); - Mock.Get(cluster).Setup(c => c.AllHosts()).Returns(() => metadata.AllHosts()); - config.Policies.LoadBalancingPolicy.InitializeAsync(cluster); + .Returns(h => config.Policies.LoadBalancingPolicy.Distance(metadata, h)); + config.Policies.LoadBalancingPolicy.InitializeAsync(metadata); connectionOpenEnabled = false; @@ -267,11 +262,9 @@ public async Task Should_NotLeakConnections_When_DisposeAndReconnectHappenSimult Mock.Get(cluster) .Setup(c => c.RetrieveAndSetDistance(It.IsAny())) - .Returns(h => config.Policies.LoadBalancingPolicy.Distance(h)); - Mock.Get(cluster).Setup(c => c.AllHosts()).Returns(() => metadata.AllHosts()); - Mock.Get(cluster).Setup(c => c.GetControlConnection()).Returns(cc); - config.LocalDatacenterProvider.Initialize(cluster); - config.Policies.LoadBalancingPolicy.InitializeAsync(cluster); + .Returns(h => config.Policies.LoadBalancingPolicy.Distance(metadata, h)); + config.LocalDatacenterProvider.Initialize(cluster, metadata.InternalMetadata); + await config.Policies.LoadBalancingPolicy.InitializeAsync(metadata).ConfigureAwait(false); createResult.ConnectionFactory.CreatedConnections.Clear(); @@ -343,7 +336,8 @@ private ControlConnectionCreateResult CreateForContactPointTest(bool keepContact var config = new TestConfigurationBuilder { ConnectionFactory = connectionFactory, - KeepContactPointsUnresolved = keepContactPointsUnresolved + KeepContactPointsUnresolved = keepContactPointsUnresolved, + SerializerManager = new SerializerManager(ProtocolVersion.V3, new TypeSerializerDefinitions().Definitions) }.Build(); _cp1 = new TestContactPoint(new List { @@ -358,22 +352,21 @@ private ControlConnectionCreateResult CreateForContactPointTest(bool keepContact new ConnectionEndPoint(_endpoint1, config.ServerNameResolver, _localhost), new ConnectionEndPoint(_endpoint2, config.ServerNameResolver, _localhost) }); + config.SerializerManager.ChangeProtocolVersion(ProtocolVersion.V3); + var metadata = new Metadata( + Mock.Of(), + config, + config.SerializerManager, + new List + { + _cp1, + _cp2, + _localhost + }); return new ControlConnectionCreateResult { ConnectionFactory = connectionFactory, - ControlConnection = new ControlConnection( - Mock.Of(), - new ProtocolEventDebouncer( - new FakeTimerFactory(), TimeSpan.Zero, TimeSpan.Zero), - ProtocolVersion.V3, - config, - new Metadata(config), - new List - { - _cp1, - _cp2, - _localhost - }) + ControlConnection = (ControlConnection)metadata.InternalMetadata.ControlConnection }; } diff --git a/src/Cassandra.Tests/Connections/Control/TopologyRefresherTests.cs b/src/Cassandra.Tests/Connections/Control/TopologyRefresherTests.cs index bbb831a48..17a42b456 100644 --- a/src/Cassandra.Tests/Connections/Control/TopologyRefresherTests.cs +++ b/src/Cassandra.Tests/Connections/Control/TopologyRefresherTests.cs @@ -23,6 +23,7 @@ using Cassandra.Connections.Control; using Cassandra.Requests; using Cassandra.Serialization; +using Cassandra.SessionManagement; using Cassandra.Tests.Connections.TestHelpers; using Moq; using NUnit.Framework; @@ -36,7 +37,7 @@ public class TopologyRefresherTests private const string PeersQuery = "SELECT * FROM system.peers"; private const string PeersV2Query = "SELECT * FROM system.peers_v2"; - private Metadata _metadata; + private IInternalMetadata _internalMetadata; private ISerializer _serializer = new SerializerManager(ProtocolVersion.MaxSupported).GetCurrentSerializer(); @@ -102,9 +103,8 @@ private TopologyRefresher CreateTopologyRefresher( { MetadataRequestHandler = fakeRequestHandler }.Build(); - var metadata = new Metadata(config); - _metadata = metadata; - return new TopologyRefresher(metadata, config); + _internalMetadata = new Metadata(Mock.Of(), config, config.SerializerManager, new List()).InternalMetadata; + return new TopologyRefresher(_internalMetadata, config); } [Test] @@ -115,8 +115,8 @@ public async Task Should_SendSystemLocalAndPeersV1AndPeersV2Queries() { MetadataRequestHandler = fakeRequestHandler }.Build(); - _metadata = new Metadata(config); - var topologyRefresher = new TopologyRefresher(_metadata, config); + _internalMetadata = new Metadata(Mock.Of(), config, config.SerializerManager, new List()).InternalMetadata; + var topologyRefresher = new TopologyRefresher(_internalMetadata, config); var connection = Mock.Of(); await topologyRefresher @@ -139,8 +139,8 @@ public async Task Should_SendSystemLocalAndPeersV2Queries() { MetadataRequestHandler = fakeRequestHandler }.Build(); - _metadata = new Metadata(config); - var topologyRefresher = new TopologyRefresher(_metadata, config); + _internalMetadata = new Metadata(Mock.Of(), config, config.SerializerManager, new List()).InternalMetadata; + var topologyRefresher = new TopologyRefresher(_internalMetadata, config); var connection = Mock.Of(); await topologyRefresher @@ -161,8 +161,8 @@ public async Task Should_KeepSendingSystemPeersV2Queries_When_ItDoesNotFail() { MetadataRequestHandler = fakeRequestHandler }.Build(); - _metadata = new Metadata(config); - var topologyRefresher = new TopologyRefresher(_metadata, config); + _internalMetadata = new Metadata(Mock.Of(), config, config.SerializerManager, new List()).InternalMetadata; + var topologyRefresher = new TopologyRefresher(_internalMetadata, config); var connection = Mock.Of(); await topologyRefresher @@ -191,8 +191,8 @@ public async Task Should_SendPeersV1OnlyAfterPeersV2Fails() { var fakeRequestHandler = CreateFakeMetadataRequestHandler(); var config = new TestConfigurationBuilder { MetadataRequestHandler = fakeRequestHandler }.Build(); - _metadata = new Metadata(config); - var topologyRefresher = new TopologyRefresher(_metadata, config); + _internalMetadata = new Metadata(Mock.Of(), config, config.SerializerManager, new List()).InternalMetadata; + var topologyRefresher = new TopologyRefresher(_internalMetadata, config); var connection = Mock.Of(); await topologyRefresher @@ -226,7 +226,7 @@ public async Task Should_SetClusterName() await topologyRefresher.RefreshNodeListAsync( new FakeConnectionEndPoint("127.0.0.1", 9042), connection, _serializer).ConfigureAwait(false); - Assert.AreEqual("ut-cluster", _metadata.ClusterName); + Assert.AreEqual("ut-cluster", _internalMetadata.ClusterName); } [Test] @@ -245,14 +245,14 @@ await topologyRefresher.RefreshNodeListAsync( new FakeConnectionEndPoint("127.0.0.1", 9042), Mock.Of(), _serializer) .ConfigureAwait(false); - Assert.AreEqual(3, _metadata.AllHosts().Count); + Assert.AreEqual(3, _internalMetadata.AllHosts().Count); //using rpc_address - var host2 = _metadata.GetHost(new IPEndPoint(hostAddress2, ProtocolOptions.DefaultPort)); + var host2 = _internalMetadata.GetHost(new IPEndPoint(hostAddress2, ProtocolOptions.DefaultPort)); Assert.NotNull(host2); Assert.AreEqual("ut-dc2", host2.Datacenter); Assert.AreEqual("ut-rack2", host2.Rack); //with rpc_address = 0.0.0.0, use peer - var host3 = _metadata.GetHost(new IPEndPoint(hostAddress3, ProtocolOptions.DefaultPort)); + var host3 = _internalMetadata.GetHost(new IPEndPoint(hostAddress3, ProtocolOptions.DefaultPort)); Assert.NotNull(host3); Assert.AreEqual("ut-dc3", host3.Datacenter); Assert.AreEqual("ut-rack3", host3.Rack); @@ -273,7 +273,7 @@ await topologyRefresher.RefreshNodeListAsync( .ConfigureAwait(false); //Only local host present - Assert.AreEqual(1, _metadata.AllHosts().Count); + Assert.AreEqual(1, _internalMetadata.AllHosts().Count); } [Test] @@ -285,9 +285,7 @@ public async Task UpdatePeersInfoUsesAddressTranslator() .Setup(t => t.Translate(It.IsAny())) .Callback(invokedEndPoints.Add) .Returns(e => e); - const int portNumber = 9999; - var metadata = new Metadata(new Configuration()); - var hostAddress2 = IPAddress.Parse("127.0.0.2"); + const int portNumber = 9999;var hostAddress2 = IPAddress.Parse("127.0.0.2"); var hostAddress3 = IPAddress.Parse("127.0.0.3"); var rows = TestHelper.CreateRows(new List> { @@ -303,13 +301,14 @@ public async Task UpdatePeersInfoUsesAddressTranslator() StartupOptionsFactory = Mock.Of(), MetadataRequestHandler = requestHandler }.Build(); - var topologyRefresher = new TopologyRefresher(metadata, config); + _internalMetadata = new Metadata(Mock.Of(), config, config.SerializerManager, new List()).InternalMetadata; + var topologyRefresher = new TopologyRefresher(_internalMetadata, config); await topologyRefresher.RefreshNodeListAsync( new FakeConnectionEndPoint("127.0.0.1", 9042), Mock.Of(), _serializer) .ConfigureAwait(false); - Assert.AreEqual(3, metadata.AllHosts().Count); + Assert.AreEqual(3, _internalMetadata.AllHosts().Count); Assert.AreEqual(2, invokedEndPoints.Count); Assert.AreEqual(hostAddress2, invokedEndPoints[0].Address); Assert.AreEqual(portNumber, invokedEndPoints[0].Port); diff --git a/src/Cassandra.Tests/Connections/HostConnectionPoolTests.cs b/src/Cassandra.Tests/Connections/HostConnectionPoolTests.cs index eccc8e26e..c8e521c57 100644 --- a/src/Cassandra.Tests/Connections/HostConnectionPoolTests.cs +++ b/src/Cassandra.Tests/Connections/HostConnectionPoolTests.cs @@ -104,7 +104,7 @@ private IHostConnectionPool CreatePool(IEndPointResolver res = null) new DefaultRetryPolicy(), NoSpeculativeExecutionPolicy.Instance, new AtomicMonotonicTimestampGenerator()), - PoolingOptions = PoolingOptions.Get(ProtocolVersion.V4).SetCoreConnectionsPerHost(HostDistance.Local, 2) + PoolingOptions = PoolingOptions.Create(ProtocolVersion.V4).SetCoreConnectionsPerHost(HostDistance.Local, 2) }.Build(); var pool = new HostConnectionPool( diff --git a/src/Cassandra.Tests/Connections/TestHelpers/FakeControlConnectionFactory.cs b/src/Cassandra.Tests/Connections/TestHelpers/FakeControlConnectionFactory.cs index 65782d18a..7e3652322 100644 --- a/src/Cassandra.Tests/Connections/TestHelpers/FakeControlConnectionFactory.cs +++ b/src/Cassandra.Tests/Connections/TestHelpers/FakeControlConnectionFactory.cs @@ -18,11 +18,13 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; + using Cassandra.Connections; using Cassandra.Connections.Control; using Cassandra.ProtocolEvents; using Cassandra.Serialization; using Cassandra.SessionManagement; + using Moq; namespace Cassandra.Tests.Connections.TestHelpers @@ -32,9 +34,9 @@ internal class FakeControlConnectionFactory : IControlConnectionFactory public IControlConnection Create( IInternalCluster cluster, IProtocolEventDebouncer protocolEventDebouncer, - ProtocolVersion initialProtocolVersion, + ISerializerManager serializerManager, Configuration config, - Metadata metadata, + IInternalMetadata metadata, IEnumerable contactPoints) { var cc = Mock.Of(); @@ -54,8 +56,8 @@ public IControlConnection Create( } } metadata.SetResolvedContactPoints(cps); + serializerManager.ChangeProtocolVersion(ProtocolVersion.V3); })); - Mock.Get(cc).Setup(c => c.Serializer).Returns(new SerializerManager(ProtocolVersion.V3)); return cc; } diff --git a/src/Cassandra.Tests/Connections/TestHelpers/FakeProtocolVersionNegotiator.cs b/src/Cassandra.Tests/Connections/TestHelpers/FakeProtocolVersionNegotiator.cs index adbcaf74b..a0879221c 100644 --- a/src/Cassandra.Tests/Connections/TestHelpers/FakeProtocolVersionNegotiator.cs +++ b/src/Cassandra.Tests/Connections/TestHelpers/FakeProtocolVersionNegotiator.cs @@ -23,13 +23,19 @@ namespace Cassandra.Tests.Connections.TestHelpers { internal class FakeProtocolVersionNegotiator : IProtocolVersionNegotiator { - public Task ChangeProtocolVersion(Configuration config, ISerializerManager serializer, ProtocolVersion nextVersion, IConnection previousConnection, - UnsupportedProtocolVersionException ex = null, ProtocolVersion? previousVersion = null) + public Task ChangeProtocolVersion( + Configuration config, + ISerializerManager serializer, + ProtocolVersion nextVersion, + IConnection previousConnection, + UnsupportedProtocolVersionException ex = null, + ProtocolVersion? previousVersion = null) { return Task.FromResult(previousConnection); } - public Task NegotiateVersionAsync(Configuration config, Metadata metadata, IConnection connection, ISerializerManager serializer) + public Task NegotiateVersionAsync( + Configuration config, IInternalMetadata internalMetadata, IConnection connection, ISerializerManager serializer) { return Task.FromResult(connection); } diff --git a/src/Cassandra.Tests/Connections/TestHelpers/FakeSupportedOptionsInitializer.cs b/src/Cassandra.Tests/Connections/TestHelpers/FakeSupportedOptionsInitializer.cs index 981118fbc..e3ea1b664 100644 --- a/src/Cassandra.Tests/Connections/TestHelpers/FakeSupportedOptionsInitializer.cs +++ b/src/Cassandra.Tests/Connections/TestHelpers/FakeSupportedOptionsInitializer.cs @@ -22,11 +22,11 @@ namespace Cassandra.Tests.Connections.TestHelpers { internal class FakeSupportedOptionsInitializer : ISupportedOptionsInitializer { - private Metadata _metadata; + private IInternalMetadata _internalMetadata; - public FakeSupportedOptionsInitializer(Metadata metadata) + public FakeSupportedOptionsInitializer(IInternalMetadata internalMetadata) { - _metadata = metadata; + _internalMetadata = internalMetadata; } public Task ApplySupportedOptionsAsync(IConnection connection) diff --git a/src/Cassandra.Tests/Connections/TestHelpers/FakeSupportedOptionsInitializerFactory.cs b/src/Cassandra.Tests/Connections/TestHelpers/FakeSupportedOptionsInitializerFactory.cs index 07efebb5c..e63973bba 100644 --- a/src/Cassandra.Tests/Connections/TestHelpers/FakeSupportedOptionsInitializerFactory.cs +++ b/src/Cassandra.Tests/Connections/TestHelpers/FakeSupportedOptionsInitializerFactory.cs @@ -19,9 +19,9 @@ namespace Cassandra.Tests.Connections.TestHelpers { internal class FakeSupportedOptionsInitializerFactory : ISupportedOptionsInitializerFactory { - public ISupportedOptionsInitializer Create(Metadata metadata) + public ISupportedOptionsInitializer Create(IInternalMetadata internalMetadata) { - return new FakeSupportedOptionsInitializer(metadata); + return new FakeSupportedOptionsInitializer(internalMetadata); } } } \ No newline at end of file diff --git a/src/Cassandra.Tests/Connections/TestHelpers/FakeTopologyRefresher.cs b/src/Cassandra.Tests/Connections/TestHelpers/FakeTopologyRefresher.cs index 421bb78e2..4f492b9d1 100644 --- a/src/Cassandra.Tests/Connections/TestHelpers/FakeTopologyRefresher.cs +++ b/src/Cassandra.Tests/Connections/TestHelpers/FakeTopologyRefresher.cs @@ -25,30 +25,30 @@ namespace Cassandra.Tests.Connections.TestHelpers { internal class FakeTopologyRefresher : ITopologyRefresher { - private readonly Metadata _metadata; - private readonly Configuration _config; + private readonly IInternalMetadata _internalMetadata; private readonly IDictionary _hosts; - public FakeTopologyRefresher(Metadata metadata, Configuration config, IDictionary hosts) + public FakeTopologyRefresher( + IInternalMetadata internalMetadata, IDictionary hosts) { - _metadata = metadata; - _config = config; + _internalMetadata = internalMetadata; _hosts = hosts; } - public Task RefreshNodeListAsync(IConnectionEndPoint currentEndPoint, IConnection connection, ISerializer serializer) + public Task RefreshNodeListAsync( + IConnectionEndPoint currentEndPoint, IConnection connection, ISerializer serializer) { foreach (var h in _hosts) { - if (_metadata.GetHost(h.Key) == null) + if (_internalMetadata.GetHost(h.Key) == null) { - var host = _metadata.AddHost(h.Key); + var host = _internalMetadata.AddHost(h.Key); host.SetInfo(h.Value); } } - _metadata.Partitioner = "Murmur3Partitioner"; - return Task.FromResult(_metadata.Hosts.First()); + _internalMetadata.Partitioner = "Murmur3Partitioner"; + return Task.FromResult(_internalMetadata.Hosts.First()); } } } \ No newline at end of file diff --git a/src/Cassandra.Tests/Connections/TestHelpers/FakeTopologyRefresherFactory.cs b/src/Cassandra.Tests/Connections/TestHelpers/FakeTopologyRefresherFactory.cs index eae0343e4..548f30e50 100644 --- a/src/Cassandra.Tests/Connections/TestHelpers/FakeTopologyRefresherFactory.cs +++ b/src/Cassandra.Tests/Connections/TestHelpers/FakeTopologyRefresherFactory.cs @@ -53,9 +53,9 @@ public FakeTopologyRefresherFactory(ICollection hosts) _rows = rows; } - public ITopologyRefresher Create(Metadata metadata, Configuration config) + public ITopologyRefresher Create(IInternalMetadata internalMetadata, Configuration config) { - return new FakeTopologyRefresher(metadata, config, _rows); + return new FakeTopologyRefresher(internalMetadata, _rows); } } } \ No newline at end of file diff --git a/src/Cassandra.Tests/DataStax/Insights/InsightsClientTests.cs b/src/Cassandra.Tests/DataStax/Insights/InsightsClientTests.cs index 8d7da5be8..70e0d9bc2 100644 --- a/src/Cassandra.Tests/DataStax/Insights/InsightsClientTests.cs +++ b/src/Cassandra.Tests/DataStax/Insights/InsightsClientTests.cs @@ -71,14 +71,14 @@ public void Should_LogFiveTimes_When_ThereAreMoreThanFiveErrorsOnStartupMessageS cc => cc.UnsafeSendQueryRequestAsync( "CALL InsightsRpc.reportInsight(?)", It.IsAny()); - Mock.Get(cluster.Metadata.ControlConnection).Setup(mockExpression).ReturnsAsync((Response)null); + Mock.Get(cluster.InternalMetadata.ControlConnection).Setup(mockExpression).ReturnsAsync((Response)null); - target.InitializeAsync(); + target.Initialize(cluster.InternalMetadata); TestHelper.RetryAssert( () => { - Mock.Get(cluster.Metadata.ControlConnection).Verify(mockExpression, Times.AtLeast(10)); + Mock.Get(cluster.InternalMetadata.ControlConnection).Verify(mockExpression, Times.AtLeast(10)); }, 30); @@ -104,7 +104,7 @@ public void Should_ResetErrorCounterForLogging_When_ThereSendMessageIsSuccessful cc => cc.UnsafeSendQueryRequestAsync( "CALL InsightsRpc.reportInsight(?)", It.IsAny()); - Mock.Get(cluster.Metadata.ControlConnection) + Mock.Get(cluster.InternalMetadata.ControlConnection) .SetupSequence(mockExpression) .ReturnsAsync((Response)null) .ReturnsAsync(new FakeResultResponse(ResultResponse.ResultResponseKind.Void)) @@ -113,12 +113,12 @@ public void Should_ResetErrorCounterForLogging_When_ThereSendMessageIsSuccessful .ReturnsAsync(new FakeResultResponse(ResultResponse.ResultResponseKind.Void)) .ReturnsAsync((Response)null); - target.InitializeAsync(); + target.Initialize(cluster.InternalMetadata); TestHelper.RetryAssert( () => { - Mock.Get(cluster.Metadata.ControlConnection).Verify(mockExpression, Times.AtLeast(20)); + Mock.Get(cluster.InternalMetadata.ControlConnection).Verify(mockExpression, Times.AtLeast(20)); }, 30); @@ -251,13 +251,13 @@ public void Should_InvokeRpcCallCorrectlyAndImmediately_When_SendStartupMessageI using (var target = InsightsClientTests.GetInsightsClient(cluster, session)) { var queryProtocolOptions = new ConcurrentQueue(); - Mock.Get(cluster.Metadata.ControlConnection).Setup(cc => cc.UnsafeSendQueryRequestAsync( + Mock.Get(cluster.InternalMetadata.ControlConnection).Setup(cc => cc.UnsafeSendQueryRequestAsync( "CALL InsightsRpc.reportInsight(?)", It.IsAny())) .ReturnsAsync(new FakeResultResponse(ResultResponse.ResultResponseKind.Void)) .Callback((query, opts) => { queryProtocolOptions.Enqueue(opts); }); - target.InitializeAsync(); + target.Initialize(cluster.InternalMetadata); TestHelper.RetryAssert( () => { Assert.GreaterOrEqual(queryProtocolOptions.Count, 1); }, 10, 50); @@ -375,13 +375,13 @@ public void Should_InvokeRpcCallCorrectlyAndImmediatelyWithExecutionProfiles_Whe using (var target = InsightsClientTests.GetInsightsClient(cluster, session)) { var queryProtocolOptions = new ConcurrentQueue(); - Mock.Get(cluster.Metadata.ControlConnection).Setup(cc => cc.UnsafeSendQueryRequestAsync( + Mock.Get(cluster.InternalMetadata.ControlConnection).Setup(cc => cc.UnsafeSendQueryRequestAsync( "CALL InsightsRpc.reportInsight(?)", It.IsAny())) .ReturnsAsync(new FakeResultResponse(ResultResponse.ResultResponseKind.Void)) .Callback((query, opts) => { queryProtocolOptions.Enqueue(opts); }); - target.InitializeAsync(); + target.Initialize(cluster.InternalMetadata); TestHelper.RetryAssert( () => { Assert.GreaterOrEqual(queryProtocolOptions.Count, 1); }, 10, 50); @@ -412,13 +412,13 @@ public void Should_InvokeRpcCallCorrectlyAndPeriodically_When_SendStatusMessageI using (var target = InsightsClientTests.GetInsightsClient(cluster, session)) { var queryProtocolOptions = new ConcurrentQueue(); - Mock.Get(cluster.Metadata.ControlConnection).Setup(cc => cc.UnsafeSendQueryRequestAsync( + Mock.Get(cluster.InternalMetadata.ControlConnection).Setup(cc => cc.UnsafeSendQueryRequestAsync( "CALL InsightsRpc.reportInsight(?)", It.IsAny())) .ReturnsAsync(new FakeResultResponse(ResultResponse.ResultResponseKind.Void)) .Callback((query, opts) => { queryProtocolOptions.Enqueue(opts); }); - target.InitializeAsync(); + target.Initialize(cluster.InternalMetadata); TestHelper.RetryAssert(() => { Assert.GreaterOrEqual(queryProtocolOptions.Count, 5); }, 5, 400); queryProtocolOptions.TryDequeue(out var result); // ignore startup message @@ -434,14 +434,14 @@ private static InsightsClient GetInsightsClient(IInternalCluster cluster, IInter var timestampGeneratorMock = Mock.Of(); var platformInfoMock = Mock.Of>(); - Mock.Get(hostnameInfoMock).Setup(m => m.GetInformation(cluster, session)).Returns("awesome_hostname"); - Mock.Get(driverInfoMock).Setup(m => m.GetInformation(cluster, session)).Returns(new DriverInfo + Mock.Get(hostnameInfoMock).Setup(m => m.GetInformation(cluster, session, cluster.InternalMetadata)).Returns("awesome_hostname"); + Mock.Get(driverInfoMock).Setup(m => m.GetInformation(cluster, session, cluster.InternalMetadata)).Returns(new DriverInfo { DriverVersion = "1.1.2", DriverName = "Driver Name" }); Mock.Get(timestampGeneratorMock).Setup(m => m.GenerateTimestamp()).Returns(124219041); - Mock.Get(platformInfoMock).Setup(m => m.GetInformation(cluster, session)).Returns(new InsightsPlatformInfo + Mock.Get(platformInfoMock).Setup(m => m.GetInformation(cluster, session, cluster.InternalMetadata)).Returns(new InsightsPlatformInfo { CentralProcessingUnits = new CentralProcessingUnitsInfo { @@ -507,8 +507,8 @@ private IInternalSession GetSession(IInternalCluster cluster) { host1, mockPool1 }, { host2, mockPool2 } }; - Mock.Get(cluster).Setup(m => m.GetHost(host1)).Returns(new Host(host1, contactPoint: null)); - Mock.Get(cluster).Setup(m => m.GetHost(host2)).Returns(new Host(host2, contactPoint: null)); + Mock.Get(cluster.InternalMetadata).Setup(m => m.GetHost(host1)).Returns(new Host(host1, contactPoint: null)); + Mock.Get(cluster.InternalMetadata).Setup(m => m.GetHost(host2)).Returns(new Host(host2, contactPoint: null)); Mock.Get(session).Setup(s => s.GetPools()).Returns(pools.ToArray()); Mock.Get(session).Setup(m => m.Cluster).Returns(cluster); Mock.Get(session).SetupGet(m => m.InternalSessionId).Returns(Guid.Parse("E21EAB96-D91E-4790-80BD-1D5FB5472258")); @@ -519,17 +519,16 @@ private IInternalCluster GetCluster(bool withProfiles, int eventDelayMillisecond { var cluster = Mock.Of(); var config = GetConfig(eventDelayMilliseconds, withProfiles); - var metadata = new Metadata(config) - { - ControlConnection = Mock.Of() - }; - Mock.Get(metadata.ControlConnection).SetupGet(cc => cc.ProtocolVersion).Returns(ProtocolVersion.V4); - Mock.Get(metadata.ControlConnection).SetupGet(cc => cc.EndPoint) + var metadata = Mock.Of(); + var controlConnection = Mock.Of(); + Mock.Get(metadata).SetupGet(m => m.ControlConnection).Returns(controlConnection); + Mock.Get(metadata).SetupGet(cc => cc.ProtocolVersion).Returns(ProtocolVersion.V4); + Mock.Get(controlConnection).SetupGet(cc => cc.EndPoint) .Returns(new ConnectionEndPoint(new IPEndPoint(IPAddress.Parse("10.10.10.10"), 9011), config.ServerNameResolver, null)); - Mock.Get(metadata.ControlConnection).SetupGet(cc => cc.LocalAddress).Returns(new IPEndPoint(IPAddress.Parse("10.10.10.2"), 9015)); + Mock.Get(controlConnection).SetupGet(cc => cc.LocalAddress).Returns(new IPEndPoint(IPAddress.Parse("10.10.10.2"), 9015)); var hostIp = new IPEndPoint(IPAddress.Parse("127.0.0.1"), 9042); var hostIp2 = new IPEndPoint(IPAddress.Parse("127.0.0.2"), 9042); - metadata.SetResolvedContactPoints(new Dictionary> + Mock.Get(metadata).SetupGet(cc => cc.ResolvedContactPoints).Returns(new Dictionary> { { new HostnameContactPoint( @@ -540,12 +539,14 @@ private IInternalCluster GetCluster(bool withProfiles, int eventDelayMillisecond "localhost"), new[] { new ConnectionEndPoint(hostIp, config.ServerNameResolver, null) } } }); - metadata.AddHost(hostIp); - metadata.AddHost(hostIp2); - metadata.Hosts.ToCollection().First().Datacenter = "dc123"; + var hosts = new Hosts(); + hosts.Add(hostIp); + hosts.Add(hostIp2); + hosts.ToCollection().First().Datacenter = "dc123"; + Mock.Get(metadata).SetupGet(m => m.Hosts).Returns(hosts); + Mock.Get(metadata).Setup(m => m.AllHosts()).Returns(hosts.ToCollection); Mock.Get(cluster).SetupGet(m => m.Configuration).Returns(config); - Mock.Get(cluster).SetupGet(m => m.Metadata).Returns(metadata); - Mock.Get(cluster).Setup(c => c.AllHosts()).Returns(metadata.AllHosts); + Mock.Get(cluster).SetupGet(m => m.InternalMetadata).Returns(metadata); return cluster; } @@ -553,7 +554,7 @@ private Configuration GetConfig(int eventDelayMilliseconds, bool withProfiles) { var graphOptions = new GraphOptions().SetName("testGraphName").SetReadConsistencyLevel(ConsistencyLevel.All); var supportVerifier = Mock.Of(); - Mock.Get(supportVerifier).Setup(m => m.SupportsInsights(It.IsAny())).Returns(true); + Mock.Get(supportVerifier).Setup(m => m.SupportsInsights(It.IsAny())).Returns(true); return new TestConfigurationBuilder { Policies = new Cassandra.Policies( diff --git a/src/Cassandra.Tests/DataStax/Insights/InsightsSupportVerifierTests.cs b/src/Cassandra.Tests/DataStax/Insights/InsightsSupportVerifierTests.cs index 322e88e28..baa4b82fc 100644 --- a/src/Cassandra.Tests/DataStax/Insights/InsightsSupportVerifierTests.cs +++ b/src/Cassandra.Tests/DataStax/Insights/InsightsSupportVerifierTests.cs @@ -16,6 +16,7 @@ using System.Collections.Generic; using System.Net; +using Cassandra.Connections.Control; using Cassandra.DataStax.Insights; using Cassandra.SessionManagement; using Moq; @@ -29,166 +30,166 @@ public class InsightsSupportVerifierTests [Test] public void Should_ReturnFalse_When_OneNode_6_0_4_AndOneNode_6_0_5() { - var cluster = Mock.Of(); - Mock.Get(cluster).Setup(c => c.AllHosts()).Returns(GetHosts("6.0.4", "6.0.5")); + var internalMetadata = Mock.Of(); + Mock.Get(internalMetadata).Setup(c => c.AllHosts()).Returns(GetHosts("6.0.4", "6.0.5")); var target = new InsightsSupportVerifier(); - Assert.IsFalse(target.SupportsInsights(cluster)); + Assert.IsFalse(target.SupportsInsights(internalMetadata)); } [Test] public void Should_ReturnFalse_When_OneNode_6_0_5_AndOneNode_6_0_4() { - var cluster = Mock.Of(); - Mock.Get(cluster).Setup(c => c.AllHosts()).Returns(GetHosts("6.0.5", "6.0.4")); + var internalMetadata = Mock.Of(); + Mock.Get(internalMetadata).Setup(c => c.AllHosts()).Returns(GetHosts("6.0.5", "6.0.4")); var target = new InsightsSupportVerifier(); - Assert.IsFalse(target.SupportsInsights(cluster)); + Assert.IsFalse(target.SupportsInsights(internalMetadata)); } [Test] public void Should_ReturnTrue_When_OneNode_6_1_0_AndOneNode_6_0_5() { - var cluster = Mock.Of(); - Mock.Get(cluster).Setup(c => c.AllHosts()).Returns(GetHosts("6.1.0", "6.0.5")); + var internalMetadata = Mock.Of(); + Mock.Get(internalMetadata).Setup(c => c.AllHosts()).Returns(GetHosts("6.1.0", "6.0.5")); var target = new InsightsSupportVerifier(); - Assert.IsTrue(target.SupportsInsights(cluster)); + Assert.IsTrue(target.SupportsInsights(internalMetadata)); } [Test] public void Should_ReturnTrue_When_TwoNodes_6_0_5() { - var cluster = Mock.Of(); - Mock.Get(cluster).Setup(c => c.AllHosts()).Returns(GetHosts("6.0.5", "6.0.5")); + var internalMetadata = Mock.Of(); + Mock.Get(internalMetadata).Setup(c => c.AllHosts()).Returns(GetHosts("6.0.5", "6.0.5")); var target = new InsightsSupportVerifier(); - Assert.IsTrue(target.SupportsInsights(cluster)); + Assert.IsTrue(target.SupportsInsights(internalMetadata)); } [Test] public void Should_ReturnFalse_When_TwoNodes_6_0_4() { - var cluster = Mock.Of(); - Mock.Get(cluster).Setup(c => c.AllHosts()).Returns(GetHosts("6.0.4", "6.0.4")); + var internalMetadata = Mock.Of(); + Mock.Get(internalMetadata).Setup(c => c.AllHosts()).Returns(GetHosts("6.0.4", "6.0.4")); var target = new InsightsSupportVerifier(); - Assert.IsFalse(target.SupportsInsights(cluster)); + Assert.IsFalse(target.SupportsInsights(internalMetadata)); } [Test] public void Should_ReturnFalse_When_OneNode5_1_12() { - var cluster = Mock.Of(); - Mock.Get(cluster).Setup(c => c.AllHosts()).Returns(GetHosts("5.1.12")); + var internalMetadata = Mock.Of(); + Mock.Get(internalMetadata).Setup(c => c.AllHosts()).Returns(GetHosts("5.1.12")); var target = new InsightsSupportVerifier(); - Assert.IsFalse(target.SupportsInsights(cluster)); + Assert.IsFalse(target.SupportsInsights(internalMetadata)); } [Test] public void Should_ReturnTrue_When_OneNode5_1_13() { - var cluster = Mock.Of(); - Mock.Get(cluster).Setup(c => c.AllHosts()).Returns(GetHosts("5.1.13")); + var internalMetadata = Mock.Of(); + Mock.Get(internalMetadata).Setup(c => c.AllHosts()).Returns(GetHosts("5.1.13")); var target = new InsightsSupportVerifier(); - Assert.IsTrue(target.SupportsInsights(cluster)); + Assert.IsTrue(target.SupportsInsights(internalMetadata)); } [Test] public void Should_ReturnTrue_When_OneNode5_2_0() { - var cluster = Mock.Of(); - Mock.Get(cluster).Setup(c => c.AllHosts()).Returns(GetHosts("5.2.0")); + var internalMetadata = Mock.Of(); + Mock.Get(internalMetadata).Setup(c => c.AllHosts()).Returns(GetHosts("5.2.0")); var target = new InsightsSupportVerifier(); - Assert.IsTrue(target.SupportsInsights(cluster)); + Assert.IsTrue(target.SupportsInsights(internalMetadata)); } [Test] public void Should_ReturnTrue_When_OneNode6_0_5() { - var cluster = Mock.Of(); - Mock.Get(cluster).Setup(c => c.AllHosts()).Returns(GetHosts("6.0.5")); + var internalMetadata = Mock.Of(); + Mock.Get(internalMetadata).Setup(c => c.AllHosts()).Returns(GetHosts("6.0.5")); var target = new InsightsSupportVerifier(); - Assert.IsTrue(target.SupportsInsights(cluster)); + Assert.IsTrue(target.SupportsInsights(internalMetadata)); } [Test] public void Should_ReturnTrue_When_OneNode6_0_5_alpha() { - var cluster = Mock.Of(); - Mock.Get(cluster).Setup(c => c.AllHosts()).Returns(GetHosts("6.0.5-alpha")); + var internalMetadata = Mock.Of(); + Mock.Get(internalMetadata).Setup(c => c.AllHosts()).Returns(GetHosts("6.0.5-alpha")); var target = new InsightsSupportVerifier(); - Assert.IsTrue(target.SupportsInsights(cluster)); + Assert.IsTrue(target.SupportsInsights(internalMetadata)); } [Test] public void Should_ReturnFalse_When_OneNode6_0_4() { - var cluster = Mock.Of(); - Mock.Get(cluster).Setup(c => c.AllHosts()).Returns(GetHosts("6.0.4")); + var internalMetadata = Mock.Of(); + Mock.Get(internalMetadata).Setup(c => c.AllHosts()).Returns(GetHosts("6.0.4")); var target = new InsightsSupportVerifier(); - Assert.IsFalse(target.SupportsInsights(cluster)); + Assert.IsFalse(target.SupportsInsights(internalMetadata)); } [Test] public void Should_ReturnTrue_When_OneNode6_1_0() { - var cluster = Mock.Of(); - Mock.Get(cluster).Setup(c => c.AllHosts()).Returns(GetHosts("6.1.0")); + var internalMetadata = Mock.Of(); + Mock.Get(internalMetadata).Setup(c => c.AllHosts()).Returns(GetHosts("6.1.0")); var target = new InsightsSupportVerifier(); - Assert.IsTrue(target.SupportsInsights(cluster)); + Assert.IsTrue(target.SupportsInsights(internalMetadata)); } [Test] public void Should_ReturnFalse_When_OneNode5_0_99() { - var cluster = Mock.Of(); - Mock.Get(cluster).Setup(c => c.AllHosts()).Returns(GetHosts("5.0.99")); + var internalMetadata = Mock.Of(); + Mock.Get(internalMetadata).Setup(c => c.AllHosts()).Returns(GetHosts("5.0.99")); var target = new InsightsSupportVerifier(); - Assert.IsFalse(target.SupportsInsights(cluster)); + Assert.IsFalse(target.SupportsInsights(internalMetadata)); } [Test] public void Should_ReturnFalse_When_OneNode5_0_0() { - var cluster = Mock.Of(); - Mock.Get(cluster).Setup(c => c.AllHosts()).Returns(GetHosts("5.0.0")); + var internalMetadata = Mock.Of(); + Mock.Get(internalMetadata).Setup(c => c.AllHosts()).Returns(GetHosts("5.0.0")); var target = new InsightsSupportVerifier(); - Assert.IsFalse(target.SupportsInsights(cluster)); + Assert.IsFalse(target.SupportsInsights(internalMetadata)); } [Test] public void Should_ReturnFalse_When_OneNode4_8_0() { - var cluster = Mock.Of(); - Mock.Get(cluster).Setup(c => c.AllHosts()).Returns(GetHosts("4.8.0")); + var internalMetadata = Mock.Of(); + Mock.Get(internalMetadata).Setup(c => c.AllHosts()).Returns(GetHosts("4.8.0")); var target = new InsightsSupportVerifier(); - Assert.IsFalse(target.SupportsInsights(cluster)); + Assert.IsFalse(target.SupportsInsights(internalMetadata)); } private ICollection GetHosts(params string[] dseVersions) diff --git a/src/Cassandra.Tests/DataStax/Insights/MessageFactories/InsightsMessageFactoryTests.cs b/src/Cassandra.Tests/DataStax/Insights/MessageFactories/InsightsMessageFactoryTests.cs index 1968ea2f1..cec6c7d89 100644 --- a/src/Cassandra.Tests/DataStax/Insights/MessageFactories/InsightsMessageFactoryTests.cs +++ b/src/Cassandra.Tests/DataStax/Insights/MessageFactories/InsightsMessageFactoryTests.cs @@ -39,7 +39,7 @@ public void Should_ReturnCorrectMetadata_When_CreateStartupMessageIsCalled() var target = Configuration.DefaultInsightsStartupMessageFactory; var timestamp = (long)(DateTimeOffset.UtcNow - new DateTimeOffset(1970, 1, 1, 0, 0, 0, 0, TimeSpan.Zero)).TotalMilliseconds; - var act = target.CreateMessage(cluster, Mock.Of()); + var act = target.CreateMessage(cluster, Mock.Of(), cluster.InternalMetadata); Assert.AreEqual(InsightType.Event, act.Metadata.InsightType); Assert.AreEqual("v1", act.Metadata.InsightMappingId); @@ -56,7 +56,7 @@ public void Should_ReturnCorrectMetadata_When_CreateStatusMessageIsCalled() var target = Configuration.DefaultInsightsStatusMessageFactory; var timestamp = (long)(DateTimeOffset.UtcNow - new DateTimeOffset(1970, 1, 1, 0, 0, 0, 0, TimeSpan.Zero)).TotalMilliseconds; - var act = target.CreateMessage(cluster, Mock.Of()); + var act = target.CreateMessage(cluster, Mock.Of(), cluster.InternalMetadata); Assert.AreEqual(InsightType.Event, act.Metadata.InsightType); Assert.AreEqual("v1", act.Metadata.InsightMappingId); @@ -84,14 +84,14 @@ public void Should_ReturnCorrectData_When_CreateStatusMessageIsCalled() { host1, mockPool1 }, { host2, mockPool2 } }; - Mock.Get(cluster).Setup(m => m.GetHost(host1)).Returns(new Host(host1, contactPoint: null)); - Mock.Get(cluster).Setup(m => m.GetHost(host2)).Returns(new Host(host2, contactPoint: null)); + Mock.Get(cluster.InternalMetadata).Setup(m => m.GetHost(host1)).Returns(new Host(host1, contactPoint: null)); + Mock.Get(cluster.InternalMetadata).Setup(m => m.GetHost(host2)).Returns(new Host(host2, contactPoint: null)); Mock.Get(session).Setup(s => s.GetPools()).Returns(pools.ToArray()); Mock.Get(session).Setup(m => m.Cluster).Returns(cluster); Mock.Get(session).SetupGet(m => m.InternalSessionId).Returns(Guid.Parse("E21EAB96-D91E-4790-80BD-1D5FB5472258")); var target = Configuration.DefaultInsightsStatusMessageFactory; - var act = target.CreateMessage(cluster, session); + var act = target.CreateMessage(cluster, session, cluster.InternalMetadata); Assert.AreEqual("127.0.0.1:9011", act.Data.ControlConnection); Assert.AreEqual("BECFE098-E462-47E7-B6A7-A21CD316D4C0", act.Data.ClientId.ToUpper()); @@ -111,7 +111,7 @@ public void Should_ReturnCorrectData_When_CreateStartupMessageIsCalled() var session = Mock.Of(); Mock.Get(session).SetupGet(m => m.InternalSessionId).Returns(Guid.Parse("E21EAB96-D91E-4790-80BD-1D5FB5472258")); - var act = target.CreateMessage(cluster, session); + var act = target.CreateMessage(cluster, session, cluster.InternalMetadata); InsightsMessageFactoryTests.AssertStartupOptions(act); @@ -226,11 +226,11 @@ private static void AssertExecutionProfile(Insight act) private IInternalCluster GetCluster() { var cluster = Mock.Of(); + var metadata = Mock.Of(); + var ccMock = Mock.Of(); + Mock.Get(cluster).SetupGet(c => c.InternalMetadata).Returns(metadata); + Mock.Get(metadata).SetupGet(m => m.ControlConnection).Returns(ccMock); var config = GetConfig(); - var metadata = new Metadata(config) - { - ControlConnection = Mock.Of() - }; var contactPoint = new HostnameContactPoint( config.DnsResolver, config.ProtocolOptions, @@ -239,19 +239,20 @@ private IInternalCluster GetCluster() "localhost"); var connectionEndPoint = new ConnectionEndPoint( new IPEndPoint(IPAddress.Parse("127.0.0.1"), 9011), config.ServerNameResolver, contactPoint); - Mock.Get(metadata.ControlConnection).SetupGet(cc => cc.ProtocolVersion).Returns(ProtocolVersion.V4); + Mock.Get(metadata).SetupGet(m => m.ResolvedContactPoints).Returns( + new Dictionary> + { + { contactPoint, new[] { connectionEndPoint } } + }); + Mock.Get(metadata).SetupGet(cc => cc.ProtocolVersion).Returns(ProtocolVersion.V4); Mock.Get(metadata.ControlConnection).SetupGet(cc => cc.EndPoint).Returns(connectionEndPoint); Mock.Get(metadata.ControlConnection).SetupGet(cc => cc.LocalAddress).Returns(new IPEndPoint(IPAddress.Parse("10.10.10.2"), 9015)); var hostIp = new IPEndPoint(IPAddress.Parse("127.0.0.1"), 9042); - metadata.SetResolvedContactPoints(new Dictionary> - { - { contactPoint, new [] { connectionEndPoint } } - }); - metadata.AddHost(hostIp); - metadata.Hosts.ToCollection().First().Datacenter = "dc123"; + var hosts = new Hosts(); + hosts.Add(hostIp); + hosts.ToCollection().First().Datacenter = "dc123"; Mock.Get(cluster).SetupGet(m => m.Configuration).Returns(config); - Mock.Get(cluster).SetupGet(m => m.Metadata).Returns(metadata); - Mock.Get(cluster).Setup(c => c.AllHosts()).Returns(metadata.AllHosts); + Mock.Get(metadata).Setup(c => c.AllHosts()).Returns(hosts.ToCollection()); return cluster; } diff --git a/src/Cassandra.Tests/ExecutionProfiles/ClusterTests.cs b/src/Cassandra.Tests/ExecutionProfiles/ClusterTests.cs index 0319ed4ae..137fb7ded 100644 --- a/src/Cassandra.Tests/ExecutionProfiles/ClusterTests.cs +++ b/src/Cassandra.Tests/ExecutionProfiles/ClusterTests.cs @@ -17,7 +17,9 @@ using System.Collections.Generic; using System.Linq; using System.Net; +using System.Threading.Tasks; using Cassandra.ExecutionProfiles; +using Cassandra.Tasks; using Cassandra.Tests.Connections.TestHelpers; using Moq; using NUnit.Framework; @@ -324,17 +326,19 @@ private class FakeSpeculativeExecutionPolicy : ISpeculativeExecutionPolicy public volatile int InitializeCount; public volatile int DisposeCount; - public void Dispose() + public Task ShutdownAsync() { DisposeCount++; + return TaskHelper.Completed; } - public void Initialize(ICluster cluster) + public Task InitializeAsync(IMetadata metadata) { InitializeCount++; + return TaskHelper.Completed; } - public ISpeculativeExecutionPlan NewPlan(string keyspace, IStatement statement) + public ISpeculativeExecutionPlan NewPlan(IMetadata metadata, string keyspace, IStatement statement) { throw new System.NotImplementedException(); } @@ -343,22 +347,21 @@ public ISpeculativeExecutionPlan NewPlan(string keyspace, IStatement statement) internal class FakeLoadBalancingPolicy : ILoadBalancingPolicy { public volatile int InitializeCount; - private ICluster _cluster; - public void Initialize(ICluster cluster) + public Task InitializeAsync(IMetadata metadata) { - _cluster = cluster; InitializeCount++; + return TaskHelper.Completed; } - public HostDistance Distance(Host host) + public HostDistance Distance(IMetadata metadata, Host host) { return HostDistance.Local; } - public IEnumerable NewQueryPlan(string keyspace, IStatement query) + public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) { - return _cluster.AllHosts(); + return metadata.AllHosts(); } } } diff --git a/src/Cassandra.Tests/ExecutionProfiles/RequestHandlerTests.cs b/src/Cassandra.Tests/ExecutionProfiles/RequestHandlerTests.cs index 72a4b48f2..3725ecfd5 100644 --- a/src/Cassandra.Tests/ExecutionProfiles/RequestHandlerTests.cs +++ b/src/Cassandra.Tests/ExecutionProfiles/RequestHandlerTests.cs @@ -29,6 +29,7 @@ using Cassandra.Responses; using Cassandra.Serialization; using Cassandra.SessionManagement; +using Cassandra.Tasks; using Cassandra.Tests.Connections.TestHelpers; using Cassandra.Tests.Requests; @@ -279,14 +280,16 @@ private RequestHandlerMockResult BuildRequestHandler( cluster.Connect(); // create session - var session = new Session(cluster, config, null, SerializerManager.Default, null); + var session = new Session(cluster, config, null, null); // create request handler var options = profile != null - ? new RequestOptions(profile, null, config.Policies, config.SocketOptions, config.QueryOptions, config.ClientOptions) + ? new RequestOptions( + profile, null, config.Policies, config.SocketOptions, config.QueryOptions, config.ClientOptions) : config.DefaultRequestOptions; var requestHandler = new RequestHandler( session, + cluster.InternalRef.InternalMetadata, new SerializerManager(ProtocolVersion.V3).GetCurrentSerializer(), statement, options); @@ -368,16 +371,17 @@ private class FakeLoadBalancingPolicy : ILoadBalancingPolicy { public long Count; - public void Initialize(ICluster cluster) + public Task InitializeAsync(IMetadata metadata) { + return TaskHelper.Completed; } - public HostDistance Distance(Host host) + public HostDistance Distance(IMetadata metadata, Host host) { return HostDistance.Local; } - public IEnumerable NewQueryPlan(string keyspace, IStatement query) + public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) { Interlocked.Increment(ref Count); return new List @@ -449,18 +453,20 @@ private class FakeSpeculativeExecutionPolicy : ISpeculativeExecutionPolicy { public long Count; - public void Dispose() + public Task ShutdownAsync() { + return TaskHelper.Completed; } - public void Initialize(ICluster cluster) + public Task InitializeAsync(IMetadata metadata) { + return TaskHelper.Completed; } - public ISpeculativeExecutionPlan NewPlan(string keyspace, IStatement statement) + public ISpeculativeExecutionPlan NewPlan(IMetadata metadata, string keyspace, IStatement statement) { Interlocked.Increment(ref Count); - return new ConstantSpeculativeExecutionPolicy(10, 1).NewPlan(keyspace, statement); + return new ConstantSpeculativeExecutionPolicy(10, 1).NewPlan(metadata, keyspace, statement); } } } diff --git a/src/Cassandra.Tests/ExecutionProfiles/SessionTests.cs b/src/Cassandra.Tests/ExecutionProfiles/SessionTests.cs index ccb21c3d3..e313c21e0 100644 --- a/src/Cassandra.Tests/ExecutionProfiles/SessionTests.cs +++ b/src/Cassandra.Tests/ExecutionProfiles/SessionTests.cs @@ -58,10 +58,10 @@ public async Task Should_CreateRequestHandlerWithCorrectRequestOptions_When_Exec Mock.Get(clusterMock).Setup(c => c.Configuration).Returns(config); Mock.Get(requestHandlerMock).Setup(r => r.SendAsync()).Returns(Task.FromResult(new RowSet())); - var session = new Session(clusterMock, config, null, serializer, null); + var session = new Session(clusterMock, config, null, null); Mock.Get(requestHandlerFactoryMock) - .Setup(m => m.Create(session, serializer.GetCurrentSerializer(), It.IsAny(), config.RequestOptions["testE"])) + .Setup(m => m.Create(session, clusterMock.InternalMetadata, serializer.GetCurrentSerializer(), It.IsAny(), config.RequestOptions["testE"])) .Returns(requestHandlerMock); if (async) @@ -73,7 +73,7 @@ public async Task Should_CreateRequestHandlerWithCorrectRequestOptions_When_Exec session.Execute(new SimpleStatement("test query"), "testE"); } - Mock.Get(requestHandlerFactoryMock).Verify(m => m.Create(session, serializer.GetCurrentSerializer(), It.IsAny(), config.RequestOptions["testE"]), Times.Once); + Mock.Get(requestHandlerFactoryMock).Verify(m => m.Create(session, clusterMock.InternalMetadata, serializer.GetCurrentSerializer(), It.IsAny(), config.RequestOptions["testE"]), Times.Once); } [Test] @@ -85,7 +85,6 @@ public async Task Should_CreateRequestHandlerWithDefaultRequestOptions_When_Exec var requestHandlerMock = Mock.Of(); var hostConnectionPoolFactoryMock = Mock.Of(); var clusterMock = Mock.Of(); - var serializer = SerializerManager.Default; var config = new TestConfigurationBuilder { RequestHandlerFactory = requestHandlerFactoryMock, @@ -104,10 +103,15 @@ public async Task Should_CreateRequestHandlerWithDefaultRequestOptions_When_Exec Mock.Get(clusterMock).Setup(c => c.Configuration).Returns(config); Mock.Get(requestHandlerMock).Setup(r => r.SendAsync()).Returns(Task.FromResult(new RowSet())); - var session = new Session(clusterMock, config, null, serializer, null); + var session = new Session(clusterMock, config, null, null); Mock.Get(requestHandlerFactoryMock) - .Setup(m => m.Create(session, serializer.GetCurrentSerializer(), It.IsAny(), config.DefaultRequestOptions)) + .Setup(m => m.Create( + session, + clusterMock.InternalMetadata, + config.SerializerManager.GetCurrentSerializer(), + It.IsAny(), + config.DefaultRequestOptions)) .Returns(requestHandlerMock); if (async) @@ -119,7 +123,14 @@ public async Task Should_CreateRequestHandlerWithDefaultRequestOptions_When_Exec session.Execute(new SimpleStatement("test query")); } - Mock.Get(requestHandlerFactoryMock).Verify(m => m.Create(session, serializer.GetCurrentSerializer(), It.IsAny(), config.DefaultRequestOptions), Times.Once); + Mock.Get(requestHandlerFactoryMock).Verify( + m => m.Create( + session, + clusterMock.InternalMetadata, + config.SerializerManager.GetCurrentSerializer(), + It.IsAny(), + config.DefaultRequestOptions), + Times.Once); } } } \ No newline at end of file diff --git a/src/Cassandra.Tests/Mapping/Linq/LinqEntryPointsTests.cs b/src/Cassandra.Tests/Mapping/Linq/LinqEntryPointsTests.cs index 8601b3729..81ca31cf3 100644 --- a/src/Cassandra.Tests/Mapping/Linq/LinqEntryPointsTests.cs +++ b/src/Cassandra.Tests/Mapping/Linq/LinqEntryPointsTests.cs @@ -14,12 +14,12 @@ // limitations under the License. // -using Cassandra.Connections.Control; using Cassandra.Data.Linq; using Cassandra.Mapping; -using Cassandra.Serialization; using Cassandra.Tests.Mapping.Pocos; + using Moq; + using NUnit.Framework; namespace Cassandra.Tests.Mapping.Linq @@ -58,7 +58,7 @@ public void Deprecated_EntryPoint_Honors_Mapping_Defined() public void Deprecated_EntryPoint_Uses_Table_Provided() { MappingConfiguration.Global.Define(new Map().TableName("tbl1")); - var table = _session.GetTable( "linqTable"); + var table = _session.GetTable("linqTable"); Assert.AreEqual( @"SELECT BooleanValue, DateTimeValue, DecimalValue, DoubleValue, Int64Value, IntValue, StringValue, UuidValue FROM linqTable", table.ToString()); @@ -68,7 +68,7 @@ public void Deprecated_EntryPoint_Uses_Table_Provided() public void Deprecated_EntryPoint_Uses_Keyspace_Provided() { MappingConfiguration.Global.Define(new Map().TableName("tbl1")); - var table = _session.GetTable( "linqTable", "linqKs"); + var table = _session.GetTable("linqTable", "linqKs"); Assert.AreEqual( @"SELECT BooleanValue, DateTimeValue, DecimalValue, DoubleValue, Int64Value, IntValue, StringValue, UuidValue FROM linqKs.linqTable", table.ToString()); @@ -124,23 +124,14 @@ public void Table_Constructor_Uses_Provided_Mappings_With_Custom_Keyspace_And_Ta table.Where(t => t.Int64Value == 1).ToString()); } - private static Mock GetSessionMock(ISerializerManager serializer = null) + private static Mock GetSessionMock() { - if (serializer == null) - { - serializer = new SerializerManager(ProtocolVersion.MaxSupported); - } var sessionMock = new Mock(MockBehavior.Strict); var config = new Configuration(); - var metadata = new Metadata(config); - var ccMock = new Mock(MockBehavior.Strict); - ccMock.Setup(cc => cc.Serializer).Returns(serializer); - metadata.ControlConnection = ccMock.Object; var clusterMock = new Mock(); - clusterMock.Setup(c => c.Metadata).Returns(metadata); clusterMock.Setup(c => c.Configuration).Returns(config); sessionMock.Setup(s => s.Cluster).Returns(clusterMock.Object); return sessionMock; } } -} +} \ No newline at end of file diff --git a/src/Cassandra.Tests/Mapping/Linq/LinqMappingUnitTests.cs b/src/Cassandra.Tests/Mapping/Linq/LinqMappingUnitTests.cs index c3a88d51f..57b5627ad 100644 --- a/src/Cassandra.Tests/Mapping/Linq/LinqMappingUnitTests.cs +++ b/src/Cassandra.Tests/Mapping/Linq/LinqMappingUnitTests.cs @@ -18,6 +18,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Cassandra.Connections.Control; using Cassandra.Data.Linq; using Cassandra.Mapping; using Cassandra.Metrics.Internal; @@ -37,6 +38,13 @@ private ISession GetSession(RowSet result) var clusterMock = new Mock(); clusterMock.Setup(c => c.Configuration).Returns(new Configuration()); + var metadataMock = new Mock(); + var metadataInternal = new Mock(); + metadataInternal.SetupGet(m => m.ProtocolVersion).Returns(ProtocolVersion.V2); + metadataMock.Setup(m => m.GetClusterDescription()).Returns(new ClusterDescription(metadataInternal.Object)); + metadataMock.Setup(m => m.GetClusterDescriptionAsync()).ReturnsAsync(new ClusterDescription(metadataInternal.Object)); + clusterMock.SetupGet(c => c.Metadata).Returns(metadataMock.Object); + var sessionMock = new Mock(MockBehavior.Strict); sessionMock.Setup(s => s.Keyspace).Returns(null); sessionMock @@ -48,7 +56,6 @@ private ISession GetSession(RowSet result) .Returns(TestHelper.DelayedTask(result, 200)) .Verifiable(); sessionMock.Setup(s => s.PrepareAsync(It.IsAny())).Returns(TaskHelper.ToTask(GetPrepared("Mock query"))); - sessionMock.Setup(s => s.BinaryProtocolVersion).Returns(2); sessionMock.Setup(s => s.Cluster).Returns(clusterMock.Object); return sessionMock.Object; } @@ -156,7 +163,11 @@ public void Linq_CqlQuery_Automatically_Pages() .Callback((s, profile) => stmt = (BoundStatement)s) .Verifiable(); sessionMock.Setup(s => s.PrepareAsync(It.IsAny())).Returns(TaskHelper.ToTask(GetPrepared("Mock query"))); - sessionMock.Setup(s => s.BinaryProtocolVersion).Returns(2); + var metadataMock = new Mock(); + var metadataInternal = new Mock(); + metadataInternal.SetupGet(m => m.ProtocolVersion).Returns(ProtocolVersion.V2); + metadataMock.Setup(m => m.GetClusterDescription()).Returns(new ClusterDescription(metadataInternal.Object)); + clusterMock.SetupGet(c => c.Metadata).Returns(metadataMock.Object); rs.AutoPage = true; rs.PagingState = new byte[] { 0, 0, 0 }; var counter = 0; diff --git a/src/Cassandra.Tests/Mapping/Linq/LinqToCqlUnitTests.cs b/src/Cassandra.Tests/Mapping/Linq/LinqToCqlUnitTests.cs index 188f68a42..f57b73b49 100644 --- a/src/Cassandra.Tests/Mapping/Linq/LinqToCqlUnitTests.cs +++ b/src/Cassandra.Tests/Mapping/Linq/LinqToCqlUnitTests.cs @@ -449,12 +449,7 @@ public void CreateTableCounterTest() var actualCqlQueries = new List(); var sessionMock = new Mock(MockBehavior.Strict); var config = new Configuration(); - var metadata = new Metadata(config); - var ccMock = new Mock(MockBehavior.Strict); - ccMock.Setup(cc => cc.Serializer).Returns(new SerializerManager(ProtocolVersion.MaxSupported)); - metadata.ControlConnection = ccMock.Object; var clusterMock = new Mock(); - clusterMock.Setup(c => c.Metadata).Returns(metadata); clusterMock.Setup(c => c.Configuration).Returns(config); sessionMock.Setup(s => s.Cluster).Returns(clusterMock.Object); sessionMock @@ -462,6 +457,7 @@ public void CreateTableCounterTest() .Returns(() => new RowSet()) .Callback(actualCqlQueries.Add) .Verifiable(); + sessionMock.Setup(s => s.ConnectAsync()).Returns(TaskHelper.Completed); var session = sessionMock.Object; var table1 = SessionExtensions.GetTable(session); @@ -485,13 +481,9 @@ public void VirtualPropertiesTest() var query2 = (from e in table where e.Id == 1 && e.Name == "MyName" select new { e.Id, e.Name, e.Description }); Assert.AreEqual("SELECT \"Id\", \"Name\", \"Description\" FROM \"InheritedEntity\" WHERE \"Id\" = ? AND \"Name\" = ?", query2.ToString()); var sessionMock = new Mock(MockBehavior.Strict); + sessionMock.Setup(s => s.ConnectAsync()).Returns(TaskHelper.Completed); var config = new Configuration(); - var metadata = new Metadata(config); - var ccMock = new Mock(MockBehavior.Strict); - ccMock.Setup(cc => cc.Serializer).Returns(new SerializerManager(ProtocolVersion.MaxSupported)); - metadata.ControlConnection = ccMock.Object; var clusterMock = new Mock(); - clusterMock.Setup(c => c.Metadata).Returns(metadata); clusterMock.Setup(c => c.Configuration).Returns(config); sessionMock.Setup(s => s.Cluster).Returns(clusterMock.Object); string createQuery = null; diff --git a/src/Cassandra.Tests/MetadataHelpers/TestHelpers/FakeSchemaParserFactory.cs b/src/Cassandra.Tests/MetadataHelpers/TestHelpers/FakeSchemaParserFactory.cs index c448953da..c53d30418 100644 --- a/src/Cassandra.Tests/MetadataHelpers/TestHelpers/FakeSchemaParserFactory.cs +++ b/src/Cassandra.Tests/MetadataHelpers/TestHelpers/FakeSchemaParserFactory.cs @@ -1,12 +1,12 @@ -// +// // Copyright (C) DataStax Inc. -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,6 +17,8 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Threading.Tasks; + +using Cassandra.Connections.Control; using Cassandra.MetadataHelpers; namespace Cassandra.Tests.MetadataHelpers.TestHelpers @@ -24,7 +26,7 @@ namespace Cassandra.Tests.MetadataHelpers.TestHelpers internal class FakeSchemaParserFactory : ISchemaParserFactory { public ISchemaParser Create( - Version cassandraVersion, Metadata parent, Func> udtResolver, ISchemaParser currentInstance = null) + Version cassandraVersion, IInternalMetadata parent, Func> udtResolver, ISchemaParser currentInstance = null) { var keyspaces = new ConcurrentDictionary(); diff --git a/src/Cassandra.Tests/ProtocolTests.cs b/src/Cassandra.Tests/ProtocolTests.cs index 6540f154c..54dbbb3e1 100644 --- a/src/Cassandra.Tests/ProtocolTests.cs +++ b/src/Cassandra.Tests/ProtocolTests.cs @@ -22,9 +22,6 @@ namespace Cassandra.Tests [TestFixture] public class ProtocolTests { - private readonly Configuration _config = new TestConfigurationBuilder { AllowBetaProtocolVersions = false }.Build(); - private readonly Configuration _configBeta = new TestConfigurationBuilder { AllowBetaProtocolVersions = true }.Build(); - [TestCase(ProtocolVersion.V4, ProtocolVersion.V5)] [TestCase(ProtocolVersion.V2, ProtocolVersion.V3)] [TestCase(ProtocolVersion.V3, ProtocolVersion.V4)] @@ -36,7 +33,7 @@ public class ProtocolTests public void GetLowerSupported_Should_NotSkipBetaVersions_When_AllowBetaProtocolVersionsTrue( ProtocolVersion version, ProtocolVersion initialVersion) { - Assert.AreEqual(version, initialVersion.GetLowerSupported(_configBeta)); + Assert.AreEqual(version, initialVersion.GetLowerSupported(true)); } [TestCase(ProtocolVersion.V4, ProtocolVersion.V5)] @@ -50,7 +47,7 @@ public void GetLowerSupported_Should_NotSkipBetaVersions_When_AllowBetaProtocolV public void GetLowerSupported_Should_SkipBetaVersions_When_AllowBetaProtocolVersionsFalse( ProtocolVersion version, ProtocolVersion initialVersion) { - Assert.AreEqual(version, initialVersion.GetLowerSupported(_config)); + Assert.AreEqual(version, initialVersion.GetLowerSupported(false)); } [TestCase(ProtocolVersion.V4, "4.0.0", "1.2.19")] @@ -65,7 +62,7 @@ public void GetLowerSupported_Should_SkipBetaVersions_When_AllowBetaProtocolVers public void GetHighestCommon_Should_Downgrade_To_Protocol_VX_With_Hosts(ProtocolVersion version, params string[] cassandraVersions) { - Assert.AreEqual(version, ProtocolVersion.MaxSupported.GetHighestCommon(_config, cassandraVersions.Select(GetHost))); + Assert.AreEqual(version, ProtocolVersion.MaxSupported.GetHighestCommon(false, cassandraVersions.Select(GetHost))); } @@ -81,7 +78,7 @@ public void GetHighestCommon_Should_Downgrade_To_Protocol_VX_With_Hosts(Protocol public void GetHighestCommon_Should_NotSkipBeta_When_AllowBetaVersionIsTrue(ProtocolVersion version, params string[] cassandraVersions) { - Assert.AreEqual(version, ProtocolVersion.MaxSupported.GetHighestCommon(_configBeta, cassandraVersions.Select(GetHost))); + Assert.AreEqual(version, ProtocolVersion.MaxSupported.GetHighestCommon(true, cassandraVersions.Select(GetHost))); } [TestCase(ProtocolVersion.V3, "6.0/3.10.2", "4.8.1/2.1.17", "5.1/3.0.13")] @@ -89,7 +86,7 @@ public void GetHighestCommon_Should_NotSkipBeta_When_AllowBetaVersionIsTrue(Prot public void GetHighestCommon_Should_Downgrade_To_Protocol_VX_With_Dse_Hosts(ProtocolVersion version, params string[] cassandraVersions) { - Assert.AreEqual(version, ProtocolVersion.MaxSupported.GetHighestCommon(_config, cassandraVersions.Select(GetHost))); + Assert.AreEqual(version, ProtocolVersion.MaxSupported.GetHighestCommon(false, cassandraVersions.Select(GetHost))); } [TestCase(ProtocolVersion.V4, "4.0.0")] @@ -102,7 +99,7 @@ public void GetHighestCommon_Should_Downgrade_To_Protocol_VX_With_Dse_Hosts(Prot public void GetHighestCommon_Should_Not_Downgrade_Protocol_With_Hosts(ProtocolVersion version, params string[] cassandraVersions) { - Assert.AreEqual(version, version.GetHighestCommon(_config, cassandraVersions.Select(GetHost))); + Assert.AreEqual(version, version.GetHighestCommon(false, cassandraVersions.Select(GetHost))); } [TestCase(ProtocolVersion.V5, "4.0.0")] @@ -115,7 +112,7 @@ public void GetHighestCommon_Should_Not_Downgrade_Protocol_With_Hosts(ProtocolVe public void GetHighestCommon_Should_Not_Downgrade_Protocol_With_Hosts_When_AllowBetaVersionIsTrue(ProtocolVersion version, params string[] cassandraVersions) { - Assert.AreEqual(version, version.GetHighestCommon(_configBeta, cassandraVersions.Select(GetHost))); + Assert.AreEqual(version, version.GetHighestCommon(true, cassandraVersions.Select(GetHost))); } [TestCase(ProtocolVersion.V4, "5.1.7/3.0.13", "5.0.13/3.0.11", "2.2.9")] @@ -125,7 +122,7 @@ public void GetHighestCommon_Should_Not_Downgrade_Protocol_With_Hosts_When_Allow public void GetHighestCommon_Should_Not_Downgrade_Protocol_With_Dse_Hosts(ProtocolVersion version, params string[] cassandraVersions) { - Assert.AreEqual(version, version.GetHighestCommon(_config, cassandraVersions.Select(GetHost))); + Assert.AreEqual(version, version.GetHighestCommon(false, cassandraVersions.Select(GetHost))); } private static Host GetHost(string cassandraVersion, int index) diff --git a/src/Cassandra.Tests/RequestExecutionTests.cs b/src/Cassandra.Tests/RequestExecutionTests.cs index 20be99187..bdc629fa3 100644 --- a/src/Cassandra.Tests/RequestExecutionTests.cs +++ b/src/Cassandra.Tests/RequestExecutionTests.cs @@ -18,6 +18,7 @@ using System.Collections.Generic; using System.Net; using Cassandra.Connections; +using Cassandra.Connections.Control; using Cassandra.ExecutionProfiles; using Cassandra.Observers; using Cassandra.Requests; @@ -40,6 +41,7 @@ public void Should_ThrowException_When_NoValidHosts(bool currentHostRetry) Mock.Get(requestHandlerFactory) .Setup(r => r.Create( It.IsAny(), + It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), @@ -68,6 +70,7 @@ public void Should_NotThrowException_When_AValidHostIsObtained(bool currentHostR Mock.Get(requestHandlerFactory) .Setup(r => r.Create( It.IsAny(), + It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), @@ -103,6 +106,7 @@ public void Should_SendRequest_When_AConnectionIsObtained(bool currentHostRetry) Mock.Get(requestHandlerFactory) .Setup(r => r.Create( It.IsAny(), + It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), @@ -152,6 +156,7 @@ public void Should_RetryRequestToSameHost_When_ConnectionFailsAndRetryDecisionIs Mock.Get(requestHandlerFactory) .Setup(r => r.Create( It.IsAny(), + It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), diff --git a/src/Cassandra.Tests/RequestHandlerTests.cs b/src/Cassandra.Tests/RequestHandlerTests.cs index 658d41814..8cd0b84d8 100644 --- a/src/Cassandra.Tests/RequestHandlerTests.cs +++ b/src/Cassandra.Tests/RequestHandlerTests.cs @@ -308,7 +308,7 @@ public void GetRequest_With_Timestamp_Generator_Empty_Value() Cassandra.Policies.DefaultLoadBalancingPolicy, Cassandra.Policies.DefaultReconnectionPolicy, Cassandra.Policies.DefaultRetryPolicy, Cassandra.Policies.DefaultSpeculativeExecutionPolicy, new NoTimestampGenerator()); - var config = RequestHandlerTests.GetConfig(new QueryOptions(), policies, PoolingOptions.Get()); + var config = RequestHandlerTests.GetConfig(new QueryOptions(), policies, PoolingOptions.Create()); var request = RequestHandler.GetRequest( statement, RequestHandlerTests.Serializer, config.DefaultRequestOptions); @@ -341,7 +341,7 @@ public void GetRequest_With_Timestamp_Generator_Empty_Value_With_Statement_Times Cassandra.Policies.DefaultLoadBalancingPolicy, Cassandra.Policies.DefaultReconnectionPolicy, Cassandra.Policies.DefaultRetryPolicy, Cassandra.Policies.DefaultSpeculativeExecutionPolicy, new NoTimestampGenerator()); - var config = RequestHandlerTests.GetConfig(new QueryOptions(), policies, PoolingOptions.Get()); + var config = RequestHandlerTests.GetConfig(new QueryOptions(), policies, PoolingOptions.Create()); var request = RequestHandler.GetRequest(statement, Serializer, config.DefaultRequestOptions); var bodyBuffer = GetBodyBuffer(request); @@ -372,7 +372,7 @@ public void GetRequest_Batch_With_64K_Queries() batch.Add(new SimpleStatement("QUERY")); } - var config = RequestHandlerTests.GetConfig(new QueryOptions(), Cassandra.Policies.DefaultPolicies, PoolingOptions.Get()); + var config = RequestHandlerTests.GetConfig(new QueryOptions(), Cassandra.Policies.DefaultPolicies, PoolingOptions.Create()); var request = RequestHandler.GetRequest(batch, Serializer, config.DefaultRequestOptions); var bodyBuffer = GetBodyBuffer(request); @@ -390,7 +390,7 @@ public void GetRequest_Batch_With_Timestamp_Generator() // To microsecond precision startDate = startDate.Subtract(TimeSpan.FromTicks(startDate.Ticks % 10)); - var config = RequestHandlerTests.GetConfig(new QueryOptions(), Cassandra.Policies.DefaultPolicies, PoolingOptions.Get()); + var config = RequestHandlerTests.GetConfig(new QueryOptions(), Cassandra.Policies.DefaultPolicies, PoolingOptions.Create()); var request = RequestHandler.GetRequest(batch, Serializer, config.DefaultRequestOptions); var bodyBuffer = GetBodyBuffer(request); @@ -426,7 +426,7 @@ public void GetRequest_Batch_With_Empty_Timestamp_Generator() Cassandra.Policies.DefaultRetryPolicy, Cassandra.Policies.DefaultSpeculativeExecutionPolicy, new NoTimestampGenerator()); - var config = RequestHandlerTests.GetConfig(new QueryOptions(), policies, PoolingOptions.Get()); + var config = RequestHandlerTests.GetConfig(new QueryOptions(), policies, PoolingOptions.Create()); var request = RequestHandler.GetRequest(batch, Serializer, config.DefaultRequestOptions); var bodyBuffer = GetBodyBuffer(request); @@ -453,7 +453,7 @@ public void GetRequest_Batch_With_Provided_Timestamp() providedTimestamp = providedTimestamp.Subtract(TimeSpan.FromTicks(providedTimestamp.Ticks % 10)); batch.SetTimestamp(providedTimestamp); - var config = RequestHandlerTests.GetConfig(new QueryOptions(), Cassandra.Policies.DefaultPolicies, PoolingOptions.Get()); + var config = RequestHandlerTests.GetConfig(new QueryOptions(), Cassandra.Policies.DefaultPolicies, PoolingOptions.Create()); var request = RequestHandler.GetRequest(batch, Serializer, config.DefaultRequestOptions); var bodyBuffer = GetBodyBuffer(request); diff --git a/src/Cassandra.Tests/Requests/FakeRequestHandlerFactory.cs b/src/Cassandra.Tests/Requests/FakeRequestHandlerFactory.cs index 26ec65020..306860647 100644 --- a/src/Cassandra.Tests/Requests/FakeRequestHandlerFactory.cs +++ b/src/Cassandra.Tests/Requests/FakeRequestHandlerFactory.cs @@ -16,10 +16,12 @@ using System; using System.Threading.Tasks; +using Cassandra.Connections.Control; using Cassandra.ExecutionProfiles; using Cassandra.Requests; using Cassandra.Serialization; using Cassandra.SessionManagement; + using Moq; namespace Cassandra.Tests.Requests @@ -28,24 +30,35 @@ internal class FakeRequestHandlerFactory : IRequestHandlerFactory { private readonly Action _executeCallback; private readonly Func _rs; - + public FakeRequestHandlerFactory(Action executeCallback, Func rs = null) { _executeCallback = executeCallback; _rs = rs ?? (stmt => new RowSet()); } - public IRequestHandler Create(IInternalSession session, ISerializer serializer, IRequest request, IStatement statement, IRequestOptions options) + public IRequestHandler Create( + IInternalSession session, + IInternalMetadata internalMetadata, + ISerializer serializer, + IRequest request, + IStatement statement, + IRequestOptions options) { return CreateMockHandler(statement); } - public IRequestHandler Create(IInternalSession session, ISerializer serializer, IStatement statement, IRequestOptions options) + public IRequestHandler Create( + IInternalSession session, + IInternalMetadata internalMetadata, + ISerializer serializer, + IStatement statement, + IRequestOptions options) { return CreateMockHandler(statement); } - public IRequestHandler Create(IInternalSession session, ISerializer serializer) + public IRequestHandler Create(IInternalSession session, IInternalMetadata internalMetadata, ISerializer serializer) { return CreateMockHandler(); } @@ -68,7 +81,7 @@ private IRequestHandler CreateMockHandler(IStatement statement = null) return handler; } - + private static Task TaskOf(T value) { var tcs = new TaskCompletionSource(); diff --git a/src/Cassandra.Tests/Requests/PrepareHandlerTests.cs b/src/Cassandra.Tests/Requests/PrepareHandlerTests.cs index 7151faf17..88bdc6934 100644 --- a/src/Cassandra.Tests/Requests/PrepareHandlerTests.cs +++ b/src/Cassandra.Tests/Requests/PrepareHandlerTests.cs @@ -27,6 +27,7 @@ using Cassandra.Responses; using Cassandra.Serialization; using Cassandra.SessionManagement; +using Cassandra.Tasks; using Cassandra.Tests.Connections.TestHelpers; using Moq; @@ -500,7 +501,7 @@ private PrepareHandlerMockResult BuildPrepareHandler(Action NewQueryPlan(string keyspace, IStatement query) + public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) { Interlocked.Increment(ref NewQueryPlanCount); throw new NotImplementedException(); diff --git a/src/Cassandra.Tests/TestConfigurationBuilder.cs b/src/Cassandra.Tests/TestConfigurationBuilder.cs index d7daed61c..cdd553dba 100644 --- a/src/Cassandra.Tests/TestConfigurationBuilder.cs +++ b/src/Cassandra.Tests/TestConfigurationBuilder.cs @@ -106,6 +106,8 @@ internal class TestConfigurationBuilder public IDnsResolver DnsResolver { get; set; } + public ISerializerManager SerializerManager { get; set; } + public IMetadataRequestHandler MetadataRequestHandler { get; set; } = new MetadataRequestHandler(); public ITopologyRefresherFactory TopologyRefresherFactory { get; set; } = new TopologyRefresherFactory(); @@ -177,7 +179,8 @@ public Configuration Build() supportedOptionsInitializerFactory: SupportedOptionsInitializerFactory, protocolVersionNegotiator: ProtocolVersionNegotiator, serverEventsSubscriber: ServerEventsSubscriber, - localDatacenterProvider: LocalDatacenterProvider); + localDatacenterProvider: LocalDatacenterProvider, + serializerManager: SerializerManager); } } } \ No newline at end of file diff --git a/src/Cassandra.Tests/TestHelper.cs b/src/Cassandra.Tests/TestHelper.cs index 1425ef61a..61d479ccf 100644 --- a/src/Cassandra.Tests/TestHelper.cs +++ b/src/Cassandra.Tests/TestHelper.cs @@ -728,20 +728,20 @@ public OrderedLoadBalancingPolicy() _childPolicy = new RoundRobinPolicy(); } - public void Initialize(ICluster cluster) + public Task InitializeAsync(IMetadata metadata) { - _hosts = cluster.AllHosts(); - _childPolicy.InitializeAsync(cluster); + _hosts = metadata.AllHosts(); + return _childPolicy.InitializeAsync(metadata); } - public HostDistance Distance(Host host) + public HostDistance Distance(IMetadata metadata, Host host) { - return _childPolicy.Distance(host); + return _childPolicy.Distance(metadata, host); } - public IEnumerable NewQueryPlan(string keyspace, IStatement query) + public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) { - return !_useRoundRobin ? _hosts : _childPolicy.NewQueryPlan(keyspace, query); + return !_useRoundRobin ? _hosts : _childPolicy.NewQueryPlan(metadata, keyspace, query); } } @@ -751,31 +751,32 @@ public IEnumerable NewQueryPlan(string keyspace, IStatement query) /// internal class CustomLoadBalancingPolicy : ILoadBalancingPolicy { - private ICluster _cluster; - private readonly Func _distanceHandler; - private readonly Func> _queryPlanHandler; + private volatile IMetadata _metadata; + private readonly Func _distanceHandler; + private readonly Func> _queryPlanHandler; public CustomLoadBalancingPolicy( - Func> queryPlanHandler = null, - Func distanceHandler = null) + Func> queryPlanHandler = null, + Func distanceHandler = null) { _queryPlanHandler = queryPlanHandler ?? ((cluster, ks, statement) => cluster.AllHosts()); _distanceHandler = distanceHandler ?? ((_, __) => HostDistance.Local); } - public void Initialize(ICluster cluster) + public Task InitializeAsync(IMetadata metadata) { - _cluster = cluster; + _metadata = metadata; + return TaskHelper.Completed; } - public HostDistance Distance(Host host) + public HostDistance Distance(IMetadata metadata, Host host) { - return _distanceHandler(_cluster, host); + return _distanceHandler(_metadata, host); } - public IEnumerable NewQueryPlan(string keyspace, IStatement query) + public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) { - return _queryPlanHandler(_cluster, keyspace, query); + return _queryPlanHandler(metadata, keyspace, query); } } } From f7ba71460e98bede9872445befc390348d3702ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Thu, 2 Jul 2020 20:01:09 +0100 Subject: [PATCH 12/31] change metrics initialization to session constructor --- .../Metrics/Internal/IMetricsManager.cs | 7 +-- .../Metrics/Internal/MetricsManager.cs | 28 +++++------ .../Registries/IInternalMetricsRegistry.cs | 5 -- .../Metrics/Registries/ISessionMetrics.cs | 2 - .../Registries/InternalMetricsRegistry.cs | 47 +++++++------------ .../Metrics/Registries/NodeMetrics.cs | 2 - .../Metrics/Registries/SessionMetrics.cs | 39 +++++++-------- src/Cassandra/Session.cs | 9 ++-- 8 files changed, 57 insertions(+), 82 deletions(-) diff --git a/src/Cassandra/Metrics/Internal/IMetricsManager.cs b/src/Cassandra/Metrics/Internal/IMetricsManager.cs index fd66d0b95..669bdbc0a 100644 --- a/src/Cassandra/Metrics/Internal/IMetricsManager.cs +++ b/src/Cassandra/Metrics/Internal/IMetricsManager.cs @@ -32,12 +32,7 @@ internal interface IMetricsManager : IDriverMetrics, IDisposable /// Get the existing node metrics for the provided host or creates them and returns them if they don't exist yet. /// INodeMetrics GetOrCreateNodeMetrics(Host host); - - /// - /// Initialize metrics with the provided session. - /// - void InitializeMetrics(IInternalSession session); - + /// /// /// diff --git a/src/Cassandra/Metrics/Internal/MetricsManager.cs b/src/Cassandra/Metrics/Internal/MetricsManager.cs index 704a669b2..3462a58b8 100644 --- a/src/Cassandra/Metrics/Internal/MetricsManager.cs +++ b/src/Cassandra/Metrics/Internal/MetricsManager.cs @@ -29,11 +29,8 @@ namespace Cassandra.Metrics.Internal /// internal class MetricsManager : IMetricsManager { - private static readonly Logger Logger = new Logger(typeof(MetricsManager)); - private readonly IDriverMetricsProvider _driverMetricsProvider; private readonly DriverMetricsOptions _metricsOptions; - private readonly bool _metricsEnabled; private readonly string _sessionBucket; private readonly ISessionMetrics _sessionMetrics; private readonly CopyOnWriteDictionary> _nodeMetricsRegistryCollection; @@ -41,13 +38,18 @@ internal class MetricsManager : IMetricsManager private readonly bool _disabledSessionTimerMetrics; private readonly bool _disabledNodeTimerMetrics; - public MetricsManager(IDriverMetricsProvider driverMetricsProvider, DriverMetricsOptions metricsOptions, bool metricsEnabled, string sessionName) + public MetricsManager( + IInternalSession session, + IDriverMetricsProvider driverMetricsProvider, + DriverMetricsOptions metricsOptions, + bool metricsEnabled, + string sessionName) { _driverMetricsProvider = driverMetricsProvider; _metricsOptions = metricsOptions; - _metricsEnabled = metricsEnabled; + AreMetricsEnabled = metricsEnabled; _sessionBucket = metricsOptions.BucketPrefix != null ? $"{metricsOptions.BucketPrefix}.{sessionName}" : sessionName; - _sessionMetrics = new SessionMetrics(_driverMetricsProvider, metricsOptions, metricsEnabled, _sessionBucket); + _sessionMetrics = new SessionMetrics(session, _driverMetricsProvider, metricsOptions, metricsEnabled, _sessionBucket); _nodeMetricsRegistryCollection = new CopyOnWriteDictionary>(); _nodeMetricsCollection = new CopyOnWriteDictionary(); _disabledSessionTimerMetrics = !metricsEnabled || !metricsOptions.EnabledSessionMetrics.Contains(SessionMetric.Timers.CqlRequests); @@ -59,9 +61,9 @@ public MetricsManager(IDriverMetricsProvider driverMetricsProvider, DriverMetric /// public IReadOnlyDictionary> NodeMetrics => _nodeMetricsRegistryCollection; - + /// - public bool AreMetricsEnabled => _metricsEnabled; + public bool AreMetricsEnabled { get; } /// public TMetricType GetNodeMetric(Host host, NodeMetric nodeMetric) where TMetricType : class, IDriverMetric @@ -103,13 +105,7 @@ public TMetricType GetSessionMetric(SessionMetric sessionMetric) wh return typedMetric; } - - /// - public void InitializeMetrics(IInternalSession session) - { - _sessionMetrics.InitializeMetrics(session); - } - + /// public void RemoveNodeMetrics(Host host) { @@ -141,7 +137,7 @@ public INodeMetrics GetOrCreateNodeMetrics(Host host) { var nodeBucket = $"{_sessionBucket}.nodes.{MetricsManager.BuildHostAddressMetricPath(host.Address)}"; - var newRegistry = new NodeMetrics(_driverMetricsProvider, _metricsOptions, _metricsEnabled, nodeBucket); + var newRegistry = new NodeMetrics(_driverMetricsProvider, _metricsOptions, AreMetricsEnabled, nodeBucket); _nodeMetricsRegistryCollection.Add(host, newRegistry.MetricsRegistry); return newRegistry; diff --git a/src/Cassandra/Metrics/Registries/IInternalMetricsRegistry.cs b/src/Cassandra/Metrics/Registries/IInternalMetricsRegistry.cs index 2bd295ba5..9b5a2c15b 100644 --- a/src/Cassandra/Metrics/Registries/IInternalMetricsRegistry.cs +++ b/src/Cassandra/Metrics/Registries/IInternalMetricsRegistry.cs @@ -35,10 +35,5 @@ internal interface IInternalMetricsRegistry : IMetricsRegistry IDriverGauge Gauge(string bucket, TMetric metric, Func valueProvider); IDriverMetric GetMetric(TMetric metric); - - /// - /// Used to notify the registry that no more metrics will be added. (Concurrency optimization). - /// - void OnMetricsAdded(); } } \ No newline at end of file diff --git a/src/Cassandra/Metrics/Registries/ISessionMetrics.cs b/src/Cassandra/Metrics/Registries/ISessionMetrics.cs index a14934d4f..5b033a858 100644 --- a/src/Cassandra/Metrics/Registries/ISessionMetrics.cs +++ b/src/Cassandra/Metrics/Registries/ISessionMetrics.cs @@ -40,7 +40,5 @@ internal interface ISessionMetrics : IDisposable /// Internal MetricsRegistry used to create metrics internally. /// IInternalMetricsRegistry MetricsRegistry { get; } - - void InitializeMetrics(IInternalSession session); } } \ No newline at end of file diff --git a/src/Cassandra/Metrics/Registries/InternalMetricsRegistry.cs b/src/Cassandra/Metrics/Registries/InternalMetricsRegistry.cs index 1d202e64c..d7bfa9b39 100644 --- a/src/Cassandra/Metrics/Registries/InternalMetricsRegistry.cs +++ b/src/Cassandra/Metrics/Registries/InternalMetricsRegistry.cs @@ -16,8 +16,8 @@ using System; using System.Collections.Generic; -using System.Threading; +using Cassandra.Collections; using Cassandra.Metrics.Abstractions; using Cassandra.Metrics.Providers.Null; @@ -30,15 +30,23 @@ internal class InternalMetricsRegistry : IInternalMetricsRegistry _disabledMetrics; - private readonly Dictionary _gauges = new Dictionary(); - private readonly Dictionary _counters = new Dictionary(); - private readonly Dictionary _meters = new Dictionary(); - private readonly Dictionary _timers = new Dictionary(); - private readonly Dictionary _metrics = new Dictionary(); + private readonly CopyOnWriteDictionary _gauges = + new CopyOnWriteDictionary(); - private bool _initialized = false; + private readonly CopyOnWriteDictionary _counters = + new CopyOnWriteDictionary(); - public InternalMetricsRegistry(IDriverMetricsProvider driverMetricsProvider, IEnumerable disabledMetrics, bool metricsEnabled) + private readonly CopyOnWriteDictionary _meters = + new CopyOnWriteDictionary(); + + private readonly CopyOnWriteDictionary _timers = + new CopyOnWriteDictionary(); + + private readonly CopyOnWriteDictionary _metrics = + new CopyOnWriteDictionary(); + + public InternalMetricsRegistry( + IDriverMetricsProvider driverMetricsProvider, IEnumerable disabledMetrics, bool metricsEnabled) { _disabledMetrics = new HashSet(disabledMetrics); _driverMetricsProvider = driverMetricsProvider; @@ -50,7 +58,7 @@ public InternalMetricsRegistry(IDriverMetricsProvider driverMetricsProvider, IEn /// public IReadOnlyDictionary Gauges => _gauges; - + /// public IReadOnlyDictionary Meters => _meters; @@ -62,7 +70,6 @@ public InternalMetricsRegistry(IDriverMetricsProvider driverMetricsProvider, IEn public IDriverTimer Timer(string bucket, TMetric metric) { - ThrowIfInitialized(); if (!IsMetricEnabled(metric)) { return NullDriverTimer.Instance; @@ -73,10 +80,9 @@ public IDriverTimer Timer(string bucket, TMetric metric) _metrics.Add(metric, timer); return timer; } - + public IDriverMeter Meter(string bucket, TMetric metric) { - ThrowIfInitialized(); if (!IsMetricEnabled(metric)) { return NullDriverMeter.Instance; @@ -90,7 +96,6 @@ public IDriverMeter Meter(string bucket, TMetric metric) public IDriverCounter Counter(string bucket, TMetric metric) { - ThrowIfInitialized(); if (!IsMetricEnabled(metric)) { return NullDriverCounter.Instance; @@ -104,7 +109,6 @@ public IDriverCounter Counter(string bucket, TMetric metric) public IDriverGauge Gauge(string bucket, TMetric metric, Func valueProvider) { - ThrowIfInitialized(); if (!IsMetricEnabled(metric)) { return NullDriverGauge.Instance; @@ -122,21 +126,6 @@ public IDriverMetric GetMetric(TMetric metric) return driverMetric; } - /// - public void OnMetricsAdded() - { - _initialized = true; - Interlocked.MemoryBarrier(); - } - - private void ThrowIfInitialized() - { - if (_initialized) - { - throw new DriverInternalError("Can not add metrics after initialization is complete."); - } - } - private bool IsMetricEnabled(TMetric metric) { return _metricsEnabled && !_disabledMetrics.Contains(metric); diff --git a/src/Cassandra/Metrics/Registries/NodeMetrics.cs b/src/Cassandra/Metrics/Registries/NodeMetrics.cs index 32446736f..6b651bfb7 100644 --- a/src/Cassandra/Metrics/Registries/NodeMetrics.cs +++ b/src/Cassandra/Metrics/Registries/NodeMetrics.cs @@ -80,8 +80,6 @@ private void InitializeMetrics() InFlight = MetricsRegistry.Gauge( _bucketName, NodeMetric.Gauges.InFlight, () => _hostConnectionPool?.InFlight); - - MetricsRegistry.OnMetricsAdded(); } catch (Exception) { diff --git a/src/Cassandra/Metrics/Registries/SessionMetrics.cs b/src/Cassandra/Metrics/Registries/SessionMetrics.cs index 980560edc..730a76624 100644 --- a/src/Cassandra/Metrics/Registries/SessionMetrics.cs +++ b/src/Cassandra/Metrics/Registries/SessionMetrics.cs @@ -16,6 +16,7 @@ using System; using System.Linq; + using Cassandra.Metrics.Abstractions; using Cassandra.SessionManagement; @@ -27,29 +28,18 @@ internal class SessionMetrics : ISessionMetrics private readonly IDriverMetricsProvider _driverMetricsProvider; private readonly string _context; - public SessionMetrics(IDriverMetricsProvider driverMetricsProvider, DriverMetricsOptions metricsOptions, bool metricsEnabled, string context) + public SessionMetrics( + IInternalSession session, + IDriverMetricsProvider driverMetricsProvider, + DriverMetricsOptions metricsOptions, + bool metricsEnabled, + string context) { _driverMetricsProvider = driverMetricsProvider; _context = context; MetricsRegistry = new InternalMetricsRegistry( driverMetricsProvider, SessionMetric.AllSessionMetrics.Except(metricsOptions.EnabledSessionMetrics), metricsEnabled); - } - - public IDriverTimer CqlRequests { get; private set; } - - public IDriverCounter CqlClientTimeouts { get; private set; } - - public IDriverMeter BytesSent { get; private set; } - - public IDriverMeter BytesReceived { get; private set; } - - public IDriverGauge ConnectedNodes { get; private set; } - - /// - public IInternalMetricsRegistry MetricsRegistry { get; } - public void InitializeMetrics(IInternalSession session) - { try { CqlRequests = MetricsRegistry.Timer(_context, SessionMetric.Timers.CqlRequests); @@ -58,8 +48,6 @@ public void InitializeMetrics(IInternalSession session) BytesReceived = MetricsRegistry.Meter(_context, SessionMetric.Meters.BytesReceived); ConnectedNodes = MetricsRegistry.Gauge( _context, SessionMetric.Gauges.ConnectedNodes, () => session.ConnectedNodes); - - MetricsRegistry.OnMetricsAdded(); } catch (Exception) { @@ -68,6 +56,19 @@ public void InitializeMetrics(IInternalSession session) } } + public IDriverTimer CqlRequests { get; } + + public IDriverCounter CqlClientTimeouts { get; } + + public IDriverMeter BytesSent { get; } + + public IDriverMeter BytesReceived { get; } + + public IDriverGauge ConnectedNodes { get; } + + /// + public IInternalMetricsRegistry MetricsRegistry { get; } + public void Dispose() { _driverMetricsProvider.ShutdownMetricsBucket(_context); diff --git a/src/Cassandra/Session.cs b/src/Cassandra/Session.cs index 3dbfef0d3..ba1839574 100644 --- a/src/Cassandra/Session.cs +++ b/src/Cassandra/Session.cs @@ -126,7 +126,12 @@ internal Session( Keyspace = keyspace; SessionName = sessionName; _connectionPool = new CopyOnWriteDictionary(); - _metricsManager = new MetricsManager(configuration.MetricsProvider, Configuration.MetricsOptions, Configuration.MetricsEnabled, SessionName); + _metricsManager = new MetricsManager( + this, + configuration.MetricsProvider, + Configuration.MetricsOptions, + Configuration.MetricsEnabled, + SessionName); _observerFactory = configuration.ObserverFactoryBuilder.Build(_metricsManager); _insightsClient = configuration.InsightsClientFactory.Create(cluster, this); UserDefinedTypes = new UdtMappingDefinitions(this); @@ -288,8 +293,6 @@ private async Task InitInternalAsync() InternalRef.InternalCluster.Metadata.HostRemoved += OnHostRemoved; - _metricsManager.InitializeMetrics(this); - var serializerManager = _cluster.Configuration.SerializerManager; if (Configuration.GetOrCreatePoolingOptions(serializerManager.CurrentProtocolVersion).GetWarmup()) { From 01f77c6c861a6679730c62c623a96c47b64360d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Thu, 2 Jul 2020 20:03:28 +0100 Subject: [PATCH 13/31] add faster initialized check --- src/Cassandra/Cluster.cs | 39 ++++++++++++++++++++++----------------- src/Cassandra/Metadata.cs | 18 ++++++++++-------- src/Cassandra/Session.cs | 22 ++++++++++++---------- 3 files changed, 44 insertions(+), 35 deletions(-) diff --git a/src/Cassandra/Cluster.cs b/src/Cassandra/Cluster.cs index bb783c145..c4addb7ca 100644 --- a/src/Cassandra/Cluster.cs +++ b/src/Cassandra/Cluster.cs @@ -47,6 +47,7 @@ public class Cluster : IInternalCluster private readonly CopyOnWriteList _connectedSessions = new CopyOnWriteList(); private readonly bool _implicitContactPoint = false; private volatile Exception _initException; + private volatile bool _initialized = false; private readonly SemaphoreSlim _sessionCreateLock = new SemaphoreSlim(1, 1); private long _sessionCounter = -1; @@ -130,9 +131,9 @@ private Cluster(IEnumerable contactPoints, Configuration configuration) } var parsedContactPoints = configuration.ContactPointParser.ParseContactPoints(contactPointsList); - - _lazyMetadata = new Metadata(this, configuration, Configuration.SerializerManager, parsedContactPoints); - _internalMetadata = _lazyMetadata.InternalMetadata; + + _internalMetadata = new InternalMetadata(this, configuration, parsedContactPoints); + _lazyMetadata = new Metadata(_internalMetadata); _initTask = Task.Run(InitAsync); } @@ -140,13 +141,13 @@ private Cluster(IEnumerable contactPoints, Configuration configuration) /// Task IInternalCluster.TryInitAndGetMetadataAsync() { - var currentState = Interlocked.Read(ref _state); - if (currentState == Cluster.Initialized) + if (_initialized) { //It was already initialized return _initTask; } - + + var currentState = Interlocked.Read(ref _state); if (currentState == Cluster.Disposed) { throw new ObjectDisposedException("This cluster object has been disposed."); @@ -203,14 +204,7 @@ private async Task InitAsync() }, TaskContinuationOptions.ExecuteSynchronously).Forget(); throw newEx; } - - var previousState = Interlocked.CompareExchange(ref _state, Cluster.Initialized, Cluster.Initializing); - if (previousState == Cluster.Disposed) - { - await ShutdownInternalAsync().ConfigureAwait(false); - throw new ObjectDisposedException("Cluster instance was disposed before initialization finished."); - } - + // initialize the local datacenter provider Configuration.LocalDatacenterProvider.Initialize(this, _internalMetadata); @@ -230,12 +224,22 @@ private async Task InitAsync() // Set metadata dependent options SetMetadataDependentOptions(); - Cluster.Logger.Info("Cluster Connected using binary protocol version: [" - + Configuration.SerializerManager.CurrentProtocolVersion - + "]"); _internalMetadata.Hosts.Added += _internalMetadata.OnHostAdded; _internalMetadata.Hosts.Removed += _internalMetadata.OnHostRemoved; _internalMetadata.Hosts.Up += OnHostUp; + + var previousState = Interlocked.CompareExchange(ref _state, Cluster.Initialized, Cluster.Initializing); + if (previousState == Cluster.Disposed) + { + await ShutdownInternalAsync().ConfigureAwait(false); + throw new ObjectDisposedException("Cluster instance was disposed before initialization finished."); + } + + _initialized = true; + + Cluster.Logger.Info("Cluster Connected using binary protocol version: [" + + Configuration.SerializerManager.CurrentProtocolVersion + + "]"); Cluster.Logger.Info("Cluster [" + _internalMetadata.ClusterName + "] has been initialized."); return _internalMetadata; @@ -417,6 +421,7 @@ public void Shutdown(int timeoutMs = Timeout.Infinite) public async Task ShutdownAsync(int timeoutMs = Timeout.Infinite) { var previousState = Interlocked.Exchange(ref _state, Cluster.Disposed); + _initialized = false; IEnumerable sessions; await _sessionCreateLock.WaitAsync().ConfigureAwait(false); diff --git a/src/Cassandra/Metadata.cs b/src/Cassandra/Metadata.cs index 3e9b86b61..14c3b0fc5 100644 --- a/src/Cassandra/Metadata.cs +++ b/src/Cassandra/Metadata.cs @@ -38,6 +38,7 @@ internal class Metadata : IMetadata private readonly int _queryAbortTimeout; private volatile Task _initTask; + private volatile bool _initialized = false; private long _state = Metadata.NotInitialized; @@ -318,30 +319,29 @@ public async Task CheckSchemaAgreementAsync() internal Task TryInitializeAsync() { - var currentState = Interlocked.Read(ref _state); - if (currentState == Metadata.Initialized) + if (_initialized) { //It was already initialized return TaskHelper.Completed; } - return InitializeAsync(currentState); + return InitializeAsync(); } internal void TryInitialize() { - var currentState = Interlocked.Read(ref _state); - if (currentState == Metadata.Initialized) + if (_initialized) { //It was already initialized return; } - TaskHelper.WaitToComplete(InitializeAsync(currentState), _queryAbortTimeout); + TaskHelper.WaitToComplete(InitializeAsync(), _queryAbortTimeout); } - private Task InitializeAsync(long currentState) + private Task InitializeAsync() { + var currentState = Interlocked.Read(ref _state); if (currentState == Metadata.Disposed) { throw new ObjectDisposedException("This metadata object has been disposed."); @@ -365,12 +365,14 @@ private async Task InitializeInternalAsync() await InternalMetadata.ShutdownAsync().ConfigureAwait(false); throw new ObjectDisposedException("Metadata instance was disposed before initialization finished."); } + + _initialized = true; } internal async Task ShutdownAsync() { var previousState = Interlocked.Exchange(ref _state, Metadata.Disposed); - + _initialized = false; if (previousState != Metadata.Initialized) { return; diff --git a/src/Cassandra/Session.cs b/src/Cassandra/Session.cs index ba1839574..c0f15cca3 100644 --- a/src/Cassandra/Session.cs +++ b/src/Cassandra/Session.cs @@ -53,6 +53,7 @@ public class Session : IInternalSession private long _state = Session.Initializing; private volatile string _keyspace; + private volatile bool _initialized = false; internal IInternalSession InternalRef => this; @@ -216,6 +217,7 @@ public async Task ShutdownAsync() { //Only dispose once var previousState = Interlocked.Exchange(ref _state, Session.Disposed); + _initialized = false; if (previousState != Session.Initialized) { return; @@ -244,17 +246,23 @@ private async Task ShutdownInternalAsync() Task IInternalSession.TryInitAndGetMetadataAsync() { + if (_initialized) + { + return Task.FromResult(_cluster.InternalMetadata); + } + ValidateState(); return _initTask; } void IInternalSession.TryInit() { - if (ValidateState()) + if (_initialized) { return; } + ValidateState(); TaskHelper.WaitToComplete(_initTask); } @@ -263,16 +271,10 @@ void IInternalSession.TryInit() /// Throws the initialization exception if the initialization failed. /// /// true if session is initialized, false otherwise - private bool ValidateState() + private void ValidateState() { var currentState = Interlocked.Read(ref _state); - if (currentState == Session.Initialized) - { - //It was already initialized - return true; - } - if (currentState == Session.Disposed) { throw new ObjectDisposedException("This session object has been disposed."); @@ -283,8 +285,6 @@ private bool ValidateState() //There was an exception that is not possible to recover from throw _cluster.InitException; } - - return false; } private async Task InitInternalAsync() @@ -315,6 +315,8 @@ private async Task InitInternalAsync() throw new ObjectDisposedException("Session instance was disposed before initialization finished."); } + _initialized = true; + return internalMetadata; } From f0725c10bbfcfc51ac5c02e94e8f8e70c96b9617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Thu, 2 Jul 2020 20:05:27 +0100 Subject: [PATCH 14/31] move protocoleventdebouncer and serializermanager to configuration --- src/Cassandra/Configuration.cs | 10 ++- .../Connections/Control/ControlConnection.cs | 68 +++++++-------- .../Control/ControlConnectionFactory.cs | 15 ++-- .../Control/IControlConnectionFactory.cs | 7 +- .../Connections/Control/IInternalMetadata.cs | 8 ++ .../Control/IProtocolVersionNegotiator.cs | 20 ++--- .../Connections/Control/InternalMetadata.cs | 85 ++++++++++--------- .../Control/ProtocolVersionNegotiator.cs | 24 +++--- src/Cassandra/Metadata.cs | 28 ++---- 9 files changed, 126 insertions(+), 139 deletions(-) diff --git a/src/Cassandra/Configuration.cs b/src/Cassandra/Configuration.cs index db5bc479f..8f28dc0e4 100644 --- a/src/Cassandra/Configuration.cs +++ b/src/Cassandra/Configuration.cs @@ -288,6 +288,8 @@ public class Configuration internal ILocalDatacenterProvider LocalDatacenterProvider { get; } + internal IProtocolEventDebouncer ProtocolEventDebouncer { get; } + internal Configuration() : this(policies: Policies.DefaultPolicies, protocolOptions: new ProtocolOptions(), @@ -367,7 +369,8 @@ internal Configuration(Policies policies, IProtocolVersionNegotiator protocolVersionNegotiator = null, IServerEventsSubscriber serverEventsSubscriber = null, ILocalDatacenterProvider localDatacenterProvider = null, - ISerializerManager serializerManager = null) + ISerializerManager serializerManager = null, + IProtocolEventDebouncer protocolEventDebouncer = null) { AddressTranslator = addressTranslator ?? throw new ArgumentNullException(nameof(addressTranslator)); QueryOptions = queryOptions ?? throw new ArgumentNullException(nameof(queryOptions)); @@ -440,6 +443,11 @@ internal Configuration(Policies policies, } SerializerManager = serializerManager ?? new SerializerManager(protocolVersion, TypeSerializers); + + ProtocolEventDebouncer = protocolEventDebouncer ?? new ProtocolEventDebouncer( + TimerFactory, + TimeSpan.FromMilliseconds(MetadataSyncOptions.RefreshSchemaDelayIncrement), + TimeSpan.FromMilliseconds(MetadataSyncOptions.MaxTotalRefreshSchemaDelay)); } /// diff --git a/src/Cassandra/Connections/Control/ControlConnection.cs b/src/Cassandra/Connections/Control/ControlConnection.cs index 6e9b08cf5..6890561ec 100644 --- a/src/Cassandra/Connections/Control/ControlConnection.cs +++ b/src/Cassandra/Connections/Control/ControlConnection.cs @@ -22,9 +22,9 @@ using System.Net.Sockets; using System.Threading; using System.Threading.Tasks; + using Cassandra.ProtocolEvents; using Cassandra.Responses; -using Cassandra.Serialization; using Cassandra.SessionManagement; using Cassandra.Tasks; @@ -34,27 +34,26 @@ internal class ControlConnection : IControlConnection { private readonly IInternalCluster _cluster; private readonly IInternalMetadata _internalMetadata; - private volatile Host _host; - private volatile IConnectionEndPoint _currentConnectionEndPoint; - private volatile IConnection _connection; + private readonly IEnumerable _contactPoints; + private readonly ITopologyRefresher _topologyRefresher; + private readonly ISupportedOptionsInitializer _supportedOptionsInitializer; + private readonly Configuration _config; + private readonly IReconnectionPolicy _reconnectionPolicy; + private readonly Timer _reconnectionTimer; internal static readonly Logger Logger = new Logger(typeof(ControlConnection)); - private readonly Configuration _config; - private readonly IReconnectionPolicy _reconnectionPolicy; private IReconnectionSchedule _reconnectionSchedule; - private readonly Timer _reconnectionTimer; private long _isShutdown; private int _refreshFlag; private Task _reconnectTask; - private readonly ISerializerManager _serializer; - private readonly IProtocolEventDebouncer _eventDebouncer; - private readonly IEnumerable _contactPoints; - private readonly ITopologyRefresher _topologyRefresher; - private readonly ISupportedOptionsInitializer _supportedOptionsInitializer; + + private volatile Host _host; + private volatile IConnectionEndPoint _currentConnectionEndPoint; + private volatile IConnection _connection; private bool IsShutdown => Interlocked.Read(ref _isShutdown) > 0L; - + /// public Host Host { @@ -68,8 +67,6 @@ public Host Host internal ControlConnection( IInternalCluster cluster, - IProtocolEventDebouncer eventDebouncer, - ISerializerManager serializerManager, Configuration config, IInternalMetadata internalMetadata, IEnumerable contactPoints) @@ -80,11 +77,9 @@ internal ControlConnection( _reconnectionSchedule = _reconnectionPolicy.NewSchedule(); _reconnectionTimer = new Timer(ReconnectEventHandler, null, Timeout.Infinite, Timeout.Infinite); _config = config; - _serializer = serializerManager; - _eventDebouncer = eventDebouncer; _contactPoints = contactPoints; - _topologyRefresher = config.TopologyRefresherFactory.Create(internalMetadata, config); - _supportedOptionsInitializer = config.SupportedOptionsInitializerFactory.Create(internalMetadata); + _topologyRefresher = config.TopologyRefresherFactory.Create(_internalMetadata, config); + _supportedOptionsInitializer = config.SupportedOptionsInitializerFactory.Create(_internalMetadata); if (!_config.KeepContactPointsUnresolved) { @@ -277,10 +272,10 @@ private async Task Connect(bool isInitializing) foreach (var endPoint in endPoints) { ControlConnection.Logger.Verbose("Attempting to connect to {0}.", endPoint.EndpointFriendlyName); - var connection = _config.ConnectionFactory.CreateUnobserved(_serializer.GetCurrentSerializer(), endPoint, _config); + var connection = _config.ConnectionFactory.CreateUnobserved(_config.SerializerManager.GetCurrentSerializer(), endPoint, _config); try { - var version = _serializer.CurrentProtocolVersion; + var version = _config.SerializerManager.CurrentProtocolVersion; try { await connection.Open().ConfigureAwait(false); @@ -300,7 +295,6 @@ private async Task Connect(bool isInitializing) connection = await _config.ProtocolVersionNegotiator.ChangeProtocolVersion( _config, - _serializer, ex.ResponseProtocolVersion, connection, ex, @@ -324,7 +318,7 @@ await _config.ProtocolVersionNegotiator.ChangeProtocolVersion( ControlConnection.Logger.Info( "Connection established to {0} using protocol version {1}.", connection.EndPoint.EndpointFriendlyName, - _serializer.CurrentProtocolVersion.ToString("D")); + _config.SerializerManager.CurrentProtocolVersion.ToString("D")); if (isInitializing) { @@ -332,14 +326,14 @@ await _config.ProtocolVersionNegotiator.ChangeProtocolVersion( } var currentHost = await _topologyRefresher.RefreshNodeListAsync( - endPoint, connection, _serializer.GetCurrentSerializer()).ConfigureAwait(false); + endPoint, connection, _config.SerializerManager.GetCurrentSerializer()).ConfigureAwait(false); SetCurrentConnection(currentHost, endPoint); if (isInitializing) { await _config.ProtocolVersionNegotiator.NegotiateVersionAsync( - _config, _internalMetadata, connection, _serializer).ConfigureAwait(false); + _config, _internalMetadata, connection).ConfigureAwait(false); } await _config.ServerEventsSubscriber.SubscribeToServerEvents(connection, OnConnectionCassandraEvent).ConfigureAwait(false); @@ -467,8 +461,8 @@ private async Task Refresh() { var currentEndPoint = _currentConnectionEndPoint; var currentHost = await _topologyRefresher.RefreshNodeListAsync( - currentEndPoint, _connection, _serializer.GetCurrentSerializer()).ConfigureAwait(false); - + currentEndPoint, _connection, _config.SerializerManager.GetCurrentSerializer()).ConfigureAwait(false); + SetCurrentConnection(currentHost, currentEndPoint); await _internalMetadata.RebuildTokenMapAsync(false, _config.MetadataSyncOptions.MetadataSyncEnabled).ConfigureAwait(false); @@ -662,7 +656,7 @@ public async Task SendQueryRequestAsync(string cqlQuery, bool retry, Q try { response = await _config.MetadataRequestHandler.SendMetadataRequestAsync( - _connection, _serializer.GetCurrentSerializer(), cqlQuery, queryProtocolOptions).ConfigureAwait(false); + _connection, _config.SerializerManager.GetCurrentSerializer(), cqlQuery, queryProtocolOptions).ConfigureAwait(false); } catch (SocketException) { @@ -684,7 +678,7 @@ public async Task SendQueryRequestAsync(string cqlQuery, bool retry, Q public Task UnsafeSendQueryRequestAsync(string cqlQuery, QueryProtocolOptions queryProtocolOptions) { return _config.MetadataRequestHandler.UnsafeSendQueryRequestAsync( - _connection, _serializer.GetCurrentSerializer(), cqlQuery, queryProtocolOptions); + _connection, _config.SerializerManager.GetCurrentSerializer(), cqlQuery, queryProtocolOptions); } /// @@ -714,7 +708,7 @@ public async Task HandleKeyspaceRefreshLaterAsync(string keyspace) { await _internalMetadata.RefreshSingleKeyspaceAsync(keyspace).ConfigureAwait(false); }); - await _eventDebouncer.HandleEventAsync(@event, false).ConfigureAwait(false); + await _config.ProtocolEventDebouncer.HandleEventAsync(@event, false).ConfigureAwait(false); } /// @@ -722,21 +716,21 @@ public Task ScheduleKeyspaceRefreshAsync(string keyspace, bool processNow) { var @event = new KeyspaceProtocolEvent(true, keyspace, () => _internalMetadata.RefreshSingleKeyspaceAsync(keyspace)); return processNow - ? _eventDebouncer.HandleEventAsync(@event, true) - : _eventDebouncer.ScheduleEventAsync(@event, false); + ? _config.ProtocolEventDebouncer.HandleEventAsync(@event, true) + : _config.ProtocolEventDebouncer.ScheduleEventAsync(@event, false); } private Task ScheduleObjectRefreshAsync(string keyspace, bool processNow, Func handler) { var @event = new KeyspaceProtocolEvent(false, keyspace, handler); return processNow - ? _eventDebouncer.HandleEventAsync(@event, true) - : _eventDebouncer.ScheduleEventAsync(@event, false); + ? _config.ProtocolEventDebouncer.HandleEventAsync(@event, true) + : _config.ProtocolEventDebouncer.ScheduleEventAsync(@event, false); } private Task ScheduleHostsRefreshAsync() { - return _eventDebouncer.ScheduleEventAsync(new ProtocolEvent(Refresh), false); + return _config.ProtocolEventDebouncer.ScheduleEventAsync(new ProtocolEvent(Refresh), false); } /// @@ -744,8 +738,8 @@ public Task ScheduleAllKeyspacesRefreshAsync(bool processNow) { var @event = new ProtocolEvent(() => _internalMetadata.RebuildTokenMapAsync(false, true)); return processNow - ? _eventDebouncer.HandleEventAsync(@event, true) - : _eventDebouncer.ScheduleEventAsync(@event, false); + ? _config.ProtocolEventDebouncer.HandleEventAsync(@event, true) + : _config.ProtocolEventDebouncer.ScheduleEventAsync(@event, false); } } } \ No newline at end of file diff --git a/src/Cassandra/Connections/Control/ControlConnectionFactory.cs b/src/Cassandra/Connections/Control/ControlConnectionFactory.cs index 1f43b08d7..37b6f0196 100644 --- a/src/Cassandra/Connections/Control/ControlConnectionFactory.cs +++ b/src/Cassandra/Connections/Control/ControlConnectionFactory.cs @@ -15,8 +15,7 @@ // using System.Collections.Generic; -using Cassandra.ProtocolEvents; -using Cassandra.Serialization; + using Cassandra.SessionManagement; namespace Cassandra.Connections.Control @@ -25,18 +24,14 @@ internal class ControlConnectionFactory : IControlConnectionFactory { public IControlConnection Create( IInternalCluster cluster, - IProtocolEventDebouncer protocolEventDebouncer, - ISerializerManager serializerManager, - Configuration config, - IInternalMetadata metadata, + Configuration config, + IInternalMetadata internalMetadata, IEnumerable contactPoints) { return new ControlConnection( cluster, - protocolEventDebouncer, - serializerManager, - config, - metadata, + config, + internalMetadata, contactPoints); } } diff --git a/src/Cassandra/Connections/Control/IControlConnectionFactory.cs b/src/Cassandra/Connections/Control/IControlConnectionFactory.cs index a501f03d2..1a7b0bc56 100644 --- a/src/Cassandra/Connections/Control/IControlConnectionFactory.cs +++ b/src/Cassandra/Connections/Control/IControlConnectionFactory.cs @@ -15,8 +15,7 @@ // using System.Collections.Generic; -using Cassandra.ProtocolEvents; -using Cassandra.Serialization; + using Cassandra.SessionManagement; namespace Cassandra.Connections.Control @@ -25,9 +24,7 @@ internal interface IControlConnectionFactory { IControlConnection Create( IInternalCluster cluster, - IProtocolEventDebouncer protocolEventDebouncer, - ISerializerManager serializerManager, - Configuration config, + Configuration config, IInternalMetadata internalMetadata, IEnumerable contactPoints); } diff --git a/src/Cassandra/Connections/Control/IInternalMetadata.cs b/src/Cassandra/Connections/Control/IInternalMetadata.cs index 8b6cbae88..5fbb92029 100644 --- a/src/Cassandra/Connections/Control/IInternalMetadata.cs +++ b/src/Cassandra/Connections/Control/IInternalMetadata.cs @@ -24,6 +24,14 @@ namespace Cassandra.Connections.Control { internal interface IInternalMetadata { + event HostsEventHandler HostsEvent; + + event SchemaChangedEventHandler SchemaChangedEvent; + + event Action HostAdded; + + event Action HostRemoved; + /// /// Gets the configuration associated with this instance. /// diff --git a/src/Cassandra/Connections/Control/IProtocolVersionNegotiator.cs b/src/Cassandra/Connections/Control/IProtocolVersionNegotiator.cs index 41c26db50..023208b63 100644 --- a/src/Cassandra/Connections/Control/IProtocolVersionNegotiator.cs +++ b/src/Cassandra/Connections/Control/IProtocolVersionNegotiator.cs @@ -1,12 +1,12 @@ -// +// // Copyright (C) DataStax Inc. -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -14,21 +14,19 @@ // limitations under the License. using System.Threading.Tasks; -using Cassandra.Serialization; namespace Cassandra.Connections.Control { internal interface IProtocolVersionNegotiator { Task ChangeProtocolVersion( - Configuration config, - ISerializerManager serializer, - ProtocolVersion nextVersion, - IConnection previousConnection, + Configuration config, + ProtocolVersion nextVersion, + IConnection previousConnection, UnsupportedProtocolVersionException ex = null, ProtocolVersion? previousVersion = null); - + Task NegotiateVersionAsync( - Configuration config, IInternalMetadata internalMetadata, IConnection connection, ISerializerManager serializer); + Configuration config, IInternalMetadata internalMetadata, IConnection connection); } } \ No newline at end of file diff --git a/src/Cassandra/Connections/Control/InternalMetadata.cs b/src/Cassandra/Connections/Control/InternalMetadata.cs index 0a0d4fa8a..d62336fd7 100644 --- a/src/Cassandra/Connections/Control/InternalMetadata.cs +++ b/src/Cassandra/Connections/Control/InternalMetadata.cs @@ -22,7 +22,6 @@ using Cassandra.Collections; using Cassandra.MetadataHelpers; -using Cassandra.ProtocolEvents; using Cassandra.Requests; using Cassandra.Serialization; using Cassandra.SessionManagement; @@ -36,15 +35,16 @@ internal class InternalMetadata : IInternalMetadata private static readonly Logger Logger = new Logger(typeof(ControlConnection)); - private readonly Metadata _parent; - private readonly IProtocolEventDebouncer _protocolEventDebouncer; - private volatile TokenMap _tokenMap; + private volatile ConcurrentDictionary _keyspaces = new ConcurrentDictionary(); + private volatile ISchemaParser _schemaParser; + private volatile CopyOnWriteDictionary> _resolvedContactPoints = new CopyOnWriteDictionary>(); + private volatile bool _isDbaas = false; private volatile string _clusterName; private volatile string _partitioner; @@ -74,44 +74,50 @@ public IReadOnlyDictionary> Reso public ProtocolVersion ProtocolVersion => SerializerManager.CurrentProtocolVersion; + public event HostsEventHandler HostsEvent; + + public event SchemaChangedEventHandler SchemaChangedEvent; + + public event Action HostAdded; + + public event Action HostRemoved; + internal InternalMetadata( IInternalCluster cluster, - Metadata parent, Configuration configuration, - ISerializerManager serializerManager, - IEnumerable parsedContactPoints) + IEnumerable parsedContactPoints, + SchemaParser schemaParser = null) { - _parent = parent; - SerializerManager = serializerManager; + SerializerManager = configuration.SerializerManager; Configuration = configuration; Hosts = new Hosts(); - _protocolEventDebouncer = new ProtocolEventDebouncer( - configuration.TimerFactory, - TimeSpan.FromMilliseconds(configuration.MetadataSyncOptions.RefreshSchemaDelayIncrement), - TimeSpan.FromMilliseconds(configuration.MetadataSyncOptions.MaxTotalRefreshSchemaDelay)); - ControlConnection = configuration.ControlConnectionFactory.Create( cluster, - _protocolEventDebouncer, - SerializerManager, Configuration, this, parsedContactPoints); Hosts.Down += OnHostDown; Hosts.Up += OnHostUp; - } + _schemaParser = schemaParser; + } + internal InternalMetadata( - IInternalCluster cluster, - Metadata parent, + IControlConnection cc, Configuration configuration, - ISerializerManager serializerManager, - IEnumerable contactPoints, - SchemaParser schemaParser) - : this(cluster, parent, configuration, serializerManager, contactPoints) + SchemaParser schemaParser = null) { + SerializerManager = configuration.SerializerManager; + Configuration = configuration; + Hosts = new Hosts(); + + ControlConnection = cc; + + Hosts.Down += OnHostDown; + Hosts.Up += OnHostUp; + _schemaParser = schemaParser; } @@ -123,26 +129,16 @@ public Task InitAsync() public Task ShutdownAsync() { ControlConnection.Dispose(); - return _protocolEventDebouncer.ShutdownAsync(); + return Configuration.ProtocolEventDebouncer.ShutdownAsync(); } public void SetResolvedContactPoints( IDictionary> resolvedContactPoints) { - _resolvedContactPoints = + _resolvedContactPoints = new CopyOnWriteDictionary>(resolvedContactPoints); } - public void OnHostRemoved(Host h) - { - _parent.OnHostRemoved(h); - } - - public void OnHostAdded(Host h) - { - _parent.OnHostAdded(h); - } - public Host GetHost(IPEndPoint address) { return Hosts.TryGet(address, out var host) ? host : null; @@ -163,19 +159,29 @@ public void RemoveHost(IPEndPoint address) Hosts.RemoveIfExists(address); } + public void OnHostRemoved(Host h) + { + HostRemoved?.Invoke(h); + } + + public void OnHostAdded(Host h) + { + HostAdded?.Invoke(h); + } + public void FireSchemaChangedEvent(SchemaChangedEventArgs.Kind what, string keyspace, string table, object sender = null) { - _parent.FireSchemaChangedEvent(what, keyspace, table, sender); + SchemaChangedEvent?.Invoke(sender ?? this, new SchemaChangedEventArgs { Keyspace = keyspace, What = what, Table = table }); } public void OnHostDown(Host h) { - _parent.OnHostDown(h); + HostsEvent?.Invoke(this, new HostsEventArgs { Address = h.Address, What = HostsEventArgs.Kind.Down }); } public void OnHostUp(Host h) { - _parent.OnHostUp(h); + HostsEvent?.Invoke(h, new HostsEventArgs { Address = h.Address, What = HostsEventArgs.Kind.Up }); } /// @@ -683,7 +689,8 @@ public void SetPartitioner(string partitioner) _partitioner = partitioner; } - public IEnumerable UpdateResolvedContactPoint(IContactPoint contactPoint, IEnumerable endpoints) + public IEnumerable UpdateResolvedContactPoint( + IContactPoint contactPoint, IEnumerable endpoints) { return _resolvedContactPoints.AddOrUpdate(contactPoint, _ => endpoints, (_, __) => endpoints); } diff --git a/src/Cassandra/Connections/Control/ProtocolVersionNegotiator.cs b/src/Cassandra/Connections/Control/ProtocolVersionNegotiator.cs index 2e2127d49..00c255f49 100644 --- a/src/Cassandra/Connections/Control/ProtocolVersionNegotiator.cs +++ b/src/Cassandra/Connections/Control/ProtocolVersionNegotiator.cs @@ -1,12 +1,12 @@ -// +// // Copyright (C) DataStax Inc. -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -14,7 +14,6 @@ // limitations under the License. using System.Threading.Tasks; -using Cassandra.Serialization; namespace Cassandra.Connections.Control { @@ -23,15 +22,15 @@ internal class ProtocolVersionNegotiator : IProtocolVersionNegotiator public async Task NegotiateVersionAsync( Configuration config, IInternalMetadata internalMetadata, - IConnection connection, - ISerializerManager serializer) + IConnection connection) { - var commonVersion = serializer.CurrentProtocolVersion.GetHighestCommon(config.AllowBetaProtocolVersions, internalMetadata.Hosts); - if (commonVersion != serializer.CurrentProtocolVersion) + var commonVersion = config.SerializerManager.CurrentProtocolVersion.GetHighestCommon( + config.AllowBetaProtocolVersions, internalMetadata.Hosts); + if (commonVersion != config.SerializerManager.CurrentProtocolVersion) { // Current connection will be closed and reopened connection = await ChangeProtocolVersion( - config, serializer, commonVersion, connection).ConfigureAwait(false); + config, commonVersion, connection).ConfigureAwait(false); } return connection; @@ -39,7 +38,6 @@ public async Task NegotiateVersionAsync( public async Task ChangeProtocolVersion( Configuration config, - ISerializerManager serializer, ProtocolVersion nextVersion, IConnection previousConnection, UnsupportedProtocolVersionException ex = null, @@ -66,12 +64,12 @@ public async Task ChangeProtocolVersion( ? $"{ex.Message}, trying with version {nextVersion:D}" : $"Changing protocol version to {nextVersion:D}"); - serializer.ChangeProtocolVersion(nextVersion); + config.SerializerManager.ChangeProtocolVersion(nextVersion); previousConnection.Dispose(); var c = config.ConnectionFactory.CreateUnobserved( - serializer.GetCurrentSerializer(), + config.SerializerManager.GetCurrentSerializer(), previousConnection.EndPoint, config); try diff --git a/src/Cassandra/Metadata.cs b/src/Cassandra/Metadata.cs index 14c3b0fc5..0df0eb246 100644 --- a/src/Cassandra/Metadata.cs +++ b/src/Cassandra/Metadata.cs @@ -21,8 +21,6 @@ using System.Threading.Tasks; using Cassandra.Connections.Control; -using Cassandra.Serialization; -using Cassandra.SessionManagement; using Cassandra.Tasks; namespace Cassandra @@ -44,28 +42,12 @@ internal class Metadata : IMetadata internal IInternalMetadata InternalMetadata { get; } - internal Metadata( - IInternalCluster cluster, - Configuration configuration, - ISerializerManager serializerManager, - IEnumerable parsedContactPoints) + internal Metadata(IInternalMetadata internalMetadata) { - _queryAbortTimeout = configuration.DefaultRequestOptions.QueryAbortTimeout; - Configuration = configuration; - InternalMetadata = new InternalMetadata(cluster, this, configuration, serializerManager, parsedContactPoints); - } - - internal Metadata( - IInternalCluster cluster, - Configuration configuration, - ISerializerManager serializerManager, - IEnumerable parsedContactPoints, - SchemaParser schemaParser) - { - _queryAbortTimeout = configuration.DefaultRequestOptions.QueryAbortTimeout; - Configuration = configuration; - InternalMetadata = new InternalMetadata( - cluster, this, configuration, serializerManager, parsedContactPoints, schemaParser); + Configuration = internalMetadata.Configuration; + _queryAbortTimeout = Configuration.DefaultRequestOptions.QueryAbortTimeout; + Configuration = Configuration; + InternalMetadata = internalMetadata; } public Configuration Configuration { get; } From 08a6abff40677b4334beff9ca435526b219b5f8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Thu, 2 Jul 2020 20:05:46 +0100 Subject: [PATCH 15/31] add event forwarding between internalmetadata and metadata --- src/Cassandra/Metadata.cs | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/Cassandra/Metadata.cs b/src/Cassandra/Metadata.cs index 0df0eb246..09bf16bc0 100644 --- a/src/Cassandra/Metadata.cs +++ b/src/Cassandra/Metadata.cs @@ -239,7 +239,7 @@ public async Task GetMaterializedViewAsync(string keys await TryInitializeAsync().ConfigureAwait(false); return await InternalMetadata.GetMaterializedViewAsync(keyspace, name).ConfigureAwait(false); } - + /// public UdtColumnInfo GetUdtDefinition(string keyspace, string typeName) { @@ -341,6 +341,8 @@ private Task InitializeAsync() private async Task InitializeInternalAsync() { await InternalMetadata.InitAsync().ConfigureAwait(false); + SetupEventForwarding(InternalMetadata); + var previousState = Interlocked.CompareExchange(ref _state, Metadata.Initialized, Metadata.Initializing); if (previousState == Metadata.Disposed) { @@ -363,29 +365,32 @@ internal async Task ShutdownAsync() await InternalMetadata.ShutdownAsync().ConfigureAwait(false); } - internal void OnHostRemoved(Host h) + private void OnInternalHostRemoved(Host h) { HostRemoved?.Invoke(h); } - internal void OnHostAdded(Host h) + private void OnInternalHostAdded(Host h) { HostAdded?.Invoke(h); } - internal void FireSchemaChangedEvent(SchemaChangedEventArgs.Kind what, string keyspace, string table, object sender = null) + private void OnInternalHostsEvent(object sender, HostsEventArgs args) { - SchemaChangedEvent?.Invoke(sender ?? this, new SchemaChangedEventArgs { Keyspace = keyspace, What = what, Table = table }); + HostsEvent?.Invoke(sender, args); } - internal void OnHostDown(Host h) + private void OnInternalSchemaChangedEvent(object sender, SchemaChangedEventArgs args) { - HostsEvent?.Invoke(this, new HostsEventArgs { Address = h.Address, What = HostsEventArgs.Kind.Down }); + SchemaChangedEvent?.Invoke(sender, args); } - internal void OnHostUp(Host h) + private void SetupEventForwarding(IInternalMetadata internalMetadata) { - HostsEvent?.Invoke(h, new HostsEventArgs { Address = h.Address, What = HostsEventArgs.Kind.Up }); + internalMetadata.HostAdded += OnInternalHostAdded; + internalMetadata.HostRemoved += OnInternalHostRemoved; + internalMetadata.HostsEvent += OnInternalHostsEvent; + internalMetadata.SchemaChangedEvent += OnInternalSchemaChangedEvent; } } } \ No newline at end of file From f90006c11f0d34a3eacfe91c09ca9d976ef44450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Thu, 2 Jul 2020 20:06:00 +0100 Subject: [PATCH 16/31] fix tests compilation errors --- .../Core/ClientTimeoutTests.cs | 2 +- .../Core/ClientWarningsTests.cs | 4 +- .../Core/ClusterPeersV2SimulacronTests.cs | 12 +- .../Core/ClusterSimulacronTests.cs | 20 +- .../Core/ConnectionSimulacronTests.cs | 46 +-- .../Core/ControlConnectionSimulatorTests.cs | 4 +- .../Core/ControlConnectionTests.cs | 37 +-- .../Core/HeartbeatTests.cs | 2 +- .../Core/MetadataTests.cs | 34 ++- .../Core/PoolTests.cs | 10 +- .../Core/PrepareLongTests.cs | 2 +- .../Core/PrepareSimulatorTests.cs | 30 +- .../Core/PreparedStatementsTests.cs | 17 +- .../Core/ReconnectionTests.cs | 24 +- .../Core/SchemaMetadataTests.cs | 2 +- .../Core/SessionStateTests.cs | 12 +- .../Core/SessionTests.cs | 47 ++- .../Core/SpeculativeExecutionLongTests.cs | 63 ++-- .../Core/SpeculativeExecutionShortTests.cs | 25 +- .../Core/TypeSerializersTests.cs | 5 +- .../Core/UdfTests.cs | 15 +- .../DataStax/Cloud/CloudIntegrationTests.cs | 10 +- .../Linq/LinqMethods/Delete.cs | 2 +- .../TokenMapSchemaChangeMetadataSyncTests.cs | 78 ++--- .../TokenMapSchemaChangeTests.cs | 41 +-- .../TokenMapTopologyChangeTests.cs | 33 +- .../Metrics/MetricsTests.cs | 19 +- .../Tests/LoadBalancingPolicyShortTests.cs | 4 +- .../Policies/Tests/RetryPolicyShortTests.cs | 12 +- .../TokenAwareTransientReplicationTests.cs | 2 +- .../SharedCloudClusterTest.cs | 5 +- .../SharedClusterTest.cs | 9 +- .../SimulacronTest.cs | 10 +- .../TestBase/TestUtils.cs | 14 +- src/Cassandra.Tests/BuilderTests.cs | 2 +- .../Control/ControlConnectionTests.cs | 25 +- .../Control/TopologyRefresherTests.cs | 12 +- .../Connections/HostConnectionPoolTests.cs | 4 +- .../FakeControlConnectionFactory.cs | 4 +- .../TestHelpers/FakeInternalMetadata.cs | 289 ++++++++++++++++++ .../Connections/TestHelpers/FakeMetadata.cs | 257 ++++++++++++++++ .../FakeProtocolVersionNegotiator.cs | 13 +- .../TestHelpers/FakeTopologyRefresher.cs | 2 +- .../HostConnectionPoolTests.cs | 2 +- .../Mapping/Linq/LinqCreateTableUnitTests.cs | 6 +- .../Mapping/MappingTestBase.cs | 3 - .../TestHelpers/FakeSchemaParser.cs | 3 +- .../Policies/DefaultLoadBalancingTests.cs | 10 +- src/Cassandra.Tests/PoliciesUnitTests.cs | 228 +++++++------- .../RequestHandlerMockTests.cs | 27 +- src/Cassandra.Tests/SchemaParserTests.cs | 39 ++- src/Cassandra.Tests/SessionTests.cs | 7 +- src/Cassandra.Tests/StatementTests.cs | 16 +- src/Cassandra.Tests/TokenTests.cs | 79 ++--- 54 files changed, 1128 insertions(+), 552 deletions(-) create mode 100644 src/Cassandra.Tests/Connections/TestHelpers/FakeInternalMetadata.cs create mode 100644 src/Cassandra.Tests/Connections/TestHelpers/FakeMetadata.cs diff --git a/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs b/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs index c9d71fb58..a184ca40c 100644 --- a/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs +++ b/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs @@ -206,7 +206,7 @@ public void Should_Use_Statement_ReadTimeout() var queryOptions = new QueryOptions().SetRetryOnTimeout(false); var builder = ClusterBuilder().AddContactPoint(_testCluster.InitialContactPoint) .WithSocketOptions(socketOptions) - .WithPoolingOptions(PoolingOptions.Get().SetHeartBeatInterval(0)) + .WithPoolingOptions(PoolingOptions.Create().SetHeartBeatInterval(0)) .WithQueryTimeout(Timeout.Infinite) .WithQueryOptions(queryOptions); using (var cluster = builder.Build()) diff --git a/src/Cassandra.IntegrationTests/Core/ClientWarningsTests.cs b/src/Cassandra.IntegrationTests/Core/ClientWarningsTests.cs index 574e1172b..20dcde097 100644 --- a/src/Cassandra.IntegrationTests/Core/ClientWarningsTests.cs +++ b/src/Cassandra.IntegrationTests/Core/ClientWarningsTests.cs @@ -68,13 +68,13 @@ public void Should_QueryTrace_When_Enabled() { var rs = Session.Execute(new SimpleStatement("SELECT * from system.local").EnableTracing()); Assert.NotNull(rs.Info.QueryTrace); - var hosts = Session.Cluster.AllHosts(); + var hosts = Session.Cluster.Metadata.AllHosts(); Assert.NotNull(hosts); var coordinator = hosts.FirstOrDefault(); Assert.NotNull(coordinator); Assert.AreEqual(coordinator.Address.Address, rs.Info.QueryTrace.Coordinator); Assert.Greater(rs.Info.QueryTrace.Events.Count, 0); - if (Session.BinaryProtocolVersion >= 4) + if (Session.Cluster.Metadata.GetClusterDescription().ProtocolVersion >= ProtocolVersion.V4) { Assert.NotNull(rs.Info.QueryTrace.ClientAddress); } diff --git a/src/Cassandra.IntegrationTests/Core/ClusterPeersV2SimulacronTests.cs b/src/Cassandra.IntegrationTests/Core/ClusterPeersV2SimulacronTests.cs index 803dc5f47..66050d913 100644 --- a/src/Cassandra.IntegrationTests/Core/ClusterPeersV2SimulacronTests.cs +++ b/src/Cassandra.IntegrationTests/Core/ClusterPeersV2SimulacronTests.cs @@ -36,10 +36,10 @@ public void Should_SendRequestsToAllHosts_When_PeersOnSameAddress() { const string query = "SELECT * FROM ks.table"; - Assert.AreEqual(3, Session.Cluster.AllHosts().Count); - Assert.IsTrue(Session.Cluster.AllHosts().All(h => h.IsUp)); - Assert.AreEqual(1, Session.Cluster.AllHosts().Select(h => h.Address.Address).Distinct().Count()); - Assert.AreEqual(3, Session.Cluster.AllHosts().Select(h => h.Address.Port).Distinct().Count()); + Assert.AreEqual(3, Session.Cluster.Metadata.AllHosts().Count); + Assert.IsTrue(Session.Cluster.Metadata.AllHosts().All(h => h.IsUp)); + Assert.AreEqual(1, Session.Cluster.Metadata.AllHosts().Select(h => h.Address.Address).Distinct().Count()); + Assert.AreEqual(3, Session.Cluster.Metadata.AllHosts().Select(h => h.Address.Port).Distinct().Count()); foreach (var i in Enumerable.Range(0, 10)) { @@ -47,8 +47,8 @@ public void Should_SendRequestsToAllHosts_When_PeersOnSameAddress() Session.Execute(query); } - Assert.AreEqual(3, Session.Cluster.AllHosts().Count); - Assert.IsTrue(Session.Cluster.AllHosts().All(h => h.IsUp)); + Assert.AreEqual(3, Session.Cluster.Metadata.AllHosts().Count); + Assert.IsTrue(Session.Cluster.Metadata.AllHosts().All(h => h.IsUp)); var queriesByNode = TestCluster.GetNodes().Select(n => n.GetQueries(query, QueryType.Query)); Assert.IsTrue(queriesByNode.All(queries => queries.Count >= 1)); diff --git a/src/Cassandra.IntegrationTests/Core/ClusterSimulacronTests.cs b/src/Cassandra.IntegrationTests/Core/ClusterSimulacronTests.cs index 50b88d7b1..7d1b5d041 100644 --- a/src/Cassandra.IntegrationTests/Core/ClusterSimulacronTests.cs +++ b/src/Cassandra.IntegrationTests/Core/ClusterSimulacronTests.cs @@ -55,26 +55,28 @@ public async Task Cluster_Should_StopSendingPeersV2Requests_When_InvalidQueryIsT var peersV2Queries = TestCluster.GetQueries("SELECT * FROM system.peers_v2"); var peersQueries = TestCluster.GetQueries("SELECT * FROM system.peers"); - await TestCluster.GetNode(Session.Cluster.Metadata.ControlConnection.Host.Address).Stop().ConfigureAwait(false); + await TestCluster.GetNode(InternalSession.InternalCluster.InternalMetadata.ControlConnection.Host.Address) + .Stop().ConfigureAwait(false); // wait until control connection reconnection is done TestHelper.RetryAssert( () => { - Assert.AreEqual(1, Session.Cluster.AllHosts().Count(h => !h.IsUp)); - Assert.IsTrue(Session.Cluster.Metadata.ControlConnection.Host.IsUp); + Assert.AreEqual(1, Session.Cluster.Metadata.AllHosts().Count(h => !h.IsUp)); + Assert.IsTrue(InternalSession.InternalCluster.InternalMetadata.ControlConnection.Host.IsUp); }, 200, 100); - await TestCluster.GetNode(Session.Cluster.Metadata.ControlConnection.Host.Address).Stop().ConfigureAwait(false); + await TestCluster.GetNode(InternalSession.InternalCluster.InternalMetadata.ControlConnection.Host.Address) + .Stop().ConfigureAwait(false); // wait until control connection reconnection is done TestHelper.RetryAssert( () => { - Assert.AreEqual(2, Session.Cluster.AllHosts().Count(h => !h.IsUp)); - Assert.IsTrue(Session.Cluster.Metadata.ControlConnection.Host.IsUp); + Assert.AreEqual(2, Session.Cluster.Metadata.AllHosts().Count(h => !h.IsUp)); + Assert.IsTrue(InternalSession.InternalCluster.InternalMetadata.ControlConnection.Host.IsUp); }, 200, 100); @@ -125,7 +127,7 @@ public void Should_Try_To_Resolve_And_Continue_With_The_Next_Contact_Point_If_It { var session = cluster.Connect(); session.Execute("select * from system.local"); - Assert.That(cluster.AllHosts().Count, Is.EqualTo(3)); + Assert.That(cluster.Metadata.AllHosts().Count, Is.EqualTo(3)); } } @@ -206,8 +208,8 @@ public void Cluster_Should_Resolve_Names() { cluster.Connect("system"); Assert.IsTrue( - cluster.AllHosts().Any(h => addressList.Contains(h.Address.Address)), - string.Join(";", cluster.AllHosts().Select(h => h.Address.ToString())) + " | " + TestCluster.InitialContactPoint.Address); + cluster.Metadata.AllHosts().Any(h => addressList.Contains(h.Address.Address)), + string.Join(";", cluster.Metadata.AllHosts().Select(h => h.Address.ToString())) + " | " + TestCluster.InitialContactPoint.Address); } catch (NoHostAvailableException ex) { diff --git a/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs b/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs index a66a67313..7c4e6ea06 100644 --- a/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs +++ b/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs @@ -51,9 +51,10 @@ public async Task Should_ThrowOperationTimedOut_When_ServerAppliesTcpBackPressur .SetStreamMode(streamMode) .SetDefunctReadTimeoutThreshold(int.MaxValue))); - var metadata = await Session.Cluster.GetMetadataAsync().ConfigureAwait(false); + var clusterDescription = await Session.Cluster.Metadata.GetClusterDescriptionAsync().ConfigureAwait(false); + var maxRequestsPerConnection = Session.Cluster.Configuration - .GetPoolingOptions(metadata.ProtocolVersion) + .GetOrCreatePoolingOptions(clusterDescription.ProtocolVersion) .GetMaxRequestsPerConnection(); var tenKbBuffer = new byte[10240]; @@ -61,7 +62,7 @@ public async Task Should_ThrowOperationTimedOut_When_ServerAppliesTcpBackPressur // send number of requests = max pending var requests = - Enumerable.Repeat(0, maxRequestsPerConnection * metadata.AllHosts().Count) + Enumerable.Repeat(0, maxRequestsPerConnection * Session.Cluster.Metadata.AllHosts().Count) .Select(i => Session.ExecuteAsync(new SimpleStatement("INSERT INTO table1 (id) VALUES (?)", tenKbBuffer))).ToList(); var taskAll = Task.WhenAll(requests); @@ -89,9 +90,6 @@ public async Task Should_ThrowOperationTimedOut_When_ServerAppliesTcpBackPressur [Test] public async Task Should_RetryOnNextNodes_When_ANodeIsPaused(bool streamMode) { - var metadata = await Session.Cluster.GetMetadataAsync().ConfigureAwait(false); - var pausedNode = TestCluster.GetNode(2); - SetupNewSession(b => b.WithPoolingOptions( new PoolingOptions() @@ -103,9 +101,12 @@ public async Task Should_RetryOnNextNodes_When_ANodeIsPaused(bool streamMode) .SetStreamMode(streamMode) .SetDefunctReadTimeoutThreshold(int.MaxValue))); + var clusterDescription = await Session.Cluster.Metadata.GetClusterDescriptionAsync().ConfigureAwait(false); + var pausedNode = TestCluster.GetNode(2); + var maxRequestsPerConnection = Session.Cluster.Configuration - .GetPoolingOptions(metadata.ProtocolVersion) + .GetOrCreatePoolingOptions(clusterDescription.ProtocolVersion) .GetMaxRequestsPerConnection(); var tenKbBuffer = new byte[10240]; @@ -114,7 +115,7 @@ public async Task Should_RetryOnNextNodes_When_ANodeIsPaused(bool streamMode) // send number of requests = max pending var requests = - Enumerable.Repeat(0, maxRequestsPerConnection * metadata.AllHosts().Count) + Enumerable.Repeat(0, maxRequestsPerConnection * Session.Cluster.Metadata.AllHosts().Count) .Select(i => Session.ExecuteAsync(new SimpleStatement("INSERT INTO table1 (id) VALUES (?)", tenKbBuffer))).ToList(); var pools = InternalSession.GetPools().ToList(); @@ -148,9 +149,6 @@ public async Task Should_RetryOnNextNodes_When_ANodeIsPaused(bool streamMode) [Test] public async Task Should_ContinueRoutingTrafficToNonPausedNodes_When_ANodeIsPaused(bool streamMode) { - var metadata = await Session.Cluster.GetMetadataAsync().ConfigureAwait(false); - var pausedNode = TestCluster.GetNode(2); - const string profileName = "running-nodes"; SetupNewSession(b => @@ -167,10 +165,13 @@ public async Task Should_ContinueRoutingTrafficToNonPausedNodes_When_ANodeIsPaus .WithLoadBalancingPolicy( new TestDisallowListLbp( Cassandra.Policies.NewDefaultLoadBalancingPolicy("dc1")))))); + + var clusterDescription = await Session.Cluster.Metadata.GetClusterDescriptionAsync().ConfigureAwait(false); + var pausedNode = TestCluster.GetNode(2); var maxRequestsPerConnection = Session.Cluster.Configuration - .GetPoolingOptions(metadata.ProtocolVersion) + .GetOrCreatePoolingOptions(clusterDescription.ProtocolVersion) .GetMaxRequestsPerConnection(); var tenKbBuffer = new byte[10240]; @@ -179,7 +180,7 @@ public async Task Should_ContinueRoutingTrafficToNonPausedNodes_When_ANodeIsPaus // send number of requests = max pending var requests = - Enumerable.Repeat(0, maxRequestsPerConnection * metadata.AllHosts().Count) + Enumerable.Repeat(0, maxRequestsPerConnection * Session.Cluster.Metadata.AllHosts().Count) .Select(i => Session.ExecuteAsync(new SimpleStatement("INSERT INTO table1 (id) VALUES (?)", tenKbBuffer))).ToList(); try @@ -236,7 +237,6 @@ public async Task Should_ContinueRoutingTrafficToNonPausedNodes_When_ANodeIsPaus [Test] public async Task Should_KeepOperationsInWriteQueue_When_ServerAppliesTcpBackPressure(bool streamMode) { - var metadata = await Session.Cluster.GetMetadataAsync().ConfigureAwait(false); SetupNewSession(b => b.WithPoolingOptions( new PoolingOptions() @@ -246,8 +246,10 @@ public async Task Should_KeepOperationsInWriteQueue_When_ServerAppliesTcpBackPre .SetReadTimeoutMillis(360000) .SetStreamMode(streamMode))); + var clusterDescription = await Session.Cluster.Metadata.GetClusterDescriptionAsync().ConfigureAwait(false); + var maxRequestsPerConnection = Session.Cluster.Configuration - .GetPoolingOptions(metadata.ProtocolVersion) + .GetOrCreatePoolingOptions(clusterDescription.ProtocolVersion) .GetMaxRequestsPerConnection(); var tenKbBuffer = new byte[10240]; @@ -300,7 +302,7 @@ public async Task Should_KeepOperationsInWriteQueue_When_ServerAppliesTcpBackPre Assert.Greater(moreFailedRequests.Count, 1); Assert.AreEqual(moreRequests.Count, moreFailedRequests.Count); - Assert.GreaterOrEqual(connections.Sum(c => c.InFlight), maxRequestsPerConnection * metadata.AllHosts().Count); + Assert.GreaterOrEqual(connections.Sum(c => c.InFlight), maxRequestsPerConnection * InternalSession.Cluster.Metadata.AllHosts().Count); // ReSharper disable once PossibleNullReferenceException Assert.IsTrue(moreFailedRequests.All(t => t.IsFaulted && ((NoHostAvailableException)t.Exception.InnerException).Errors.All(e => e.Value is BusyPoolException))); @@ -380,19 +382,19 @@ public TestDisallowListLbp(ILoadBalancingPolicy parent, params IPEndPoint[] disa _disallowed = disallowed; } - public void Initialize(ICluster cluster) + public Task InitializeAsync(IMetadata metadata) { - _parent.InitializeAsync(cluster); + return _parent.InitializeAsync(metadata); } - public HostDistance Distance(Host host) + public HostDistance Distance(IMetadata metadata, Host host) { - return _parent.Distance(host); + return _parent.Distance(metadata, host); } - public IEnumerable NewQueryPlan(string keyspace, IStatement query) + public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) { - var plan = _parent.NewQueryPlan(keyspace, query); + var plan = _parent.NewQueryPlan(metadata, keyspace, query); return plan.Where(h => !_disallowed.Contains(h.Address)); } } diff --git a/src/Cassandra.IntegrationTests/Core/ControlConnectionSimulatorTests.cs b/src/Cassandra.IntegrationTests/Core/ControlConnectionSimulatorTests.cs index d353703ce..fd3db1056 100644 --- a/src/Cassandra.IntegrationTests/Core/ControlConnectionSimulatorTests.cs +++ b/src/Cassandra.IntegrationTests/Core/ControlConnectionSimulatorTests.cs @@ -54,7 +54,7 @@ public void Should_Downgrade_To_Protocol_VX_With_Versions(ProtocolVersion versio { var session = cluster.Connect(); Parallel.For(0, 10, _ => session.Execute("SELECT * FROM system.local")); - Assert.AreEqual(version, cluster.InternalRef.GetControlConnection().ProtocolVersion); + Assert.AreEqual(version, cluster.InternalRef.InternalMetadata.ProtocolVersion); } else { @@ -83,7 +83,7 @@ public void Should_Not_Downgrade_Protocol_Version(ProtocolVersion version, param { var session = cluster.Connect(); Parallel.For(0, 10, _ => session.Execute("SELECT * FROM system.local")); - Assert.AreEqual(version, cluster.InternalRef.GetControlConnection().ProtocolVersion); + Assert.AreEqual(version, cluster.InternalRef.InternalMetadata.ProtocolVersion); } } diff --git a/src/Cassandra.IntegrationTests/Core/ControlConnectionTests.cs b/src/Cassandra.IntegrationTests/Core/ControlConnectionTests.cs index 34fe225d0..d5a250a52 100644 --- a/src/Cassandra.IntegrationTests/Core/ControlConnectionTests.cs +++ b/src/Cassandra.IntegrationTests/Core/ControlConnectionTests.cs @@ -25,6 +25,7 @@ using Cassandra.IntegrationTests.TestClusterManagement; using Cassandra.SessionManagement; using Cassandra.Tests; +using Cassandra.Tests.Connections.TestHelpers; using Moq; namespace Cassandra.IntegrationTests.Core @@ -44,9 +45,9 @@ public void SetupFixture() [Test] public void Should_Use_Maximum_Protocol_Version_Supported() { - var cc = NewInstance(); + var cc = NewInstance(ProtocolVersion.MaxSupported, out var config); cc.InitAsync().Wait(InitTimeout); - Assert.AreEqual(GetProtocolVersion(), cc.ProtocolVersion); + Assert.AreEqual(GetProtocolVersion(), config.SerializerManager.CurrentProtocolVersion); cc.Dispose(); } @@ -59,9 +60,9 @@ public void Should_Use_Maximum_Protocol_Version_Provided() //protocol 2 is not supported in Cassandra 3.0+ version = ProtocolVersion.V3; } - var cc = NewInstance(version); + var cc = NewInstance(version, out var config); cc.InitAsync().Wait(InitTimeout); - Assert.AreEqual(version, cc.ProtocolVersion); + Assert.AreEqual(version, config.SerializerManager.CurrentProtocolVersion); cc.Dispose(); } @@ -70,9 +71,9 @@ public void Should_Downgrade_The_Protocol_Version() { //Use a higher protocol version var version = (ProtocolVersion)(GetProtocolVersion() + 1); - var cc = NewInstance(version); + var cc = NewInstance(version, out var config); cc.InitAsync().Wait(InitTimeout); - Assert.AreEqual(version - 1, cc.ProtocolVersion); + Assert.AreEqual(version - 1, config.SerializerManager.CurrentProtocolVersion); } [Test, TestCassandraVersion(3, 0)] @@ -80,33 +81,25 @@ public void Should_Downgrade_The_Protocol_Version_With_Higher_Version_Than_Suppo { // Use a non-existent higher cassandra protocol version var version = (ProtocolVersion)0x0f; - var cc = NewInstance(version); + var cc = NewInstance(version, out var config); cc.InitAsync().Wait(InitTimeout); - Assert.AreEqual(ProtocolVersion.V4, cc.ProtocolVersion); + Assert.AreEqual(ProtocolVersion.V4, config.SerializerManager.CurrentProtocolVersion); } - private ControlConnection NewInstance( - ProtocolVersion version = ProtocolVersion.MaxSupported, - Configuration config = null, - Metadata metadata = null) + private ControlConnection NewInstance(ProtocolVersion version, out Configuration config) { - config = config ?? new Configuration(); - if (metadata == null) - { - metadata = new Metadata(config); - metadata.AddHost(new IPEndPoint(IPAddress.Parse(_testCluster.InitialContactPoint), ProtocolOptions.DefaultPort)); - } + config = new Configuration(); + config.SerializerManager.ChangeProtocolVersion(version); + var internalMetadata = new FakeInternalMetadata(config); + internalMetadata.AddHost(new IPEndPoint(IPAddress.Parse(_testCluster.InitialContactPoint), ProtocolOptions.DefaultPort)); var cc = new ControlConnection( Mock.Of(), - GetEventDebouncer(config), - version, config, - metadata, + internalMetadata, new List { new IpLiteralContactPoint(IPAddress.Parse(_testCluster.InitialContactPoint), config.ProtocolOptions, config.ServerNameResolver ) }); - metadata.ControlConnection = cc; return cc; } diff --git a/src/Cassandra.IntegrationTests/Core/HeartbeatTests.cs b/src/Cassandra.IntegrationTests/Core/HeartbeatTests.cs index 95e0650c6..1c18b38fc 100644 --- a/src/Cassandra.IntegrationTests/Core/HeartbeatTests.cs +++ b/src/Cassandra.IntegrationTests/Core/HeartbeatTests.cs @@ -49,7 +49,7 @@ public void OneTimeTearDown() public async Task Connection_Should_Send_Options_Requests_For_Heartbeats(bool executeQuery) { var builder = ClusterBuilder() - .WithPoolingOptions(PoolingOptions.Get().SetHeartBeatInterval(4000)) + .WithPoolingOptions(PoolingOptions.Create().SetHeartBeatInterval(4000)) .AddContactPoint(_testCluster.InitialContactPoint); using (var cluster = builder.Build()) diff --git a/src/Cassandra.IntegrationTests/Core/MetadataTests.cs b/src/Cassandra.IntegrationTests/Core/MetadataTests.cs index 8ea03bc76..6fe685538 100644 --- a/src/Cassandra.IntegrationTests/Core/MetadataTests.cs +++ b/src/Cassandra.IntegrationTests/Core/MetadataTests.cs @@ -24,6 +24,7 @@ using System.Text; using System.Threading; using Cassandra.IntegrationTests.TestBase; +using Cassandra.SessionManagement; using SortOrder = Cassandra.DataCollectionMetadata.SortOrder; namespace Cassandra.IntegrationTests.Core @@ -53,7 +54,7 @@ public void KeyspacesMetadataUpToDateViaCassandraEvents() Assert.Greater(initialLength, 0); //GetReplicas should yield the primary replica when the Keyspace is not found - Assert.AreEqual(1, cluster.GetReplicas("ks2", new byte[] {0, 0, 0, 1}).Count); + Assert.AreEqual(1, cluster.Metadata.GetReplicas("ks2", new byte[] {0, 0, 0, 1}).Count); const string createKeyspaceQuery = "CREATE KEYSPACE {0} WITH replication = {{ 'class' : '{1}', {2} }}"; session.Execute(string.Format(createKeyspaceQuery, "ks1", "SimpleStrategy", "'replication_factor' : 1")); @@ -70,7 +71,7 @@ public void KeyspacesMetadataUpToDateViaCassandraEvents() Assert.NotNull(ks2); Assert.AreEqual(ks2.Replication["replication_factor"], 3); //GetReplicas should yield the 2 replicas (rf=3 but cluster=2) when the Keyspace is found - Assert.AreEqual(2, cluster.GetReplicas("ks2", new byte[] {0, 0, 0, 1}).Count); + Assert.AreEqual(2, cluster.Metadata.GetReplicas("ks2", new byte[] {0, 0, 0, 1}).Count); var ks3 = cluster.Metadata.GetKeyspace("ks3"); Assert.NotNull(ks3); Assert.AreEqual(ks3.Replication["dc1"], 1); @@ -84,17 +85,20 @@ public void MetadataMethodReconnects() ITestCluster testCluster = TestClusterManager.GetNonShareableTestCluster(2); var cluster = testCluster.Cluster; //The control connection is connected to host 1 - Assert.AreEqual(1, TestHelper.GetLastAddressByte(cluster.Metadata.ControlConnection.EndPoint.GetHostIpEndPointWithFallback())); + Assert.AreEqual(1, TestHelper.GetLastAddressByte( + cluster.InternalRef.InternalMetadata.ControlConnection.EndPoint.GetHostIpEndPointWithFallback())); testCluster.StopForce(1); Thread.Sleep(10000); //The control connection is still connected to host 1 - Assert.AreEqual(1, TestHelper.GetLastAddressByte(cluster.Metadata.ControlConnection.EndPoint.GetHostIpEndPointWithFallback())); + Assert.AreEqual(1, TestHelper.GetLastAddressByte( + cluster.InternalRef.InternalMetadata.ControlConnection.EndPoint.GetHostIpEndPointWithFallback())); var t = cluster.Metadata.GetTable("system", "local"); Assert.NotNull(t); //The control connection should be connected to host 2 - Assert.AreEqual(2, TestHelper.GetLastAddressByte(cluster.Metadata.ControlConnection.EndPoint.GetHostIpEndPointWithFallback())); + Assert.AreEqual(2, TestHelper.GetLastAddressByte( + cluster.InternalRef.InternalMetadata.ControlConnection.EndPoint.GetHostIpEndPointWithFallback())); } [Test] @@ -113,7 +117,7 @@ public void HostDownViaMetadataEvents() //The control connection is connected to host 1 //All host are up - Assert.True(cluster.AllHosts().All(h => h.IsUp)); + Assert.True(cluster.Metadata.AllHosts().All(h => h.IsUp)); testCluster.StopForce(2); var counter = 0; @@ -121,13 +125,13 @@ public void HostDownViaMetadataEvents() //No query to avoid getting a socket exception while (counter++ < maxWait) { - if (cluster.AllHosts().Any(h => TestHelper.GetLastAddressByte(h) == 2 && !h.IsUp)) + if (cluster.Metadata.AllHosts().Any(h => TestHelper.GetLastAddressByte(h) == 2 && !h.IsUp)) { break; } Thread.Sleep(1000); } - Assert.True(cluster.AllHosts().Any(h => TestHelper.GetLastAddressByte(h) == 2 && !h.IsUp)); + Assert.True(cluster.Metadata.AllHosts().Any(h => TestHelper.GetLastAddressByte(h) == 2 && !h.IsUp)); Assert.AreNotEqual(counter, maxWait, "Waited but it was never notified via events"); Assert.True(downEventFired); } @@ -157,7 +161,8 @@ public void MetadataHostsEventTest(bool useControlConnectionHost) } }; //The host not used by the control connection - int hostToKill = TestHelper.GetLastAddressByte(cluster.Metadata.ControlConnection.EndPoint.GetHostIpEndPointWithFallback()); + int hostToKill = TestHelper.GetLastAddressByte( + cluster.InternalRef.InternalMetadata.ControlConnection.EndPoint.GetHostIpEndPointWithFallback()); if (!useControlConnectionHost) { hostToKill = hostToKill == 1 ? 2 : 1; @@ -165,18 +170,19 @@ public void MetadataHostsEventTest(bool useControlConnectionHost) testCluster.Stop(hostToKill); Thread.Sleep(10000); TestHelper.Invoke(() => session.Execute("SELECT key from system.local"), 10); - Assert.True(cluster.AllHosts().Any(h => TestHelper.GetLastAddressByte(h) == hostToKill && !h.IsUp)); + Assert.True(cluster.Metadata.AllHosts().Any(h => TestHelper.GetLastAddressByte(h) == hostToKill && !h.IsUp)); Assert.True(downEventFired); testCluster.Start(hostToKill); Thread.Sleep(20000); TestHelper.Invoke(() => session.Execute("SELECT key from system.local"), 10); - Assert.True(cluster.AllHosts().All(h => h.IsConsiderablyUp)); + Assert.True(cluster.Metadata.AllHosts().All(h => h.IsConsiderablyUp)); //When the host of the control connection is used //It can result that event UP is not fired as it is not received by the control connection (it reconnected but missed the event) Assert.True(upEventFired || useControlConnectionHost); } - private void CheckPureMetadata(Cluster cluster, ISession session, string tableName, string keyspaceName, TableOptions tableOptions = null) + private void CheckPureMetadata( + Cluster cluster, ISession session, string tableName, string keyspaceName, TableOptions tableOptions = null) { // build create table cql tableName = TestUtils.GetUniqueTableName().ToLower(); @@ -219,7 +225,7 @@ private void CheckPureMetadata(Cluster cluster, ISession session, string tableNa stringBuilder.Append("))" + opt + ";"); QueryTools.ExecuteSyncNonQuery(session, stringBuilder.ToString()); - TestUtils.WaitForSchemaAgreement(session.Cluster); + TestUtils.WaitForSchemaAgreement(cluster); var table = cluster.Metadata.GetTable(keyspaceName, tableName); Assert.AreEqual(tableName, table.Name); @@ -544,7 +550,7 @@ public void Should_Retrieve_Host_Cassandra_Version() var testCluster = TestClusterManager.GetNonShareableTestCluster(2, DefaultMaxClusterCreateRetries, true, false); using (var cluster = ClusterBuilder().AddContactPoint(testCluster.InitialContactPoint).Build()) { - CollectionAssert.DoesNotContain(cluster.Metadata.Hosts.Select(h => h.CassandraVersion), null); + CollectionAssert.DoesNotContain(cluster.InternalRef.InternalMetadata.Hosts.Select(h => h.CassandraVersion), null); } } diff --git a/src/Cassandra.IntegrationTests/Core/PoolTests.cs b/src/Cassandra.IntegrationTests/Core/PoolTests.cs index fd50c0ffd..ca6322bd3 100644 --- a/src/Cassandra.IntegrationTests/Core/PoolTests.cs +++ b/src/Cassandra.IntegrationTests/Core/PoolTests.cs @@ -146,7 +146,7 @@ public void FailoverThenReconnect() { actions.Add(selectAction); //Check that the control connection is using first host - StringAssert.StartsWith(nonShareableTestCluster.ClusterIpPrefix + "1", nonShareableTestCluster.Cluster.Metadata.ControlConnection.EndPoint.GetHostIpEndPointWithFallback().ToString()); + StringAssert.StartsWith(nonShareableTestCluster.ClusterIpPrefix + "1", nonShareableTestCluster.Cluster.InternalRef.InternalMetadata.ControlConnection.EndPoint.GetHostIpEndPointWithFallback().ToString()); //Kill some nodes //Including the one used by the control connection @@ -198,7 +198,7 @@ public void FailoverThenReconnect() Assert.Contains(nonShareableTestCluster.ClusterIpPrefix + "3:" + DefaultCassandraPort, queriedHosts); Assert.Contains(nonShareableTestCluster.ClusterIpPrefix + "4:" + DefaultCassandraPort, queriedHosts); //Check that the control connection is still using last host - StringAssert.StartsWith(nonShareableTestCluster.ClusterIpPrefix + "4", nonShareableTestCluster.Cluster.Metadata.ControlConnection.EndPoint.GetHostIpEndPointWithFallback().ToString()); + StringAssert.StartsWith(nonShareableTestCluster.ClusterIpPrefix + "4", nonShareableTestCluster.Cluster.InternalRef.InternalMetadata.ControlConnection.EndPoint.GetHostIpEndPointWithFallback().ToString()); } } } @@ -218,7 +218,7 @@ public void ReconnectionAttemptedOnlyOnce() .WithReconnectionPolicy(new ConstantReconnectionPolicy(reconnectionDelay)) .Build(); var connectionAttempts = 0; - cluster.Metadata.Hosts.Down += h => + cluster.InternalRef.InternalMetadata.Hosts.Down += h => { //Every time there is a connection attempt, it is marked as down connectionAttempts++; @@ -275,12 +275,12 @@ public void AddressTranslatorIsCalledPerEachPeer() cluster.Connect(); //2 peers translated Assert.AreEqual(2, invokedEndPoints.Count); - Assert.True(cluster.AllHosts().All(h => h.IsUp)); + Assert.True(cluster.Metadata.AllHosts().All(h => h.IsUp)); testCluster.Stop(3); //Wait for the C* event to notify the control connection Thread.Sleep(30000); //Should be down - Assert.False(cluster.AllHosts().First(h => TestHelper.GetLastAddressByte(h) == 3).IsUp); + Assert.False(cluster.Metadata.AllHosts().First(h => TestHelper.GetLastAddressByte(h) == 3).IsUp); //Should have been translated Assert.AreEqual(3, invokedEndPoints.Count); diff --git a/src/Cassandra.IntegrationTests/Core/PrepareLongTests.cs b/src/Cassandra.IntegrationTests/Core/PrepareLongTests.cs index eb59b94d5..9a590b957 100644 --- a/src/Cassandra.IntegrationTests/Core/PrepareLongTests.cs +++ b/src/Cassandra.IntegrationTests/Core/PrepareLongTests.cs @@ -36,7 +36,7 @@ public void PreparedStatement_Is_Usable_After_Node_Restart_When_Connecting_Provi // Connect using a keyspace var session = cluster.Connect("system"); var ps = session.Prepare("SELECT key FROM local"); - var host = cluster.AllHosts().First(); + var host = cluster.Metadata.AllHosts().First(); var row = session.Execute(ps.Bind()).First(); Assert.NotNull(row.GetValue("key")); diff --git a/src/Cassandra.IntegrationTests/Core/PrepareSimulatorTests.cs b/src/Cassandra.IntegrationTests/Core/PrepareSimulatorTests.cs index 0adfa9a7e..c1caf20fa 100644 --- a/src/Cassandra.IntegrationTests/Core/PrepareSimulatorTests.cs +++ b/src/Cassandra.IntegrationTests/Core/PrepareSimulatorTests.cs @@ -80,7 +80,7 @@ public void Should_Prepare_On_First_Node() Assert.AreEqual(Query, ps.Cql); var firstRow = session.Execute(ps.Bind()).FirstOrDefault(); Assert.NotNull(firstRow); - var node = simulacronCluster.GetNode(cluster.AllHosts().First().Address); + var node = simulacronCluster.GetNode(cluster.Metadata.AllHosts().First().Address); // Executed on first node Assert.AreEqual(1, node.GetQueries(Query, QueryType.Prepare).Count); // Only executed on the first node @@ -135,8 +135,8 @@ public void Should_Failover_When_First_Node_Fails() .WithLoadBalancingPolicy(new TestHelper.OrderedLoadBalancingPolicy()).Build()) { var session = cluster.Connect(); - var firstHost = cluster.AllHosts().First(); - foreach (var h in cluster.AllHosts()) + var firstHost = cluster.Metadata.AllHosts().First(); + foreach (var h in cluster.Metadata.AllHosts()) { var node = simulacronCluster.GetNode(h.Address); node.Prime(h == firstHost ? PrepareSimulatorTests.IsBootstrappingPrime : QueryPrime()); @@ -157,8 +157,8 @@ public void Should_Prepare_On_All_Ignoring_Individual_Failures() .WithLoadBalancingPolicy(new TestHelper.OrderedLoadBalancingPolicy()).Build()) { var session = cluster.Connect(); - var secondHost = cluster.AllHosts().Skip(1).First(); - foreach (var h in cluster.AllHosts()) + var secondHost = cluster.Metadata.AllHosts().Skip(1).First(); + foreach (var h in cluster.Metadata.AllHosts()) { var node = simulacronCluster.GetNode(h.Address); node.Prime(h == secondHost ? PrepareSimulatorTests.IsBootstrappingPrime : QueryPrime()); @@ -181,8 +181,8 @@ public void Should_Failover_When_First_Node_Timeouts() .WithLoadBalancingPolicy(new TestHelper.OrderedLoadBalancingPolicy()).Build()) { var session = cluster.Connect(); - var firstHost = cluster.AllHosts().First(); - foreach (var h in cluster.AllHosts()) + var firstHost = cluster.Metadata.AllHosts().First(); + foreach (var h in cluster.Metadata.AllHosts()) { var node = simulacronCluster.GetNode(h.Address); node.Prime(QueryPrime(h == firstHost ? 10000 : 0)); @@ -212,11 +212,11 @@ public async Task Should_Reprepare_On_Up_Node() // It should have been prepared once on the node we are about to stop Assert.AreEqual(1, node.GetQueries(Query, QueryType.Prepare).Count); await node.Stop().ConfigureAwait(false); - await TestHelper.WaitUntilAsync(() => cluster.AllHosts().Any(h => !h.IsUp)).ConfigureAwait(false); - Assert.AreEqual(1, cluster.AllHosts().Count(h => !h.IsUp)); + await TestHelper.WaitUntilAsync(() => cluster.Metadata.AllHosts().Any(h => !h.IsUp)).ConfigureAwait(false); + Assert.AreEqual(1, cluster.Metadata.AllHosts().Count(h => !h.IsUp)); await node.Start().ConfigureAwait(false); - await TestHelper.WaitUntilAsync(() => cluster.AllHosts().All(h => h.IsUp)).ConfigureAwait(false); - Assert.AreEqual(0, cluster.AllHosts().Count(h => !h.IsUp)); + await TestHelper.WaitUntilAsync(() => cluster.Metadata.AllHosts().All(h => h.IsUp)).ConfigureAwait(false); + Assert.AreEqual(0, cluster.Metadata.AllHosts().Count(h => !h.IsUp)); TestHelper.WaitUntil(() => node.GetQueries(Query, QueryType.Prepare).Count == 2); // It should be prepared 2 times Assert.AreEqual(2, node.GetQueries(Query, QueryType.Prepare).Count); @@ -249,8 +249,8 @@ public async Task Should_ReprepareOnUpNodeAfterSetKeyspace_With_SessionKeyspace( var node = simulacronCluster.GetNodes().Skip(1).First(); await node.Stop().ConfigureAwait(false); - await TestHelper.WaitUntilAsync(() => cluster.AllHosts().Any(h => !h.IsUp)).ConfigureAwait(false); - Assert.AreEqual(1, cluster.AllHosts().Count(h => !h.IsUp)); + await TestHelper.WaitUntilAsync(() => cluster.Metadata.AllHosts().Any(h => !h.IsUp)).ConfigureAwait(false); + Assert.AreEqual(1, cluster.Metadata.AllHosts().Count(h => !h.IsUp)); // still only 1 USE and Prepare requests Assert.AreEqual(1, node.GetQueries($"USE \"{PrepareSimulatorTests.Keyspace}\"").Count); @@ -261,8 +261,8 @@ public async Task Should_ReprepareOnUpNodeAfterSetKeyspace_With_SessionKeyspace( await node.Start().ConfigureAwait(false); // wait until node is up - await TestHelper.WaitUntilAsync(() => cluster.AllHosts().All(h => h.IsUp)).ConfigureAwait(false); - Assert.AreEqual(0, cluster.AllHosts().Count(h => !h.IsUp)); + await TestHelper.WaitUntilAsync(() => cluster.Metadata.AllHosts().All(h => h.IsUp)).ConfigureAwait(false); + Assert.AreEqual(0, cluster.Metadata.AllHosts().Count(h => !h.IsUp)); // wait until driver reprepares the statement TestHelper.WaitUntil(() => diff --git a/src/Cassandra.IntegrationTests/Core/PreparedStatementsTests.cs b/src/Cassandra.IntegrationTests/Core/PreparedStatementsTests.cs index 905da0b12..34e9fe589 100644 --- a/src/Cassandra.IntegrationTests/Core/PreparedStatementsTests.cs +++ b/src/Cassandra.IntegrationTests/Core/PreparedStatementsTests.cs @@ -25,6 +25,7 @@ using System.Collections; using System.Threading; using Cassandra.IntegrationTests.TestBase; +using Cassandra.SessionManagement; using Cassandra.Tests; namespace Cassandra.IntegrationTests.Core @@ -182,7 +183,7 @@ public void PreparedStatement_With_Changing_Schema() var selectPs1 = session1.Prepare("SELECT * FROM table1"); var selectPs2 = session2.Prepare("SELECT * FROM table1"); - var protocolVersion = (ProtocolVersion)session1.BinaryProtocolVersion; + var protocolVersion = session1.Cluster.Metadata.GetClusterDescription().ProtocolVersion; if (protocolVersion.SupportsResultMetadataId()) { originalResultMetadataId = selectPs1.ResultMetadata.ResultMetadataId; @@ -841,7 +842,7 @@ public void Session_Prepare_With_Keyspace_Defined_On_Protocol_Greater_Than_4(boo } Assert.AreEqual("system", ps.Keyspace); - for (var i = 0; i < Cluster.AllHosts().Count; i++) + for (var i = 0; i < Cluster.Metadata.AllHosts().Count; i++) { var boundStatement = ps.Bind(); Assert.AreEqual("system", boundStatement.Keyspace); @@ -875,7 +876,7 @@ await TestHelper.TimesLimit(async () => var rs = await Session.ExecuteAsync(boundStatement).ConfigureAwait(false); Assert.NotNull(rs.First().GetValue("key")); return rs; - }, Cluster.AllHosts().Count, Cluster.AllHosts().Count).ConfigureAwait(false); + }, Cluster.Metadata.AllHosts().Count, Cluster.Metadata.AllHosts().Count).ConfigureAwait(false); } [Test] @@ -966,7 +967,7 @@ public void Prepared_SelectOne() tweet_id int PRIMARY KEY, numb double, label text);", tableName)); - TestUtils.WaitForSchemaAgreement(Session.Cluster); + TestUtils.WaitForSchemaAgreement(InternalSession.InternalCluster); } catch (AlreadyExistsException) { @@ -1146,7 +1147,7 @@ public void InsertingSingleValuePrepared(Type tp, object value = null) value {1} );", tableName, cassandraDataTypeName)); - TestUtils.WaitForSchemaAgreement(Session.Cluster); + TestUtils.WaitForSchemaAgreement(InternalSession.InternalCluster); var toInsert = new List(1); object val = Randomm.RandomVal(tp); @@ -1174,17 +1175,17 @@ public void InsertingSingleValuePrepared(Type tp, object value = null) private void CreateTable(string tableName) { - CreateTable(Session, tableName); + CreateTable(InternalSession, tableName); } - private void CreateTable(ISession session, string tableName) + private void CreateTable(IInternalSession session, string tableName) { QueryTools.ExecuteSyncNonQuery(session, $@"CREATE TABLE {tableName}( id int PRIMARY KEY, label text, number int );"); - TestUtils.WaitForSchemaAgreement(session.Cluster); + TestUtils.WaitForSchemaAgreement(session.InternalCluster); } } } diff --git a/src/Cassandra.IntegrationTests/Core/ReconnectionTests.cs b/src/Cassandra.IntegrationTests/Core/ReconnectionTests.cs index e3f6b138e..f08e14ef0 100644 --- a/src/Cassandra.IntegrationTests/Core/ReconnectionTests.cs +++ b/src/Cassandra.IntegrationTests/Core/ReconnectionTests.cs @@ -86,7 +86,7 @@ public void Reconnection_Attempted_Multiple_Times() //Another session to have multiple pools var dummySession = cluster.Connect(); TestHelper.Invoke(() => dummySession.Execute("SELECT * FROM system.local"), 10); - var host = cluster.AllHosts().First(); + var host = cluster.Metadata.AllHosts().First(); var upCounter = 0; var downCounter = 0; cluster.Metadata.HostsEvent += (sender, e) => @@ -157,7 +157,7 @@ public void Reconnection_Attempted_Multiple_Times_On_Multiple_Nodes() //Another session to have multiple pools var dummySession = cluster.Connect(); TestHelper.Invoke(() => dummySession.Execute("SELECT * FROM system.local"), 10); - var hosts = cluster.AllHosts().ToList(); + var hosts = cluster.Metadata.AllHosts().ToList(); var host1 = hosts[0]; var host2 = hosts[1]; var upCounter = new ConcurrentDictionary(); @@ -235,7 +235,7 @@ public void Executions_After_Reconnection_Resizes_Pool() var session2 = (IInternalSession)cluster.Connect(); TestHelper.Invoke(() => session1.Execute("SELECT * FROM system.local"), 10); TestHelper.Invoke(() => session2.Execute("SELECT * FROM system.local"), 10); - var hosts = cluster.AllHosts().ToList(); + var hosts = cluster.Metadata.AllHosts().ToList(); var host1 = hosts[0]; var host2 = hosts[1]; var upCounter = new ConcurrentDictionary(); @@ -309,7 +309,7 @@ public void Should_UseNewHostInQueryPlans_When_HostIsDecommissionedAndJoinsAgain session.Execute("CREATE TABLE test_table (id text, PRIMARY KEY (id))"); // Assert that there are 2 pools, one for each host - var hosts = session.Cluster.AllHosts().ToList(); + var hosts = session.Cluster.Metadata.AllHosts().ToList(); var pool1 = session.GetExistingPool(hosts[0].Address); Assert.AreEqual(2, pool1.OpenConnections); var pool2 = session.GetExistingPool(hosts[1].Address); @@ -352,7 +352,7 @@ public void Should_UseNewHostInQueryPlans_When_HostIsDecommissionedAndJoinsAgain // Assert that there are 2 hosts TestHelper.RetryAssert(() => { - Assert.AreEqual(2, cluster.AllHosts().Count); + Assert.AreEqual(2, cluster.Metadata.AllHosts().Count); }, 1000, 180); // Assert that queries use both hosts again @@ -402,12 +402,12 @@ public void Should_UpdateHosts_When_HostIpChanges() { var session = (IInternalSession)cluster.Connect(); session.CreateKeyspaceIfNotExists("ks1"); - var hosts = session.Cluster.AllHosts().OrderBy(h => h.Address.ToString()).ToArray(); + var hosts = session.Cluster.Metadata.AllHosts().OrderBy(h => h.Address.ToString()).ToArray(); Assert.AreEqual(3, hosts.Length); Assert.AreEqual(3, session.GetPools().Count()); Assert.IsNotNull(session.GetExistingPool(oldEndPoint)); Assert.IsTrue(hosts.Select(h => h.Address.Address.ToString()).SequenceEqual(addresses)); - var tokenMap = session.Cluster.Metadata.TokenToReplicasMap; + var tokenMap = session.InternalCluster.InternalMetadata.TokenToReplicasMap; var oldHostTokens = tokenMap.GetByKeyspace("ks1") .Where(kvp => kvp.Value.First().Address.Address.ToString().Equals(oldIp)); @@ -424,20 +424,20 @@ public void Should_UpdateHosts_When_HostIpChanges() () => { Assert.AreEqual(1, - session.Cluster.AllHosts() + session.Cluster.Metadata.AllHosts() .Count(h => h.Address.Address.ToString().Equals($"{_realCluster.Value.ClusterIpPrefix}4")), - string.Join(";", session.Cluster.AllHosts().Select(h => h.Address.Address.ToString()))); - Assert.AreNotSame(tokenMap, session.Cluster.Metadata.TokenToReplicasMap); + string.Join(";", session.Cluster.Metadata.AllHosts().Select(h => h.Address.Address.ToString()))); + Assert.AreNotSame(tokenMap, session.InternalCluster.InternalMetadata.TokenToReplicasMap); }, 500, 100); - var newTokenMap = session.Cluster.Metadata.TokenToReplicasMap; + var newTokenMap = session.InternalCluster.InternalMetadata.TokenToReplicasMap; var newHostTokens = newTokenMap.GetByKeyspace("ks1") .Where(kvp => kvp.Value.First().Address.Address.ToString().Equals(newIp)).ToList(); - hosts = session.Cluster.AllHosts().ToArray(); + hosts = session.Cluster.Metadata.AllHosts().ToArray(); Assert.AreEqual(3, hosts.Length); Assert.IsTrue(hosts.Select(h => h.Address.Address.ToString()).SequenceEqual(newAddresses)); Assert.IsTrue(newHostTokens.Select(h => h.Key).SequenceEqual(oldHostTokens.Select(h => h.Key))); diff --git a/src/Cassandra.IntegrationTests/Core/SchemaMetadataTests.cs b/src/Cassandra.IntegrationTests/Core/SchemaMetadataTests.cs index da6ba842f..ec36d847d 100644 --- a/src/Cassandra.IntegrationTests/Core/SchemaMetadataTests.cs +++ b/src/Cassandra.IntegrationTests/Core/SchemaMetadataTests.cs @@ -737,7 +737,7 @@ public void CassandraVersion_Should_Be_Obtained_From_Host_Metadata(bool metadata var cluster = GetNewTemporaryCluster(builder => builder.WithMetadataSyncOptions(new MetadataSyncOptions().SetMetadataSyncEnabled(metadataSync))); var _ = cluster.Connect(); - foreach (var host in Cluster.AllHosts()) + foreach (var host in Cluster.Metadata.AllHosts()) { Assert.NotNull(host.CassandraVersion); Assert.Greater(host.CassandraVersion, new Version(1, 2)); diff --git a/src/Cassandra.IntegrationTests/Core/SessionStateTests.cs b/src/Cassandra.IntegrationTests/Core/SessionStateTests.cs index fbe14638f..fca173996 100644 --- a/src/Cassandra.IntegrationTests/Core/SessionStateTests.cs +++ b/src/Cassandra.IntegrationTests/Core/SessionStateTests.cs @@ -54,13 +54,13 @@ public void OneTimeTearDown() [Test] public async Task Session_GetState_Should_Return_A_Snapshot_Of_The_Pools_State() { - var poolingOptions = PoolingOptions.Get().SetCoreConnectionsPerHost(HostDistance.Local, 2); + var poolingOptions = PoolingOptions.Create().SetCoreConnectionsPerHost(HostDistance.Local, 2); using (var cluster = ClusterBuilder() .AddContactPoint(_testCluster.InitialContactPoint) .WithPoolingOptions(poolingOptions) .Build()) { - var session = cluster.Connect(); + var session = await cluster.ConnectAsync().ConfigureAwait(false); var counter = 0; ISessionState state = null; // Warmup @@ -79,13 +79,13 @@ await TestHelper.TimesLimit(async () => }, 280, 100).ConfigureAwait(false); Assert.NotNull(state); var stringState = state.ToString(); - CollectionAssert.AreEquivalent(cluster.AllHosts(), state.GetConnectedHosts()); - foreach (var host in cluster.AllHosts()) + CollectionAssert.AreEquivalent(cluster.Metadata.AllHosts(), state.GetConnectedHosts()); + foreach (var host in cluster.Metadata.AllHosts()) { Assert.AreEqual(2, state.GetOpenConnections(host)); StringAssert.Contains($"\"{host.Address}\": {{", stringState); } - var totalInFlight = cluster.AllHosts().Sum(h => state.GetInFlightQueries(h)); + var totalInFlight = cluster.Metadata.AllHosts().Sum(h => state.GetInFlightQueries(h)); Assert.Greater(totalInFlight, 0); Assert.LessOrEqual(totalInFlight, limit); } @@ -104,7 +104,7 @@ public void Session_GetState_Should_Return_Zero_After_Cluster_Disposal() session = cluster.Connect(); state = session.GetState(); Assert.AreNotEqual(SessionState.Empty(), state); - hosts = cluster.AllHosts(); + hosts = cluster.Metadata.AllHosts(); } state = session.GetState(); Assert.NotNull(hosts); diff --git a/src/Cassandra.IntegrationTests/Core/SessionTests.cs b/src/Cassandra.IntegrationTests/Core/SessionTests.cs index 0387c5b64..2d37d68f3 100644 --- a/src/Cassandra.IntegrationTests/Core/SessionTests.cs +++ b/src/Cassandra.IntegrationTests/Core/SessionTests.cs @@ -180,8 +180,7 @@ public async Task Should_Create_The_Right_Amount_Of_Connections() .SetCoreConnectionsPerHost(HostDistance.Local, 3))); var localSession1 = (IInternalSession)localCluster1.Connect(); - var metadata1 = await localCluster1.GetMetadataAsync().ConfigureAwait(false); - var hosts1 = metadata1.AllHosts().ToList(); + var hosts1 = (await localCluster1.Metadata.AllHostsAsync().ConfigureAwait(false)).ToList(); Assert.AreEqual(3, hosts1.Count); //Execute multiple times a query on the newly created keyspace for (var i = 0; i < 12; i++) @@ -190,8 +189,8 @@ public async Task Should_Create_The_Right_Amount_Of_Connections() } await Task.Delay(2000).ConfigureAwait(false); - var pool11 = await localSession1.GetOrCreateConnectionPool(hosts1[0], HostDistance.Local).ConfigureAwait(false); - var pool12 = await localSession1.GetOrCreateConnectionPool(hosts1[1], HostDistance.Local).ConfigureAwait(false); + var pool11 = localSession1.GetOrCreateConnectionPool(hosts1[0], HostDistance.Local); + var pool12 = localSession1.GetOrCreateConnectionPool(hosts1[1], HostDistance.Local); Assert.That(pool11.OpenConnections, Is.EqualTo(3)); Assert.That(pool12.OpenConnections, Is.EqualTo(3)); @@ -200,9 +199,8 @@ public async Task Should_Create_The_Right_Amount_Of_Connections() .WithPoolingOptions(new PoolingOptions().SetCoreConnectionsPerHost(HostDistance.Local, 1)) .Build()) { - var metadata2 = await localCluster2.GetMetadataAsync().ConfigureAwait(false); var localSession2 = (IInternalSession)localCluster2.Connect(); - var hosts2 = metadata2.AllHosts().ToList(); + var hosts2 = (await localCluster2.Metadata.AllHostsAsync().ConfigureAwait(false)).ToList(); Assert.AreEqual(3, hosts2.Count); //Execute multiple times a query on the newly created keyspace for (var i = 0; i < 6; i++) @@ -211,8 +209,8 @@ public async Task Should_Create_The_Right_Amount_Of_Connections() } await Task.Delay(2000).ConfigureAwait(false); - var pool21 = await localSession2.GetOrCreateConnectionPool(hosts2[0], HostDistance.Local).ConfigureAwait(false); - var pool22 = await localSession2.GetOrCreateConnectionPool(hosts2[1], HostDistance.Local).ConfigureAwait(false); + var pool21 = localSession2.GetOrCreateConnectionPool(hosts2[0], HostDistance.Local); + var pool22 = localSession2.GetOrCreateConnectionPool(hosts2[1], HostDistance.Local); Assert.That(pool21.OpenConnections, Is.EqualTo(1)); Assert.That(pool22.OpenConnections, Is.EqualTo(1)); } @@ -239,15 +237,16 @@ public async Task Session_With_Host_Changing_Distance() var counter = 0; using (var localCluster = builder.Build()) { - var metadata = await localCluster.GetMetadataAsync().ConfigureAwait(false); var localSession = (IInternalSession) await localCluster.ConnectAsync().ConfigureAwait(false); - var remoteHost = metadata.AllHosts().First(h => TestHelper.GetLastAddressByte(h) == 2); + var remoteHost = + (await localCluster.Metadata.AllHostsAsync().ConfigureAwait(false)) + .First(h => TestHelper.GetLastAddressByte(h) == 2); var stopWatch = new Stopwatch(); var distanceReset = 0; TestHelper.Invoke(() => localSession.Execute("SELECT key FROM system.local"), 10); - var hosts = metadata.AllHosts().ToArray(); - var pool1 = await localSession.GetOrCreateConnectionPool(hosts[0], HostDistance.Local).ConfigureAwait(false); - var pool2 = await localSession.GetOrCreateConnectionPool(hosts[1], HostDistance.Local).ConfigureAwait(false); + var hosts = localCluster.Metadata.AllHosts().ToArray(); + var pool1 = localSession.GetOrCreateConnectionPool(hosts[0], HostDistance.Local); + var pool2 = localSession.GetOrCreateConnectionPool(hosts[1], HostDistance.Local); var tcs = new TaskCompletionSource(); tcs.SetResult(null); var completedTask = tcs.Task; @@ -309,23 +308,19 @@ public void SetRemoteHost(Host h) _ignoredHost = h; } - public void Initialize(ICluster cluster) + public Task InitializeAsync(IMetadata metadata) { - _childPolicy.Initialize(cluster); + return _childPolicy.InitializeAsync(metadata); } - public HostDistance Distance(Host host) + public HostDistance Distance(IMetadata metadata, Host host) { - if (host == _ignoredHost) - { - return HostDistance.Ignored; - } - return HostDistance.Local; + return host == _ignoredHost ? HostDistance.Ignored : HostDistance.Local; } - public IEnumerable NewQueryPlan(string keyspace, IStatement query) + public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) { - return _childPolicy.NewQueryPlan(keyspace, query); + return _childPolicy.NewQueryPlan(metadata, keyspace, query); } } @@ -339,7 +334,7 @@ public async Task Session_Disposed_On_Cluster() var session1 = cluster.Connect(); var session2 = cluster.Connect(); var isDown = 0; - foreach (var host in cluster.AllHosts()) + foreach (var host in await cluster.Metadata.AllHostsAsync().ConfigureAwait(false)) { host.Down += _ => Interlocked.Increment(ref isDown); } @@ -350,10 +345,10 @@ public async Task Session_Disposed_On_Cluster() session1.Dispose(); // All nodes should be up - Assert.AreEqual(cluster.AllHosts().Count, cluster.AllHosts().Count(h => h.IsUp)); + Assert.AreEqual(cluster.Metadata.AllHosts().Count, cluster.Metadata.AllHosts().Count(h => h.IsUp)); // And session2 should be queryable await TestHelper.TimesLimit(() => session2.ExecuteAsync(new SimpleStatement(query)), 100, 32).ConfigureAwait(false); - Assert.AreEqual(cluster.AllHosts().Count, cluster.AllHosts().Count(h => h.IsUp)); + Assert.AreEqual(cluster.Metadata.AllHosts().Count, cluster.Metadata.AllHosts().Count(h => h.IsUp)); cluster.Dispose(); Assert.AreEqual(0, Volatile.Read(ref isDown)); } diff --git a/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionLongTests.cs b/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionLongTests.cs index b46fc1b77..e4f2e07e9 100644 --- a/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionLongTests.cs +++ b/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionLongTests.cs @@ -38,8 +38,11 @@ public class SpeculativeExecutionLongTests : TestGlobals private ITestCluster _testCluster; private ISession GetSession( - ISpeculativeExecutionPolicy speculativeExecutionPolicy = null, bool warmup = true, - ILoadBalancingPolicy lbp = null, PoolingOptions pooling = null) + ISpeculativeExecutionPolicy speculativeExecutionPolicy = null, + bool warmup = true, + ILoadBalancingPolicy lbp = null, + PoolingOptions pooling = null, + ProtocolVersion maxProtocolVersion = ProtocolVersion.MaxSupported) { if (_testCluster == null) { @@ -50,7 +53,8 @@ private ISession GetSession( .WithSpeculativeExecutionPolicy(speculativeExecutionPolicy) .WithLoadBalancingPolicy(lbp ?? Cassandra.Policies.DefaultLoadBalancingPolicy) .WithRetryPolicy(DowngradingConsistencyRetryPolicy.Instance) - .WithSocketOptions(new SocketOptions().SetReadTimeoutMillis(0)); + .WithSocketOptions(new SocketOptions().SetReadTimeoutMillis(0)) + .WithMaxProtocolVersion(maxProtocolVersion); if (pooling != null) { builder.WithPoolingOptions(pooling); @@ -85,42 +89,33 @@ public void TestFixtureTearDown() [Test, TestTimeout(120000)] public void SpeculativeExecution_Pause_Using_All_Stream_Ids() { - var maxProtocolVersion = Cluster.MaxProtocolVersion; _testCluster = TestClusterManager.GetNonShareableTestCluster(2, 1, true, false); - Cluster.MaxProtocolVersion = 2; - try + var pooling = PoolingOptions.Create(); + var session = GetSession(new ConstantSpeculativeExecutionPolicy(50L, 1), true, null, pooling, ProtocolVersion.V2); + const int pauseThreshold = 140 * 2; + var tasks = new List>(); + var semaphore = new SemaphoreSlim(150 * 2); + for (var i = 0; i < 512; i++) { - var pooling = PoolingOptions.Get(); - var session = GetSession(new ConstantSpeculativeExecutionPolicy(50L, 1), true, null, pooling); - const int pauseThreshold = 140 * 2; - var tasks = new List>(); - var semaphore = new SemaphoreSlim(150 * 2); - for (var i = 0; i < 512; i++) + //Pause after the stream ids are in use for the connections + if (i == pauseThreshold) { - //Pause after the stream ids are in use for the connections - if (i == pauseThreshold) - { - _testCluster.PauseNode(1); - } - semaphore.Wait(); - tasks.Add(session - .ExecuteAsync(new SimpleStatement(QueryLocal).SetIdempotence(true)) - .ContinueSync(rs => - { - semaphore.Release(); - return rs.Info.QueriedHost.Address; - })); + _testCluster.PauseNode(1); } - Task.WaitAll(tasks.Select(t => (Task)t).ToArray()); - _testCluster.ResumeNode(1); - //There shouldn't be any query using node1 as coordinator passed the threshold. - Assert.AreEqual(0, tasks.Skip(pauseThreshold).Count(t => t.Result.Equals(_addressNode1))); - Thread.Sleep(1000); - } - finally - { - Cluster.MaxProtocolVersion = maxProtocolVersion; + semaphore.Wait(); + tasks.Add(session + .ExecuteAsync(new SimpleStatement(QueryLocal).SetIdempotence(true)) + .ContinueSync(rs => + { + semaphore.Release(); + return rs.Info.QueriedHost.Address; + })); } + Task.WaitAll(tasks.Select(t => (Task)t).ToArray()); + _testCluster.ResumeNode(1); + //There shouldn't be any query using node1 as coordinator passed the threshold. + Assert.AreEqual(0, tasks.Skip(pauseThreshold).Count(t => t.Result.Equals(_addressNode1))); + Thread.Sleep(1000); } /// diff --git a/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionShortTests.cs b/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionShortTests.cs index 13cb87442..98e129c40 100644 --- a/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionShortTests.cs +++ b/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionShortTests.cs @@ -21,7 +21,9 @@ using System.Net; using System.Threading; using System.Threading.Tasks; + using Cassandra.IntegrationTests.TestClusterManagement.Simulacron; +using Cassandra.Tasks; using Cassandra.Tests; using NUnit.Framework; @@ -67,7 +69,7 @@ private ISession GetSession( public SpeculativeExecutionShortTests() : base(false, new SimulacronOptions { Nodes = "2" }, false) { } - + public override void SetUp() { base.SetUp(); @@ -111,7 +113,7 @@ public async Task SpeculativeExecution_Should_Not_Execute_On_Next_Node_When_Not_ TestCluster.GetNode(1).PrimeFluent( b => b.WhenQuery(QueryLocal) - .ThenRowsSuccess(new[] {"key"}, r => r.WithRow("local")).WithDelayInMs(1000)); + .ThenRowsSuccess(new[] { "key" }, r => r.WithRow("local")).WithDelayInMs(1000)); var rs = await session.ExecuteAsync(new SimpleStatement(QueryLocal).SetIdempotence(false)).ConfigureAwait(false); @@ -154,15 +156,17 @@ public ICollection ScheduledMoreThanOnce get { return _scheduledMore.Values; } } - public void Dispose() + public Task ShutdownAsync() { + return TaskHelper.Completed; } - public void Initialize(ICluster cluster) + public Task InitializeAsync(IMetadata metadata) { + return TaskHelper.Completed; } - public ISpeculativeExecutionPlan NewPlan(string keyspace, IStatement statement) + public ISpeculativeExecutionPlan NewPlan(IMetadata metadata, string keyspace, IStatement statement) { return new LoggedSpeculativeExecutionPlan(this); } @@ -192,7 +196,6 @@ public long NextExecution(Host lastQueried) private class OrderedLoadBalancingPolicy : ILoadBalancingPolicy { private readonly string[] _addresses; - private ICluster _cluster; private int _hostYielded; public int HostYielded @@ -205,19 +208,19 @@ public OrderedLoadBalancingPolicy(params string[] addresses) _addresses = addresses; } - public void Initialize(ICluster cluster) + public Task InitializeAsync(IMetadata metadata) { - _cluster = cluster; + return TaskHelper.Completed; } - public HostDistance Distance(Host host) + public HostDistance Distance(IMetadata metadata, Host host) { return HostDistance.Local; } - public IEnumerable NewQueryPlan(string keyspace, IStatement query) + public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) { - var hosts = _cluster.AllHosts().ToArray(); + var hosts = metadata.AllHostsSnapshot().ToArray(); foreach (var addr in _addresses) { var host = hosts.Single(h => h.Address.Address.ToString() == addr); diff --git a/src/Cassandra.IntegrationTests/Core/TypeSerializersTests.cs b/src/Cassandra.IntegrationTests/Core/TypeSerializersTests.cs index 1ed1ec862..d35104945 100644 --- a/src/Cassandra.IntegrationTests/Core/TypeSerializersTests.cs +++ b/src/Cassandra.IntegrationTests/Core/TypeSerializersTests.cs @@ -189,7 +189,10 @@ public void Should_Use_Primitive_TypeSerializers_For_Partition_Key() { var statement = ps.Bind(v); Assert.NotNull(statement.RoutingKey); - CollectionAssert.AreEqual(new BigDecimalSerializer().Serialize((ushort)session.BinaryProtocolVersion, v), statement.RoutingKey.RawRoutingKey); + CollectionAssert.AreEqual( + new BigDecimalSerializer().Serialize( + (ushort)session.Cluster.Metadata.GetClusterDescription().ProtocolVersion, v), + statement.RoutingKey.RawRoutingKey); session.Execute(statement); var row = session.Execute(new SimpleStatement("SELECT * FROM tbl_decimal_key WHERE id = ?", v)).First(); Assert.AreEqual(row.GetValue("id"), v); diff --git a/src/Cassandra.IntegrationTests/Core/UdfTests.cs b/src/Cassandra.IntegrationTests/Core/UdfTests.cs index 75e353a48..87ea82183 100644 --- a/src/Cassandra.IntegrationTests/Core/UdfTests.cs +++ b/src/Cassandra.IntegrationTests/Core/UdfTests.cs @@ -21,6 +21,7 @@ using System.Threading.Tasks; using Cassandra.IntegrationTests.TestBase; using Cassandra.IntegrationTests.TestClusterManagement; +using Cassandra.SessionManagement; using Cassandra.Tests; using NUnit.Framework; @@ -32,7 +33,7 @@ public class UdfTests : TestGlobals private ITestCluster _testCluster; private readonly List _clusters = new List(); - private ICluster GetCluster(bool metadataSync) + private IInternalCluster GetCluster(bool metadataSync) { var cluster = ClusterBuilder() .AddContactPoint(_testCluster.InitialContactPoint) @@ -202,9 +203,9 @@ public void GetFunction_Should_Return_Most_Up_To_Date_Metadata_Via_Events(bool m var cluster2 = GetCluster(metadataSync); var session2 = cluster.Connect("ks_udf"); session.Execute("CREATE OR REPLACE FUNCTION stringify(i int) RETURNS NULL ON NULL INPUT RETURNS text LANGUAGE java AS 'return Integer.toString(i);'"); - cluster2.RefreshSchema("ks_udf"); + cluster2.Metadata.RefreshSchema("ks_udf"); Task.Delay(500).GetAwaiter().GetResult(); // wait for events to be processed - var _ = cluster2.Metadata.KeyspacesSnapshot // cache + var _ = cluster2.InternalMetadata.KeyspacesSnapshot // cache .Single(kvp => kvp.Key == "ks_udf") .Value .GetFunction("stringify", new[] { "int" }); @@ -226,7 +227,7 @@ public void GetFunction_Should_Return_Most_Up_To_Date_Metadata_Via_Events(bool m else { Task.Delay(2000).GetAwaiter().GetResult(); - func = cluster2.Metadata.KeyspacesSnapshot + func = cluster2.InternalMetadata.KeyspacesSnapshot .Single(kvp => kvp.Key == "ks_udf") .Value .GetFunction("stringify", new[] { "int" }); @@ -291,9 +292,9 @@ public void GetAggregate_Should_Return_Most_Up_To_Date_Metadata_Via_Events(bool var cluster2 = GetCluster(metadataSync); var session2 = cluster2.Connect("ks_udf"); session.Execute("CREATE OR REPLACE AGGREGATE ks_udf.sum2(int) SFUNC plus STYPE int INITCOND 0"); - cluster2.RefreshSchema("ks_udf"); + cluster2.Metadata.RefreshSchema("ks_udf"); Task.Delay(500).GetAwaiter().GetResult(); // wait for events to be processed - var _ = cluster2.Metadata.KeyspacesSnapshot // cache + var _ = cluster2.InternalMetadata.KeyspacesSnapshot // cache .Single(kvp => kvp.Key == "ks_udf") .Value .GetAggregate("sum2", new[] { "int" }); @@ -315,7 +316,7 @@ public void GetAggregate_Should_Return_Most_Up_To_Date_Metadata_Via_Events(bool else { Task.Delay(2000).GetAwaiter().GetResult(); - aggregate = cluster2.Metadata.KeyspacesSnapshot + aggregate = cluster2.InternalMetadata.KeyspacesSnapshot .Single(kvp => kvp.Key == "ks_udf") .Value .GetAggregate("sum2", new[] { "int" }); diff --git a/src/Cassandra.IntegrationTests/DataStax/Cloud/CloudIntegrationTests.cs b/src/Cassandra.IntegrationTests/DataStax/Cloud/CloudIntegrationTests.cs index 68216d541..bb5250b62 100644 --- a/src/Cassandra.IntegrationTests/DataStax/Cloud/CloudIntegrationTests.cs +++ b/src/Cassandra.IntegrationTests/DataStax/Cloud/CloudIntegrationTests.cs @@ -59,7 +59,7 @@ public async Task Should_ContinueQuerying_When_ANodeGoesDown() .WithReconnectionPolicy(new ConstantReconnectionPolicy(40)) .WithQueryOptions(new QueryOptions().SetDefaultIdempotence(true))).ConfigureAwait(false); - Assert.IsTrue(session.Cluster.AllHosts().All(h => h.IsUp)); + Assert.IsTrue((await session.Cluster.Metadata.AllHostsAsync().ConfigureAwait(false)).All(h => h.IsUp)); var restarted = true; var t = Task.Run(async () => { @@ -72,10 +72,10 @@ public async Task Should_ContinueQuerying_When_ANodeGoesDown() TestHelper.RetryAssert( () => { - var dict = Session.Cluster.Metadata.TokenToReplicasMap.GetByKeyspace("system_distributed"); + var dict = session.InternalCluster.InternalMetadata.TokenToReplicasMap.GetByKeyspace("system_distributed"); Assert.AreEqual(3, dict.First().Value.Count); - Assert.AreEqual(3, Session.Cluster.AllHosts().Count); - Assert.IsTrue(Session.Cluster.AllHosts().All(h => h.IsUp)); + Assert.AreEqual(3, session.Cluster.Metadata.AllHosts().Count); + Assert.IsTrue(session.Cluster.Metadata.AllHosts().All(h => h.IsUp)); }, 20, 500); @@ -168,7 +168,7 @@ public async Task Should_MatchSystemLocalInformationOfEachNode() { var rs = await session.ExecuteAsync(new SimpleStatement("SELECT * FROM system.local")).ConfigureAwait(false); var row = rs.First(); - var host = session.Cluster.GetHost(new IPEndPoint(rs.Info.QueriedHost.Address, rs.Info.QueriedHost.Port)); + var host = await session.Cluster.Metadata.GetHostAsync(new IPEndPoint(rs.Info.QueriedHost.Address, rs.Info.QueriedHost.Port)).ConfigureAwait(false); Assert.IsNotNull(host); queriedHosts.Add(rs.Info.QueriedHost.Address); Assert.AreEqual(host.HostId, row.GetValue("host_id")); diff --git a/src/Cassandra.IntegrationTests/Linq/LinqMethods/Delete.cs b/src/Cassandra.IntegrationTests/Linq/LinqMethods/Delete.cs index 6e08b00eb..5b76451f7 100644 --- a/src/Cassandra.IntegrationTests/Linq/LinqMethods/Delete.cs +++ b/src/Cassandra.IntegrationTests/Linq/LinqMethods/Delete.cs @@ -132,7 +132,7 @@ public void Delete_NoSuchRecord() Assert.AreEqual(1, listOfExecutionParameters.Count); var parameter = Convert.FromBase64String((string)listOfExecutionParameters.Single().Single()); - var actualParameter = (string) Session.Cluster.Metadata.ControlConnection.Serializer.GetCurrentSerializer().Deserialize(parameter, 0, parameter.Length, ColumnTypeCode.Text, null); + var actualParameter = (string) Session.Cluster.Configuration.SerializerManager.GetCurrentSerializer().Deserialize(parameter, 0, parameter.Length, ColumnTypeCode.Text, null); Assert.AreNotEqual(entityToDelete.StringType, actualParameter); Assert.IsTrue(actualParameter.StartsWith(entityToDelete.StringType)); Assert.IsTrue(actualParameter.Length > entityToDelete.StringType.Length); diff --git a/src/Cassandra.IntegrationTests/MetadataTests/TokenMapSchemaChangeMetadataSyncTests.cs b/src/Cassandra.IntegrationTests/MetadataTests/TokenMapSchemaChangeMetadataSyncTests.cs index 8b9121dcf..33c573750 100644 --- a/src/Cassandra.IntegrationTests/MetadataTests/TokenMapSchemaChangeMetadataSyncTests.cs +++ b/src/Cassandra.IntegrationTests/MetadataTests/TokenMapSchemaChangeMetadataSyncTests.cs @@ -65,19 +65,20 @@ public void TokenMap_Should_NotUpdateExistingTokenMap_When_KeyspaceIsCreated() .Build()) { var newSession = newCluster.Connect(); - var oldTokenMap = newCluster.Metadata.TokenToReplicasMap; - Assert.AreEqual(3, newCluster.Metadata.Hosts.Count); + newSession.Connect(); + var oldTokenMap = newCluster.InternalRef.InternalMetadata.TokenToReplicasMap; + Assert.AreEqual(3, newCluster.InternalRef.InternalMetadata.Hosts.Count); - Assert.IsNull(newCluster.Metadata.TokenToReplicasMap.GetByKeyspace(keyspaceName)); + Assert.IsNull(newCluster.InternalRef.InternalMetadata.TokenToReplicasMap.GetByKeyspace(keyspaceName)); var createKeyspaceCql = $"CREATE KEYSPACE {keyspaceName} WITH replication = {{'class': 'SimpleStrategy', 'replication_factor' : 3}}"; newSession.Execute(createKeyspaceCql); TestUtils.WaitForSchemaAgreement(newCluster); newSession.ChangeKeyspace(keyspaceName); - Assert.IsNull(newCluster.Metadata.TokenToReplicasMap.GetByKeyspace(keyspaceName)); - Assert.AreEqual(1, newCluster.Metadata.GetReplicas(keyspaceName, Encoding.UTF8.GetBytes("123")).Count); - Assert.IsTrue(object.ReferenceEquals(newCluster.Metadata.TokenToReplicasMap, oldTokenMap)); + Assert.IsNull(newCluster.InternalRef.InternalMetadata.TokenToReplicasMap.GetByKeyspace(keyspaceName)); + Assert.AreEqual(1, newCluster.InternalRef.InternalMetadata.GetReplicas(keyspaceName, Encoding.UTF8.GetBytes("123")).Count); + Assert.IsTrue(object.ReferenceEquals(newCluster.InternalRef.InternalMetadata.TokenToReplicasMap, oldTokenMap)); } } @@ -99,10 +100,10 @@ public void TokenMap_Should_NotUpdateExistingTokenMap_When_KeyspaceIsRemoved() var removeKeyspaceCql = $"DROP KEYSPACE {keyspaceName}"; newSession.Execute(removeKeyspaceCql); TestUtils.WaitForSchemaAgreement(newCluster); - var oldTokenMap = newCluster.Metadata.TokenToReplicasMap; - Assert.IsNull(newCluster.Metadata.TokenToReplicasMap.GetByKeyspace(keyspaceName)); + var oldTokenMap = newCluster.InternalRef.InternalMetadata.TokenToReplicasMap; + Assert.IsNull(newCluster.InternalRef.InternalMetadata.TokenToReplicasMap.GetByKeyspace(keyspaceName)); Assert.AreEqual(1, newCluster.Metadata.GetReplicas(keyspaceName, Encoding.UTF8.GetBytes("123")).Count); - Assert.IsTrue(object.ReferenceEquals(newCluster.Metadata.TokenToReplicasMap, oldTokenMap)); + Assert.IsTrue(object.ReferenceEquals(newCluster.InternalRef.InternalMetadata.TokenToReplicasMap, oldTokenMap)); } } @@ -121,27 +122,28 @@ public void TokenMap_Should_NotUpdateExistingTokenMap_When_KeyspaceIsChanged() .Build()) { var newSession = newCluster.Connect(keyspaceName); + newSession.Connect(); TestHelper.RetryAssert(() => { - var replicas = newCluster.Metadata.TokenToReplicasMap.GetByKeyspace(keyspaceName); + var replicas = newCluster.InternalRef.InternalMetadata.TokenToReplicasMap.GetByKeyspace(keyspaceName); Assert.IsNull(replicas); Assert.AreEqual(1, newCluster.Metadata.GetReplicas(keyspaceName, Encoding.UTF8.GetBytes("123")).Count); }); - Assert.AreEqual(3, newCluster.Metadata.Hosts.Count(h => h.IsUp)); - var oldTokenMap = newCluster.Metadata.TokenToReplicasMap; + Assert.AreEqual(3, newCluster.InternalRef.InternalMetadata.Hosts.Count(h => h.IsUp)); + var oldTokenMap = newCluster.InternalRef.InternalMetadata.TokenToReplicasMap; var alterKeyspaceCql = $"ALTER KEYSPACE {keyspaceName} WITH replication = {{'class': 'SimpleStrategy', 'replication_factor' : 2}}"; newSession.Execute(alterKeyspaceCql); TestUtils.WaitForSchemaAgreement(newCluster); TestHelper.RetryAssert(() => { - var replicas = newCluster.Metadata.TokenToReplicasMap.GetByKeyspace(keyspaceName); + var replicas = newCluster.InternalRef.InternalMetadata.TokenToReplicasMap.GetByKeyspace(keyspaceName); Assert.IsNull(replicas); Assert.AreEqual(1, newCluster.Metadata.GetReplicas(keyspaceName, Encoding.UTF8.GetBytes("123")).Count); }); - Assert.AreEqual(3, newCluster.Metadata.Hosts.Count(h => h.IsUp)); - Assert.IsTrue(object.ReferenceEquals(newCluster.Metadata.TokenToReplicasMap, oldTokenMap)); + Assert.AreEqual(3, newCluster.InternalRef.InternalMetadata.Hosts.Count(h => h.IsUp)); + Assert.IsTrue(object.ReferenceEquals(newCluster.InternalRef.InternalMetadata.TokenToReplicasMap, oldTokenMap)); } } @@ -163,24 +165,25 @@ public async Task TokenMap_Should_RefreshTokenMapForSingleKeyspace_When_RefreshS .WithQueryTimeout(60000) .Build()) { - var newSession = newCluster.Connect(keyspaceName); - var oldTokenMap = newCluster.Metadata.TokenToReplicasMap; - var replicas = newCluster.Metadata.TokenToReplicasMap.GetByKeyspace(keyspaceName); + var newSession = await newCluster.ConnectAsync(keyspaceName).ConfigureAwait(false); + await newSession.ConnectAsync().ConfigureAwait(false); + var oldTokenMap = newCluster.InternalRef.InternalMetadata.TokenToReplicasMap; + var replicas = newCluster.InternalRef.InternalMetadata.TokenToReplicasMap.GetByKeyspace(keyspaceName); Assert.IsNull(replicas); Assert.AreEqual(1, newCluster.Metadata.GetReplicas(keyspaceName, Encoding.UTF8.GetBytes("123")).Count); - Assert.AreEqual(3, newCluster.Metadata.Hosts.Count(h => h.IsUp)); + Assert.AreEqual(3, newCluster.InternalRef.InternalMetadata.Hosts.Count(h => h.IsUp)); Assert.AreEqual(1, newCluster.Metadata.GetReplicas(keyspaceName, Encoding.UTF8.GetBytes("123")).Count); - await newCluster.RefreshSchemaAsync(keyspaceName).ConfigureAwait(false); + await newCluster.Metadata.RefreshSchemaAsync(keyspaceName).ConfigureAwait(false); - Assert.AreEqual(1, newCluster.Metadata.KeyspacesSnapshot.Length); + Assert.AreEqual(1, newCluster.InternalRef.InternalMetadata.KeyspacesSnapshot.Length); - replicas = newCluster.Metadata.TokenToReplicasMap.GetByKeyspace(keyspaceName); - Assert.AreEqual(newCluster.Metadata.Hosts.Sum(h => h.Tokens.Count()), replicas.Count); + replicas = newCluster.InternalRef.InternalMetadata.TokenToReplicasMap.GetByKeyspace(keyspaceName); + Assert.AreEqual(newCluster.InternalRef.InternalMetadata.Hosts.Sum(h => h.Tokens.Count()), replicas.Count); Assert.AreEqual(3, newCluster.Metadata.GetReplicas(keyspaceName, Encoding.UTF8.GetBytes("123")).Count); - Assert.AreEqual(3, newCluster.Metadata.Hosts.Count(h => h.IsUp)); - Assert.IsTrue(object.ReferenceEquals(newCluster.Metadata.TokenToReplicasMap, oldTokenMap)); + Assert.AreEqual(3, newCluster.InternalRef.InternalMetadata.Hosts.Count(h => h.IsUp)); + Assert.IsTrue(object.ReferenceEquals(newCluster.InternalRef.InternalMetadata.TokenToReplicasMap, oldTokenMap)); } } @@ -202,28 +205,29 @@ public async Task TokenMap_Should_RefreshTokenMapForAllKeyspaces_When_RefreshSch .WithQueryTimeout(60000) .Build()) { - var newSession = newCluster.Connect(keyspaceName); - var replicas = newCluster.Metadata.TokenToReplicasMap.GetByKeyspace(keyspaceName); + var newSession = await newCluster.ConnectAsync(keyspaceName).ConfigureAwait(false); + await newSession.ConnectAsync().ConfigureAwait(false); + var replicas = newCluster.InternalRef.InternalMetadata.TokenToReplicasMap.GetByKeyspace(keyspaceName); Assert.IsNull(replicas); Assert.AreEqual(1, newCluster.Metadata.GetReplicas(keyspaceName, Encoding.UTF8.GetBytes("123")).Count); - var oldTokenMap = newCluster.Metadata.TokenToReplicasMap; - Assert.AreEqual(3, newCluster.Metadata.Hosts.Count(h => h.IsUp)); + var oldTokenMap = newCluster.InternalRef.InternalMetadata.TokenToReplicasMap; + Assert.AreEqual(3, newCluster.InternalRef.InternalMetadata.Hosts.Count(h => h.IsUp)); Assert.AreEqual(1, newCluster.Metadata.GetReplicas(keyspaceName, Encoding.UTF8.GetBytes("123")).Count); - await newCluster.RefreshSchemaAsync().ConfigureAwait(false); + await newCluster.Metadata.RefreshSchemaAsync().ConfigureAwait(false); - Assert.GreaterOrEqual(newCluster.Metadata.KeyspacesSnapshot.Length, 2); + Assert.GreaterOrEqual(newCluster.InternalRef.InternalMetadata.KeyspacesSnapshot.Length, 2); - replicas = newCluster.Metadata.TokenToReplicasMap.GetByKeyspace(keyspaceName); - Assert.AreEqual(newCluster.Metadata.Hosts.Sum(h => h.Tokens.Count()), replicas.Count); + replicas = newCluster.InternalRef.InternalMetadata.TokenToReplicasMap.GetByKeyspace(keyspaceName); + Assert.AreEqual(newCluster.InternalRef.InternalMetadata.Hosts.Sum(h => h.Tokens.Count()), replicas.Count); Assert.AreEqual(3, newCluster.Metadata.GetReplicas(keyspaceName, Encoding.UTF8.GetBytes("123")).Count); - replicas = newCluster.Metadata.TokenToReplicasMap.GetByKeyspace(keyspaceName1); - Assert.AreEqual(newCluster.Metadata.Hosts.Sum(h => h.Tokens.Count()), replicas.Count); + replicas = newCluster.InternalRef.InternalMetadata.TokenToReplicasMap.GetByKeyspace(keyspaceName1); + Assert.AreEqual(newCluster.InternalRef.InternalMetadata.Hosts.Sum(h => h.Tokens.Count()), replicas.Count); Assert.AreEqual(3, newCluster.Metadata.GetReplicas(keyspaceName, Encoding.UTF8.GetBytes("123")).Count); - Assert.AreEqual(3, newCluster.Metadata.Hosts.Count(h => h.IsUp)); - Assert.IsFalse(object.ReferenceEquals(newCluster.Metadata.TokenToReplicasMap, oldTokenMap)); + Assert.AreEqual(3, newCluster.InternalRef.InternalMetadata.Hosts.Count(h => h.IsUp)); + Assert.IsFalse(object.ReferenceEquals(newCluster.InternalRef.InternalMetadata.TokenToReplicasMap, oldTokenMap)); } } } diff --git a/src/Cassandra.IntegrationTests/MetadataTests/TokenMapSchemaChangeTests.cs b/src/Cassandra.IntegrationTests/MetadataTests/TokenMapSchemaChangeTests.cs index c390e2587..7f8897359 100644 --- a/src/Cassandra.IntegrationTests/MetadataTests/TokenMapSchemaChangeTests.cs +++ b/src/Cassandra.IntegrationTests/MetadataTests/TokenMapSchemaChangeTests.cs @@ -37,11 +37,12 @@ public void TokenMap_Should_UpdateExistingTokenMap_When_KeyspaceIsCreated() TestUtils.WaitForSchemaAgreement(Cluster); var keyspaceName = TestUtils.GetUniqueKeyspaceName().ToLower(); var newSession = GetNewTemporarySession(); - var newCluster = newSession.Cluster; - var oldTokenMap = newCluster.Metadata.TokenToReplicasMap; - Assert.AreEqual(3, newCluster.Metadata.Hosts.Count); + newSession.Connect(); + var newCluster = newSession.InternalCluster; + var oldTokenMap = newCluster.InternalMetadata.TokenToReplicasMap; + Assert.AreEqual(3, newCluster.InternalMetadata.Hosts.Count); - Assert.IsNull(newCluster.Metadata.TokenToReplicasMap.GetByKeyspace(keyspaceName)); + Assert.IsNull(newCluster.InternalMetadata.TokenToReplicasMap.GetByKeyspace(keyspaceName)); var createKeyspaceCql = $"CREATE KEYSPACE {keyspaceName} WITH replication = {{'class': 'SimpleStrategy', 'replication_factor' : 3}}"; newSession.Execute(createKeyspaceCql); @@ -53,11 +54,11 @@ public void TokenMap_Should_UpdateExistingTokenMap_When_KeyspaceIsCreated() IReadOnlyDictionary> replicas = null; Assert.DoesNotThrow(() => { - replicas = newCluster.Metadata.TokenToReplicasMap.GetByKeyspace(keyspaceName); + replicas = newCluster.InternalMetadata.TokenToReplicasMap.GetByKeyspace(keyspaceName); }); - Assert.AreEqual(newCluster.Metadata.Hosts.Sum(h => h.Tokens.Count()), replicas.Count); + Assert.AreEqual(newCluster.InternalMetadata.Hosts.Sum(h => h.Tokens.Count()), replicas.Count); }); - Assert.IsTrue(object.ReferenceEquals(newCluster.Metadata.TokenToReplicasMap, oldTokenMap)); + Assert.IsTrue(object.ReferenceEquals(newCluster.InternalMetadata.TokenToReplicasMap, oldTokenMap)); } [Test] @@ -69,16 +70,16 @@ public void TokenMap_Should_UpdateExistingTokenMap_When_KeyspaceIsRemoved() TestUtils.WaitForSchemaAgreement(Cluster); var newSession = GetNewTemporarySession(); - var newCluster = newSession.Cluster; + var newCluster = newSession.InternalCluster; var removeKeyspaceCql = $"DROP KEYSPACE {keyspaceName}"; newSession.Execute(removeKeyspaceCql); TestUtils.WaitForSchemaAgreement(newCluster); - var oldTokenMap = newCluster.Metadata.TokenToReplicasMap; + var oldTokenMap = newCluster.InternalMetadata.TokenToReplicasMap; TestHelper.RetryAssert(() => { - Assert.IsNull(newCluster.Metadata.TokenToReplicasMap.GetByKeyspace(keyspaceName)); + Assert.IsNull(newCluster.InternalMetadata.TokenToReplicasMap.GetByKeyspace(keyspaceName)); }); - Assert.IsTrue(object.ReferenceEquals(newCluster.Metadata.TokenToReplicasMap, oldTokenMap)); + Assert.IsTrue(object.ReferenceEquals(newCluster.InternalMetadata.TokenToReplicasMap, oldTokenMap)); } [Test] @@ -90,28 +91,28 @@ public void TokenMap_Should_UpdateExistingTokenMap_When_KeyspaceIsChanged() TestUtils.WaitForSchemaAgreement(Cluster); var newSession = GetNewTemporarySession(keyspaceName); - var newCluster = newSession.Cluster; + var newCluster = newSession.InternalCluster; TestHelper.RetryAssert(() => { - var replicas = newCluster.Metadata.TokenToReplicasMap.GetByKeyspace(keyspaceName); - Assert.AreEqual(newCluster.Metadata.Hosts.Sum(h => h.Tokens.Count()), replicas.Count); + var replicas = newCluster.InternalMetadata.TokenToReplicasMap.GetByKeyspace(keyspaceName); + Assert.AreEqual(newCluster.InternalMetadata.Hosts.Sum(h => h.Tokens.Count()), replicas.Count); Assert.AreEqual(3, newCluster.Metadata.GetReplicas(keyspaceName, Encoding.UTF8.GetBytes("123")).Count); }); - Assert.AreEqual(3, newCluster.Metadata.Hosts.Count(h => h.IsUp)); - var oldTokenMap = newCluster.Metadata.TokenToReplicasMap; + Assert.AreEqual(3, newCluster.InternalMetadata.Hosts.Count(h => h.IsUp)); + var oldTokenMap = newCluster.InternalMetadata.TokenToReplicasMap; var alterKeyspaceCql = $"ALTER KEYSPACE {keyspaceName} WITH replication = {{'class': 'SimpleStrategy', 'replication_factor' : 2}}"; newSession.Execute(alterKeyspaceCql); TestUtils.WaitForSchemaAgreement(newCluster); TestHelper.RetryAssert(() => { - var replicas = newCluster.Metadata.TokenToReplicasMap.GetByKeyspace(keyspaceName); - Assert.AreEqual(newCluster.Metadata.Hosts.Sum(h => h.Tokens.Count()), replicas.Count); + var replicas = newCluster.InternalMetadata.TokenToReplicasMap.GetByKeyspace(keyspaceName); + Assert.AreEqual(newCluster.InternalMetadata.Hosts.Sum(h => h.Tokens.Count()), replicas.Count); Assert.AreEqual(2, newCluster.Metadata.GetReplicas(keyspaceName, Encoding.UTF8.GetBytes("123")).Count); }); - Assert.AreEqual(3, newCluster.Metadata.Hosts.Count(h => h.IsUp)); - Assert.IsTrue(object.ReferenceEquals(newCluster.Metadata.TokenToReplicasMap, oldTokenMap)); + Assert.AreEqual(3, newCluster.InternalMetadata.Hosts.Count(h => h.IsUp)); + Assert.IsTrue(object.ReferenceEquals(newCluster.InternalMetadata.TokenToReplicasMap, oldTokenMap)); } } } \ No newline at end of file diff --git a/src/Cassandra.IntegrationTests/MetadataTests/TokenMapTopologyChangeTests.cs b/src/Cassandra.IntegrationTests/MetadataTests/TokenMapTopologyChangeTests.cs index 92760652d..5dc08b6e6 100644 --- a/src/Cassandra.IntegrationTests/MetadataTests/TokenMapTopologyChangeTests.cs +++ b/src/Cassandra.IntegrationTests/MetadataTests/TokenMapTopologyChangeTests.cs @@ -21,6 +21,7 @@ using Cassandra.IntegrationTests.TestBase; using Cassandra.IntegrationTests.TestClusterManagement; +using Cassandra.SessionManagement; using Cassandra.Tests; using NUnit.Framework; @@ -31,8 +32,8 @@ namespace Cassandra.IntegrationTests.MetadataTests public class TokenMapTopologyChangeTests : TestGlobals { private ITestCluster TestCluster { get; set; } - private ICluster ClusterObjSync { get; set; } - private ICluster ClusterObjNotSync { get; set; } + private IInternalCluster ClusterObjSync { get; set; } + private IInternalCluster ClusterObjNotSync { get; set; } [Test] public void TokenMap_Should_RebuildTokenMap_When_NodeIsDecommissioned() @@ -74,8 +75,8 @@ public void TokenMap_Should_RebuildTokenMap_When_NodeIsDecommissioned() TestHelper.RetryAssert(() => { - Assert.AreEqual(3, ClusterObjSync.Metadata.Hosts.Count); - Assert.AreEqual(3, ClusterObjNotSync.Metadata.Hosts.Count); + Assert.AreEqual(3, ClusterObjSync.InternalMetadata.Hosts.Count); + Assert.AreEqual(3, ClusterObjNotSync.InternalMetadata.Hosts.Count); replicasSync = ClusterObjSync.Metadata.GetReplicas(keyspaceName, Encoding.UTF8.GetBytes("123")); replicasNotSync = ClusterObjNotSync.Metadata.GetReplicas(keyspaceName, Encoding.UTF8.GetBytes("123")); @@ -84,8 +85,8 @@ public void TokenMap_Should_RebuildTokenMap_When_NodeIsDecommissioned() Assert.AreEqual(1, replicasNotSync.Count); }, 100, 150); - var oldTokenMapNotSync = ClusterObjNotSync.Metadata.TokenToReplicasMap; - var oldTokenMapSync = ClusterObjSync.Metadata.TokenToReplicasMap; + var oldTokenMapNotSync = ClusterObjNotSync.InternalMetadata.TokenToReplicasMap; + var oldTokenMapSync = ClusterObjSync.InternalMetadata.TokenToReplicasMap; if (TestClusterManager.SupportsDecommissionForcefully()) { @@ -100,8 +101,8 @@ public void TokenMap_Should_RebuildTokenMap_When_NodeIsDecommissioned() TestHelper.RetryAssert(() => { - Assert.AreEqual(2, ClusterObjSync.Metadata.Hosts.Count, "ClusterObjSync.Metadata.Hosts.Count"); - Assert.AreEqual(2, ClusterObjNotSync.Metadata.Hosts.Count, "ClusterObjNotSync.Metadata.Hosts.Count"); + Assert.AreEqual(2, ClusterObjSync.InternalMetadata.Hosts.Count, "ClusterObjSync.Metadata.Hosts.Count"); + Assert.AreEqual(2, ClusterObjNotSync.InternalMetadata.Hosts.Count, "ClusterObjNotSync.Metadata.Hosts.Count"); replicasSync = ClusterObjSync.Metadata.GetReplicas(keyspaceName, Encoding.UTF8.GetBytes("123")); replicasNotSync = ClusterObjNotSync.Metadata.GetReplicas(keyspaceName, Encoding.UTF8.GetBytes("123")); @@ -109,18 +110,18 @@ public void TokenMap_Should_RebuildTokenMap_When_NodeIsDecommissioned() Assert.AreEqual(2, replicasSync.Count, "replicasSync.Count"); Assert.AreEqual(1, replicasNotSync.Count, "replicasNotSync.Count"); - Assert.IsFalse(object.ReferenceEquals(ClusterObjNotSync.Metadata.TokenToReplicasMap, oldTokenMapNotSync)); - Assert.IsFalse(object.ReferenceEquals(ClusterObjSync.Metadata.TokenToReplicasMap, oldTokenMapSync)); + Assert.IsFalse(object.ReferenceEquals(ClusterObjNotSync.InternalMetadata.TokenToReplicasMap, oldTokenMapNotSync)); + Assert.IsFalse(object.ReferenceEquals(ClusterObjSync.InternalMetadata.TokenToReplicasMap, oldTokenMapSync)); }, 1000, 360); - oldTokenMapNotSync = ClusterObjNotSync.Metadata.TokenToReplicasMap; - oldTokenMapSync = ClusterObjSync.Metadata.TokenToReplicasMap; + oldTokenMapNotSync = ClusterObjNotSync.InternalMetadata.TokenToReplicasMap; + oldTokenMapSync = ClusterObjSync.InternalMetadata.TokenToReplicasMap; this.TestCluster.BootstrapNode(4); TestHelper.RetryAssert(() => { - Assert.AreEqual(3, ClusterObjSync.Metadata.Hosts.Count); - Assert.AreEqual(3, ClusterObjNotSync.Metadata.Hosts.Count); + Assert.AreEqual(3, ClusterObjSync.InternalMetadata.Hosts.Count); + Assert.AreEqual(3, ClusterObjNotSync.InternalMetadata.Hosts.Count); replicasSync = ClusterObjSync.Metadata.GetReplicas(keyspaceName, Encoding.UTF8.GetBytes("123")); replicasNotSync = ClusterObjNotSync.Metadata.GetReplicas(keyspaceName, Encoding.UTF8.GetBytes("123")); @@ -128,8 +129,8 @@ public void TokenMap_Should_RebuildTokenMap_When_NodeIsDecommissioned() Assert.AreEqual(3, replicasSync.Count); Assert.AreEqual(1, replicasNotSync.Count); - Assert.IsFalse(object.ReferenceEquals(ClusterObjNotSync.Metadata.TokenToReplicasMap, oldTokenMapNotSync)); - Assert.IsFalse(object.ReferenceEquals(ClusterObjSync.Metadata.TokenToReplicasMap, oldTokenMapSync)); + Assert.IsFalse(object.ReferenceEquals(ClusterObjNotSync.InternalMetadata.TokenToReplicasMap, oldTokenMapNotSync)); + Assert.IsFalse(object.ReferenceEquals(ClusterObjSync.InternalMetadata.TokenToReplicasMap, oldTokenMapSync)); }, 1000, 360); } diff --git a/src/Cassandra.IntegrationTests/Metrics/MetricsTests.cs b/src/Cassandra.IntegrationTests/Metrics/MetricsTests.cs index db43baa4f..2fba6498b 100644 --- a/src/Cassandra.IntegrationTests/Metrics/MetricsTests.cs +++ b/src/Cassandra.IntegrationTests/Metrics/MetricsTests.cs @@ -98,13 +98,14 @@ public void Should_RemoveNodeMetricsAndDisposeMetricsContext_When_HostIsRemoved( _metricsRoot = new MetricsBuilder().Build(); var cluster = GetNewTemporaryCluster(b => b.WithMetrics(_metricsRoot.CreateDriverMetricsProvider())); var session = cluster.Connect(); + session.Connect(); var metrics = session.GetMetrics(); - Assert.AreEqual(3, cluster.Metadata.Hosts.Count); + Assert.AreEqual(3, cluster.InternalMetadata.Hosts.Count); Assert.AreEqual(3, metrics.NodeMetrics.Count); // get address for host that will be removed from the cluster in this test var address = TestCluster.ClusterIpPrefix + "2"; - var hostToBeRemoved = cluster.Metadata.Hosts.First(h => h.Address.Address.Equals(IPAddress.Parse(address))); + var hostToBeRemoved = cluster.InternalMetadata.Hosts.First(h => h.Address.Address.Equals(IPAddress.Parse(address))); // check node metrics are valid var gauge = metrics.GetNodeGauge(hostToBeRemoved, NodeMetric.Gauges.OpenConnections); @@ -130,7 +131,7 @@ public void Should_RemoveNodeMetricsAndDisposeMetricsContext_When_HostIsRemoved( TestCluster.Stop(2); try { - TestHelper.RetryAssert(() => { Assert.AreEqual(2, cluster.Metadata.Hosts.Count, "metadata hosts count failed"); }, 200, 50); + TestHelper.RetryAssert(() => { Assert.AreEqual(2, cluster.InternalMetadata.Hosts.Count, "metadata hosts count failed"); }, 200, 50); TestHelper.RetryAssert(() => { Assert.AreEqual(2, metrics.NodeMetrics.Count, "Node metrics count failed"); }, 10, 500); } catch @@ -146,7 +147,7 @@ public void Should_RemoveNodeMetricsAndDisposeMetricsContext_When_HostIsRemoved( TestCluster.Start(2, "--jvm_arg=\"-Dcassandra.override_decommission=true\""); - TestHelper.RetryAssert(() => { Assert.AreEqual(3, cluster.Metadata.Hosts.Count, "metadata hosts count after bootstrap failed"); }, + TestHelper.RetryAssert(() => { Assert.AreEqual(3, cluster.InternalMetadata.Hosts.Count, "metadata hosts count after bootstrap failed"); }, 200, 50); // when new host is chosen by LBP, connection pool is created @@ -177,6 +178,7 @@ public void Should_AllMetricsHaveValidValues_When_AllNodesAreUp() .SetEnabledNodeMetrics(NodeMetric.AllNodeMetrics) .SetEnabledSessionMetrics(SessionMetric.AllSessionMetrics))); var session = cluster.Connect(); + session.Connect(); Assert.AreEqual(25, NodeMetric.AllNodeMetrics.Count()); Assert.AreEqual(25, MetricsTests.Counters.Concat(MetricsTests.Gauges.Concat(MetricsTests.Timers.Concat(MetricsTests.Meters))) @@ -192,7 +194,7 @@ public void Should_AllMetricsHaveValidValues_When_AllNodesAreUp() var waitedForRefresh = false; var metrics = session.GetMetrics(); - foreach (var h in cluster.AllHosts()) + foreach (var h in cluster.Metadata.AllHosts()) { foreach (var c in MetricsTests.Counters) { @@ -231,6 +233,7 @@ public void Should_DefaultMetricsHaveValidValuesAndTimersDisabled() _metricsRoot = new MetricsBuilder().Build(); var cluster = GetNewTemporaryCluster(b => b.WithMetrics(_metricsRoot.CreateDriverMetricsProvider())); var session = cluster.Connect(); + session.Connect(); Assert.AreEqual(24, NodeMetric.DefaultNodeMetrics.Count()); Assert.IsTrue(NodeMetric.DefaultNodeMetrics.SequenceEqual(NodeMetric.DefaultNodeMetrics.Distinct())); Assert.AreEqual(NodeMetric.Timers.CqlMessages, NodeMetric.AllNodeMetrics.Except(NodeMetric.DefaultNodeMetrics).Single()); @@ -248,7 +251,7 @@ public void Should_DefaultMetricsHaveValidValuesAndTimersDisabled() } var metrics = session.GetMetrics(); - foreach (var h in cluster.AllHosts()) + foreach (var h in cluster.Metadata.AllHosts()) { foreach (var c in MetricsTests.Counters) { @@ -293,8 +296,8 @@ public void Should_AllMetricsHaveValidValues_When_NodeIsDown() } var metrics = session.GetMetrics(); - var downNode = session.Cluster.AllHosts().Single(h => h.Address.Address.ToString() == (TestCluster.ClusterIpPrefix + "2")); - foreach (var h in cluster.AllHosts()) + var downNode = session.Cluster.Metadata.AllHosts().Single(h => h.Address.Address.ToString() == (TestCluster.ClusterIpPrefix + "2")); + foreach (var h in cluster.Metadata.AllHosts()) { foreach (var c in MetricsTests.Counters) { diff --git a/src/Cassandra.IntegrationTests/Policies/Tests/LoadBalancingPolicyShortTests.cs b/src/Cassandra.IntegrationTests/Policies/Tests/LoadBalancingPolicyShortTests.cs index fe8e8da30..b895a4042 100644 --- a/src/Cassandra.IntegrationTests/Policies/Tests/LoadBalancingPolicyShortTests.cs +++ b/src/Cassandra.IntegrationTests/Policies/Tests/LoadBalancingPolicyShortTests.cs @@ -321,7 +321,7 @@ public void TokenAware_VNodes_Test(bool metadataSync) try { var session = cluster.Connect(); - Assert.AreEqual(256, cluster.AllHosts().First().Tokens.Count()); + Assert.AreEqual(256, cluster.Metadata.AllHosts().First().Tokens.Count()); var ks = TestUtils.GetUniqueKeyspaceName(); session.Execute($"CREATE KEYSPACE \"{ks}\" WITH replication = {{'class': 'SimpleStrategy', 'replication_factor' : 1}}"); session.ChangeKeyspace(ks); @@ -380,7 +380,7 @@ public void Token_Aware_Uses_Keyspace_From_Statement_To_Determine_Replication(bo // Manually calculate the routing key var routingKey = SerializerManager.Default.GetCurrentSerializer().Serialize(id); // Get the replicas - var replicas = cluster.GetReplicas(ks, routingKey); + var replicas = cluster.Metadata.GetReplicas(ks, routingKey); Assert.AreEqual(metadataSync ? 2 : 1, replicas.Count); CollectionAssert.AreEquivalent(replicas.Select(h => h.Address), coordinators); } diff --git a/src/Cassandra.IntegrationTests/Policies/Tests/RetryPolicyShortTests.cs b/src/Cassandra.IntegrationTests/Policies/Tests/RetryPolicyShortTests.cs index cec3ec437..14df42640 100644 --- a/src/Cassandra.IntegrationTests/Policies/Tests/RetryPolicyShortTests.cs +++ b/src/Cassandra.IntegrationTests/Policies/Tests/RetryPolicyShortTests.cs @@ -23,6 +23,7 @@ using Cassandra.IntegrationTests.SimulacronAPI.PrimeBuilder.Then; using Cassandra.IntegrationTests.TestBase; using Cassandra.IntegrationTests.TestClusterManagement.Simulacron; +using Cassandra.Tasks; using Cassandra.Tests; using Newtonsoft.Json; @@ -266,7 +267,6 @@ public RetryDecision OnRequestError(IStatement statement, Configuration config, private class CustomLoadBalancingPolicy : ILoadBalancingPolicy { - private ICluster _cluster; private readonly string[] _hosts; public CustomLoadBalancingPolicy(string[] hosts) @@ -274,20 +274,20 @@ public CustomLoadBalancingPolicy(string[] hosts) _hosts = hosts; } - public void Initialize(ICluster cluster) + public Task InitializeAsync(IMetadata metadata) { - _cluster = cluster; + return TaskHelper.Completed; } - public HostDistance Distance(Host host) + public HostDistance Distance(IMetadata metadata, Host host) { return HostDistance.Local; } - public IEnumerable NewQueryPlan(string keyspace, IStatement query) + public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) { var queryPlan = new List(); - var allHosts = _cluster.AllHosts(); + var allHosts = metadata.AllHostsSnapshot(); foreach (var host in _hosts) { queryPlan.Add(allHosts.Single(h => h.Address.ToString() == host)); diff --git a/src/Cassandra.IntegrationTests/Policies/Tests/TokenAwareTransientReplicationTests.cs b/src/Cassandra.IntegrationTests/Policies/Tests/TokenAwareTransientReplicationTests.cs index f613d6071..a623992a8 100644 --- a/src/Cassandra.IntegrationTests/Policies/Tests/TokenAwareTransientReplicationTests.cs +++ b/src/Cassandra.IntegrationTests/Policies/Tests/TokenAwareTransientReplicationTests.cs @@ -46,7 +46,7 @@ public void TokenAware_TransientReplication_NoHopsAndOnlyFullReplicas() { var session = cluster.Connect(); var ks = TestUtils.GetUniqueKeyspaceName(); - session.Execute($"CREATE KEYSPACE \"{ks}\" WITH replication = {{'class': 'NetworkTopologyStrategy', '{cluster.AllHosts().First().Datacenter}' : '3/1'}}"); + session.Execute($"CREATE KEYSPACE \"{ks}\" WITH replication = {{'class': 'NetworkTopologyStrategy', '{cluster.Metadata.AllHosts().First().Datacenter}' : '3/1'}}"); session.ChangeKeyspace(ks); session.Execute("CREATE TABLE tbl1 (id uuid primary key) WITH read_repair='NONE' AND additional_write_policy='NEVER'"); var ps = session.Prepare("INSERT INTO tbl1 (id) VALUES (?)"); diff --git a/src/Cassandra.IntegrationTests/SharedCloudClusterTest.cs b/src/Cassandra.IntegrationTests/SharedCloudClusterTest.cs index 6a7d30a6c..1a2ba77e3 100644 --- a/src/Cassandra.IntegrationTests/SharedCloudClusterTest.cs +++ b/src/Cassandra.IntegrationTests/SharedCloudClusterTest.cs @@ -18,6 +18,7 @@ using System.IO; using System.Threading.Tasks; using Cassandra.IntegrationTests.TestClusterManagement; +using Cassandra.SessionManagement; namespace Cassandra.IntegrationTests { @@ -99,7 +100,7 @@ protected ICluster CreateTemporaryCluster(string creds = "creds-v1.zip", Action< return cluster; } - protected async Task CreateSessionAsync( + internal async Task CreateSessionAsync( string creds = "creds-v1.zip", int retries = SharedCloudClusterTest.MaxRetries, Action act = null) { Exception last = null; @@ -109,7 +110,7 @@ protected async Task CreateSessionAsync( try { cluster = CreateTemporaryCluster(creds, act); - return await cluster.ConnectAsync().ConfigureAwait(false); + return (IInternalSession) await cluster.ConnectAsync().ConfigureAwait(false); } catch (Exception ex) { diff --git a/src/Cassandra.IntegrationTests/SharedClusterTest.cs b/src/Cassandra.IntegrationTests/SharedClusterTest.cs index 16e77b1c9..ad0a6c4d9 100644 --- a/src/Cassandra.IntegrationTests/SharedClusterTest.cs +++ b/src/Cassandra.IntegrationTests/SharedClusterTest.cs @@ -18,6 +18,7 @@ using System.Collections.Generic; using Cassandra.IntegrationTests.TestBase; using Cassandra.IntegrationTests.TestClusterManagement; +using Cassandra.SessionManagement; using NUnit.Framework; namespace Cassandra.IntegrationTests @@ -57,6 +58,8 @@ public abstract class SharedClusterTest : TestGlobals /// protected ISession Session { get; set; } + internal IInternalSession InternalSession => (IInternalSession) Session; + /// /// It executes the queries provided on test fixture setup. /// Ignored when null. @@ -135,9 +138,9 @@ public virtual void OneTimeTearDown() ClusterInstances.Clear(); } - protected ISession GetNewTemporarySession(string keyspace = null) + internal IInternalSession GetNewTemporarySession(string keyspace = null) { - return GetNewTemporaryCluster().Connect(keyspace); + return (IInternalSession) GetNewTemporaryCluster().Connect(keyspace); } [TearDown] @@ -157,7 +160,7 @@ public virtual void TearDown() ClusterInstances.Clear(); } - protected virtual ICluster GetNewTemporaryCluster(Action build = null) + internal virtual IInternalCluster GetNewTemporaryCluster(Action build = null) { var builder = ClusterBuilder() diff --git a/src/Cassandra.IntegrationTests/SimulacronTest.cs b/src/Cassandra.IntegrationTests/SimulacronTest.cs index dd10fdc0f..90e5f88e1 100644 --- a/src/Cassandra.IntegrationTests/SimulacronTest.cs +++ b/src/Cassandra.IntegrationTests/SimulacronTest.cs @@ -61,6 +61,8 @@ protected SimulacronTest( protected ICluster SessionCluster => Session?.Cluster; + internal IInternalCluster InternalCluster => (IInternalCluster) SessionCluster; + protected SimulacronCluster TestCluster { get; private set; } protected IEnumerable> GetBoundStatementExecutionParameters(string cql) @@ -71,7 +73,7 @@ protected IEnumerable> GetBoundStatementExecutionParameters(string protected string SerializeParameter(object parameter) { - var serializer = Session.Cluster.Metadata.ControlConnection.Serializer.GetCurrentSerializer(); + var serializer = Session.Cluster.Configuration.SerializerManager.GetCurrentSerializer(); return Convert.ToBase64String(serializer.Serialize(parameter)); } @@ -93,7 +95,7 @@ protected void VerifyStatement(QueryType type, string cql, int count, params obj protected void VerifyStatement(IList logs, string cql, int count, params object[] positionalParameters) { - var serializer = Session.Cluster.Metadata.ControlConnection.Serializer.GetCurrentSerializer(); + var serializer = Session.Cluster.Configuration.SerializerManager.GetCurrentSerializer(); var paramBytes = positionalParameters.Select(obj => obj == null ? null : Convert.ToBase64String(serializer.Serialize(obj))).ToList(); var filteredQueries = logs.Where(q => (q.Query == cql || cql == null) && q.Frame.GetQueryMessage().Options.PositionalValues.SequenceEqual(paramBytes)); @@ -107,7 +109,7 @@ protected void VerifyBatchStatement(int count, byte[][] ids, params object[][] p protected void VerifyBatchStatement(int count, string[] queries, params object[][] parameters) { - var serializer = Session.Cluster.Metadata.ControlConnection.Serializer.GetCurrentSerializer(); + var serializer = Session.Cluster.Configuration.SerializerManager.GetCurrentSerializer(); var logs = TestCluster.GetQueries(null, QueryType.Batch); var paramBytes = parameters.SelectMany(obj => obj.Select(o => o == null ? null : Convert.ToBase64String(serializer.Serialize(o)))).ToArray(); @@ -119,7 +121,7 @@ protected void VerifyBatchStatement(int count, string[] queries, params object[] protected void VerifyBatchStatement(int count, string[] queries, Func func, params object[][] parameters) { - var serializer = Session.Cluster.Metadata.ControlConnection.Serializer.GetCurrentSerializer(); + var serializer = Session.Cluster.Configuration.SerializerManager.GetCurrentSerializer(); var logs = TestCluster.GetQueries(null, QueryType.Batch); var paramBytes = parameters.SelectMany(obj => obj.Select(o => o == null ? null : Convert.ToBase64String(serializer.Serialize(o)))).ToArray(); diff --git a/src/Cassandra.IntegrationTests/TestBase/TestUtils.cs b/src/Cassandra.IntegrationTests/TestBase/TestUtils.cs index b710b483f..7c9a6c647 100644 --- a/src/Cassandra.IntegrationTests/TestBase/TestUtils.cs +++ b/src/Cassandra.IntegrationTests/TestBase/TestUtils.cs @@ -25,6 +25,7 @@ using System.Text.RegularExpressions; using System.Threading; using Cassandra.IntegrationTests.TestClusterManagement; +using Cassandra.SessionManagement; using Cassandra.Tests; using NUnit.Framework; @@ -197,7 +198,7 @@ private static void WaitForMeta(string nodeHost, Cluster cluster, int maxTry, bo try { // Are all nodes in the cluster accounted for? - bool disconnected = !cluster.RefreshSchema(); + bool disconnected = !cluster.Metadata.RefreshSchema(); if (disconnected) { string warnStr = "While waiting for host " + nodeHost + " to be " + expectedFinalNodeState + ", the cluster is now totally down, returning now ... "; @@ -205,7 +206,7 @@ private static void WaitForMeta(string nodeHost, Cluster cluster, int maxTry, bo return; } - Metadata metadata = cluster.Metadata; + var metadata = cluster.Metadata; foreach (Host host in metadata.AllHosts()) { bool hostFound = false; @@ -621,18 +622,17 @@ public static bool IsNodeReachable(IPAddress ip, int port = 9042) public static void WaitForSchemaAgreement( ICluster cluster, bool ignoreDownNodes = true, bool throwOnMaxRetries = false, int maxRetries = 20) { - var hostsLength = cluster.AllHosts().Count; + var hostsLength = cluster.Metadata.AllHosts().Count; if (hostsLength == 1) { return; } - var cc = cluster.Metadata.ControlConnection; + var cc = ((IInternalCluster)cluster).InternalMetadata.ControlConnection; var counter = 0; - var nodesDown = ignoreDownNodes ? cluster.AllHosts().Count(h => !h.IsConsiderablyUp) : 0; + var nodesDown = ignoreDownNodes ? cluster.Metadata.AllHosts().Count(h => !h.IsConsiderablyUp) : 0; while (counter++ < maxRetries) { Trace.TraceInformation("Waiting for test schema agreement"); - Thread.Sleep(500); var schemaVersions = new List(); //peers schemaVersions.AddRange(cc.Query("SELECT peer, schema_version FROM system.peers").Select(r => r.GetValue("schema_version"))); @@ -645,6 +645,8 @@ public static void WaitForSchemaAgreement( //There is 1 schema version or 1 + nodes that are considered as down return; } + + Thread.Sleep(500); } if (throwOnMaxRetries) diff --git a/src/Cassandra.Tests/BuilderTests.cs b/src/Cassandra.Tests/BuilderTests.cs index 5691e520f..b59954c8a 100644 --- a/src/Cassandra.Tests/BuilderTests.cs +++ b/src/Cassandra.Tests/BuilderTests.cs @@ -165,7 +165,7 @@ public void WithMaxProtocolVersion_Validates_Greater_Than_Zero() public void PoolingOptions_Create_Based_On_Protocol_Version(ProtocolVersion protocolVersion, int coreConnections, int maxConnections) { - var options1 = PoolingOptions.Get(protocolVersion); + var options1 = PoolingOptions.Create(protocolVersion); var cluster1 = Cluster.Builder() .AddContactPoint("::1") .WithPoolingOptions(options1) diff --git a/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs b/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs index 4714851eb..56adc6657 100644 --- a/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs +++ b/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs @@ -59,7 +59,7 @@ private ControlConnectionCreateResult NewInstance( IDictionary rows = null, IInternalCluster cluster = null, Configuration config = null, - Metadata metadata = null, + IInternalMetadata internalMetadata = null, Action configBuilderAct = null) { if (rows == null) @@ -112,18 +112,19 @@ private ControlConnectionCreateResult NewInstance( config.ServerNameResolver) }; - if (metadata == null) + if (internalMetadata == null) { - metadata = new Metadata(cluster, config, config.SerializerManager, contactPoints); + internalMetadata = new InternalMetadata(cluster, config, contactPoints); } return new ControlConnectionCreateResult { ConnectionFactory = connectionFactory, - Metadata = metadata, + Metadata = new FakeMetadata(internalMetadata), Cluster = cluster, Config = config, - ControlConnection = (ControlConnection)metadata.InternalMetadata.ControlConnection + ControlConnection = (ControlConnection)internalMetadata.ControlConnection, + InternalMetadata = internalMetadata }; } @@ -263,7 +264,7 @@ public async Task Should_NotLeakConnections_When_DisposeAndReconnectHappenSimult Mock.Get(cluster) .Setup(c => c.RetrieveAndSetDistance(It.IsAny())) .Returns(h => config.Policies.LoadBalancingPolicy.Distance(metadata, h)); - config.LocalDatacenterProvider.Initialize(cluster, metadata.InternalMetadata); + config.LocalDatacenterProvider.Initialize(cluster, createResult.InternalMetadata); await config.Policies.LoadBalancingPolicy.InitializeAsync(metadata).ConfigureAwait(false); createResult.ConnectionFactory.CreatedConnections.Clear(); @@ -353,20 +354,22 @@ private ControlConnectionCreateResult CreateForContactPointTest(bool keepContact new ConnectionEndPoint(_endpoint2, config.ServerNameResolver, _localhost) }); config.SerializerManager.ChangeProtocolVersion(ProtocolVersion.V3); - var metadata = new Metadata( + var internalMetadata = new InternalMetadata( Mock.Of(), config, - config.SerializerManager, new List { _cp1, _cp2, _localhost }); + var metadata = new FakeMetadata(internalMetadata); return new ControlConnectionCreateResult { ConnectionFactory = connectionFactory, - ControlConnection = (ControlConnection)metadata.InternalMetadata.ControlConnection + ControlConnection = (ControlConnection)metadata.InternalMetadata.ControlConnection, + Metadata = new Metadata(internalMetadata), + InternalMetadata = internalMetadata }; } @@ -374,7 +377,9 @@ private class ControlConnectionCreateResult { public ControlConnection ControlConnection { get; set; } - public Metadata Metadata { get; set; } + public IMetadata Metadata { get; set; } + + public IInternalMetadata InternalMetadata { get; set; } public Configuration Config { get; set; } diff --git a/src/Cassandra.Tests/Connections/Control/TopologyRefresherTests.cs b/src/Cassandra.Tests/Connections/Control/TopologyRefresherTests.cs index 17a42b456..a20914b98 100644 --- a/src/Cassandra.Tests/Connections/Control/TopologyRefresherTests.cs +++ b/src/Cassandra.Tests/Connections/Control/TopologyRefresherTests.cs @@ -103,7 +103,7 @@ private TopologyRefresher CreateTopologyRefresher( { MetadataRequestHandler = fakeRequestHandler }.Build(); - _internalMetadata = new Metadata(Mock.Of(), config, config.SerializerManager, new List()).InternalMetadata; + _internalMetadata = new InternalMetadata(Mock.Of(), config, new List()); return new TopologyRefresher(_internalMetadata, config); } @@ -115,7 +115,7 @@ public async Task Should_SendSystemLocalAndPeersV1AndPeersV2Queries() { MetadataRequestHandler = fakeRequestHandler }.Build(); - _internalMetadata = new Metadata(Mock.Of(), config, config.SerializerManager, new List()).InternalMetadata; + _internalMetadata = new InternalMetadata(Mock.Of(), config, new List()); var topologyRefresher = new TopologyRefresher(_internalMetadata, config); var connection = Mock.Of(); @@ -139,7 +139,7 @@ public async Task Should_SendSystemLocalAndPeersV2Queries() { MetadataRequestHandler = fakeRequestHandler }.Build(); - _internalMetadata = new Metadata(Mock.Of(), config, config.SerializerManager, new List()).InternalMetadata; + _internalMetadata = new InternalMetadata(Mock.Of(), config, new List()); var topologyRefresher = new TopologyRefresher(_internalMetadata, config); var connection = Mock.Of(); @@ -161,7 +161,7 @@ public async Task Should_KeepSendingSystemPeersV2Queries_When_ItDoesNotFail() { MetadataRequestHandler = fakeRequestHandler }.Build(); - _internalMetadata = new Metadata(Mock.Of(), config, config.SerializerManager, new List()).InternalMetadata; + _internalMetadata = new InternalMetadata(Mock.Of(), config, new List()); var topologyRefresher = new TopologyRefresher(_internalMetadata, config); var connection = Mock.Of(); @@ -191,7 +191,7 @@ public async Task Should_SendPeersV1OnlyAfterPeersV2Fails() { var fakeRequestHandler = CreateFakeMetadataRequestHandler(); var config = new TestConfigurationBuilder { MetadataRequestHandler = fakeRequestHandler }.Build(); - _internalMetadata = new Metadata(Mock.Of(), config, config.SerializerManager, new List()).InternalMetadata; + _internalMetadata = new InternalMetadata(Mock.Of(), config, new List()); var topologyRefresher = new TopologyRefresher(_internalMetadata, config); var connection = Mock.Of(); @@ -301,7 +301,7 @@ public async Task UpdatePeersInfoUsesAddressTranslator() StartupOptionsFactory = Mock.Of(), MetadataRequestHandler = requestHandler }.Build(); - _internalMetadata = new Metadata(Mock.Of(), config, config.SerializerManager, new List()).InternalMetadata; + _internalMetadata = new InternalMetadata(Mock.Of(), config, new List()); var topologyRefresher = new TopologyRefresher(_internalMetadata, config); await topologyRefresher.RefreshNodeListAsync( diff --git a/src/Cassandra.Tests/Connections/HostConnectionPoolTests.cs b/src/Cassandra.Tests/Connections/HostConnectionPoolTests.cs index c8e521c57..6e287b600 100644 --- a/src/Cassandra.Tests/Connections/HostConnectionPoolTests.cs +++ b/src/Cassandra.Tests/Connections/HostConnectionPoolTests.cs @@ -111,7 +111,9 @@ private IHostConnectionPool CreatePool(IEndPointResolver res = null) _host, config, SerializerManager.Default, - new MetricsObserverFactory(new MetricsManager(new NullDriverMetricsProvider(), new DriverMetricsOptions(), false, "s1")) + new MetricsObserverFactory( + new MetricsManager( + null, new NullDriverMetricsProvider(), new DriverMetricsOptions(), false, "s1")) ); pool.SetDistance(HostDistance.Local); // set expected connections length diff --git a/src/Cassandra.Tests/Connections/TestHelpers/FakeControlConnectionFactory.cs b/src/Cassandra.Tests/Connections/TestHelpers/FakeControlConnectionFactory.cs index 7e3652322..8d1e317d3 100644 --- a/src/Cassandra.Tests/Connections/TestHelpers/FakeControlConnectionFactory.cs +++ b/src/Cassandra.Tests/Connections/TestHelpers/FakeControlConnectionFactory.cs @@ -33,8 +33,6 @@ internal class FakeControlConnectionFactory : IControlConnectionFactory { public IControlConnection Create( IInternalCluster cluster, - IProtocolEventDebouncer protocolEventDebouncer, - ISerializerManager serializerManager, Configuration config, IInternalMetadata metadata, IEnumerable contactPoints) @@ -56,7 +54,7 @@ public IControlConnection Create( } } metadata.SetResolvedContactPoints(cps); - serializerManager.ChangeProtocolVersion(ProtocolVersion.V3); + config.SerializerManager.ChangeProtocolVersion(ProtocolVersion.V3); })); return cc; } diff --git a/src/Cassandra.Tests/Connections/TestHelpers/FakeInternalMetadata.cs b/src/Cassandra.Tests/Connections/TestHelpers/FakeInternalMetadata.cs new file mode 100644 index 000000000..0cda792b3 --- /dev/null +++ b/src/Cassandra.Tests/Connections/TestHelpers/FakeInternalMetadata.cs @@ -0,0 +1,289 @@ +// +// Copyright (C) DataStax Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +using System; +using System.Collections.Generic; +using System.Net; +using System.Threading.Tasks; + +using Cassandra.Collections; +using Cassandra.Connections; +using Cassandra.Connections.Control; +using Cassandra.MetadataHelpers; +using Cassandra.Serialization; + +namespace Cassandra.Tests.Connections.TestHelpers +{ + internal class FakeInternalMetadata : IInternalMetadata + { + private volatile CopyOnWriteDictionary> _resolvedContactPoints = + new CopyOnWriteDictionary>(); + + public FakeInternalMetadata(Configuration config) + { + Configuration = config; + Hosts = new Hosts(); + Hosts.Down += OnHostDown; + Hosts.Up += OnHostUp; + } + + public event HostsEventHandler HostsEvent; + + public event SchemaChangedEventHandler SchemaChangedEvent; + + public event Action HostAdded; + + public event Action HostRemoved; + + public Configuration Configuration { get; } + + public IControlConnection ControlConnection { get; } + + public ISerializerManager SerializerManager => throw new NotImplementedException(); + + public ISchemaParser SchemaParser => throw new NotImplementedException(); + + public string Partitioner => throw new NotImplementedException(); + + public Hosts Hosts { get; } + + public IReadOnlyDictionary> ResolvedContactPoints => + _resolvedContactPoints; + + public IReadOnlyTokenMap TokenToReplicasMap => throw new NotImplementedException(); + + public bool IsDbaas => throw new NotImplementedException(); + + public string ClusterName => throw new NotImplementedException(); + + public ProtocolVersion ProtocolVersion => throw new NotImplementedException(); + + public KeyValuePair[] KeyspacesSnapshot => throw new NotImplementedException(); + + public Task InitAsync() + { + throw new NotImplementedException(); + } + + public Task ShutdownAsync() + { + throw new NotImplementedException(); + } + + public void SetResolvedContactPoints(IDictionary> resolvedContactPoints) + { + _resolvedContactPoints = + new CopyOnWriteDictionary>(resolvedContactPoints); + } + + public Host GetHost(IPEndPoint address) + { + Hosts.TryGet(address, out var h); + return h; + } + + public Host AddHost(IPEndPoint address) + { + return Hosts.Add(address); + } + + public Host AddHost(IPEndPoint address, IContactPoint contactPoint) + { + return Hosts.Add(address, contactPoint); + } + + public void RemoveHost(IPEndPoint address) + { + Hosts.RemoveIfExists(address); + } + + public void OnHostRemoved(Host h) + { + HostRemoved?.Invoke(h); + } + + public void OnHostAdded(Host h) + { + HostAdded?.Invoke(h); + } + + public void FireSchemaChangedEvent(SchemaChangedEventArgs.Kind what, string keyspace, string table, object sender = null) + { + SchemaChangedEvent?.Invoke(sender ?? this, new SchemaChangedEventArgs { Keyspace = keyspace, What = what, Table = table }); + } + + public void OnHostDown(Host h) + { + HostsEvent?.Invoke(this, new HostsEventArgs { Address = h.Address, What = HostsEventArgs.Kind.Down }); + } + + public void OnHostUp(Host h) + { + HostsEvent?.Invoke(h, new HostsEventArgs { Address = h.Address, What = HostsEventArgs.Kind.Up }); + } + + public ICollection AllHosts() + { + return Hosts.ToCollection(); + } + + public IEnumerable AllReplicas() + { + throw new NotImplementedException(); + } + + public Task RebuildTokenMapAsync(bool retry, bool fetchKeyspaces) + { + throw new NotImplementedException(); + } + + public bool RemoveKeyspaceFromTokenMap(string name) + { + throw new NotImplementedException(); + } + + public Task UpdateTokenMapForKeyspace(string name) + { + throw new NotImplementedException(); + } + + public ICollection GetReplicas(string keyspaceName, byte[] partitionKey) + { + throw new NotImplementedException(); + } + + public ICollection GetReplicas(byte[] partitionKey) + { + throw new NotImplementedException(); + } + + public Task GetKeyspaceAsync(string keyspace) + { + throw new NotImplementedException(); + } + + public Task> GetKeyspacesAsync() + { + throw new NotImplementedException(); + } + + public Task> GetTablesAsync(string keyspace) + { + throw new NotImplementedException(); + } + + public Task GetTableAsync(string keyspace, string tableName) + { + throw new NotImplementedException(); + } + + public Task GetMaterializedViewAsync(string keyspace, string name) + { + throw new NotImplementedException(); + } + + public Task GetUdtDefinitionAsync(string keyspace, string typeName) + { + throw new NotImplementedException(); + } + + public Task GetFunctionAsync(string keyspace, string name, string[] signature) + { + throw new NotImplementedException(); + } + + public Task GetAggregateAsync(string keyspace, string name, string[] signature) + { + throw new NotImplementedException(); + } + + public Task GetQueryTraceAsync(QueryTrace trace) + { + throw new NotImplementedException(); + } + + public Task RefreshSchemaAsync(string keyspace = null, string table = null) + { + throw new NotImplementedException(); + } + + public bool RemoveKeyspace(string name) + { + throw new NotImplementedException(); + } + + public Task RefreshSingleKeyspaceAsync(string name) + { + throw new NotImplementedException(); + } + + public void ClearTable(string keyspaceName, string tableName) + { + throw new NotImplementedException(); + } + + public void ClearView(string keyspaceName, string name) + { + throw new NotImplementedException(); + } + + public void ClearFunction(string keyspaceName, string functionName, string[] signature) + { + throw new NotImplementedException(); + } + + public void ClearAggregate(string keyspaceName, string aggregateName, string[] signature) + { + throw new NotImplementedException(); + } + + public Task CheckSchemaAgreementAsync() + { + throw new NotImplementedException(); + } + + public Task WaitForSchemaAgreementAsync(IConnection connection) + { + throw new NotImplementedException(); + } + + public void SetCassandraVersion(Version version) + { + throw new NotImplementedException(); + } + + public void SetProductTypeAsDbaas() + { + throw new NotImplementedException(); + } + + public void SetClusterName(string clusterName) + { + throw new NotImplementedException(); + } + + public void SetPartitioner(string partitioner) + { + throw new NotImplementedException(); + } + + public IEnumerable UpdateResolvedContactPoint( + IContactPoint contactPoint, IEnumerable endpoints) + { + return _resolvedContactPoints.AddOrUpdate(contactPoint, _ => endpoints, (_, __) => endpoints); + } + } +} \ No newline at end of file diff --git a/src/Cassandra.Tests/Connections/TestHelpers/FakeMetadata.cs b/src/Cassandra.Tests/Connections/TestHelpers/FakeMetadata.cs new file mode 100644 index 000000000..964d7ce51 --- /dev/null +++ b/src/Cassandra.Tests/Connections/TestHelpers/FakeMetadata.cs @@ -0,0 +1,257 @@ +// +// Copyright (C) DataStax Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +using System; +using System.Collections.Generic; +using System.Net; +using System.Threading.Tasks; + +using Cassandra.Connections.Control; + +namespace Cassandra.Tests.Connections.TestHelpers +{ + internal class FakeMetadata : IMetadata + { + public FakeMetadata(Configuration config) + { + Configuration = config; + InternalMetadata = new FakeInternalMetadata(config); + SetupEventForwarding(InternalMetadata); + } + + public FakeMetadata(IInternalMetadata internalMetadata) + { + Configuration = internalMetadata.Configuration; + InternalMetadata = internalMetadata; + SetupEventForwarding(internalMetadata); + } + + public event HostsEventHandler HostsEvent; + + public event SchemaChangedEventHandler SchemaChangedEvent; + + public event Action HostAdded; + + public event Action HostRemoved; + + public Configuration Configuration { get; } + + internal IInternalMetadata InternalMetadata { get; } + + public Task GetClusterDescriptionAsync() + { + throw new NotImplementedException(); + } + + public ClusterDescription GetClusterDescription() + { + throw new NotImplementedException(); + } + + public ICollection AllHostsSnapshot() + { + return InternalMetadata.AllHosts(); + } + + public IEnumerable AllReplicasSnapshot() + { + return InternalMetadata.AllReplicas(); + } + + public ICollection GetReplicasSnapshot(string keyspaceName, byte[] partitionKey) + { + return InternalMetadata.GetReplicas(keyspaceName, partitionKey); + } + + public ICollection GetReplicasSnapshot(byte[] partitionKey) + { + return InternalMetadata.GetReplicas(partitionKey); + } + + public Host GetHost(IPEndPoint address) + { + throw new NotImplementedException(); + } + + public Task GetHostAsync(IPEndPoint address) + { + throw new NotImplementedException(); + } + + public ICollection AllHosts() + { + throw new NotImplementedException(); + } + + public Task> AllHostsAsync() + { + throw new NotImplementedException(); + } + + public IEnumerable AllReplicas() + { + throw new NotImplementedException(); + } + + public Task> AllReplicasAsync() + { + throw new NotImplementedException(); + } + + public ICollection GetReplicas(string keyspaceName, byte[] partitionKey) + { + throw new NotImplementedException(); + } + + public ICollection GetReplicas(byte[] partitionKey) + { + throw new NotImplementedException(); + } + + public Task> GetReplicasAsync(string keyspaceName, byte[] partitionKey) + { + throw new NotImplementedException(); + } + + public Task> GetReplicasAsync(byte[] partitionKey) + { + throw new NotImplementedException(); + } + + public KeyspaceMetadata GetKeyspace(string keyspace) + { + throw new NotImplementedException(); + } + + public Task GetKeyspaceAsync(string keyspace) + { + throw new NotImplementedException(); + } + + public ICollection GetKeyspaces() + { + throw new NotImplementedException(); + } + + public Task> GetKeyspacesAsync() + { + throw new NotImplementedException(); + } + + public ICollection GetTables(string keyspace) + { + throw new NotImplementedException(); + } + + public Task> GetTablesAsync(string keyspace) + { + throw new NotImplementedException(); + } + + public TableMetadata GetTable(string keyspace, string tableName) + { + throw new NotImplementedException(); + } + + public Task GetTableAsync(string keyspace, string tableName) + { + throw new NotImplementedException(); + } + + public MaterializedViewMetadata GetMaterializedView(string keyspace, string name) + { + throw new NotImplementedException(); + } + + public Task GetMaterializedViewAsync(string keyspace, string name) + { + throw new NotImplementedException(); + } + + public UdtColumnInfo GetUdtDefinition(string keyspace, string typeName) + { + throw new NotImplementedException(); + } + + public Task GetUdtDefinitionAsync(string keyspace, string typeName) + { + throw new NotImplementedException(); + } + + public FunctionMetadata GetFunction(string keyspace, string name, string[] signature) + { + throw new NotImplementedException(); + } + + public Task GetFunctionAsync(string keyspace, string name, string[] signature) + { + throw new NotImplementedException(); + } + + public AggregateMetadata GetAggregate(string keyspace, string name, string[] signature) + { + throw new NotImplementedException(); + } + + public Task GetAggregateAsync(string keyspace, string name, string[] signature) + { + throw new NotImplementedException(); + } + + public bool RefreshSchema(string keyspace = null, string table = null) + { + throw new NotImplementedException(); + } + + public Task RefreshSchemaAsync(string keyspace = null, string table = null) + { + throw new NotImplementedException(); + } + + public Task CheckSchemaAgreementAsync() + { + throw new NotImplementedException(); + } + + private void OnInternalHostRemoved(Host h) + { + HostRemoved?.Invoke(h); + } + + private void OnInternalHostAdded(Host h) + { + HostAdded?.Invoke(h); + } + + private void OnInternalHostsEvent(object sender, HostsEventArgs args) + { + HostsEvent?.Invoke(sender, args); + } + + private void OnInternalSchemaChangedEvent(object sender, SchemaChangedEventArgs args) + { + SchemaChangedEvent?.Invoke(sender, args); + } + + private void SetupEventForwarding(IInternalMetadata internalMetadata) + { + internalMetadata.HostAdded += OnInternalHostAdded; + internalMetadata.HostRemoved += OnInternalHostRemoved; + internalMetadata.HostsEvent += OnInternalHostsEvent; + internalMetadata.SchemaChangedEvent += OnInternalSchemaChangedEvent; + } + } +} \ No newline at end of file diff --git a/src/Cassandra.Tests/Connections/TestHelpers/FakeProtocolVersionNegotiator.cs b/src/Cassandra.Tests/Connections/TestHelpers/FakeProtocolVersionNegotiator.cs index a0879221c..3b753a956 100644 --- a/src/Cassandra.Tests/Connections/TestHelpers/FakeProtocolVersionNegotiator.cs +++ b/src/Cassandra.Tests/Connections/TestHelpers/FakeProtocolVersionNegotiator.cs @@ -15,27 +15,26 @@ // using System.Threading.Tasks; + using Cassandra.Connections; using Cassandra.Connections.Control; -using Cassandra.Serialization; namespace Cassandra.Tests.Connections.TestHelpers { internal class FakeProtocolVersionNegotiator : IProtocolVersionNegotiator { public Task ChangeProtocolVersion( - Configuration config, - ISerializerManager serializer, - ProtocolVersion nextVersion, - IConnection previousConnection, - UnsupportedProtocolVersionException ex = null, + Configuration config, + ProtocolVersion nextVersion, + IConnection previousConnection, + UnsupportedProtocolVersionException ex = null, ProtocolVersion? previousVersion = null) { return Task.FromResult(previousConnection); } public Task NegotiateVersionAsync( - Configuration config, IInternalMetadata internalMetadata, IConnection connection, ISerializerManager serializer) + Configuration config, IInternalMetadata internalMetadata, IConnection connection) { return Task.FromResult(connection); } diff --git a/src/Cassandra.Tests/Connections/TestHelpers/FakeTopologyRefresher.cs b/src/Cassandra.Tests/Connections/TestHelpers/FakeTopologyRefresher.cs index 4f492b9d1..334230ffa 100644 --- a/src/Cassandra.Tests/Connections/TestHelpers/FakeTopologyRefresher.cs +++ b/src/Cassandra.Tests/Connections/TestHelpers/FakeTopologyRefresher.cs @@ -47,7 +47,7 @@ public Task RefreshNodeListAsync( } } - _internalMetadata.Partitioner = "Murmur3Partitioner"; + _internalMetadata.SetPartitioner("Murmur3Partitioner"); return Task.FromResult(_internalMetadata.Hosts.First()); } } diff --git a/src/Cassandra.Tests/HostConnectionPoolTests.cs b/src/Cassandra.Tests/HostConnectionPoolTests.cs index 160fcc2f7..65947ea17 100644 --- a/src/Cassandra.Tests/HostConnectionPoolTests.cs +++ b/src/Cassandra.Tests/HostConnectionPoolTests.cs @@ -98,7 +98,7 @@ private static Mock GetPoolMock(Host host = null, Configurat host, config, new SerializerManager(ProtocolVersion.MaxSupported), - new MetricsObserverFactory(new MetricsManager(new NullDriverMetricsProvider(), new DriverMetricsOptions(), false, "s1"))); + new MetricsObserverFactory(new MetricsManager(null, new NullDriverMetricsProvider(), new DriverMetricsOptions(), false, "s1"))); } private static Configuration GetConfig(int coreConnections = 3, int maxConnections = 8, IReconnectionPolicy rp = null) diff --git a/src/Cassandra.Tests/Mapping/Linq/LinqCreateTableUnitTests.cs b/src/Cassandra.Tests/Mapping/Linq/LinqCreateTableUnitTests.cs index fed8a868d..536b962d5 100644 --- a/src/Cassandra.Tests/Mapping/Linq/LinqCreateTableUnitTests.cs +++ b/src/Cassandra.Tests/Mapping/Linq/LinqCreateTableUnitTests.cs @@ -18,6 +18,7 @@ using Cassandra.Data.Linq; using Cassandra.Mapping; using Cassandra.Serialization; +using Cassandra.Tests.Connections.TestHelpers; using Cassandra.Tests.Mapping.Pocos; using Moq; using NUnit.Framework; @@ -585,11 +586,8 @@ private static Mock GetSessionMock(ISerializerManager serializer = nul serializer = new SerializerManager(ProtocolVersion.MaxSupported); } var sessionMock = new Mock(MockBehavior.Strict); - var ccMock = new Mock(MockBehavior.Strict); - var config = new Configuration(); - var metadata = new Metadata(config, serializer, ccMock.Object); + var config = new TestConfigurationBuilder { SerializerManager = serializer }.Build(); var clusterMock = new Mock(); - clusterMock.Setup(c => c.Metadata).Returns(metadata); clusterMock.Setup(c => c.Configuration).Returns(config); sessionMock.Setup(s => s.Cluster).Returns(clusterMock.Object); return sessionMock; diff --git a/src/Cassandra.Tests/Mapping/MappingTestBase.cs b/src/Cassandra.Tests/Mapping/MappingTestBase.cs index 9578f3446..1216cd48b 100644 --- a/src/Cassandra.Tests/Mapping/MappingTestBase.cs +++ b/src/Cassandra.Tests/Mapping/MappingTestBase.cs @@ -133,9 +133,6 @@ protected ISession GetSession(RowSet rs, Action callback .Setup(s => s.PrepareAsync(It.IsAny())) .Returns(query => TaskHelper.ToTask(GetPrepared(query))) .Verifiable(); - sessionMock - .Setup(s => s.BinaryProtocolVersion) - .Returns((int)protocolVersion); return sessionMock.Object; } diff --git a/src/Cassandra.Tests/MetadataHelpers/TestHelpers/FakeSchemaParser.cs b/src/Cassandra.Tests/MetadataHelpers/TestHelpers/FakeSchemaParser.cs index 640ab0007..769cdfe54 100644 --- a/src/Cassandra.Tests/MetadataHelpers/TestHelpers/FakeSchemaParser.cs +++ b/src/Cassandra.Tests/MetadataHelpers/TestHelpers/FakeSchemaParser.cs @@ -18,6 +18,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Cassandra.Tests.Connections.TestHelpers; namespace Cassandra.Tests.MetadataHelpers.TestHelpers { @@ -26,7 +27,7 @@ internal class FakeSchemaParser : SchemaParser private readonly ConcurrentDictionary _keyspaces; public FakeSchemaParser( - ConcurrentDictionary keyspaces) : base(new Metadata(new Configuration())) + ConcurrentDictionary keyspaces) : base(new FakeInternalMetadata(new Configuration())) { _keyspaces = keyspaces; } diff --git a/src/Cassandra.Tests/Policies/DefaultLoadBalancingTests.cs b/src/Cassandra.Tests/Policies/DefaultLoadBalancingTests.cs index 3e4c958e2..345ff0f00 100644 --- a/src/Cassandra.Tests/Policies/DefaultLoadBalancingTests.cs +++ b/src/Cassandra.Tests/Policies/DefaultLoadBalancingTests.cs @@ -29,7 +29,7 @@ public void Should_Yield_Preferred_Host_First() #pragma warning restore 618 var statement = new TargettedSimpleStatement("Q"); statement.PreferredHost = new Host(new IPEndPoint(201, 9042), ReconnectionPolicy); - var hosts = lbp.NewQueryPlan(null, statement); + var hosts = lbp.NewQueryPlan(null, null, statement); CollectionAssert.AreEqual( new[] { "201.0.0.0:9042", "101.0.0.0:9042", "102.0.0.0:9042" }, hosts.Select(h => h.Address.ToString())); @@ -42,7 +42,7 @@ public void Should_Yield_Child_Hosts_When_No_Preferred_Host_Defined() var lbp = new DefaultLoadBalancingPolicy(new TestLoadBalancingPolicy()); #pragma warning restore 618 var statement = new TargettedSimpleStatement("Q"); - var hosts = lbp.NewQueryPlan(null, statement); + var hosts = lbp.NewQueryPlan(null, null, statement); CollectionAssert.AreEqual( new[] { "101.0.0.0:9042", "102.0.0.0:9042" }, hosts.Select(h => h.Address.ToString())); @@ -54,12 +54,12 @@ public void Should_Set_Distance_For_Preferred_Host_To_Local() #pragma warning disable 618 var lbp = new DefaultLoadBalancingPolicy(new TestLoadBalancingPolicy(HostDistance.Ignored)); #pragma warning restore 618 - Assert.AreEqual(HostDistance.Ignored, lbp.Distance(new Host(new IPEndPoint(200L, 9042), ReconnectionPolicy))); + Assert.AreEqual(HostDistance.Ignored, lbp.Distance(null, new Host(new IPEndPoint(200L, 9042), ReconnectionPolicy))); var statement = new TargettedSimpleStatement("Q"); // Use 201 as preferred statement.PreferredHost = new Host(new IPEndPoint(201L, 9042), ReconnectionPolicy); - lbp.NewQueryPlan(null, statement); - Assert.AreEqual(HostDistance.Local, lbp.Distance(statement.PreferredHost)); + lbp.NewQueryPlan(null, null, statement); + Assert.AreEqual(HostDistance.Local, lbp.Distance(null, statement.PreferredHost)); } } } diff --git a/src/Cassandra.Tests/PoliciesUnitTests.cs b/src/Cassandra.Tests/PoliciesUnitTests.cs index 4b7e6eccf..bbd623401 100644 --- a/src/Cassandra.Tests/PoliciesUnitTests.cs +++ b/src/Cassandra.Tests/PoliciesUnitTests.cs @@ -18,15 +18,15 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -using System.Net; -using NUnit.Framework; -using Moq; using System.Threading.Tasks; -using System.Threading; + using Cassandra.Connections.Control; using Cassandra.SessionManagement; using Cassandra.Tests.Connections.TestHelpers; -using Cassandra.Tests.MetadataHelpers.TestHelpers; + +using Moq; + +using NUnit.Framework; #pragma warning disable 618 @@ -36,21 +36,21 @@ namespace Cassandra.Tests public class PoliciesUnitTests { [Test] - public void RoundRobinIsCyclicTest() + public async Task RoundRobinIsCyclicTest() { byte hostLength = 4; var hostList = GetHostList(hostLength); - var clusterMock = new Mock(); - clusterMock - .Setup(c => c.AllHosts()) + var metadataMock = new Mock(); + metadataMock + .Setup(c => c.AllHostsSnapshot()) .Returns(hostList) .Verifiable(); //Initialize the balancing policy var policy = new RoundRobinPolicy(); - policy.Initialize(clusterMock.Object); - var balancedHosts = policy.NewQueryPlan(null, new SimpleStatement()); + await policy.InitializeAsync(metadataMock.Object).ConfigureAwait(false); + var balancedHosts = policy.NewQueryPlan(metadataMock.Object, null, new SimpleStatement()); //Take a list of hosts of 4, it should get 1 of every one in a cyclic order. var firstRound = balancedHosts.ToList(); @@ -65,7 +65,7 @@ public void RoundRobinIsCyclicTest() var followingRounds = new List(); for (var i = 0; i < 10; i++) { - followingRounds.AddRange(policy.NewQueryPlan(null, new SimpleStatement())); + followingRounds.AddRange(policy.NewQueryPlan(metadataMock.Object, null, new SimpleStatement())); } Assert.AreEqual(10 * hostLength, followingRounds.Count); @@ -77,72 +77,63 @@ public void RoundRobinIsCyclicTest() Assert.AreNotSame(followingRounds[i + 2], followingRounds[i]); } - clusterMock.Verify(); + metadataMock.Verify(); } [Test] - public void RoundRobinIsCyclicTestInParallel() + public async Task RoundRobinIsCyclicTestInParallel() { byte hostLength = 4; var hostList = GetHostList(hostLength); - var clusterMock = new Mock(); - clusterMock - .Setup(c => c.AllHosts()) + var metadataMock = new Mock(); + metadataMock + .Setup(c => c.AllHostsSnapshot()) .Returns(hostList) .Verifiable(); //Initialize the balancing policy var policy = new RoundRobinPolicy(); - policy.Initialize(clusterMock.Object); + await policy.InitializeAsync(metadataMock.Object).ConfigureAwait(false); - Action action = () => + Func action = async _ => { var resultingHosts = new List(); - var hostEnumerator = policy.NewQueryPlan(null, new SimpleStatement()); + var hostEnumerator = policy.NewQueryPlan(metadataMock.Object, null, new SimpleStatement()); foreach (var h in hostEnumerator) { //Slow down to try to execute it at the same time - Thread.Sleep(50); + await Task.Delay(50).ConfigureAwait(false); resultingHosts.Add(h); } Assert.AreEqual(hostLength, resultingHosts.Count); Assert.AreEqual(hostLength, resultingHosts.Distinct().Count()); }; - var actions = new List(); - for (var i = 0; i < 100; i++) - { - actions.Add(action); - } - - var parallelOptions = new ParallelOptions(); - parallelOptions.TaskScheduler = new ThreadPerTaskScheduler(); - parallelOptions.MaxDegreeOfParallelism = 1000; - - Parallel.Invoke(parallelOptions, actions.ToArray()); - clusterMock.Verify(); + var actions = Enumerable.Range(0, 100).Select(action); + await Task.WhenAll(actions).ConfigureAwait(false); + metadataMock.Verify(); } [TestCase(true)] [TestCase(false)] [Test] - public void DcInferringPolicyInitializeInfersLocalDc(bool implicitContactPoint) + public async Task DcInferringPolicyInitializeInfersLocalDc(bool implicitContactPoint) { var hostList = new List { TestHelper.CreateHost("0.0.0.1", "dc1"), TestHelper.CreateHost("0.0.0.2", "dc2") }; - var clusterMock = CreateClusterMock(hostList, implicitContactPoint: implicitContactPoint); + var metadataMock = CreateMetadataMock(hostList, implicitContactPoint: implicitContactPoint); var policy = new DcInferringLoadBalancingPolicy(); - policy.Initialize(clusterMock); - Assert.AreEqual(HostDistance.Local, policy.Distance(hostList[0])); - Assert.AreEqual(HostDistance.Remote, policy.Distance(hostList[1])); + await policy.InitializeAsync(metadataMock).ConfigureAwait(false); + Assert.AreEqual(HostDistance.Local, policy.Distance(metadataMock, hostList[0])); + Assert.AreEqual(HostDistance.Remote, policy.Distance(metadataMock, hostList[1])); } [Test] - public void DCAwareRoundRobinPolicyNeverHitsRemote() + public async Task DCAwareRoundRobinPolicyNeverHitsRemote() { byte hostLength = 5; var hostList = new List(); @@ -153,13 +144,13 @@ public void DCAwareRoundRobinPolicyNeverHitsRemote() //Add another remote host at the end hostList.AddRange(GetHostList(2, 2, "remote")); - var clusterMock = CreateClusterMock(hostList); + var metadataMock = CreateMetadataMock(hostList); //Initialize the balancing policy //0 used nodes per remote dc var policy = new DCAwareRoundRobinPolicy("local"); - policy.Initialize(clusterMock); - var balancedHosts = policy.NewQueryPlan(null, new SimpleStatement()); + await policy.InitializeAsync(metadataMock).ConfigureAwait(false); + var balancedHosts = policy.NewQueryPlan(metadataMock, null, new SimpleStatement()); var firstRound = balancedHosts.ToList(); //Returns only local hosts @@ -170,27 +161,27 @@ public void DCAwareRoundRobinPolicyNeverHitsRemote() var followingRounds = new List(); for (var i = 0; i < 10; i++) { - followingRounds.AddRange(policy.NewQueryPlan(null, new SimpleStatement()).ToList()); + followingRounds.AddRange(policy.NewQueryPlan(metadataMock, null, new SimpleStatement()).ToList()); } Assert.AreEqual(10 * (hostLength - 2), followingRounds.Count); - + //Check that there aren't remote nodes. Assert.AreEqual(0, followingRounds.Count(h => h.Datacenter != "local")); } - + [Test] - public void DCAwareRoundRobinInitializeUsesBuilderLocalDc() + public async Task DCAwareRoundRobinInitializeUsesBuilderLocalDc() { var hostList = new List { TestHelper.CreateHost("0.0.0.1", "dc1"), TestHelper.CreateHost("0.0.0.2", "dc2") }; - var clusterMock = CreateClusterMock(hostList, "dc2"); + var metadataMock = CreateMetadataMock(hostList, "dc2"); var policy = new DCAwareRoundRobinPolicy(); - policy.Initialize(clusterMock); - Assert.AreEqual(HostDistance.Remote, policy.Distance(hostList[0])); - Assert.AreEqual(HostDistance.Local, policy.Distance(hostList[1])); + await policy.InitializeAsync(metadataMock).ConfigureAwait(false); + Assert.AreEqual(HostDistance.Remote, policy.Distance(metadataMock, hostList[0])); + Assert.AreEqual(HostDistance.Local, policy.Distance(metadataMock, hostList[1])); } [Test] @@ -201,30 +192,30 @@ public void DCAwareRoundRobinInitializeDoesNotInferLocalDcWhenNotImplicitContact TestHelper.CreateHost("0.0.0.1", "dc1"), TestHelper.CreateHost("0.0.0.2", "dc2") }; - var clusterMock = CreateClusterMock(hostList, implicitContactPoint: false); + var metadataMock = CreateMetadataMock(hostList, implicitContactPoint: false); var policy = new DCAwareRoundRobinPolicy(); - var ex = Assert.Throws(() => policy.Initialize(clusterMock)); + var ex = Assert.ThrowsAsync(() => policy.InitializeAsync(metadataMock)); Assert.AreEqual( "Since you provided explicit contact points, the local datacenter " + "must be explicitly set. It can be specified in the load balancing " + "policy constructor or via the Builder.WithLocalDatacenter() method." + - " Available datacenters: dc1, dc2.", + " Available datacenters: dc1, dc2.", ex.Message); } [Test] - public void DCAwareRoundRobinInitializeInfersLocalDcImplicitContactPoint() + public async Task DCAwareRoundRobinInitializeInfersLocalDcImplicitContactPoint() { var hostList = new List { TestHelper.CreateHost("0.0.0.1", "dc1"), TestHelper.CreateHost("0.0.0.2", "dc2") }; - var clusterMock = CreateClusterMock(hostList, implicitContactPoint: true); + var metadataMock = CreateMetadataMock(hostList, implicitContactPoint: true); var policy = new DCAwareRoundRobinPolicy(); - policy.Initialize(clusterMock); - Assert.AreEqual(HostDistance.Local, policy.Distance(hostList[0])); - Assert.AreEqual(HostDistance.Remote, policy.Distance(hostList[1])); + await policy.InitializeAsync(metadataMock).ConfigureAwait(false); + Assert.AreEqual(HostDistance.Local, policy.Distance(metadataMock, hostList[0])); + Assert.AreEqual(HostDistance.Remote, policy.Distance(metadataMock, hostList[1])); } [Test] @@ -235,14 +226,14 @@ public void DCAwareRoundRobinInitializeNotMatchingDcThrows() TestHelper.CreateHost("0.0.0.1", "dc1"), TestHelper.CreateHost("0.0.0.2", "dc2") }; - var clusterMock = CreateClusterMock(hostList); + var clusterMock = CreateMetadataMock(hostList); var policy = new DCAwareRoundRobinPolicy("not_valid_dc"); - var ex = Assert.Throws(() => policy.Initialize(clusterMock)); + var ex = Assert.ThrowsAsync(() => policy.InitializeAsync(clusterMock)); Assert.IsTrue( - ex.Message.Contains("Datacenter not_valid_dc does not match any of the nodes, available datacenters:"), + ex.Message.Contains("Datacenter not_valid_dc does not match any of the nodes, available datacenters:"), ex.Message); } - + [Test] public void DCAwareRoundRobinInitializeNotMatchingDcFromBuilderLocalDcThrows() { @@ -251,16 +242,16 @@ public void DCAwareRoundRobinInitializeNotMatchingDcFromBuilderLocalDcThrows() TestHelper.CreateHost("0.0.0.1", "dc1"), TestHelper.CreateHost("0.0.0.2", "dc2") }; - var clusterMock = CreateClusterMock(hostList, "not_valid_dc"); + var metadataMock = CreateMetadataMock(hostList, "not_valid_dc"); var policy = new DCAwareRoundRobinPolicy(); - var ex = Assert.Throws(() => policy.Initialize(clusterMock)); + var ex = Assert.ThrowsAsync(() => policy.InitializeAsync(metadataMock)); Assert.IsTrue( - ex.Message.Contains("Datacenter not_valid_dc does not match any of the nodes, available datacenters:"), + ex.Message.Contains("Datacenter not_valid_dc does not match any of the nodes, available datacenters:"), ex.Message); } [Test] - public void DCAwareRoundRobinPolicyTestInParallel() + public async Task DCAwareRoundRobinPolicyTestInParallel() { var hostList = new List { @@ -278,17 +269,17 @@ public void DCAwareRoundRobinPolicyTestInParallel() var localHostsLength = hostList.Count(h => h.Datacenter == "dc1"); const string localDc = "dc1"; - var clusterMock = CreateClusterMock(hostList); + var metadataMock = CreateMetadataMock(hostList); //Initialize the balancing policy var policy = new DCAwareRoundRobinPolicy(localDc); - policy.Initialize(clusterMock); + await policy.InitializeAsync(metadataMock).ConfigureAwait(false); var allHosts = new ConcurrentBag(); var firstHosts = new ConcurrentBag(); Action action = () => { - var hosts = policy.NewQueryPlan(null, null).ToList(); + var hosts = policy.NewQueryPlan(metadataMock, null, null).ToList(); //Check that the value is not repeated Assert.AreEqual(0, hosts.GroupBy(x => x) .Where(g => g.Count() > 1) @@ -315,18 +306,18 @@ public void DCAwareRoundRobinPolicyTestInParallel() { if (h.Datacenter == localDc) { - Assert.AreEqual(times/localHostsLength, firstHosts.Count(hc => hc == h)); + Assert.AreEqual(times / localHostsLength, firstHosts.Count(hc => hc == h)); } else { Assert.AreEqual(0, firstHosts.Count(hc => hc == h)); } } - Mock.Get(clusterMock).Verify(); + Mock.Get(metadataMock.InternalMetadata).Verify(); } [Test] - public void DCAwareRoundRobinPolicyCachesLocalNodes() + public async Task DCAwareRoundRobinPolicyCachesLocalNodes() { var hostList = new List { @@ -343,20 +334,20 @@ public void DCAwareRoundRobinPolicyCachesLocalNodes() }; const string localDc = "dc1"; - var clusterMock = CreateClusterMock(hostList); + var metadataMock = CreateMetadataMock(hostList); //Initialize the balancing policy var policy = new DCAwareRoundRobinPolicy(localDc); - policy.Initialize(clusterMock); + await policy.InitializeAsync(metadataMock).ConfigureAwait(false); var instances = new ConcurrentBag(); - Action action = () => instances.Add(policy.GetHosts()); + Action action = () => instances.Add(policy.GetHosts(metadataMock)); TestHelper.ParallelInvoke(action, 100); Assert.AreEqual(1, instances.GroupBy(i => i.GetHashCode()).Count()); } [Test] - public void DCAwareRoundRobinPolicyWithNodesChanging() + public async Task DCAwareRoundRobinPolicyWithNodesChanging() { var hostList = new ConcurrentBag { @@ -374,8 +365,8 @@ public void DCAwareRoundRobinPolicyWithNodesChanging() const string localDc = "dc1"; //to remove the host 3 var hostToRemove = hostList.First(h => TestHelper.GetLastAddressByte(h) == 3); - var clusterMock = CreateClusterMock(); - Mock.Get(clusterMock) + var metadataMock = CreateMetadataMock(); + Mock.Get(metadataMock.InternalMetadata) .Setup(c => c.AllHosts()) .Returns(() => { @@ -383,12 +374,11 @@ public void DCAwareRoundRobinPolicyWithNodesChanging() }); //Initialize the balancing policy - clusterMock.Configuration.LocalDatacenterProvider.Initialize(clusterMock); var policy = new DCAwareRoundRobinPolicy(localDc); - policy.Initialize(clusterMock); + await policy.InitializeAsync(metadataMock).ConfigureAwait(false); var hostYielded = new ConcurrentBag>(); - Action action = () => hostYielded.Add(policy.NewQueryPlan(null, null).ToList()); + Action action = () => hostYielded.Add(policy.NewQueryPlan(metadataMock, null, null).ToList()); //Invoke without nodes changing TestHelper.ParallelInvoke(action, 100); @@ -400,7 +390,7 @@ public void DCAwareRoundRobinPolicyWithNodesChanging() { var host = TestHelper.CreateHost("0.0.0.11", "dc1"); //raise event and then add - Mock.Get(clusterMock).Raise(c => c.HostAdded += null, host); + Mock.Get(metadataMock.InternalMetadata).Raise(c => c.HostAdded += null, host); hostList.Add(host); }); actionList.Insert(400, () => @@ -408,14 +398,14 @@ public void DCAwareRoundRobinPolicyWithNodesChanging() var host = TestHelper.CreateHost("0.0.0.12", "dc1"); //first add and then raise event hostList.Add(host); - Mock.Get(clusterMock).Raise(c => c.HostAdded += null, host); + Mock.Get(metadataMock.InternalMetadata).Raise(c => c.HostAdded += null, host); }); - + actionList.Insert(400, () => { var host = hostToRemove; hostList = new ConcurrentBag(hostList.Where(h => h != hostToRemove)); - Mock.Get(clusterMock).Raise(c => c.HostRemoved += null, host); + Mock.Get(metadataMock.InternalMetadata).Raise(c => c.HostRemoved += null, host); }); //Invoke it with nodes being modified @@ -463,7 +453,7 @@ public void DowngradingConsistencyRetryTest() [Test] public void FixedReconnectionPolicyTests() { - var delays = new long[] {0, 2, 100, 200, 500, 1000}; + var delays = new long[] { 0, 2, 100, 200, 500, 1000 }; var policy = new FixedReconnectionPolicy(delays); var schedule = policy.NewSchedule(); const int times = 30; @@ -479,7 +469,7 @@ public void FixedReconnectionPolicyTests() } [Test] - public void TokenAwarePolicyReturnsLocalReplicasOnly() + public async Task TokenAwarePolicyReturnsLocalReplicasOnly() { var hostList = new List { @@ -495,8 +485,8 @@ public void TokenAwarePolicyReturnsLocalReplicasOnly() TestHelper.CreateHost("0.0.0.9", "dc1") }; var n = 2; - var clusterMock = CreateClusterMock(hostList); - Mock.Get(clusterMock) + var metadataMock = CreateMetadataMock(hostList); + Mock.Get(metadataMock.InternalMetadata) .Setup(c => c.GetReplicas(It.IsAny(), It.IsAny())) .Returns((keyspace, key) => { @@ -511,33 +501,33 @@ public void TokenAwarePolicyReturnsLocalReplicasOnly() .Verifiable(); var policy = new TokenAwarePolicy(new DCAwareRoundRobinPolicy("dc1")); - policy.Initialize(clusterMock); + await policy.InitializeAsync(metadataMock).ConfigureAwait(false); //key for host :::1 and :::3 var k = new RoutingKey { RawRoutingKey = new byte[] { 1 } }; - var hosts = policy.NewQueryPlan(null, new SimpleStatement().SetRoutingKey(k)).ToList(); + var hosts = policy.NewQueryPlan(metadataMock, null, new SimpleStatement().SetRoutingKey(k)).ToList(); //5 local hosts Assert.AreEqual(5, hosts.Count); //local replica first Assert.AreEqual(1, TestHelper.GetLastAddressByte(hosts[0])); - Mock.Get(clusterMock).Verify(); + Mock.Get(metadataMock).Verify(); //key for host :::2 and :::5 k = new RoutingKey { RawRoutingKey = new byte[] { 2 } }; n = 3; - hosts = policy.NewQueryPlan(null, new SimpleStatement().SetRoutingKey(k)).ToList(); + hosts = policy.NewQueryPlan(metadataMock, null, new SimpleStatement().SetRoutingKey(k)).ToList(); Assert.AreEqual(5, hosts.Count); //local replicas first - CollectionAssert.AreEquivalent(new[] { 2, 5}, hosts.Take(2).Select(TestHelper.GetLastAddressByte)); + CollectionAssert.AreEquivalent(new[] { 2, 5 }, hosts.Take(2).Select(TestHelper.GetLastAddressByte)); //next should be local nodes Assert.AreEqual("dc1", hosts[2].Datacenter); Assert.AreEqual("dc1", hosts[3].Datacenter); Assert.AreEqual("dc1", hosts[4].Datacenter); - Mock.Get(clusterMock).Verify(); + Mock.Get(metadataMock.InternalMetadata).Verify(); } [Test] - public void TokenAwarePolicyRoundRobinsOnLocalReplicas() + public async Task TokenAwarePolicyRoundRobinsOnLocalReplicas() { var hostList = new List { @@ -552,8 +542,8 @@ public void TokenAwarePolicyRoundRobinsOnLocalReplicas() TestHelper.CreateHost("0.0.0.8", "dc2"), TestHelper.CreateHost("0.0.0.9", "dc1") }; - var clusterMock = CreateClusterMock(hostList); - Mock.Get(clusterMock) + var metadataMock = CreateMetadataMock(hostList); + Mock.Get(metadataMock.InternalMetadata) .Setup(c => c.GetReplicas(It.IsAny(), It.IsAny())) .Returns((keyspace, key) => { @@ -568,7 +558,7 @@ public void TokenAwarePolicyRoundRobinsOnLocalReplicas() .Verifiable(); var policy = new TokenAwarePolicy(new DCAwareRoundRobinPolicy("dc1")); - policy.Initialize(clusterMock); + await policy.InitializeAsync(metadataMock).ConfigureAwait(false); var firstHosts = new ConcurrentBag(); var k = new RoutingKey { RawRoutingKey = new byte[] { 1 } }; @@ -576,7 +566,7 @@ public void TokenAwarePolicyRoundRobinsOnLocalReplicas() const int times = 10000; Action action = () => { - var h = policy.NewQueryPlan(null, new SimpleStatement().SetRoutingKey(k)).First(); + var h = policy.NewQueryPlan(metadataMock, null, new SimpleStatement().SetRoutingKey(k)).First(); firstHosts.Add(h); }; TestHelper.ParallelInvoke(action, times); @@ -587,11 +577,11 @@ public void TokenAwarePolicyRoundRobinsOnLocalReplicas() // Around half will to one and half to the other Assert.That(queryPlansWithHost1AsFirst / times, Is.GreaterThan(0.45).And.LessThan(0.55)); Assert.That(queryPlansWithHost2AsFirst / times, Is.GreaterThan(0.45).And.LessThan(0.55)); - Mock.Get(clusterMock).Verify(); + Mock.Get(metadataMock.InternalMetadata).Verify(); } [Test] - public void TokenAwarePolicyReturnsChildHostsIfNoRoutingKey() + public async Task TokenAwarePolicyReturnsChildHostsIfNoRoutingKey() { var hostList = new List { @@ -600,24 +590,24 @@ public void TokenAwarePolicyReturnsChildHostsIfNoRoutingKey() TestHelper.CreateHost("0.0.0.3", "dc2"), TestHelper.CreateHost("0.0.0.4", "dc2") }; - var clusterMock = CreateClusterMock(hostList); + var metadataMock = CreateMetadataMock(hostList); var policy = new TokenAwarePolicy(new DCAwareRoundRobinPolicy("dc1")); - policy.Initialize(clusterMock); + await policy.InitializeAsync(metadataMock).ConfigureAwait(false); //No routing key - var hosts = policy.NewQueryPlan(null, new SimpleStatement()).ToList(); + var hosts = policy.NewQueryPlan(metadataMock, null, new SimpleStatement()).ToList(); //2 localhosts - Assert.AreEqual(2, hosts.Count(h => policy.Distance(h) == HostDistance.Local)); + Assert.AreEqual(2, hosts.Count(h => policy.Distance(metadataMock, h) == HostDistance.Local)); Assert.AreEqual("dc1", hosts[0].Datacenter); Assert.AreEqual("dc1", hosts[1].Datacenter); - Mock.Get(clusterMock).Verify(); + Mock.Get(metadataMock).Verify(); //No statement - hosts = policy.NewQueryPlan(null, null).ToList(); + hosts = policy.NewQueryPlan(metadataMock, null, null).ToList(); //2 localhosts - Assert.AreEqual(2, hosts.Count(h => policy.Distance(h) == HostDistance.Local)); + Assert.AreEqual(2, hosts.Count(h => policy.Distance(metadataMock, h) == HostDistance.Local)); Assert.AreEqual("dc1", hosts[0].Datacenter); Assert.AreEqual("dc1", hosts[1].Datacenter); - Mock.Get(clusterMock).Verify(); + Mock.Get(metadataMock).Verify(); } [Test] @@ -668,24 +658,28 @@ public void IdempotenceAwareRetryPolicy_Should_Rethrow_OnWriteTimeout_With_Non_I Assert.AreEqual(0, testPolicy.UnavailableCounter); } - private IInternalCluster CreateClusterMock( - ICollection hostList = null, - string localDc = null, + private FakeMetadata CreateMetadataMock( + ICollection hostList = null, + string localDc = null, bool implicitContactPoint = false) { var config = new TestConfigurationBuilder { LocalDatacenter = localDc }.Build(); var cluster = Mock.Of(); + var internalMetadata = Mock.Of(); + var metadata = new FakeMetadata(internalMetadata); Mock.Get(cluster).SetupGet(c => c.Configuration).Returns(config); + Mock.Get(cluster).SetupGet(c => c.InternalMetadata).Returns(internalMetadata); + Mock.Get(cluster).SetupGet(c => c.Metadata).Returns(metadata); Mock.Get(cluster).SetupGet(c => c.ImplicitContactPoint).Returns(implicitContactPoint); if (hostList != null) { var cc = Mock.Of(); Mock.Get(cc).SetupGet(c => c.Host).Returns(hostList.First()); - Mock.Get(cluster).Setup(c => c.AllHosts()).Returns(hostList); - Mock.Get(cluster).Setup(c => c.GetControlConnection()).Returns(cc); - config.LocalDatacenterProvider.Initialize(cluster); + Mock.Get(internalMetadata).SetupGet(m => m.ControlConnection).Returns(cc); + Mock.Get(internalMetadata).SetupGet(m => m.AllHosts()).Returns(hostList); + config.LocalDatacenterProvider.Initialize(cluster, internalMetadata); } - return cluster; + return metadata; } /// diff --git a/src/Cassandra.Tests/RequestHandlerMockTests.cs b/src/Cassandra.Tests/RequestHandlerMockTests.cs index 70b169155..2befd132f 100644 --- a/src/Cassandra.Tests/RequestHandlerMockTests.cs +++ b/src/Cassandra.Tests/RequestHandlerMockTests.cs @@ -18,6 +18,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Net; +using Cassandra.Connections.Control; using Cassandra.Metrics; using Cassandra.Metrics.Internal; using Cassandra.Metrics.Providers.Null; @@ -42,7 +43,14 @@ private static IInternalSession GetMockInternalSession() var clusterMock = new Mock(); sessionMock.Setup(x => x.InternalCluster).Returns(clusterMock.Object); sessionMock.Setup(x => x.ObserverFactory) - .Returns(new MetricsObserverFactory(new MetricsManager(new NullDriverMetricsProvider(), new DriverMetricsOptions(), true, "s1"))); + .Returns( + new MetricsObserverFactory( + new MetricsManager( + sessionMock.Object, + new NullDriverMetricsProvider(), + new DriverMetricsOptions(), + true, + "s1"))); return sessionMock.Object; } private static Configuration GetConfig(ILoadBalancingPolicy lbp) @@ -67,6 +75,7 @@ private static Configuration GetConfig(ILoadBalancingPolicy lbp) public void Should_ThrowNoHostAvailableException_When_QueryPlanMoveNextReturnsFalse() { var sessionMock = GetMockInternalSession(); + var metadata = Mock.Of(); var lbpMock = Mock.Of(); Mock.Get(sessionMock).SetupGet(m => m.Cluster.Configuration).Returns(RequestHandlerMockTests.GetConfig(lbpMock)); var enumerable = Mock.Of>(); @@ -75,11 +84,11 @@ public void Should_ThrowNoHostAvailableException_When_QueryPlanMoveNextReturnsFa Mock.Get(enumerator).Setup(m => m.MoveNext()).Returns(false); Mock.Get(enumerable).Setup(m => m.GetEnumerator()).Returns(enumerator); Mock.Get(lbpMock) - .Setup(m => m.NewQueryPlan(It.IsAny(), It.IsAny())) + .Setup(m => m.NewQueryPlan(It.IsAny(), It.IsAny(), It.IsAny())) .Returns(enumerable); var triedHosts = new Dictionary(); - var sut = new RequestHandler(sessionMock, new SerializerManager(ProtocolVersion.V4).GetCurrentSerializer()); + var sut = new RequestHandler(sessionMock, metadata, new SerializerManager(ProtocolVersion.V4).GetCurrentSerializer()); Assert.Throws(() => sut.GetNextValidHost(triedHosts)); } @@ -87,6 +96,7 @@ public void Should_ThrowNoHostAvailableException_When_QueryPlanMoveNextReturnsFa public void Should_ThrowNoHostAvailableException_When_QueryPlanMoveNextReturnsTrueButCurrentReturnsNull() { var sessionMock = GetMockInternalSession(); + var metadata = Mock.Of(); var lbpMock = Mock.Of(); Mock.Get(sessionMock).SetupGet(m => m.Cluster.Configuration).Returns(RequestHandlerMockTests.GetConfig(lbpMock)); var enumerable = Mock.Of>(); @@ -96,11 +106,11 @@ public void Should_ThrowNoHostAvailableException_When_QueryPlanMoveNextReturnsTr Mock.Get(enumerator).SetupGet(m => m.Current).Returns((Host)null); Mock.Get(enumerable).Setup(m => m.GetEnumerator()).Returns(enumerator); Mock.Get(lbpMock) - .Setup(m => m.NewQueryPlan(It.IsAny(), It.IsAny())) + .Setup(m => m.NewQueryPlan(It.IsAny(), It.IsAny(), It.IsAny())) .Returns(enumerable); var triedHosts = new Dictionary(); - var sut = new RequestHandler(sessionMock, new SerializerManager(ProtocolVersion.V4).GetCurrentSerializer()); + var sut = new RequestHandler(sessionMock, metadata, new SerializerManager(ProtocolVersion.V4).GetCurrentSerializer()); Assert.Throws(() => sut.GetNextValidHost(triedHosts)); } @@ -108,6 +118,7 @@ public void Should_ThrowNoHostAvailableException_When_QueryPlanMoveNextReturnsTr public void Should_ReturnHost_When_QueryPlanMoveNextReturnsTrueAndCurrentReturnsHost() { var sessionMock = GetMockInternalSession(); + var metadata = Mock.Of(); var lbpMock = Mock.Of(); Mock.Get(sessionMock).SetupGet(m => m.Cluster.Configuration).Returns(RequestHandlerMockTests.GetConfig(lbpMock)); var enumerable = Mock.Of>(); @@ -117,12 +128,12 @@ public void Should_ReturnHost_When_QueryPlanMoveNextReturnsTrueAndCurrentReturns Mock.Get(enumerator).SetupGet(m => m.Current).Returns(host); Mock.Get(enumerable).Setup(m => m.GetEnumerator()).Returns(enumerator); Mock.Get(lbpMock) - .Setup(m => m.NewQueryPlan(It.IsAny(), It.IsAny())) + .Setup(m => m.NewQueryPlan(It.IsAny(), It.IsAny(), It.IsAny())) .Returns(enumerable); - Mock.Get(lbpMock).Setup(m => m.Distance(host)).Returns(HostDistance.Local); + Mock.Get(lbpMock).Setup(m => m.Distance(It.IsAny(), host)).Returns(HostDistance.Local); var triedHosts = new Dictionary(); - var sut = new RequestHandler(sessionMock, new SerializerManager(ProtocolVersion.V4).GetCurrentSerializer()); + var sut = new RequestHandler(sessionMock, metadata, new SerializerManager(ProtocolVersion.V4).GetCurrentSerializer()); var validHost = sut.GetNextValidHost(triedHosts); Assert.NotNull(validHost); Assert.AreEqual(host, validHost.Host); diff --git a/src/Cassandra.Tests/SchemaParserTests.cs b/src/Cassandra.Tests/SchemaParserTests.cs index 6f0ea484a..6474b9782 100644 --- a/src/Cassandra.Tests/SchemaParserTests.cs +++ b/src/Cassandra.Tests/SchemaParserTests.cs @@ -19,10 +19,15 @@ using System.Linq; using System.Net; using System.Threading.Tasks; + using Cassandra.Connections.Control; +using Cassandra.SessionManagement; using Cassandra.Tasks; + using Moq; + using NUnit.Framework; + using SortOrder = Cassandra.DataCollectionMetadata.SortOrder; namespace Cassandra.Tests @@ -32,24 +37,18 @@ public class SchemaParserTests { private static SchemaParserV1 GetV1Instance(IControlConnection cc) { - var metadata = new Metadata(new Configuration()) - { - ControlConnection = cc - }; + var metadata = new InternalMetadata(cc, new Configuration()); metadata.SetCassandraVersion(new Version(2, 0)); return new SchemaParserV1(metadata); } private static SchemaParserV2 GetV2Instance(IControlConnection cc, Func> udtResolver = null) { - var metadata = new Metadata(new Configuration()) - { - ControlConnection = cc - }; + var metadata = new InternalMetadata(cc, new Configuration()); metadata.SetCassandraVersion(new Version(3, 0)); return new SchemaParserV2(metadata, udtResolver); } - + /// /// Helper method to get a QueryTrace instance.. /// @@ -57,7 +56,7 @@ private static QueryTrace GetQueryTrace() { var clusterMock = new Mock(); clusterMock.Setup(c => c.Configuration).Returns(new Configuration()); - var sessionMock = new Mock(MockBehavior.Strict); + var sessionMock = new Mock(MockBehavior.Strict); sessionMock.Setup(s => s.Cluster).Returns(clusterMock.Object); return new QueryTrace(Guid.NewGuid(), sessionMock.Object); } @@ -96,7 +95,7 @@ public void SchemaParserV1_GetKeyspace_Should_Retrieve_And_Parse_Keyspace_With_S Assert.AreEqual(ksName, ks.Name); Assert.AreEqual(true, ks.DurableWrites); Assert.AreEqual("Simple", ks.StrategyClass); - CollectionAssert.AreEqual(new Dictionary {{"replication_factor", 4}}, ks.Replication); + CollectionAssert.AreEqual(new Dictionary { { "replication_factor", 4 } }, ks.Replication); } [Test] @@ -135,7 +134,7 @@ public void SchemaParserV1_GetTable_Should_Parse_2_0_Table_With_Compact_Storage( {"type","Standard"}, {"value_alias",null} }); - var columnRows = new [] { + var columnRows = new[] { new Dictionary{{"keyspace_name","ks_tbl_meta"},{"columnfamily_name","tbl1"},{"column_name","id" },{"component_index",null},{"index_name",null},{"index_options",null},{"index_type",null},{"type","partition_key"},{"validator","org.apache.cassandra.db.marshal.UUIDType"}}, new Dictionary{{"keyspace_name","ks_tbl_meta"},{"columnfamily_name","tbl1"},{"column_name","text1"},{"component_index",null},{"index_name",null},{"index_options",null},{"index_type",null},{"type","regular" },{"validator","org.apache.cassandra.db.marshal.UTF8Type"}}, new Dictionary{{"keyspace_name","ks_tbl_meta"},{"columnfamily_name","tbl1"},{"column_name","text2"},{"component_index",null},{"index_name",null},{"index_options",null},{"index_type",null},{"type","regular" },{"validator","org.apache.cassandra.db.marshal.UTF8Type"}} @@ -247,14 +246,14 @@ public void SchemaParserV1_GetTable_Should_Parse_2_0_Table_With_StaticColumn() [Test] public void SchemaParserV1_GetTable_Should_Parse_1_2_Table_With_Partition_And_Clustering_Keys() { - var tableRow = TestHelper.CreateRow(new Dictionary - { - {"keyspace_name", "ks_tbl_meta"}, {"columnfamily_name", "tbl1"}, {"bloom_filter_fp_chance", 0.01}, {"caching", "KEYS_ONLY"}, + var tableRow = TestHelper.CreateRow(new Dictionary + { + {"keyspace_name", "ks_tbl_meta"}, {"columnfamily_name", "tbl1"}, {"bloom_filter_fp_chance", 0.01}, {"caching", "KEYS_ONLY"}, {"column_aliases", "[\"zck\"]"}, {"comment", ""}, {"compaction_strategy_class", "org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy"}, {"compaction_strategy_options", "{}"}, {"comparator", "org.apache.cassandra.db.marshal.CompositeType(org.apache.cassandra.db.marshal.TimeUUIDType,org.apache.cassandra.db.marshal.UTF8Type)"}, {"compression_parameters", "{\"sstable_compression\":\"org.apache.cassandra.io.compress.SnappyCompressor\"}"}, {"default_validator", "org.apache.cassandra.db.marshal.BytesType"}, {"gc_grace_seconds", 864000}, {"id", null}, {"key_alias", null}, {"key_aliases", "[\"pk1\",\"apk2\"]"}, {"key_validator", "org.apache.cassandra.db.marshal.CompositeType(org.apache.cassandra.db.marshal.UUIDType,org.apache.cassandra.db.marshal.UTF8Type)"}, {"local_read_repair_chance", 0D}, {"max_compaction_threshold", 32}, {"min_compaction_threshold", 4}, {"populate_io_cache_on_flush", false}, {"read_repair_chance", 0.1}, {"replicate_on_write", true}, {"subcomparator", null}, {"type", "Standard"}, {"value_alias", null} }); - var columnRows = new [] + var columnRows = new[] { new Dictionary { {"keyspace_name", "ks_tbl_meta"}, {"columnfamily_name", "tbl1"}, {"column_name", "val2" }, {"component_index", 1}, {"index_name", null}, {"index_options", null}, {"index_type", null}, {"validator", "org.apache.cassandra.db.marshal.BytesType"}}, new Dictionary { {"keyspace_name", "ks_tbl_meta"}, {"columnfamily_name", "tbl1"}, {"column_name", "valz1"}, {"component_index", 1}, {"index_name", null}, {"index_options", null}, {"index_type", null}, {"validator", "org.apache.cassandra.db.marshal.Int32Type"}} @@ -636,13 +635,13 @@ public void SchemaParserV2_GetTable_Should_Parse_3_0_Table_With_SecondaryIndexes .Returns(() => TestHelper.DelayedTask(columnRows)); queryProviderMock .Setup(cc => cc.QueryAsync(It.IsRegex("system_schema\\.indexes.*ks1"), It.IsAny())) - .Returns(() => TestHelper.DelayedTask>(new[] {indexRow})); + .Returns(() => TestHelper.DelayedTask>(new[] { indexRow })); var parser = GetV2Instance(queryProviderMock.Object); var ks = TaskHelper.WaitToComplete(parser.GetKeyspaceAsync("ks1")); Assert.NotNull(ks); var table = ks.GetTableMetadata("tbl4"); Assert.False(table.Options.IsCompactStorage); - CollectionAssert.AreEquivalent(new[] { "pk", "ck", "val"}, table.TableColumns.Select(c => c.Name)); + CollectionAssert.AreEquivalent(new[] { "pk", "ck", "val" }, table.TableColumns.Select(c => c.Name)); CollectionAssert.AreEqual(new[] { "pk" }, table.PartitionKeys.Select(c => c.Name)); CollectionAssert.AreEqual(new[] { "ck" }, table.ClusteringKeys.Select(c => c.Item1.Name)); CollectionAssert.AreEqual(new[] { SortOrder.Descending }, table.ClusteringKeys.Select(c => c.Item2)); @@ -672,7 +671,7 @@ public void SchemaParserV2_GetTable_Should_Propagate_Exceptions_From_Query_Provi //This will cause the task to be faulted queryProviderMock .Setup(cc => cc.QueryAsync(It.IsRegex("system_schema\\.columns.*ks1"), It.IsAny())) - .Returns(() => TaskHelper.FromException>(new NoHostAvailableException(new Dictionary()))); + .Returns(() => TaskHelper.FromException>(new NoHostAvailableException(new Dictionary()))); queryProviderMock .Setup(cc => cc.QueryAsync(It.IsRegex("system_schema\\.indexes.*ks1"), It.IsAny())) .Returns(() => TestHelper.DelayedTask(Enumerable.Empty())); @@ -784,7 +783,7 @@ public void SchemaParser_GetQueryTrace_Should_Try_Multiple_Times_To_Get_The_Trac {"parameters", null}, {"started_at", DateTimeOffset.Now} }); - return TestHelper.DelayedTask>(new[] {sessionRow}); + return TestHelper.DelayedTask>(new[] { sessionRow }); }); queryProviderMock .Setup(cc => cc.QueryAsync(It.IsRegex("system_traces\\.events"), It.IsAny())) diff --git a/src/Cassandra.Tests/SessionTests.cs b/src/Cassandra.Tests/SessionTests.cs index a8058f7d7..222026e4e 100644 --- a/src/Cassandra.Tests/SessionTests.cs +++ b/src/Cassandra.Tests/SessionTests.cs @@ -34,8 +34,11 @@ public void Should_GenerateNewSessionId_When_SessionIsCreated() var sessionNames = new ConcurrentQueue(); var sessionFactoryMock = Mock.Of(); Mock.Get(sessionFactoryMock).Setup(s => - s.CreateSession(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) - .ReturnsAsync(Mock.Of()) + s.CreateSession( + It.IsAny(), + It.IsAny(), + It.IsAny())) + .Returns(Mock.Of()) .Callback((c, ks, serializer, name) => { sessionNames.Enqueue(name); }); var config = new TestConfigurationBuilder diff --git a/src/Cassandra.Tests/StatementTests.cs b/src/Cassandra.Tests/StatementTests.cs index 69a99142b..46d465064 100644 --- a/src/Cassandra.Tests/StatementTests.cs +++ b/src/Cassandra.Tests/StatementTests.cs @@ -17,6 +17,8 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading.Tasks; +using Cassandra.Connections.Control; using Cassandra.Requests; using Cassandra.Serialization; using Cassandra.SessionManagement; @@ -325,25 +327,25 @@ public void BatchStatement_Should_Use_Routing_Key_Of_First_Statement_With_Statem } [Test] - public void BatchStatement_Should_UseRoutingKeyAndKeyspaceOfFirstStatement_When_TokenAwareLbpIsUsed() + public async Task BatchStatement_Should_UseRoutingKeyAndKeyspaceOfFirstStatement_When_TokenAwareLbpIsUsed() { var rawRoutingKey = new byte[] {1, 2, 3, 4}; var lbp = new TokenAwarePolicy(new ClusterTests.FakeLoadBalancingPolicy()); - var clusterMock = Mock.Of(); - Mock.Get(clusterMock).Setup(c => c.GetReplicas(It.IsAny(), It.IsAny())) + var metadataMock = Mock.Of(); + Mock.Get(metadataMock).Setup(c => c.GetReplicas(It.IsAny(), It.IsAny())) .Returns(new List()); - Mock.Get(clusterMock).Setup(c => c.AllHosts()) + Mock.Get(metadataMock).Setup(c => c.AllHosts()) .Returns(new List()); - lbp.Initialize(clusterMock); + await lbp.InitializeAsync(metadataMock).ConfigureAwait(false); var s1Mock = new Mock(MockBehavior.Loose); s1Mock.Setup(s => s.RoutingKey).Returns(new RoutingKey(rawRoutingKey)); s1Mock.Setup(s => s.Keyspace).Returns("ks1"); var batch = new BatchStatement().Add(s1Mock.Object); - var _ = lbp.NewQueryPlan("ks2", batch).ToList(); + var _ = lbp.NewQueryPlan(metadataMock, "ks2", batch).ToList(); - Mock.Get(clusterMock).Verify(c => c.GetReplicas("ks1", rawRoutingKey), Times.Once); + Mock.Get(metadataMock).Verify(c => c.GetReplicas("ks1", rawRoutingKey), Times.Once); } } } diff --git a/src/Cassandra.Tests/TokenTests.cs b/src/Cassandra.Tests/TokenTests.cs index 9173b6a34..f88fdf8b4 100644 --- a/src/Cassandra.Tests/TokenTests.cs +++ b/src/Cassandra.Tests/TokenTests.cs @@ -417,7 +417,7 @@ public void Build_Should_OnlyCallOncePerReplicationConfiguration_When_MultipleKe [Test] [Repeat(1)] - public void Should_UpdateKeyspacesAndTokenMapCorrectly_When_MultipleThreadsCallingRefreshKeyspace() + public async Task Should_UpdateKeyspacesAndTokenMapCorrectly_When_MultipleThreadsCallingRefreshKeyspace() { var keyspaces = new ConcurrentDictionary(); @@ -439,31 +439,30 @@ public void Should_UpdateKeyspacesAndTokenMapCorrectly_When_MultipleThreadsCalli var schemaParser = new FakeSchemaParser(keyspaces); var config = new TestConfigurationBuilder { - ConnectionFactory = new FakeConnectionFactory() + ConnectionFactory = new FakeConnectionFactory(), + MetadataSyncOptions = new MetadataSyncOptions().SetRefreshSchemaDelayIncrement(20).SetMaxTotalRefreshSchemaDelay(100) }.Build(); - var metadata = new Metadata(config, schemaParser) {Partitioner = "Murmur3Partitioner"}; - metadata.ControlConnection = new ControlConnection( - Mock.Of(), - new ProtocolEventDebouncer(new TaskBasedTimerFactory(), TimeSpan.FromMilliseconds(20), TimeSpan.FromSeconds(100)), - ProtocolVersion.V3, + var internalMetadata = new InternalMetadata( + Mock.Of(), config, - metadata, new List { new IpLiteralContactPoint(IPAddress.Parse("127.0.0.1"), config.ProtocolOptions, config.ServerNameResolver) - }); - metadata.Hosts.Add(new IPEndPoint(IPAddress.Parse("192.168.0.1"), 9042)); - metadata.Hosts.Add(new IPEndPoint(IPAddress.Parse("192.168.0.2"), 9042)); - metadata.Hosts.Add(new IPEndPoint(IPAddress.Parse("192.168.0.3"), 9042)); - metadata.Hosts.Add(new IPEndPoint(IPAddress.Parse("192.168.0.4"), 9042)); - metadata.Hosts.Add(new IPEndPoint(IPAddress.Parse("192.168.0.5"), 9042)); - metadata.Hosts.Add(new IPEndPoint(IPAddress.Parse("192.168.0.6"), 9042)); - metadata.Hosts.Add(new IPEndPoint(IPAddress.Parse("192.168.0.7"), 9042)); - metadata.Hosts.Add(new IPEndPoint(IPAddress.Parse("192.168.0.8"), 9042)); - metadata.Hosts.Add(new IPEndPoint(IPAddress.Parse("192.168.0.9"), 9042)); - metadata.Hosts.Add(new IPEndPoint(IPAddress.Parse("192.168.0.10"), 9042)); + }, + schemaParser); + internalMetadata.SetPartitioner("Murmur3Partitioner"); + internalMetadata.Hosts.Add(new IPEndPoint(IPAddress.Parse("192.168.0.1"), 9042)); + internalMetadata.Hosts.Add(new IPEndPoint(IPAddress.Parse("192.168.0.2"), 9042)); + internalMetadata.Hosts.Add(new IPEndPoint(IPAddress.Parse("192.168.0.3"), 9042)); + internalMetadata.Hosts.Add(new IPEndPoint(IPAddress.Parse("192.168.0.4"), 9042)); + internalMetadata.Hosts.Add(new IPEndPoint(IPAddress.Parse("192.168.0.5"), 9042)); + internalMetadata.Hosts.Add(new IPEndPoint(IPAddress.Parse("192.168.0.6"), 9042)); + internalMetadata.Hosts.Add(new IPEndPoint(IPAddress.Parse("192.168.0.7"), 9042)); + internalMetadata.Hosts.Add(new IPEndPoint(IPAddress.Parse("192.168.0.8"), 9042)); + internalMetadata.Hosts.Add(new IPEndPoint(IPAddress.Parse("192.168.0.9"), 9042)); + internalMetadata.Hosts.Add(new IPEndPoint(IPAddress.Parse("192.168.0.10"), 9042)); var initialToken = 1; - foreach (var h in metadata.Hosts) + foreach (var h in internalMetadata.Hosts) { h.SetInfo(new TestHelper.DictionaryBasedRow(new Dictionary { @@ -474,8 +473,8 @@ public void Should_UpdateKeyspacesAndTokenMapCorrectly_When_MultipleThreadsCalli })); initialToken++; } - metadata.RebuildTokenMapAsync(false, true).GetAwaiter().GetResult(); - var expectedTokenMap = metadata.TokenToReplicasMap; + internalMetadata.RebuildTokenMapAsync(false, true).GetAwaiter().GetResult(); + var expectedTokenMap = internalMetadata.TokenToReplicasMap; Assert.NotNull(expectedTokenMap); var bag = new ConcurrentBag(); var tasks = new List(); @@ -483,13 +482,13 @@ public void Should_UpdateKeyspacesAndTokenMapCorrectly_When_MultipleThreadsCalli { var index = i; tasks.Add(Task.Factory.StartNew( - () => + async () => { for (var j = 0; j < 35; j++) { if (j % 10 == 0 && index % 2 == 0) { - metadata.RefreshSchemaAsync().GetAwaiter().GetResult(); + await internalMetadata.RefreshSchemaAsync().ConfigureAwait(false); } else if (j % 16 == 0) { @@ -497,8 +496,8 @@ public void Should_UpdateKeyspacesAndTokenMapCorrectly_When_MultipleThreadsCalli { if (keyspaces.TryRemove(ksName, out var ks)) { - metadata.RefreshSchemaAsync(ksName).GetAwaiter().GetResult(); - ks = metadata.GetKeyspace(ksName); + await internalMetadata.RefreshSchemaAsync(ksName).ConfigureAwait(false); + ks = await internalMetadata.GetKeyspaceAsync(ksName).ConfigureAwait(false); if (ks != null) { throw new Exception($"refresh for {ks.Name} returned non null after refresh single."); @@ -513,8 +512,8 @@ public void Should_UpdateKeyspacesAndTokenMapCorrectly_When_MultipleThreadsCalli { if (keyspaces.TryRemove(ksName, out var ks)) { - metadata.ControlConnection.HandleKeyspaceRefreshLaterAsync(ks.Name).GetAwaiter().GetResult(); - ks = metadata.GetKeyspace(ksName); + await internalMetadata.ControlConnection.HandleKeyspaceRefreshLaterAsync(ks.Name).ConfigureAwait(false); + ks = await internalMetadata.GetKeyspaceAsync(ksName).ConfigureAwait(false); if (ks != null) { throw new Exception($"refresh for {ks.Name} returned non null after remove."); @@ -530,8 +529,8 @@ public void Should_UpdateKeyspacesAndTokenMapCorrectly_When_MultipleThreadsCalli keyspaceName, ks, (s, keyspaceMetadata) => ks); - metadata.ControlConnection.HandleKeyspaceRefreshLaterAsync(ks.Name).GetAwaiter().GetResult(); - ks = metadata.GetKeyspace(ks.Name); + await internalMetadata.ControlConnection.HandleKeyspaceRefreshLaterAsync(ks.Name).ConfigureAwait(false); + ks = await internalMetadata.GetKeyspaceAsync(ks.Name).ConfigureAwait(false); if (ks == null) { throw new Exception($"refresh for {keyspaceName} returned null after add."); @@ -540,19 +539,21 @@ public void Should_UpdateKeyspacesAndTokenMapCorrectly_When_MultipleThreadsCalli } } }, - TaskCreationOptions.LongRunning | TaskCreationOptions.DenyChildAttach)); + TaskCreationOptions.LongRunning | TaskCreationOptions.DenyChildAttach).Unwrap()); } - Task.WaitAll(tasks.ToArray()); - AssertSameReplicas(keyspaces.Values, expectedTokenMap, metadata.TokenToReplicasMap); + await Task.WhenAll(tasks).ConfigureAwait(false); + AssertSameReplicas(keyspaces.Values, expectedTokenMap, internalMetadata.TokenToReplicasMap); } [Test] - public void RefreshSingleKeyspace_Should_BuildTokenMap_When_TokenMapIsNull() + public async Task RefreshSingleKeyspace_Should_BuildTokenMap_When_TokenMapIsNull() { var keyspaces = new ConcurrentDictionary(); keyspaces.GetOrAdd("ks1", FakeSchemaParserFactory.CreateSimpleKeyspace("ks1", 1)); var schemaParser = new FakeSchemaParser(keyspaces); - var metadata = new Metadata(new Configuration(), schemaParser) { Partitioner = "Murmur3Partitioner" }; + var metadata = new InternalMetadata( + Mock.Of(), new Configuration(), new List(), schemaParser); + metadata.SetPartitioner("Murmur3Partitioner"); metadata.Hosts.Add(new IPEndPoint(IPAddress.Parse("192.168.0.1"), 9042)); ; metadata.Hosts.First().SetInfo(new TestHelper.DictionaryBasedRow(new Dictionary { @@ -563,11 +564,12 @@ public void RefreshSingleKeyspace_Should_BuildTokenMap_When_TokenMapIsNull() })); Assert.IsNull(metadata.TokenToReplicasMap); - metadata.RefreshSingleKeyspace("ks1").GetAwaiter().GetResult(); + await metadata.RefreshSingleKeyspaceAsync("ks1").ConfigureAwait(false); Assert.NotNull(metadata.TokenToReplicasMap); } - private void AssertSameReplicas(IEnumerable keyspaces, IReadOnlyTokenMap expectedTokenMap, IReadOnlyTokenMap actualTokenMap) + private void AssertSameReplicas( + IEnumerable keyspaces, IReadOnlyTokenMap expectedTokenMap, IReadOnlyTokenMap actualTokenMap) { foreach (var k in keyspaces) { @@ -598,7 +600,8 @@ private void AssertSameReplicas(IEnumerable keyspaces, IReadOn } } - private void AssertOnlyOneStrategyIsCalled(IList strategies, params int[] equalStrategiesIndexes) + private void AssertOnlyOneStrategyIsCalled( + IList strategies, params int[] equalStrategiesIndexes) { var sameStrategies = equalStrategiesIndexes.Select(t => strategies[t]).ToList(); Assert.AreEqual(1, sameStrategies.Count(strategy => strategy.Calls == 1)); From aa6b759fa585e0c1aa61f29556324524a88f3a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Thu, 2 Jul 2020 20:13:34 +0100 Subject: [PATCH 17/31] fix cod analysis errors --- src/Cassandra/Connections/Control/InternalMetadata.cs | 2 +- src/Cassandra/Metadata.cs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Cassandra/Connections/Control/InternalMetadata.cs b/src/Cassandra/Connections/Control/InternalMetadata.cs index d62336fd7..d7c1af306 100644 --- a/src/Cassandra/Connections/Control/InternalMetadata.cs +++ b/src/Cassandra/Connections/Control/InternalMetadata.cs @@ -643,7 +643,7 @@ public async Task WaitForSchemaAgreementAsync(IConnection connection) null); var queries = new[] { connection.Send(schemaVersionLocalQuery), connection.Send(schemaVersionPeersQuery) }; // ReSharper disable once CoVariantArrayConversion - await Task.WhenAll(queries); + await Task.WhenAll(queries).ConfigureAwait(false); if (InternalMetadata.CheckSchemaVersionResults( Configuration.MetadataRequestHandler.GetRowSet(await queries[0].ConfigureAwait(false)), diff --git a/src/Cassandra/Metadata.cs b/src/Cassandra/Metadata.cs index 09bf16bc0..7d54511da 100644 --- a/src/Cassandra/Metadata.cs +++ b/src/Cassandra/Metadata.cs @@ -46,7 +46,6 @@ internal Metadata(IInternalMetadata internalMetadata) { Configuration = internalMetadata.Configuration; _queryAbortTimeout = Configuration.DefaultRequestOptions.QueryAbortTimeout; - Configuration = Configuration; InternalMetadata = internalMetadata; } From 2ac8d45303e51b2d5cab32f27a1e2eb49849f687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Mon, 6 Jul 2020 20:37:05 +0100 Subject: [PATCH 18/31] implement init timeouts and reconnection; change LBP init (wip) --- .../Core/SpeculativeExecutionShortTests.cs | 2 +- src/Cassandra/Builder.cs | 10 +- src/Cassandra/Cluster.cs | 141 +++++++++++------- src/Cassandra/Configuration.cs | 9 +- .../Connections/Control/ControlConnection.cs | 44 +++--- .../Connections/Control/IControlConnection.cs | 3 +- .../Connections/Control/IInternalMetadata.cs | 3 +- .../Connections/Control/InternalMetadata.cs | 5 +- src/Cassandra/Data/Linq/Batch.cs | 15 +- src/Cassandra/Data/Linq/BatchV1.cs | 20 ++- src/Cassandra/Data/Linq/BatchV2.cs | 17 ++- src/Cassandra/Data/Linq/CqlCommand.cs | 2 + .../Data/Linq/CqlConditionalCommand.cs | 6 +- src/Cassandra/Data/Linq/CqlQuery.cs | 1 + src/Cassandra/Data/Linq/CqlQueryBase.cs | 1 + .../Data/Linq/CqlQuerySingleElement.cs | 1 + src/Cassandra/Data/Linq/CqlScalar.cs | 1 + src/Cassandra/Data/Linq/SessionExtensions.cs | 12 +- src/Cassandra/Data/Linq/Table.cs | 1 + src/Cassandra/Extensions.cs | 12 +- src/Cassandra/IMetadata.cs | 68 +-------- src/Cassandra/IMetadataQueryProvider.cs | 2 - src/Cassandra/IMetadataSnapshotProvider.cs | 88 +++++++++++ src/Cassandra/InitializationErrorException.cs | 37 +++++ .../InitializationTimeoutException.cs | 45 ++++++ src/Cassandra/Logger.cs | 26 ++++ src/Cassandra/Mapping/Mapper.cs | 34 ++++- src/Cassandra/Metadata.cs | 58 ++++--- .../ConstantSpeculativeExecutionPolicy.cs | 2 +- .../Policies/DCAwareRoundRobinPolicy.cs | 14 +- .../Policies/ILoadBalancingPolicy.cs | 12 +- .../Policies/ISpeculativeExecutionPolicy.cs | 6 +- src/Cassandra/QueryTrace.cs | 10 +- src/Cassandra/Requests/TaskTimeoutHelper.cs | 50 +++++++ src/Cassandra/Session.cs | 124 ++++++++++++--- .../SessionManagement/IInternalCluster.cs | 2 + .../SessionManagement/IInternalSession.cs | 4 + src/Cassandra/SocketOptions.cs | 6 +- src/Cassandra/Tasks/TaskHelper.cs | 8 +- src/Cassandra/UdtMappingDefinitions.cs | 14 +- 40 files changed, 664 insertions(+), 252 deletions(-) create mode 100644 src/Cassandra/IMetadataSnapshotProvider.cs create mode 100644 src/Cassandra/InitializationErrorException.cs create mode 100644 src/Cassandra/InitializationTimeoutException.cs create mode 100644 src/Cassandra/Requests/TaskTimeoutHelper.cs diff --git a/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionShortTests.cs b/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionShortTests.cs index 98e129c40..17be2c051 100644 --- a/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionShortTests.cs +++ b/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionShortTests.cs @@ -161,7 +161,7 @@ public Task ShutdownAsync() return TaskHelper.Completed; } - public Task InitializeAsync(IMetadata metadata) + public Task InitializeAsync(IMetadataSnapshotProvider metadata) { return TaskHelper.Completed; } diff --git a/src/Cassandra/Builder.cs b/src/Cassandra/Builder.cs index 6d540c8a7..f9623c4fb 100644 --- a/src/Cassandra/Builder.cs +++ b/src/Cassandra/Builder.cs @@ -81,6 +81,7 @@ public class Builder : IInitializer private bool? _keepContactPointsUnresolved; private bool? _allowBetaProtocolVersions; private string _localDatacenter; + private long? _initializationTimeoutMs; public Builder() { @@ -204,7 +205,8 @@ public Configuration GetConfiguration() typeSerializerDefinitions, _keepContactPointsUnresolved, _allowBetaProtocolVersions, - _localDatacenter); + _localDatacenter, + _initializationTimeoutMs); return config; } @@ -1182,6 +1184,12 @@ public Builder WithMonitorReporting(bool enabled) return WithMonitorReporting(_monitorReportingOptions.SetMonitorReportingEnabled(enabled)); } + public Builder WithInitializationTimeout(long milliseconds) + { + _initializationTimeoutMs = milliseconds; + return this; + } + /// /// Configures options related to Monitor Reporting for the new cluster. /// By default, Monitor Reporting is enabled server types and versions that support it. diff --git a/src/Cassandra/Cluster.cs b/src/Cassandra/Cluster.cs index c4addb7ca..069125c7f 100644 --- a/src/Cassandra/Cluster.cs +++ b/src/Cassandra/Cluster.cs @@ -48,6 +48,7 @@ public class Cluster : IInternalCluster private readonly bool _implicitContactPoint = false; private volatile Exception _initException; private volatile bool _initialized = false; + private volatile TaskCompletionSource _initTaskCompletionSource; private readonly SemaphoreSlim _sessionCreateLock = new SemaphoreSlim(1, 1); private long _sessionCounter = -1; @@ -56,6 +57,7 @@ public class Cluster : IInternalCluster private IReadOnlyList _loadBalancingPolicies; private readonly Task _initTask; + private readonly CancellationTokenSource _initCancellationTokenSource = new CancellationTokenSource(); private long _state = Cluster.Initializing; @@ -135,7 +137,8 @@ private Cluster(IEnumerable contactPoints, Configuration configuration) _internalMetadata = new InternalMetadata(this, configuration, parsedContactPoints); _lazyMetadata = new Metadata(_internalMetadata); - _initTask = Task.Run(InitAsync); + _initTaskCompletionSource = new TaskCompletionSource(); + _initTask = Task.Run(InitInternalAsync); } /// @@ -144,7 +147,7 @@ Task IInternalCluster.TryInitAndGetMetadataAsync() if (_initialized) { //It was already initialized - return _initTask; + return Task.FromResult(_internalMetadata); } var currentState = Interlocked.Read(ref _state); @@ -159,10 +162,10 @@ Task IInternalCluster.TryInitAndGetMetadataAsync() throw _initException; } - return _initTask; + return _initTaskCompletionSource.Task; } - private async Task InitAsync() + private async Task InitInternalAsync() { Cluster.Logger.Info("Connecting to cluster using {0}", Cluster.GetAssemblyInfo()); try @@ -178,31 +181,48 @@ private async Task InitAsync() _loadBalancingPolicies = loadBalancingPolicies.ToList(); - // Only abort the async operations when at least twice the time for ConnectTimeout per host passed - var initialAbortTimeout = Configuration.SocketOptions.ConnectTimeoutMillis * 2 * _internalMetadata.Hosts.Count; - initialAbortTimeout = Math.Max(initialAbortTimeout, Configuration.SocketOptions.MetadataAbortTimeout); - var initTask = _lazyMetadata.TryInitializeAsync(); - try - { - await initTask.WaitToCompleteAsync(initialAbortTimeout).ConfigureAwait(false); - } - catch (TimeoutException ex) + var reconnectionSchedule = Configuration.Policies.ReconnectionPolicy.NewSchedule(); + + do { - var newEx = new TimeoutException( - "Cluster initialization was aborted after timing out. This mechanism is put in place to" + - " avoid blocking the calling thread forever. This usually caused by a networking issue" + - " between the client driver instance and the cluster. You can increase this timeout via " + - "the SocketOptions.ConnectTimeoutMillis config setting. This can also be related to deadlocks " + - "caused by mixing synchronous and asynchronous code.", ex); - _initException = new InitFatalErrorException(newEx); - initTask.ContinueWith(t => + try + { + await _lazyMetadata.TryInitializeAsync(_initCancellationTokenSource.Token).ConfigureAwait(false); + } + catch (Exception ex) { - if (t.IsFaulted && t.Exception != null) + if (IsDisposed) { - _initException = new InitFatalErrorException(t.Exception.InnerException); + throw new ObjectDisposedException("Cluster instance was disposed before initialization finished."); } - }, TaskContinuationOptions.ExecuteSynchronously).Forget(); - throw newEx; + + var currentTcs = _initTaskCompletionSource; + + var delay = reconnectionSchedule.NextDelayMs(); + Cluster.Logger.Error(ex, "Cluster initialization failed. Retrying in {0} ms.", delay); + Task.Run(() => currentTcs.TrySetException( + new InitializationErrorException( + "Cluster initialization failed. See inner exception. " + + "The driver will attempt to retry the initialization according to the reconnection policy " + + "schedule."))).Forget(); + + try + { + await Task.Delay( + TimeSpan.FromMilliseconds(delay), + _initCancellationTokenSource.Token).ConfigureAwait(false); + } + finally + { + _initTaskCompletionSource = new TaskCompletionSource(); + } + + } + } while (!IsDisposed); + + if (IsDisposed) + { + throw new ObjectDisposedException("Cluster instance was disposed before initialization finished."); } // initialize the local datacenter provider @@ -221,11 +241,6 @@ private async Task InitAsync() InitializeHostDistances(); - // Set metadata dependent options - SetMetadataDependentOptions(); - - _internalMetadata.Hosts.Added += _internalMetadata.OnHostAdded; - _internalMetadata.Hosts.Removed += _internalMetadata.OnHostRemoved; _internalMetadata.Hosts.Up += OnHostUp; var previousState = Interlocked.CompareExchange(ref _state, Cluster.Initialized, Cluster.Initializing); @@ -242,23 +257,23 @@ private async Task InitAsync() + "]"); Cluster.Logger.Info("Cluster [" + _internalMetadata.ClusterName + "] has been initialized."); + Task.Run(() => _initTaskCompletionSource.TrySetResult(_internalMetadata)).Forget(); return _internalMetadata; } - catch (NoHostAvailableException) - { - //No host available now, maybe later it can recover from - throw; - } - catch (TimeoutException) - { - throw; - } catch (Exception ex) { + if (IsDisposed) + { + var newEx = new ObjectDisposedException("Cluster instance was disposed before initialization finished."); + Task.Run(() => _initTaskCompletionSource.TrySetException(newEx)).Forget(); + throw newEx; + } + //There was an error that the driver is not able to recover from //Store the exception for the following times _initException = new InitFatalErrorException(ex); //Throw the actual exception for the first time + Task.Run(() => _initTaskCompletionSource.TrySetException(ex)).Forget(); throw; } } @@ -270,6 +285,19 @@ private void InitializeHostDistances() InternalRef.RetrieveAndSetDistance(host); } } + + TimeSpan IInternalCluster.GetInitTimeout() + { + if (Configuration.InitializationTimeoutMs.HasValue) + { + return TimeSpan.FromMilliseconds(Configuration.InitializationTimeoutMs.Value); + } + + // Only abort the async operations when at least twice the time for ConnectTimeout per host passed + var initialAbortTimeoutMs = Configuration.SocketOptions.ConnectTimeoutMillis * 2 * _internalMetadata.Hosts.Count; + initialAbortTimeoutMs = Math.Max(initialAbortTimeoutMs, Configuration.SocketOptions.MetadataAbortTimeoutMs); + return TimeSpan.FromMilliseconds(initialAbortTimeoutMs); + } private static string GetAssemblyInfo() { @@ -355,14 +383,6 @@ private long GetAndIncrementSessionCounter() return newCounter < 0 ? Math.Abs(newCounter) : newCounter; } - private void SetMetadataDependentOptions() - { - if (_internalMetadata.IsDbaas) - { - Configuration.SetDefaultConsistencyLevel(ConsistencyLevel.LocalQuorum); - } - } - /// /// Creates new session on this cluster, and sets it to default keyspace. /// If default keyspace does not exist then it will be created and session will be set to it. @@ -449,12 +469,23 @@ public async Task ShutdownAsync(int timeoutMs = Timeout.Infinite) Cluster.Logger.Warning("Exception occured while disposing session instances: {0}", ex.ToString()); } - if (previousState != Cluster.Initialized) + _initCancellationTokenSource.Cancel(); + + if (previousState == Cluster.Initialized) { - return; + await ShutdownInternalAsync().ConfigureAwait(false); + } + else + { + try + { + await _initTask.ConfigureAwait(false); + } + catch (Exception) + { + // ignored + } } - - await ShutdownInternalAsync().ConfigureAwait(false); Cluster.Logger.Info("Cluster [" + _internalMetadata.ClusterName + "] has been shut down."); } @@ -480,12 +511,12 @@ private async Task ShutdownInternalAsync() /// HostDistance IInternalCluster.RetrieveAndSetDistance(Host host) { - var distance = _loadBalancingPolicies[0].Distance(Metadata, host); + var distance = _loadBalancingPolicies[0].Distance(this, host); for (var i = 1; i < _loadBalancingPolicies.Count; i++) { var lbp = _loadBalancingPolicies[i]; - var lbpDistance = lbp.Distance(Metadata, host); + var lbpDistance = lbp.Distance(this, host); if (lbpDistance < distance) { distance = lbpDistance; @@ -500,8 +531,6 @@ HostDistance IInternalCluster.RetrieveAndSetDistance(Host host) async Task IInternalCluster.PrepareAsync( IInternalSession session, string cqlQuery, string keyspace, IDictionary customPayload) { - await InternalRef.TryInitAndGetMetadataAsync().ConfigureAwait(false); - var serializer = _internalMetadata.SerializerManager.GetCurrentSerializer(); var currentVersion = serializer.ProtocolVersion; if (!currentVersion.SupportsKeyspaceInRequest() && keyspace != null) @@ -523,7 +552,7 @@ private async Task PrepareAsync(IInternalSession session, Pre var ps = await handler.PrepareAsync( request, session, - lbp.NewQueryPlan(Metadata, session.Keyspace, null).GetEnumerator()).ConfigureAwait(false); + lbp.NewQueryPlan(this, session.Keyspace, null).GetEnumerator()).ConfigureAwait(false); var psAdded = InternalRef.PreparedQueries.GetOrAdd(ps.Id, ps); if (ps != psAdded) { diff --git a/src/Cassandra/Configuration.cs b/src/Cassandra/Configuration.cs index 8f28dc0e4..aa2821570 100644 --- a/src/Cassandra/Configuration.cs +++ b/src/Cassandra/Configuration.cs @@ -127,6 +127,8 @@ public class Configuration /// public string LocalDatacenter { get; } + public long? InitializationTimeoutMs { get; } + /// /// Shared reusable timer /// @@ -314,7 +316,8 @@ internal Configuration() : typeSerializerDefinitions: null, keepContactPointsUnresolved: null, allowBetaProtocolVersions: null, - localDatacenter: null) + localDatacenter: null, + initializationTimeoutMs: null) { } @@ -346,6 +349,7 @@ internal Configuration(Policies policies, bool? keepContactPointsUnresolved, bool? allowBetaProtocolVersions, string localDatacenter, + long? initializationTimeoutMs, ISessionFactory sessionFactory = null, IRequestOptionsMapper requestOptionsMapper = null, IStartupOptionsFactory startupOptionsFactory = null, @@ -420,7 +424,8 @@ internal Configuration(Policies policies, RequestOptions = RequestOptionsMapper.BuildRequestOptionsDictionary(executionProfiles, policies, socketOptions, clientOptions, queryOptions, GraphOptions); ExecutionProfiles = BuildExecutionProfilesDictionary(executionProfiles, RequestOptions); LocalDatacenter = localDatacenter; - + InitializationTimeoutMs = initializationTimeoutMs; + MonitorReportingOptions = monitorReportingOptions ?? new MonitorReportingOptions(); InsightsSupportVerifier = insightsSupportVerifier ?? Configuration.DefaultInsightsSupportVerifier; InsightsClientFactory = insightsClientFactory ?? Configuration.DefaultInsightsClientFactory; diff --git a/src/Cassandra/Connections/Control/ControlConnection.cs b/src/Cassandra/Connections/Control/ControlConnection.cs index 6890561ec..677c39bd1 100644 --- a/src/Cassandra/Connections/Control/ControlConnection.cs +++ b/src/Cassandra/Connections/Control/ControlConnection.cs @@ -93,10 +93,10 @@ public void Dispose() } /// - public async Task InitAsync() + public async Task InitAsync(CancellationToken token = default(CancellationToken)) { ControlConnection.Logger.Info("Trying to connect the ControlConnection"); - await Connect(true).ConfigureAwait(false); + await Connect(true, token).ConfigureAwait(false); } /// @@ -171,38 +171,36 @@ private IEnumerable>> ContactPointResoluti private IEnumerable>> AllHostsEndPointResolutionTasksEnumerable( ConcurrentDictionary attemptedContactPoints, - ConcurrentDictionary attemptedHosts, - bool isInitializing) + ConcurrentDictionary attemptedHosts) { foreach (var host in GetHostEnumerable()) { if (attemptedHosts.TryAdd(host, null)) { - if (!IsHostValid(host, isInitializing)) + if (!IsHostValid(host, true)) { continue; } - yield return ResolveHostContactPointOrConnectionEndpointAsync(attemptedContactPoints, host, isInitializing); + yield return ResolveHostContactPointOrConnectionEndpointAsync(attemptedContactPoints, host, true); } } } private IEnumerable>> DefaultLbpHostsEnumerable( ConcurrentDictionary attemptedContactPoints, - ConcurrentDictionary attemptedHosts, - bool isInitializing) + ConcurrentDictionary attemptedHosts) { foreach (var host in _config.DefaultRequestOptions.LoadBalancingPolicy.NewQueryPlan(_cluster.Metadata, null, null)) { if (attemptedHosts.TryAdd(host, null)) { - if (!IsHostValid(host, isInitializing)) + if (!IsHostValid(host, false)) { continue; } - yield return ResolveHostContactPointOrConnectionEndpointAsync(attemptedContactPoints, host, isInitializing); + yield return ResolveHostContactPointOrConnectionEndpointAsync(attemptedContactPoints, host, false); } } } @@ -237,9 +235,10 @@ private bool IsHostValid(Host host, bool initializing) /// /// Determines whether the ControlConnection is connecting for the first time as part of the initialization. /// + /// Used to cancel initialization /// /// - private async Task Connect(bool isInitializing) + private async Task Connect(bool isInitializing, CancellationToken token = default(CancellationToken)) { // lazy iterator of endpoints to try for the control connection IEnumerable>> endPointResolutionTasksLazyIterator = @@ -251,7 +250,8 @@ private async Task Connect(bool isInitializing) // start with endpoints from the default LBP if it is already initialized if (!isInitializing) { - endPointResolutionTasksLazyIterator = DefaultLbpHostsEnumerable(attemptedContactPoints, attemptedHosts, isInitializing); + await _cluster.TryInitAndGetMetadataAsync().ConfigureAwait(false); + endPointResolutionTasksLazyIterator = DefaultLbpHostsEnumerable(attemptedContactPoints, attemptedHosts); } // add contact points next @@ -262,7 +262,7 @@ private async Task Connect(bool isInitializing) if (isInitializing) { endPointResolutionTasksLazyIterator = endPointResolutionTasksLazyIterator.Concat( - AllHostsEndPointResolutionTasksEnumerable(attemptedContactPoints, attemptedHosts, isInitializing)); + AllHostsEndPointResolutionTasksEnumerable(attemptedContactPoints, attemptedHosts)); } var triedHosts = new Dictionary(); @@ -271,6 +271,11 @@ private async Task Connect(bool isInitializing) var endPoints = await endPointResolutionTask.ConfigureAwait(false); foreach (var endPoint in endPoints) { + if (token.IsCancellationRequested) + { + throw new TaskCanceledException(); + } + ControlConnection.Logger.Verbose("Attempting to connect to {0}.", endPoint.EndpointFriendlyName); var connection = _config.ConnectionFactory.CreateUnobserved(_config.SerializerManager.GetCurrentSerializer(), endPoint, _config); try @@ -528,6 +533,9 @@ private async void OnConnectionCassandraEvent(object sender, CassandraEventArgs { try { + // make sure the cluster object has finished initializing before processing protocol events + await _cluster.TryInitAndGetMetadataAsync().ConfigureAwait(false); + //This event is invoked from a worker thread (not a IO thread) if (e is TopologyChangeEventArgs tce) { @@ -635,15 +643,7 @@ private void SetCurrentConnection(Host host, IConnectionEndPoint endPoint) _currentConnectionEndPoint = endPoint; _internalMetadata.SetCassandraVersion(host.CassandraVersion); } - - /// - /// Uses the active connection to execute a query - /// - public IEnumerable Query(string cqlQuery, bool retry = false) - { - return TaskHelper.WaitToComplete(QueryAsync(cqlQuery, retry), _config.SocketOptions.MetadataAbortTimeout); - } - + public async Task> QueryAsync(string cqlQuery, bool retry = false) { return _config.MetadataRequestHandler.GetRowSet( diff --git a/src/Cassandra/Connections/Control/IControlConnection.cs b/src/Cassandra/Connections/Control/IControlConnection.cs index 54cfcf585..4fa426ddd 100644 --- a/src/Cassandra/Connections/Control/IControlConnection.cs +++ b/src/Cassandra/Connections/Control/IControlConnection.cs @@ -15,6 +15,7 @@ // using System; +using System.Threading; using System.Threading.Tasks; namespace Cassandra.Connections.Control @@ -33,7 +34,7 @@ internal interface IControlConnection : IMetadataQueryProvider, IDisposable /// /// /// - Task InitAsync(); + Task InitAsync(CancellationToken token = default(CancellationToken)); /// /// Updates keyspace metadata and token map if necessary. diff --git a/src/Cassandra/Connections/Control/IInternalMetadata.cs b/src/Cassandra/Connections/Control/IInternalMetadata.cs index 5fbb92029..2606e8b61 100644 --- a/src/Cassandra/Connections/Control/IInternalMetadata.cs +++ b/src/Cassandra/Connections/Control/IInternalMetadata.cs @@ -16,6 +16,7 @@ using System; using System.Collections.Generic; using System.Net; +using System.Threading; using System.Threading.Tasks; using Cassandra.MetadataHelpers; using Cassandra.Serialization; @@ -62,7 +63,7 @@ internal interface IInternalMetadata KeyValuePair[] KeyspacesSnapshot { get; } - Task InitAsync(); + Task InitAsync(CancellationToken token = default(CancellationToken)); Task ShutdownAsync(); diff --git a/src/Cassandra/Connections/Control/InternalMetadata.cs b/src/Cassandra/Connections/Control/InternalMetadata.cs index d7c1af306..6b0c2217a 100644 --- a/src/Cassandra/Connections/Control/InternalMetadata.cs +++ b/src/Cassandra/Connections/Control/InternalMetadata.cs @@ -18,6 +18,7 @@ using System.Collections.Generic; using System.Linq; using System.Net; +using System.Threading; using System.Threading.Tasks; using Cassandra.Collections; @@ -121,9 +122,9 @@ internal InternalMetadata( _schemaParser = schemaParser; } - public Task InitAsync() + public Task InitAsync(CancellationToken token = default(CancellationToken)) { - return ControlConnection.InitAsync(); + return ControlConnection.InitAsync(token); } public Task ShutdownAsync() diff --git a/src/Cassandra/Data/Linq/Batch.cs b/src/Cassandra/Data/Linq/Batch.cs index 7a05e9cf2..2889915c5 100644 --- a/src/Cassandra/Data/Linq/Batch.cs +++ b/src/Cassandra/Data/Linq/Batch.cs @@ -85,16 +85,16 @@ public void Execute() public void Execute(string executionProfile) { - WaitToCompleteWithMetrics(InternalExecuteAsync(executionProfile), QueryAbortTimeout); + InternalExecute(executionProfile); } - - protected abstract Task InternalExecuteAsync(); protected abstract Task InternalExecuteAsync(string executionProfile); + protected abstract RowSet InternalExecute(string executionProfile); + public Task ExecuteAsync() { - return InternalExecuteAsync(); + return InternalExecuteAsync(Configuration.DefaultExecutionProfileName); } public Task ExecuteAsync(string executionProfile) @@ -104,7 +104,7 @@ public Task ExecuteAsync(string executionProfile) public IAsyncResult BeginExecute(AsyncCallback callback, object state) { - return InternalExecuteAsync().ToApm(callback, state); + return InternalExecuteAsync(Configuration.DefaultExecutionProfileName).ToApm(callback, state); } public void EndExecute(IAsyncResult ar) @@ -125,10 +125,5 @@ protected string BatchTypeString() throw new ArgumentException(); } } - - internal T WaitToCompleteWithMetrics(Task task, int timeout = Timeout.Infinite) - { - return TaskHelper.WaitToCompleteWithMetrics(_metricsManager, task, timeout); - } } } diff --git a/src/Cassandra/Data/Linq/BatchV1.cs b/src/Cassandra/Data/Linq/BatchV1.cs index 9e6f44da4..cf23191de 100644 --- a/src/Cassandra/Data/Linq/BatchV1.cs +++ b/src/Cassandra/Data/Linq/BatchV1.cs @@ -16,7 +16,6 @@ using System.Text; using System.Threading.Tasks; -using Cassandra.Tasks; namespace Cassandra.Data.Linq { @@ -41,21 +40,28 @@ public override void Append(CqlCommand cqlCommand) _batchScript.AppendLine(";"); } - protected override Task InternalExecuteAsync() + protected override RowSet InternalExecute(string executionProfile) { - return InternalExecuteAsync(Configuration.DefaultExecutionProfileName); + var stmt = GetStatement(); + return _session.Execute(stmt, executionProfile); } - + protected override Task InternalExecuteAsync(string executionProfile) + { + var stmt = GetStatement(); + return _session.ExecuteAsync(stmt, executionProfile); + } + + private IStatement GetStatement() { if (_batchScript.Length == 0) { - return TaskHelper.FromException(new RequestInvalidException("The Batch must contain queries to execute")); + throw new RequestInvalidException("The Batch must contain queries to execute"); } string cqlQuery = GetCql(); var stmt = new SimpleStatement(cqlQuery); this.CopyQueryPropertiesTo(stmt); - return _session.ExecuteAsync(stmt, executionProfile); + return stmt; } private string GetCql() @@ -73,4 +79,4 @@ public override string ToString() return GetCql(); } } -} +} \ No newline at end of file diff --git a/src/Cassandra/Data/Linq/BatchV2.cs b/src/Cassandra/Data/Linq/BatchV2.cs index a9bcf8587..d503faed2 100644 --- a/src/Cassandra/Data/Linq/BatchV2.cs +++ b/src/Cassandra/Data/Linq/BatchV2.cs @@ -16,7 +16,6 @@ using System.Text; using System.Threading.Tasks; -using Cassandra.Tasks; namespace Cassandra.Data.Linq { @@ -41,17 +40,23 @@ public override void Append(CqlCommand cqlCommand) } _batchScript.Add(cqlCommand); } - - protected override Task InternalExecuteAsync() + + protected override RowSet InternalExecute(string executionProfile) { - return InternalExecuteAsync(Configuration.DefaultExecutionProfileName); + if (_batchScript.IsEmpty) + { + throw new RequestInvalidException("The Batch must contain queries to execute"); + } + _batchScript.SetBatchType(_batchType); + this.CopyQueryPropertiesTo(_batchScript); + return _session.Execute(_batchScript, executionProfile); } protected override Task InternalExecuteAsync(string executionProfile) { if (_batchScript.IsEmpty) { - return TaskHelper.FromException(new RequestInvalidException("The Batch must contain queries to execute")); + throw new RequestInvalidException("The Batch must contain queries to execute"); } _batchScript.SetBatchType(_batchType); this.CopyQueryPropertiesTo(_batchScript); @@ -68,4 +73,4 @@ public override string ToString() return sb.ToString(); } } -} +} \ No newline at end of file diff --git a/src/Cassandra/Data/Linq/CqlCommand.cs b/src/Cassandra/Data/Linq/CqlCommand.cs index 9ccc32c44..e9de3c2f8 100644 --- a/src/Cassandra/Data/Linq/CqlCommand.cs +++ b/src/Cassandra/Data/Linq/CqlCommand.cs @@ -114,6 +114,8 @@ public RowSet Execute(string executionProfile) { throw new ArgumentNullException(nameof(executionProfile)); } + + GetTable().GetSession().Connect(); return WaitToCompleteWithMetrics(ExecuteAsync(executionProfile), QueryAbortTimeout); } diff --git a/src/Cassandra/Data/Linq/CqlConditionalCommand.cs b/src/Cassandra/Data/Linq/CqlConditionalCommand.cs index 0c344698c..87b133958 100644 --- a/src/Cassandra/Data/Linq/CqlConditionalCommand.cs +++ b/src/Cassandra/Data/Linq/CqlConditionalCommand.cs @@ -89,8 +89,10 @@ protected internal override string GetCql(out object[] values) { throw new ArgumentNullException(nameof(executionProfile)); } - - var queryAbortTimeout = GetTable().GetSession().Cluster.Configuration.ClientOptions.QueryAbortTimeout; + + var session = GetTable().GetSession(); + session.Connect(); + var queryAbortTimeout = session.Cluster.Configuration.ClientOptions.QueryAbortTimeout; return WaitToCompleteWithMetrics(ExecuteAsync(executionProfile), queryAbortTimeout); } diff --git a/src/Cassandra/Data/Linq/CqlQuery.cs b/src/Cassandra/Data/Linq/CqlQuery.cs index 5ea17410f..e0060fa36 100644 --- a/src/Cassandra/Data/Linq/CqlQuery.cs +++ b/src/Cassandra/Data/Linq/CqlQuery.cs @@ -147,6 +147,7 @@ public IPage ExecutePaged(string executionProfile) throw new ArgumentNullException(nameof(executionProfile)); } + GetTable().GetSession().Connect(); return WaitToCompleteWithMetrics(ExecutePagedAsync(executionProfile), QueryAbortTimeout); } diff --git a/src/Cassandra/Data/Linq/CqlQueryBase.cs b/src/Cassandra/Data/Linq/CqlQueryBase.cs index f38f0671e..bd0747118 100644 --- a/src/Cassandra/Data/Linq/CqlQueryBase.cs +++ b/src/Cassandra/Data/Linq/CqlQueryBase.cs @@ -182,6 +182,7 @@ public IEnumerable EndExecute(IAsyncResult ar) private IEnumerable ExecuteCqlQuery(string executionProfile) { + GetTable().GetSession().Connect(); return WaitToCompleteWithMetrics(ExecuteCqlQueryAsync(executionProfile), QueryAbortTimeout); } diff --git a/src/Cassandra/Data/Linq/CqlQuerySingleElement.cs b/src/Cassandra/Data/Linq/CqlQuerySingleElement.cs index 41917603d..66956cbf7 100644 --- a/src/Cassandra/Data/Linq/CqlQuerySingleElement.cs +++ b/src/Cassandra/Data/Linq/CqlQuerySingleElement.cs @@ -90,6 +90,7 @@ public override string ToString() /// public new TEntity Execute(string executionProfile) { + GetTable().GetSession().Connect(); return WaitToCompleteWithMetrics(ExecuteAsync(executionProfile), QueryAbortTimeout); } } diff --git a/src/Cassandra/Data/Linq/CqlScalar.cs b/src/Cassandra/Data/Linq/CqlScalar.cs index 2314fa7b0..1f2683de9 100644 --- a/src/Cassandra/Data/Linq/CqlScalar.cs +++ b/src/Cassandra/Data/Linq/CqlScalar.cs @@ -43,6 +43,7 @@ internal CqlScalar(Expression expression, ITable table, StatementFactory stmtFac public new TEntity Execute(string executionProfile) { + GetTable().GetSession().Connect(); return WaitToCompleteWithMetrics(ExecuteAsync(executionProfile), QueryAbortTimeout); } diff --git a/src/Cassandra/Data/Linq/SessionExtensions.cs b/src/Cassandra/Data/Linq/SessionExtensions.cs index 57741aac6..6e28e9df4 100644 --- a/src/Cassandra/Data/Linq/SessionExtensions.cs +++ b/src/Cassandra/Data/Linq/SessionExtensions.cs @@ -65,9 +65,8 @@ public static Batch CreateBatch(this ISession session) /// public static Batch CreateBatch(this ISession session, BatchType batchType) { - return TaskHelper.WaitToComplete( - session.CreateBatchAsync(batchType), - session.Cluster.Configuration.DefaultRequestOptions.QueryAbortTimeout); + var metadata = session.Cluster.Metadata.GetClusterDescription(); + return session.CreateBatch(metadata, batchType); } public static Task CreateBatchAsync(this ISession session) @@ -78,7 +77,12 @@ public static Task CreateBatchAsync(this ISession session) public static async Task CreateBatchAsync(this ISession session, BatchType batchType) { var metadata = await session.Cluster.Metadata.GetClusterDescriptionAsync().ConfigureAwait(false); - if (metadata.ProtocolVersion.SupportsBatch()) + return session.CreateBatch(metadata, batchType); + } + + private static Batch CreateBatch(this ISession session, ClusterDescription description, BatchType batchType) + { + if (description.ProtocolVersion.SupportsBatch()) { return new BatchV2(session, batchType); } diff --git a/src/Cassandra/Data/Linq/Table.cs b/src/Cassandra/Data/Linq/Table.cs index c63a9a80d..5fb0f9be0 100644 --- a/src/Cassandra/Data/Linq/Table.cs +++ b/src/Cassandra/Data/Linq/Table.cs @@ -149,6 +149,7 @@ public Type GetEntityType() public void Create() { + _session.Connect(); WaitToCompleteWithMetrics(CreateAsync(), QueryAbortTimeout); } diff --git a/src/Cassandra/Extensions.cs b/src/Cassandra/Extensions.cs index 83686d239..970b5fc98 100644 --- a/src/Cassandra/Extensions.cs +++ b/src/Cassandra/Extensions.cs @@ -46,9 +46,15 @@ public static class Extensions /// public static ISessionState GetState(this ISession instance) { - return TaskHelper.WaitToComplete( - instance.GetStateAsync(), - instance.Cluster.Configuration.DefaultRequestOptions.QueryAbortTimeout); + var session = instance as IInternalSession; + + if (session == null) + { + return SessionState.Empty(); + } + + var metadata = session.TryInitAndGetMetadata(); + return SessionState.From(session, metadata); } /// diff --git a/src/Cassandra/IMetadata.cs b/src/Cassandra/IMetadata.cs index 8793a402d..dabcd0cc1 100644 --- a/src/Cassandra/IMetadata.cs +++ b/src/Cassandra/IMetadata.cs @@ -23,76 +23,12 @@ namespace Cassandra /// /// Allows for fetching of metadata about the connected cluster, including known nodes and schema definitions. /// - public interface IMetadata + public interface IMetadata : IMetadataSnapshotProvider { - event HostsEventHandler HostsEvent; - - event SchemaChangedEventHandler SchemaChangedEvent; - - /// - /// Event that gets triggered when a new host is added to the cluster - /// - event Action HostAdded; - - /// - /// Event that gets triggered when a host has been removed from the cluster - /// - event Action HostRemoved; - - Configuration Configuration { get; } - Task GetClusterDescriptionAsync(); ClusterDescription GetClusterDescription(); - - /// - /// - /// Returns all known hosts of this cluster from the driver's cache. The driver's cache - /// is kept up to date using server protocol events so it will not be populated until the initialization is done - /// and a connection is open. - /// - /// - /// This method might return an empty collection if the initialization has not finished yet. - /// - /// - ICollection AllHostsSnapshot(); - - /// - /// - /// Get the replicas without performing any I/O (it will use the driver's cache). The driver's cache - /// is kept up to date using server protocol events so it will not be populated until the initialization is done - /// and a connection is open. - /// - /// - /// This method might return an empty collection if the initialization has not finished yet. - /// - /// - IEnumerable AllReplicasSnapshot(); - - /// - /// - /// Get the replicas for a given keyspace and partition key without performing any I/O (it will use the driver's cache). - /// The driver's cache is kept up to date using server protocol events so it will not be populated - /// until the initialization is done and a connection is open. - /// - /// - /// This method might return an empty collection if the initialization has not finished yet. - /// - /// - ICollection GetReplicasSnapshot(string keyspaceName, byte[] partitionKey); - - /// - /// - /// Get the replicas for a partition key without performing any I/O (it will use the driver's cache). - /// The driver's cache is kept up to date using server protocol events so it will not be populated - /// until the initialization is done and a connection is open. - /// - /// - /// This method might return an empty collection if the initialization has not finished yet. - /// - /// - ICollection GetReplicasSnapshot(byte[] partitionKey); - + Host GetHost(IPEndPoint address); Task GetHostAsync(IPEndPoint address); diff --git a/src/Cassandra/IMetadataQueryProvider.cs b/src/Cassandra/IMetadataQueryProvider.cs index 43c679df5..307d98b16 100644 --- a/src/Cassandra/IMetadataQueryProvider.cs +++ b/src/Cassandra/IMetadataQueryProvider.cs @@ -46,7 +46,5 @@ internal interface IMetadataQueryProvider /// Send request without any retry or reconnection logic. Also exceptions are not caught or logged. /// Task UnsafeSendQueryRequestAsync(string cqlQuery, QueryProtocolOptions queryProtocolOptions); - - IEnumerable Query(string cqlQuery, bool retry = false); } } \ No newline at end of file diff --git a/src/Cassandra/IMetadataSnapshotProvider.cs b/src/Cassandra/IMetadataSnapshotProvider.cs new file mode 100644 index 000000000..8575d11b1 --- /dev/null +++ b/src/Cassandra/IMetadataSnapshotProvider.cs @@ -0,0 +1,88 @@ +// +// Copyright (C) DataStax Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using System; +using System.Collections.Generic; +using System.Net; + +namespace Cassandra +{ + public interface IMetadataSnapshotProvider + { + event HostsEventHandler HostsEvent; + + event SchemaChangedEventHandler SchemaChangedEvent; + + /// + /// Event that gets triggered when a new host is added to the cluster + /// + event Action HostAdded; + + /// + /// Event that gets triggered when a host has been removed from the cluster + /// + event Action HostRemoved; + + Configuration Configuration { get; } + + /// + /// + /// Returns all known hosts of this cluster from the driver's cache. The driver's cache + /// is kept up to date using server protocol events so it will not be populated until the metadata initialization is done + /// and a connection is open. + /// + /// + /// This method might return an empty collection if the metadata initialization has not finished yet. + /// + /// + ICollection AllHostsSnapshot(); + + /// + /// + /// Get the replicas without performing any I/O (it will use the driver's cache). The driver's cache + /// is kept up to date using server protocol events so it will not be populated until the metadata initialization is done + /// and a connection is open. + /// + /// + /// This method might return an empty collection if the metadata initialization has not finished yet. + /// + /// + IEnumerable AllReplicasSnapshot(); + + /// + /// + /// Get the replicas for a given keyspace and partition key without performing any I/O (it will use the driver's cache). + /// The driver's cache is kept up to date using server protocol events so it will not be populated + /// until the metadata initialization is done and a connection is open. + /// + /// + /// This method might return an empty collection if the metadata initialization has not finished yet. + /// + /// + ICollection GetReplicasSnapshot(string keyspaceName, byte[] partitionKey); + + /// + /// + /// Get the replicas for a partition key without performing any I/O (it will use the driver's cache). + /// The driver's cache is kept up to date using server protocol events so it will not be populated + /// until the metadata initialization is done and a connection is open. + /// + /// + /// This method might return an empty collection if the metadata initialization has not finished yet. + /// + /// + ICollection GetReplicasSnapshot(byte[] partitionKey); + } +} \ No newline at end of file diff --git a/src/Cassandra/InitializationErrorException.cs b/src/Cassandra/InitializationErrorException.cs new file mode 100644 index 000000000..aa47881b1 --- /dev/null +++ b/src/Cassandra/InitializationErrorException.cs @@ -0,0 +1,37 @@ +// +// Copyright (C) DataStax Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +using System; +using System.Runtime.Serialization; + +namespace Cassandra +{ + [Serializable] + public class InitializationErrorException : DriverException + { + internal InitializationErrorException(string message) : base(message) + { + } + + internal InitializationErrorException(string message, Exception innerException) : base(message, innerException) + { + } + + protected InitializationErrorException(SerializationInfo info, StreamingContext context) : base(info, context) + { + } + } +} \ No newline at end of file diff --git a/src/Cassandra/InitializationTimeoutException.cs b/src/Cassandra/InitializationTimeoutException.cs new file mode 100644 index 000000000..93b720ccd --- /dev/null +++ b/src/Cassandra/InitializationTimeoutException.cs @@ -0,0 +1,45 @@ +// +// Copyright (C) DataStax Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +using System; +using System.Runtime.Serialization; + +namespace Cassandra +{ + [Serializable] + public class InitializationTimeoutException : DriverException + { + internal InitializationTimeoutException() : base("Cluster initialization was aborted after timing out. This mechanism is put in place to" + + " avoid blocking the calling thread forever. This usually caused by a networking issue" + + " between the client driver instance and the cluster. You can increase this timeout via " + + "the SocketOptions.ConnectTimeoutMillis config setting. This can also be related to deadlocks " + + "caused by mixing synchronous and asynchronous code.") + { + } + + internal InitializationTimeoutException(string message) : base(message) + { + } + + internal InitializationTimeoutException(string message, Exception innerException) : base(message, innerException) + { + } + + protected InitializationTimeoutException(SerializationInfo info, StreamingContext context) : base(info, context) + { + } + } +} \ No newline at end of file diff --git a/src/Cassandra/Logger.cs b/src/Cassandra/Logger.cs index 458f1d7c6..02dd354b1 100644 --- a/src/Cassandra/Logger.cs +++ b/src/Cassandra/Logger.cs @@ -64,6 +64,11 @@ public void Error(string message, params object[] args) _loggerHandler.Error(message, args); } + public void Error(Exception ex, string message, params object[] args) + { + _loggerHandler.Error(ex, message, args); + } + public void Warning(string message, params object[] args) { _loggerHandler.Warning(message, args); @@ -86,6 +91,7 @@ internal interface ILoggerHandler { void Error(Exception ex); void Error(string message, Exception ex = null); + void Error(Exception ex, string message, params object[] args); void Error(string message, params object[] args); void Verbose(string message, params object[] args); void Info(string message, params object[] args); @@ -116,6 +122,11 @@ public void Error(string message, params object[] args) _logger.LogError(message, args); } + public void Error(Exception ex, string message, params object[] args) + { + _logger.LogError(0, ex, message, args); + } + public void Verbose(string message, params object[] args) { _logger.LogDebug(message, args); @@ -211,6 +222,21 @@ public void Error(string message, params object[] args) Trace.WriteLine(string.Format("{0} #ERROR: {1}", DateTimeOffset.Now.DateTime.ToString(DateFormat), message), _category); } + public void Error(Exception ex, string message, params object[] args) + { + if (!Diagnostics.CassandraTraceSwitch.TraceError) + { + return; + } + if (args != null && args.Length > 0) + { + message = string.Format(message, args); + } + Trace.WriteLine( + string.Format("{0} #ERROR: {1}", DateTimeOffset.Now.DateTime.ToString(DateFormat), + message + (ex != null ? "\nEXCEPTION:\n " + GetExceptionAndAllInnerEx(ex) : string.Empty)), _category); + } + public void Warning(string message, params object[] args) { if (!Diagnostics.CassandraTraceSwitch.TraceWarning) diff --git a/src/Cassandra/Mapping/Mapper.cs b/src/Cassandra/Mapping/Mapper.cs index 8efe6d6b0..d154e0ab0 100644 --- a/src/Cassandra/Mapping/Mapper.cs +++ b/src/Cassandra/Mapping/Mapper.cs @@ -428,17 +428,18 @@ public ICqlBatch CreateBatch(BatchType batchType) /// public void Execute(ICqlBatch batch) { - //Wait async method to be completed or throw - TaskHelper.WaitToCompleteWithMetrics(_metricsManager, ExecuteAsync(batch), _queryAbortTimeout); + Execute(batch, Configuration.DefaultExecutionProfileName); } /// public void Execute(ICqlBatch batch, string executionProfile) { + _session.Connect(); + //Wait async method to be completed or throw TaskHelper.WaitToCompleteWithMetrics(_metricsManager, ExecuteAsync(batch, executionProfile), _queryAbortTimeout); } - + /// public Task ExecuteAsync(ICqlBatch batch) { @@ -479,6 +480,7 @@ public AppliedInfo DeleteIf(string cql, params object[] args) /// public AppliedInfo DeleteIf(Cql cql) { + _session.Connect(); return TaskHelper.WaitToCompleteWithMetrics(_metricsManager, DeleteIfAsync(cql), _queryAbortTimeout); } @@ -511,6 +513,8 @@ public IEnumerable Fetch(string cql, params object[] args) /// public IEnumerable Fetch(Cql cql) { + _session.Connect(); + //Use the async method var t = FetchAsync(cql); //Wait for it to be completed or throw @@ -533,6 +537,8 @@ public IPage FetchPage(int pageSize, byte[] pagingState, string cql, param /// public IPage FetchPage(Cql cql) { + _session.Connect(); + //Use the async method var t = FetchPageAsync(cql); //Wait for it to be completed or throw @@ -549,6 +555,8 @@ public T Single(string cql, params object[] args) /// public T Single(Cql cql) { + _session.Connect(); + //Use the async method var t = SingleAsync(cql); //Wait for it to be completed or throw @@ -565,6 +573,8 @@ public T SingleOrDefault(string cql, params object[] args) /// public T SingleOrDefault(Cql cql) { + _session.Connect(); + //Use async method var t = SingleOrDefaultAsync(cql); //Wait for it to be completed or throw @@ -581,6 +591,8 @@ public T First(string cql, params object[] args) /// public T First(Cql cql) { + _session.Connect(); + //Use async method var t = FirstAsync(cql); //Wait for it to be completed or throw @@ -597,6 +609,8 @@ public T FirstOrDefault(string cql, params object[] args) /// public T FirstOrDefault(Cql cql) { + _session.Connect(); + //Use async method var t = FirstOrDefaultAsync(cql); //Wait for it to be completed or throw @@ -642,6 +656,8 @@ public void Insert(T poco, string executionProfile, bool insertNulls, int? tt throw new ArgumentNullException(nameof(executionProfile)); } + _session.Connect(); + //Wait async method to be completed or throw TaskHelper.WaitToCompleteWithMetrics(_metricsManager, InsertAsync(poco, executionProfile, insertNulls, ttl, queryOptions), _queryAbortTimeout); } @@ -673,18 +689,21 @@ public AppliedInfo InsertIfNotExists(T poco, string executionProfile, bool /// public AppliedInfo InsertIfNotExists(T poco, bool insertNulls, int? ttl, CqlQueryOptions queryOptions = null) { + _session.Connect(); return TaskHelper.WaitToCompleteWithMetrics(_metricsManager, InsertIfNotExistsAsync(poco, insertNulls, ttl, queryOptions), _queryAbortTimeout); } /// public AppliedInfo InsertIfNotExists(T poco, string executionProfile, bool insertNulls, int? ttl, CqlQueryOptions queryOptions = null) { + _session.Connect(); return TaskHelper.WaitToCompleteWithMetrics(_metricsManager, InsertIfNotExistsAsync(poco, executionProfile, insertNulls, ttl, queryOptions), _queryAbortTimeout); } /// public void Update(T poco, CqlQueryOptions queryOptions = null) { + _session.Connect(); //Wait async method to be completed or throw TaskHelper.WaitToCompleteWithMetrics(_metricsManager, UpdateAsync(poco, queryOptions), _queryAbortTimeout); } @@ -692,6 +711,7 @@ public void Update(T poco, CqlQueryOptions queryOptions = null) /// public void Update(T poco, string executionProfile, CqlQueryOptions queryOptions = null) { + _session.Connect(); //Wait async method to be completed or throw TaskHelper.WaitToCompleteWithMetrics(_metricsManager, UpdateAsync(poco, executionProfile, queryOptions), _queryAbortTimeout); } @@ -705,6 +725,7 @@ public void Update(string cql, params object[] args) /// public void Update(Cql cql) { + _session.Connect(); //Wait async method to be completed or throw TaskHelper.WaitToCompleteWithMetrics(_metricsManager, UpdateAsync(cql), _queryAbortTimeout); } @@ -718,6 +739,7 @@ public AppliedInfo UpdateIf(string cql, params object[] args) /// public AppliedInfo UpdateIf(Cql cql) { + _session.Connect(); //Wait async method to be completed or throw return TaskHelper.WaitToCompleteWithMetrics(_metricsManager, UpdateIfAsync(cql), _queryAbortTimeout); } @@ -725,6 +747,7 @@ public AppliedInfo UpdateIf(Cql cql) /// public void Delete(T poco, CqlQueryOptions queryOptions = null) { + _session.Connect(); //Wait async method to be completed or throw TaskHelper.WaitToCompleteWithMetrics(_metricsManager, DeleteAsync(poco, queryOptions), _queryAbortTimeout); } @@ -732,6 +755,7 @@ public void Delete(T poco, CqlQueryOptions queryOptions = null) /// public void Delete(T poco, string executionProfile, CqlQueryOptions queryOptions = null) { + _session.Connect(); //Wait async method to be completed or throw TaskHelper.WaitToCompleteWithMetrics(_metricsManager, DeleteAsync(poco, executionProfile, queryOptions), _queryAbortTimeout); } @@ -745,6 +769,7 @@ public void Delete(string cql, params object[] args) /// public void Delete(Cql cql) { + _session.Connect(); //Wait async method to be completed or throw TaskHelper.WaitToCompleteWithMetrics(_metricsManager, DeleteAsync(cql), _queryAbortTimeout); } @@ -758,6 +783,7 @@ public void Execute(string cql, params object[] args) /// public void Execute(Cql cql) { + _session.Connect(); //Wait async method to be completed or throw TaskHelper.WaitToCompleteWithMetrics(_metricsManager, ExecuteAsync(cql), _queryAbortTimeout); } @@ -794,12 +820,14 @@ public async Task> ExecuteConditionalAsync(ICqlBatch batch, st /// public AppliedInfo ExecuteConditional(ICqlBatch batch) { + _session.Connect(); return TaskHelper.WaitToCompleteWithMetrics(_metricsManager, ExecuteConditionalAsync(batch), _queryAbortTimeout); } /// public AppliedInfo ExecuteConditional(ICqlBatch batch, string executionProfile) { + _session.Connect(); return TaskHelper.WaitToCompleteWithMetrics(_metricsManager, ExecuteConditionalAsync(batch, executionProfile), _queryAbortTimeout); } diff --git a/src/Cassandra/Metadata.cs b/src/Cassandra/Metadata.cs index 7d54511da..ef48cb409 100644 --- a/src/Cassandra/Metadata.cs +++ b/src/Cassandra/Metadata.cs @@ -177,7 +177,8 @@ public Task> GetReplicasAsync(byte[] partitionKey) /// public KeyspaceMetadata GetKeyspace(string keyspace) { - return TaskHelper.WaitToComplete(GetKeyspaceAsync(keyspace), _queryAbortTimeout); + TryInitialize(); + return TaskHelper.WaitToComplete(InternalMetadata.GetKeyspaceAsync(keyspace), _queryAbortTimeout); } /// @@ -190,7 +191,8 @@ public async Task GetKeyspaceAsync(string keyspace) /// public ICollection GetKeyspaces() { - return TaskHelper.WaitToComplete(GetKeyspacesAsync(), _queryAbortTimeout); + TryInitialize(); + return TaskHelper.WaitToComplete(InternalMetadata.GetKeyspacesAsync(), _queryAbortTimeout); } /// @@ -203,7 +205,8 @@ public async Task> GetKeyspacesAsync() /// public ICollection GetTables(string keyspace) { - return TaskHelper.WaitToComplete(GetTablesAsync(keyspace), _queryAbortTimeout); + TryInitialize(); + return TaskHelper.WaitToComplete(InternalMetadata.GetTablesAsync(keyspace), _queryAbortTimeout); } /// @@ -216,7 +219,8 @@ public async Task> GetTablesAsync(string keyspace) /// public TableMetadata GetTable(string keyspace, string tableName) { - return TaskHelper.WaitToComplete(GetTableAsync(keyspace, tableName), _queryAbortTimeout * 2); + TryInitialize(); + return TaskHelper.WaitToComplete(InternalMetadata.GetTableAsync(keyspace, tableName), _queryAbortTimeout * 2); } /// @@ -229,7 +233,8 @@ public async Task GetTableAsync(string keyspace, string tableName /// public MaterializedViewMetadata GetMaterializedView(string keyspace, string name) { - return TaskHelper.WaitToComplete(GetMaterializedViewAsync(keyspace, name), _queryAbortTimeout * 2); + TryInitialize(); + return TaskHelper.WaitToComplete(InternalMetadata.GetMaterializedViewAsync(keyspace, name), _queryAbortTimeout * 2); } /// @@ -242,7 +247,8 @@ public async Task GetMaterializedViewAsync(string keys /// public UdtColumnInfo GetUdtDefinition(string keyspace, string typeName) { - return TaskHelper.WaitToComplete(GetUdtDefinitionAsync(keyspace, typeName), _queryAbortTimeout); + TryInitialize(); + return TaskHelper.WaitToComplete(InternalMetadata.GetUdtDefinitionAsync(keyspace, typeName), _queryAbortTimeout); } /// @@ -255,7 +261,8 @@ public async Task GetUdtDefinitionAsync(string keyspace, string t /// public FunctionMetadata GetFunction(string keyspace, string name, string[] signature) { - return TaskHelper.WaitToComplete(GetFunctionAsync(keyspace, name, signature), _queryAbortTimeout); + TryInitialize(); + return TaskHelper.WaitToComplete(InternalMetadata.GetFunctionAsync(keyspace, name, signature), _queryAbortTimeout); } /// @@ -268,7 +275,8 @@ public async Task GetFunctionAsync(string keyspace, string nam /// public AggregateMetadata GetAggregate(string keyspace, string name, string[] signature) { - return TaskHelper.WaitToComplete(GetAggregateAsync(keyspace, name, signature), _queryAbortTimeout); + TryInitialize(); + return TaskHelper.WaitToComplete(InternalMetadata.GetAggregateAsync(keyspace, name, signature), _queryAbortTimeout); } /// @@ -281,7 +289,8 @@ public async Task GetAggregateAsync(string keyspace, string n /// public bool RefreshSchema(string keyspace = null, string table = null) { - return TaskHelper.WaitToComplete(RefreshSchemaAsync(keyspace, table), _queryAbortTimeout * 2); + TryInitialize(); + return TaskHelper.WaitToComplete(InternalMetadata.RefreshSchemaAsync(keyspace, table), _queryAbortTimeout * 2); } /// @@ -298,7 +307,7 @@ public async Task CheckSchemaAgreementAsync() return await InternalMetadata.CheckSchemaAgreementAsync().ConfigureAwait(false); } - internal Task TryInitializeAsync() + internal Task TryInitializeAsync(CancellationToken token = default(CancellationToken)) { if (_initialized) { @@ -306,7 +315,8 @@ internal Task TryInitializeAsync() return TaskHelper.Completed; } - return InitializeAsync(); + TryLaunchInitTask(token); + return _initTask; } internal void TryInitialize() @@ -317,10 +327,11 @@ internal void TryInitialize() return; } - TaskHelper.WaitToComplete(InitializeAsync(), _queryAbortTimeout); + TryLaunchInitTask(); + _initTask.GetAwaiter().GetResult(); } - private Task InitializeAsync() + private void TryLaunchInitTask(CancellationToken token = default(CancellationToken)) { var currentState = Interlocked.Read(ref _state); if (currentState == Metadata.Disposed) @@ -331,15 +342,13 @@ private Task InitializeAsync() if (Interlocked.CompareExchange(ref _state, Metadata.Initializing, Metadata.NotInitialized) == Metadata.NotInitialized) { - _initTask = Task.Run(InitializeInternalAsync); + _initTask = Task.Run(() => InitializeInternalAsync(token)); } - - return _initTask; } - private async Task InitializeInternalAsync() + private async Task InitializeInternalAsync(CancellationToken token = default(CancellationToken)) { - await InternalMetadata.InitAsync().ConfigureAwait(false); + await InternalMetadata.InitAsync(token).ConfigureAwait(false); SetupEventForwarding(InternalMetadata); var previousState = Interlocked.CompareExchange(ref _state, Metadata.Initialized, Metadata.Initializing); @@ -348,6 +357,9 @@ private async Task InitializeInternalAsync() await InternalMetadata.ShutdownAsync().ConfigureAwait(false); throw new ObjectDisposedException("Metadata instance was disposed before initialization finished."); } + + // Set metadata dependent options + SetMetadataDependentOptions(); _initialized = true; } @@ -386,10 +398,20 @@ private void OnInternalSchemaChangedEvent(object sender, SchemaChangedEventArgs private void SetupEventForwarding(IInternalMetadata internalMetadata) { + internalMetadata.Hosts.Added += internalMetadata.OnHostAdded; + internalMetadata.Hosts.Removed += internalMetadata.OnHostRemoved; internalMetadata.HostAdded += OnInternalHostAdded; internalMetadata.HostRemoved += OnInternalHostRemoved; internalMetadata.HostsEvent += OnInternalHostsEvent; internalMetadata.SchemaChangedEvent += OnInternalSchemaChangedEvent; } + + private void SetMetadataDependentOptions() + { + if (InternalMetadata.IsDbaas) + { + Configuration.SetDefaultConsistencyLevel(ConsistencyLevel.LocalQuorum); + } + } } } \ No newline at end of file diff --git a/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs b/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs index c57ee3aae..864451207 100644 --- a/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs +++ b/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs @@ -51,7 +51,7 @@ public ConstantSpeculativeExecutionPolicy(long delay, int maxSpeculativeExecutio public int MaxSpeculativeExecutions { get; } - public Task InitializeAsync(IMetadata metadata) + public Task InitializeAsync(IMetadataSnapshotProvider metadata) { return TaskHelper.Completed; } diff --git a/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs b/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs index fdd171d72..86236431b 100644 --- a/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs +++ b/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs @@ -78,7 +78,7 @@ public DCAwareRoundRobinPolicy(string localDc) : this(inferLocalDc: false) /// public string LocalDc { get; private set; } - public Task InitializeAsync(IMetadata metadata) + public Task InitializeAsync(IMetadataSnapshotProvider metadata) { //When the pool changes, it should clear the local cache metadata.HostAdded += _ => ClearHosts(); @@ -97,10 +97,10 @@ public Task InitializeAsync(IMetadata metadata) /// is Ignored.

To configure how many host in each remote /// datacenter is considered Remote.

/// - /// The information about the session instance for which the policy is created. + /// The cluster instance for which the policy is created. /// the host of which to return the distance of. /// the HostDistance to host. - public HostDistance Distance(IMetadata metadata, Host host) + public HostDistance Distance(ICluster cluster, Host host) { var dc = GetDatacenter(host); return dc == LocalDc ? HostDistance.Local : HostDistance.Remote; @@ -113,12 +113,12 @@ public HostDistance Distance(IMetadata metadata, Host host) /// per remote datacenter. The order of the local node in the returned query plan /// will follow a Round-robin algorithm.

/// - /// The information about the session instance for which the policy is created. + /// The information about the session instance for which the policy is created. /// Keyspace on which the query is going to be executed /// the query for which to build the plan. /// a new query plan, i.e. an iterator indicating which host to try /// first for querying, which one to use as failover, etc... - public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) + public IEnumerable NewQueryPlan(ICluster cluster, string keyspace, IStatement query) { var startIndex = Interlocked.Increment(ref _index); @@ -128,7 +128,7 @@ public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStat Interlocked.Exchange(ref _index, 0); } - var hosts = GetHosts(metadata); + var hosts = GetHosts(cluster.Metadata); //Round-robin through local nodes for (var i = 0; i < hosts.Count; i++) { @@ -150,7 +150,7 @@ private string GetDatacenter(Host host) /// /// Gets a tuple containing the list of local and remote nodes /// - internal List GetHosts(IMetadata metadata) + internal List GetHosts(IMetadataSnapshotProvider metadata) { var hosts = _hosts; if (hosts != null) diff --git a/src/Cassandra/Policies/ILoadBalancingPolicy.cs b/src/Cassandra/Policies/ILoadBalancingPolicy.cs index c5d7185d9..e26bacb4d 100644 --- a/src/Cassandra/Policies/ILoadBalancingPolicy.cs +++ b/src/Cassandra/Policies/ILoadBalancingPolicy.cs @@ -38,8 +38,8 @@ public interface ILoadBalancingPolicy /// before any call to another of the methods of the policy. /// /// - /// Metadata instance of the session for which the policy is created. - Task InitializeAsync(IMetadata metadata); + /// Metadata snapshot provider of the session for which the policy is created. + Task InitializeAsync(IMetadataSnapshotProvider metadata); /// /// Returns the distance assigned by this policy to the provided host.

The @@ -52,11 +52,11 @@ public interface ILoadBalancingPolicy /// host in remote datacenters when the policy itself always picks host in the /// local datacenter first.

/// - /// Metadata instance of the session for which the policy is created. + /// Cluster instance for which the policy is created. /// the host of which to return the distance of. /// /// the HostDistance to host. - HostDistance Distance(IMetadata metadata, Host host); + HostDistance Distance(ICluster cluster, Host host); /// /// Returns the hosts to use for a new query.

Each new query will call this @@ -65,12 +65,12 @@ public interface ILoadBalancingPolicy /// be so), the next host will be used. If all hosts of the returned /// Iterator are down, the query will fail.

/// - /// Metadata instance of the session for which the policy is created. + /// Cluster instance for which the policy is created. /// The query for which to build a plan, it can be null. /// Keyspace on which the query is going to be executed, it can be null. /// An iterator of Host. The query is tried against the hosts returned /// by this iterator in order, until the query has been sent successfully to one /// of the host. - IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query); + IEnumerable NewQueryPlan(ICluster cluster, string keyspace, IStatement query); } } diff --git a/src/Cassandra/Policies/ISpeculativeExecutionPolicy.cs b/src/Cassandra/Policies/ISpeculativeExecutionPolicy.cs index 9d280793c..66734b9b7 100644 --- a/src/Cassandra/Policies/ISpeculativeExecutionPolicy.cs +++ b/src/Cassandra/Policies/ISpeculativeExecutionPolicy.cs @@ -28,16 +28,16 @@ public interface ISpeculativeExecutionPolicy /// /// Initializes the policy at cluster startup. /// - Task InitializeAsync(IMetadata metadata); + Task InitializeAsync(IMetadataSnapshotProvider metadata); /// /// Returns the plan to use for a new query. /// - /// the metadata instance for the current session. + /// the cluster instance. /// the currently logged keyspace /// the query for which to build a plan. /// - ISpeculativeExecutionPlan NewPlan(IMetadata metadata, string keyspace, IStatement statement); + ISpeculativeExecutionPlan NewPlan(ICluster cluster, string keyspace, IStatement statement); /// /// Disposes the policy at cluster shutdown. diff --git a/src/Cassandra/QueryTrace.cs b/src/Cassandra/QueryTrace.cs index cd9ac9ef4..4ec7d7358 100644 --- a/src/Cassandra/QueryTrace.cs +++ b/src/Cassandra/QueryTrace.cs @@ -216,7 +216,7 @@ private void DoFetchTrace() { try { - TaskHelper.WaitToComplete(LoadAsync(), _metadataFetchSyncTimeout); + Load(); } catch (Exception ex) { @@ -227,6 +227,14 @@ private void DoFetchTrace() _isDisconnected = false; } } + internal QueryTrace Load() + { + // mark as disconnected, guaranteeing that it wont make metadata fetches triggered by a property get + // ReSharper disable once InconsistentlySynchronizedField : Can be both async and sync, don't mind + _isDisconnected = false; + var metadata = _session.TryInitAndGetMetadata(); + return TaskHelper.WaitToComplete(metadata.GetQueryTraceAsync(this), _metadataFetchSyncTimeout); + } internal async Task LoadAsync() { diff --git a/src/Cassandra/Requests/TaskTimeoutHelper.cs b/src/Cassandra/Requests/TaskTimeoutHelper.cs new file mode 100644 index 000000000..69fe97bba --- /dev/null +++ b/src/Cassandra/Requests/TaskTimeoutHelper.cs @@ -0,0 +1,50 @@ +// +// Copyright (C) DataStax Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using System; +using System.Threading; +using System.Threading.Tasks; + +namespace Cassandra.Requests +{ + internal class TaskTimeoutHelper : IDisposable + { + private readonly Task _taskToWait; + private readonly CancellationTokenSource _tcs; + private readonly Task _timeoutTask; + + public TaskTimeoutHelper(Task taskToWait, TimeSpan timeout) + { + _taskToWait = taskToWait; + _tcs = new CancellationTokenSource(); + _timeoutTask = Task.Delay(timeout, _tcs.Token); + } + + public bool WaitWithTimeout() + { + return Task.WaitAny(_taskToWait, _timeoutTask) == 0; + } + + public async Task WaitWithTimeoutAsync() + { + return (await Task.WhenAny(_taskToWait, _timeoutTask).ConfigureAwait(false)) == _taskToWait; + } + + public void Dispose() + { + _tcs.Dispose(); + } + } +} \ No newline at end of file diff --git a/src/Cassandra/Session.cs b/src/Cassandra/Session.cs index c0f15cca3..1b070c464 100644 --- a/src/Cassandra/Session.cs +++ b/src/Cassandra/Session.cs @@ -30,6 +30,7 @@ using Cassandra.Metrics; using Cassandra.Metrics.Internal; using Cassandra.Observers.Abstractions; +using Cassandra.Requests; using Cassandra.SessionManagement; using Cassandra.Tasks; @@ -137,6 +138,7 @@ internal Session( _insightsClient = configuration.InsightsClientFactory.Create(cluster, this); UserDefinedTypes = new UdtMappingDefinitions(this); _initTask = Task.Run(InitInternalAsync); + } /// @@ -243,6 +245,17 @@ private async Task ShutdownInternalAsync() pool.Value.Dispose(); } } + + Task IInternalSession.TryInitAsync() + { + if (_initialized) + { + return TaskHelper.Completed; + } + + ValidateState(); + return WaitInitAsync(); + } Task IInternalSession.TryInitAndGetMetadataAsync() { @@ -252,7 +265,7 @@ Task IInternalSession.TryInitAndGetMetadataAsync() } ValidateState(); - return _initTask; + return WaitInitAndGetMetadataAsync(); } void IInternalSession.TryInit() @@ -263,7 +276,18 @@ void IInternalSession.TryInit() } ValidateState(); - TaskHelper.WaitToComplete(_initTask); + WaitInit(); + } + + IInternalMetadata IInternalSession.TryInitAndGetMetadata() + { + if (_initialized) + { + return _cluster.InternalMetadata; + } + + ValidateState(); + return WaitInitAndGetMetadata(); } /// @@ -286,6 +310,52 @@ private void ValidateState() throw _cluster.InitException; } } + + private void WaitInit() + { + using (var waiter = new TaskTimeoutHelper(_initTask, _cluster.GetInitTimeout())) + { + waiter.WaitWithTimeout(); + } + + throw new InitializationTimeoutException(); + } + + private IInternalMetadata WaitInitAndGetMetadata() + { + using (var waiter = new TaskTimeoutHelper(_initTask, _cluster.GetInitTimeout())) + { + if (waiter.WaitWithTimeout()) + { + return _initTask.Result; + } + } + + throw new InitializationTimeoutException(); + } + + private async Task WaitInitAndGetMetadataAsync() + { + using (var waiter = new TaskTimeoutHelper(_initTask, _cluster.GetInitTimeout())) + { + if (await waiter.WaitWithTimeoutAsync().ConfigureAwait(false)) + { + return _initTask.Result; + } + } + + throw new InitializationTimeoutException(); + } + + private async Task WaitInitAsync() + { + using (var waiter = new TaskTimeoutHelper(_initTask, _cluster.GetInitTimeout())) + { + await waiter.WaitWithTimeoutAsync().ConfigureAwait(false); + } + + throw new InitializationTimeoutException(); + } private async Task InitInternalAsync() { @@ -357,7 +427,11 @@ private async Task WarmupAsync(IInternalMetadata metadata) public RowSet EndExecute(IAsyncResult ar) { var task = (Task)ar; - TaskHelper.WaitToCompleteWithMetrics(_metricsManager, task, Configuration.DefaultRequestOptions.QueryAbortTimeout); + var initTimeout = _cluster.GetInitTimeout(); + var timeout = _initialized + ? Configuration.DefaultRequestOptions.QueryAbortTimeout + initTimeout.TotalMilliseconds + : initTimeout.TotalMilliseconds; + TaskHelper.WaitToCompleteWithMetrics(_metricsManager, task, (int)timeout); return task.Result; } @@ -365,14 +439,19 @@ public RowSet EndExecute(IAsyncResult ar) public PreparedStatement EndPrepare(IAsyncResult ar) { var task = (Task)ar; - TaskHelper.WaitToCompleteWithMetrics(_metricsManager, task, Configuration.DefaultRequestOptions.QueryAbortTimeout); + var initTimeout = _cluster.GetInitTimeout(); + var timeout = _initialized + ? Configuration.DefaultRequestOptions.QueryAbortTimeout + initTimeout.TotalMilliseconds + : initTimeout.TotalMilliseconds; + TaskHelper.WaitToCompleteWithMetrics(_metricsManager, task, (int)timeout); return task.Result; } /// public RowSet Execute(IStatement statement, string executionProfileName) { - var task = ExecuteAsync(statement, executionProfileName); + var metadata = InternalRef.TryInitAndGetMetadata(); + var task = ExecuteInternalAsync(metadata, statement, InternalRef.GetRequestOptions(executionProfileName)); TaskHelper.WaitToCompleteWithMetrics(_metricsManager, task, Configuration.DefaultRequestOptions.QueryAbortTimeout); return task.Result; } @@ -414,18 +493,15 @@ public Task ExecuteAsync(IStatement statement) } /// - public Task ExecuteAsync(IStatement statement, string executionProfileName) - { - return ExecuteAsync(statement, InternalRef.GetRequestOptions(executionProfileName)); - } - - private async Task ExecuteAsync(IStatement statement, IRequestOptions requestOptions) + public async Task ExecuteAsync(IStatement statement, string executionProfileName) { var metadata = await InternalRef.TryInitAndGetMetadataAsync().ConfigureAwait(false); - return await ExecuteAsync(metadata, statement, requestOptions).ConfigureAwait(false); + return await ExecuteInternalAsync( + metadata, statement, InternalRef.GetRequestOptions(executionProfileName)).ConfigureAwait(false); } - - private Task ExecuteAsync(IInternalMetadata metadata, IStatement statement, IRequestOptions requestOptions) + + private Task ExecuteInternalAsync( + IInternalMetadata metadata, IStatement statement, IRequestOptions requestOptions) { return Configuration.RequestHandlerFactory .Create(this, metadata, metadata.SerializerManager.GetCurrentSerializer(), statement, requestOptions) @@ -520,7 +596,8 @@ public PreparedStatement Prepare(string cqlQuery, string keyspace) /// public PreparedStatement Prepare(string cqlQuery, string keyspace, IDictionary customPayload) { - var task = PrepareAsync(cqlQuery, keyspace, customPayload); + InternalRef.TryInit(); + var task = _cluster.PrepareAsync(this, cqlQuery, keyspace, customPayload); TaskHelper.WaitToCompleteWithMetrics(_metricsManager, task, Configuration.ClientOptions.QueryAbortTimeout); return task.Result; } @@ -547,6 +624,7 @@ public Task PrepareAsync(string cqlQuery, string keyspace) public async Task PrepareAsync( string cqlQuery, string keyspace, IDictionary customPayload) { + await InternalRef.TryInitAsync().ConfigureAwait(false); return await _cluster.PrepareAsync(this, cqlQuery, keyspace, customPayload).ConfigureAwait(false); } @@ -591,17 +669,25 @@ public Task ExecuteGraphAsync(IGraphStatement graphStatement) /// public GraphResultSet ExecuteGraph(IGraphStatement statement, string executionProfileName) { - return TaskHelper.WaitToCompleteWithMetrics(_metricsManager, ExecuteGraphAsync(statement, executionProfileName)); + var metadata = InternalRef.TryInitAndGetMetadata(); + return TaskHelper.WaitToCompleteWithMetrics( + _metricsManager, ExecuteGraphInternalAsync(metadata, statement, executionProfileName)); } /// public async Task ExecuteGraphAsync(IGraphStatement graphStatement, string executionProfileName) { var metadata = await InternalRef.TryInitAndGetMetadataAsync().ConfigureAwait(false); + return await ExecuteGraphInternalAsync(metadata, graphStatement, executionProfileName).ConfigureAwait(false); + } + + private async Task ExecuteGraphInternalAsync( + IInternalMetadata metadata, IGraphStatement graphStatement, string executionProfileName) + { var requestOptions = InternalRef.GetRequestOptions(executionProfileName); var stmt = graphStatement.ToIStatement(requestOptions.GraphOptions); await GetAnalyticsPrimary(metadata, stmt, graphStatement, requestOptions).ConfigureAwait(false); - var rs = await ExecuteAsync(stmt, requestOptions).ConfigureAwait(false); + var rs = await ExecuteInternalAsync(metadata, stmt, requestOptions).ConfigureAwait(false); return GraphResultSet.CreateNew(rs, graphStatement, requestOptions.GraphOptions); } @@ -618,8 +704,8 @@ private async Task GetAnalyticsPrimary( RowSet rs; try { - rs = await ExecuteAsync( - new SimpleStatement("CALL DseClientTool.getAnalyticsGraphServer()"), requestOptions).ConfigureAwait(false); + rs = await ExecuteInternalAsync( + internalMetadata, new SimpleStatement("CALL DseClientTool.getAnalyticsGraphServer()"), requestOptions).ConfigureAwait(false); } catch (Exception ex) { diff --git a/src/Cassandra/SessionManagement/IInternalCluster.cs b/src/Cassandra/SessionManagement/IInternalCluster.cs index b92c4e120..c23a13b16 100644 --- a/src/Cassandra/SessionManagement/IInternalCluster.cs +++ b/src/Cassandra/SessionManagement/IInternalCluster.cs @@ -63,5 +63,7 @@ internal interface IInternalCluster : ICluster /// Initializes once (Thread-safe) the control connection and retrieve the internal metadata object. /// Task TryInitAndGetMetadataAsync(); + + TimeSpan GetInitTimeout(); } } \ No newline at end of file diff --git a/src/Cassandra/SessionManagement/IInternalSession.cs b/src/Cassandra/SessionManagement/IInternalSession.cs index 96b143dd8..529eccfd3 100644 --- a/src/Cassandra/SessionManagement/IInternalSession.cs +++ b/src/Cassandra/SessionManagement/IInternalSession.cs @@ -39,6 +39,10 @@ internal interface IInternalSession : ISession void TryInit(); + Task TryInitAsync(); + + IInternalMetadata TryInitAndGetMetadata(); + Task TryInitAndGetMetadataAsync(); /// diff --git a/src/Cassandra/SocketOptions.cs b/src/Cassandra/SocketOptions.cs index dbce0f7fb..a78f9076b 100644 --- a/src/Cassandra/SocketOptions.cs +++ b/src/Cassandra/SocketOptions.cs @@ -44,7 +44,7 @@ public class SocketOptions private bool _useStreamMode; private int _readTimeoutMillis = DefaultReadTimeoutMillis; private int _defunctReadTimeoutThreshold = DefaultDefunctReadTimeoutThreshold; - private int _metadataAbortTimeout = 5 * 60000; + private int _metadataAbortTimeoutMs = 5 * 60000; /// /// Gets the number of milliseconds to wait for the socket to connect @@ -122,7 +122,7 @@ public int ReadTimeoutMillis get { return _readTimeoutMillis; } } - internal int MetadataAbortTimeout => _metadataAbortTimeout; + internal int MetadataAbortTimeoutMs => _metadataAbortTimeoutMs; /// /// Gets the amount of requests that simultaneously have to timeout before closing the connection. @@ -227,7 +227,7 @@ public SocketOptions SetDefunctReadTimeoutThreshold(int amountOfTimeouts) internal SocketOptions SetMetadataAbortTimeout(int metadataAbortTimeout) { - _metadataAbortTimeout = metadataAbortTimeout; + _metadataAbortTimeoutMs = metadataAbortTimeout; return this; } } diff --git a/src/Cassandra/Tasks/TaskHelper.cs b/src/Cassandra/Tasks/TaskHelper.cs index 72b72b593..9389d429c 100644 --- a/src/Cassandra/Tasks/TaskHelper.cs +++ b/src/Cassandra/Tasks/TaskHelper.cs @@ -171,13 +171,13 @@ public static void WaitToComplete(Task task, int timeout = Timeout.Infinite) /// It throws a TimeoutException when the task didn't complete in the expected time. /// /// the task to wait upon - /// timeout in milliseconds + /// timeout in milliseconds /// /// - public static async Task WaitToCompleteAsync(this Task task, int timeout = Timeout.Infinite) + public static async Task WaitToCompleteAsync(this Task task, int timeoutMs = Timeout.Infinite) { //It should wait and throw any exception - if (timeout == Timeout.Infinite) + if (timeoutMs == Timeout.Infinite) { await task.ConfigureAwait(false); return; @@ -185,7 +185,7 @@ public static async Task WaitToCompleteAsync(this Task task, int timeout = Timeo try { - var timeoutTask = Task.Delay(TimeSpan.FromMilliseconds(timeout)); + var timeoutTask = Task.Delay(TimeSpan.FromMilliseconds(timeoutMs)); var finishedTask = await Task.WhenAny(task, timeoutTask).ConfigureAwait(false); if (finishedTask == timeoutTask) { diff --git a/src/Cassandra/UdtMappingDefinitions.cs b/src/Cassandra/UdtMappingDefinitions.cs index 3f7ba38ac..cc3a5469d 100644 --- a/src/Cassandra/UdtMappingDefinitions.cs +++ b/src/Cassandra/UdtMappingDefinitions.cs @@ -46,7 +46,14 @@ internal UdtMappingDefinitions(IInternalSession session) /// public void Define(params UdtMap[] udtMaps) { - TaskHelper.WaitToComplete(DefineAsync(udtMaps), _cluster.Configuration.DefaultRequestOptions.QueryAbortTimeout); + if (udtMaps == null) + { + throw new ArgumentNullException("udtMaps"); + } + + var metadata = _session.TryInitAndGetMetadata(); + TaskHelper.WaitToComplete( + DefineInternalAsync(metadata, udtMaps), _cluster.Configuration.DefaultRequestOptions.QueryAbortTimeout); } /// @@ -60,6 +67,11 @@ public async Task DefineAsync(params UdtMap[] udtMaps) throw new ArgumentNullException("udtMaps"); } var metadata = await _session.TryInitAndGetMetadataAsync().ConfigureAwait(false); + await DefineInternalAsync(metadata, udtMaps).ConfigureAwait(false); + } + + private async Task DefineInternalAsync(IInternalMetadata metadata, UdtMap[] udtMaps) + { var sessionKeyspace = _session.Keyspace; if (string.IsNullOrEmpty(sessionKeyspace) && udtMaps.Any(map => map.Keyspace == null)) { From ecf4b7e36d6de36950c9ce1cea8961513da8e2f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Tue, 7 Jul 2020 13:40:52 +0100 Subject: [PATCH 19/31] fixed build errors and init bug --- .../Core/ClusterTests.cs | 8 +- .../Core/ConnectionSimulacronTests.cs | 10 +- .../Core/PoolShortTests.cs | 6 +- .../Core/SessionTests.cs | 8 +- .../Core/SpeculativeExecutionShortTests.cs | 10 +- .../Policies/Tests/RetryPolicyShortTests.cs | 8 +- .../TestBase/TestUtils.cs | 6 +- src/Cassandra.Tests/BaseUnitTest.cs | 6 +- src/Cassandra.Tests/ClusterTests.cs | 8 +- .../Control/ControlConnectionTests.cs | 17 ++- .../FakeControlConnectionFactory.cs | 3 +- .../TestHelpers/FakeInternalMetadata.cs | 3 +- .../Connections/TestHelpers/FakeMetadata.cs | 9 +- .../ExecutionProfiles/ClusterTests.cs | 12 +- .../ExecutionProfiles/RequestHandlerTests.cs | 12 +- src/Cassandra.Tests/PoliciesUnitTests.cs | 46 +++--- .../RequestHandlerMockTests.cs | 8 +- .../Requests/PrepareHandlerTests.cs | 6 +- src/Cassandra.Tests/StatementTests.cs | 4 +- .../TestConfigurationBuilder.cs | 5 +- src/Cassandra.Tests/TestHelper.cs | 38 ++--- src/Cassandra/Cluster.cs | 34 +++-- .../Connections/Control/ControlConnection.cs | 2 +- .../StartupMessage/DataCentersInfoProvider.cs | 2 +- src/Cassandra/Metadata.cs | 12 +- .../ConstantSpeculativeExecutionPolicy.cs | 2 +- .../Policies/DefaultLoadBalancingPolicy.cs | 18 +-- .../Policies/NoSpeculativeExecutionPolicy.cs | 4 +- .../Policies/RetryLoadBalancingPolicy.cs | 10 +- src/Cassandra/Policies/RoundRobinPolicy.cs | 12 +- src/Cassandra/Policies/TokenAwarePolicy.cs | 24 +-- src/Cassandra/Requests/RequestHandler.cs | 4 +- src/Cassandra/Session.cs | 138 ++++++++++++++---- .../SessionManagement/IInternalCluster.cs | 2 +- 34 files changed, 309 insertions(+), 188 deletions(-) diff --git a/src/Cassandra.IntegrationTests/Core/ClusterTests.cs b/src/Cassandra.IntegrationTests/Core/ClusterTests.cs index a8e3db90b..e0eba19cf 100644 --- a/src/Cassandra.IntegrationTests/Core/ClusterTests.cs +++ b/src/Cassandra.IntegrationTests/Core/ClusterTests.cs @@ -239,20 +239,20 @@ private class TestLoadBalancingPolicy : ILoadBalancingPolicy { public Host ControlConnectionHost { get; private set; } - public Task InitializeAsync(IMetadata metadata) + public Task InitializeAsync(IMetadataSnapshotProvider metadata) { ControlConnectionHost = ((Metadata)metadata).InternalMetadata.ControlConnection.Host; return TaskHelper.Completed; } - public HostDistance Distance(IMetadata metadata, Host host) + public HostDistance Distance(ICluster cluster, Host host) { return HostDistance.Local; } - public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) + public IEnumerable NewQueryPlan(ICluster cluster, string keyspace, IStatement query) { - return metadata.AllHosts(); + return cluster.Metadata.AllHosts(); } } } diff --git a/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs b/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs index 7c4e6ea06..a9fffe0b0 100644 --- a/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs +++ b/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs @@ -382,19 +382,19 @@ public TestDisallowListLbp(ILoadBalancingPolicy parent, params IPEndPoint[] disa _disallowed = disallowed; } - public Task InitializeAsync(IMetadata metadata) + public Task InitializeAsync(IMetadataSnapshotProvider metadata) { return _parent.InitializeAsync(metadata); } - public HostDistance Distance(IMetadata metadata, Host host) + public HostDistance Distance(ICluster cluster, Host host) { - return _parent.Distance(metadata, host); + return _parent.Distance(cluster, host); } - public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) + public IEnumerable NewQueryPlan(ICluster cluster, string keyspace, IStatement query) { - var plan = _parent.NewQueryPlan(metadata, keyspace, query); + var plan = _parent.NewQueryPlan(cluster, keyspace, query); return plan.Where(h => !_disallowed.Contains(h.Address)); } } diff --git a/src/Cassandra.IntegrationTests/Core/PoolShortTests.cs b/src/Cassandra.IntegrationTests/Core/PoolShortTests.cs index 0ddc1b520..127e5896d 100644 --- a/src/Cassandra.IntegrationTests/Core/PoolShortTests.cs +++ b/src/Cassandra.IntegrationTests/Core/PoolShortTests.cs @@ -592,8 +592,8 @@ public void Should_Throw_NoHostAvailableException_When_Targeting_Single_Ignored_ const string query = "SELECT * FROM system.local"; // Mark the last host as ignored var lbp = new TestHelper.CustomLoadBalancingPolicy( - (cluster, ks, stmt) => cluster.AllHosts(), - (cluster, host) => host.Equals(cluster.AllHosts().Last()) ? HostDistance.Ignored : HostDistance.Local); + (cluster, ks, stmt) => cluster.Metadata.AllHosts(), + (cluster, host) => host.Equals(cluster.Metadata.AllHosts().Last()) ? HostDistance.Ignored : HostDistance.Local); var builder = ClusterBuilder().WithLoadBalancingPolicy(lbp); using (var testCluster = SimulacronCluster.CreateNew(new SimulacronOptions { Nodes = "3" })) @@ -706,7 +706,7 @@ public async Task Should_Not_Use_The_LoadBalancingPolicy_When_Targeting_Single_H var lbp = new TestHelper.CustomLoadBalancingPolicy((cluster, ks, stmt) => { Interlocked.Increment(ref queryPlanCounter); - return cluster.AllHosts(); + return cluster.Metadata.AllHosts(); }); var builder = ClusterBuilder().WithLoadBalancingPolicy(lbp); diff --git a/src/Cassandra.IntegrationTests/Core/SessionTests.cs b/src/Cassandra.IntegrationTests/Core/SessionTests.cs index 2d37d68f3..6837a2466 100644 --- a/src/Cassandra.IntegrationTests/Core/SessionTests.cs +++ b/src/Cassandra.IntegrationTests/Core/SessionTests.cs @@ -308,19 +308,19 @@ public void SetRemoteHost(Host h) _ignoredHost = h; } - public Task InitializeAsync(IMetadata metadata) + public Task InitializeAsync(IMetadataSnapshotProvider metadata) { return _childPolicy.InitializeAsync(metadata); } - public HostDistance Distance(IMetadata metadata, Host host) + public HostDistance Distance(ICluster cluster, Host host) { return host == _ignoredHost ? HostDistance.Ignored : HostDistance.Local; } - public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) + public IEnumerable NewQueryPlan(ICluster cluster, string keyspace, IStatement query) { - return _childPolicy.NewQueryPlan(metadata, keyspace, query); + return _childPolicy.NewQueryPlan(cluster, keyspace, query); } } diff --git a/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionShortTests.cs b/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionShortTests.cs index 17be2c051..7c7228be2 100644 --- a/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionShortTests.cs +++ b/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionShortTests.cs @@ -166,7 +166,7 @@ public Task InitializeAsync(IMetadataSnapshotProvider metadata) return TaskHelper.Completed; } - public ISpeculativeExecutionPlan NewPlan(IMetadata metadata, string keyspace, IStatement statement) + public ISpeculativeExecutionPlan NewPlan(ICluster cluster, string keyspace, IStatement statement) { return new LoggedSpeculativeExecutionPlan(this); } @@ -208,19 +208,19 @@ public OrderedLoadBalancingPolicy(params string[] addresses) _addresses = addresses; } - public Task InitializeAsync(IMetadata metadata) + public Task InitializeAsync(IMetadataSnapshotProvider metadata) { return TaskHelper.Completed; } - public HostDistance Distance(IMetadata metadata, Host host) + public HostDistance Distance(ICluster cluster, Host host) { return HostDistance.Local; } - public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) + public IEnumerable NewQueryPlan(ICluster cluster, string keyspace, IStatement query) { - var hosts = metadata.AllHostsSnapshot().ToArray(); + var hosts = cluster.Metadata.AllHostsSnapshot().ToArray(); foreach (var addr in _addresses) { var host = hosts.Single(h => h.Address.Address.ToString() == addr); diff --git a/src/Cassandra.IntegrationTests/Policies/Tests/RetryPolicyShortTests.cs b/src/Cassandra.IntegrationTests/Policies/Tests/RetryPolicyShortTests.cs index 14df42640..9d3633a10 100644 --- a/src/Cassandra.IntegrationTests/Policies/Tests/RetryPolicyShortTests.cs +++ b/src/Cassandra.IntegrationTests/Policies/Tests/RetryPolicyShortTests.cs @@ -274,20 +274,20 @@ public CustomLoadBalancingPolicy(string[] hosts) _hosts = hosts; } - public Task InitializeAsync(IMetadata metadata) + public Task InitializeAsync(IMetadataSnapshotProvider metadata) { return TaskHelper.Completed; } - public HostDistance Distance(IMetadata metadata, Host host) + public HostDistance Distance(ICluster cluster, Host host) { return HostDistance.Local; } - public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) + public IEnumerable NewQueryPlan(ICluster cluster, string keyspace, IStatement query) { var queryPlan = new List(); - var allHosts = metadata.AllHostsSnapshot(); + var allHosts = cluster.Metadata.AllHostsSnapshot(); foreach (var host in _hosts) { queryPlan.Add(allHosts.Single(h => h.Address.ToString() == host)); diff --git a/src/Cassandra.IntegrationTests/TestBase/TestUtils.cs b/src/Cassandra.IntegrationTests/TestBase/TestUtils.cs index 7c9a6c647..f33994247 100644 --- a/src/Cassandra.IntegrationTests/TestBase/TestUtils.cs +++ b/src/Cassandra.IntegrationTests/TestBase/TestUtils.cs @@ -635,9 +635,11 @@ public static void WaitForSchemaAgreement( Trace.TraceInformation("Waiting for test schema agreement"); var schemaVersions = new List(); //peers - schemaVersions.AddRange(cc.Query("SELECT peer, schema_version FROM system.peers").Select(r => r.GetValue("schema_version"))); + schemaVersions.AddRange(cc.QueryAsync("SELECT peer, schema_version FROM system.peers").GetAwaiter().GetResult() + .Select(r => r.GetValue("schema_version"))); //local - schemaVersions.Add(cc.Query("SELECT schema_version FROM system.local").Select(r => r.GetValue("schema_version")).First()); + schemaVersions.Add(cc.QueryAsync("SELECT schema_version FROM system.local").GetAwaiter().GetResult() + .Select(r => r.GetValue("schema_version")).First()); var differentSchemas = schemaVersions.Distinct().Count(); if (differentSchemas <= 1 + nodesDown) diff --git a/src/Cassandra.Tests/BaseUnitTest.cs b/src/Cassandra.Tests/BaseUnitTest.cs index 1311d6fe0..656e6a505 100644 --- a/src/Cassandra.Tests/BaseUnitTest.cs +++ b/src/Cassandra.Tests/BaseUnitTest.cs @@ -70,17 +70,17 @@ public TestLoadBalancingPolicy(HostDistance distance = HostDistance.Local) _distance = distance; } - public Task InitializeAsync(IMetadata metadata) + public Task InitializeAsync(IMetadataSnapshotProvider metadata) { return TaskHelper.Completed; } - public HostDistance Distance(IMetadata metadata, Host host) + public HostDistance Distance(ICluster cluster, Host host) { return _distance; } - public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) + public IEnumerable NewQueryPlan(ICluster cluster, string keyspace, IStatement query) { return new[] { diff --git a/src/Cassandra.Tests/ClusterTests.cs b/src/Cassandra.Tests/ClusterTests.cs index ed4f7e129..554d02cb3 100644 --- a/src/Cassandra.Tests/ClusterTests.cs +++ b/src/Cassandra.Tests/ClusterTests.cs @@ -250,19 +250,19 @@ public FakeHostDistanceLbp(IDictionary distances) _distances = distances; } - public Task InitializeAsync(IMetadata metadata) + public Task InitializeAsync(IMetadataSnapshotProvider metadata) { return TaskHelper.Completed; } - public HostDistance Distance(IMetadata metadata, Host host) + public HostDistance Distance(ICluster cluster, Host host) { return _distances[host.Address.Address.ToString()]; } - public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) + public IEnumerable NewQueryPlan(ICluster cluster, string keyspace, IStatement query) { - return metadata.AllHosts().OrderBy(h => Guid.NewGuid().GetHashCode()).Take(_distances.Count); + return cluster.Metadata.AllHosts().OrderBy(h => Guid.NewGuid().GetHashCode()).Take(_distances.Count); } } } diff --git a/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs b/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs index 56adc6657..1e9d97f8c 100644 --- a/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs +++ b/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs @@ -20,6 +20,7 @@ using System.Linq; using System.Net; using System.Net.Sockets; +using System.Threading; using System.Threading.Tasks; using Cassandra.Connections; using Cassandra.Connections.Control; @@ -117,10 +118,13 @@ private ControlConnectionCreateResult NewInstance( internalMetadata = new InternalMetadata(cluster, config, contactPoints); } + var metadata = new FakeMetadata(internalMetadata); + Mock.Get(cluster).SetupGet(c => c.Metadata).Returns(metadata); + return new ControlConnectionCreateResult { ConnectionFactory = connectionFactory, - Metadata = new FakeMetadata(internalMetadata), + Metadata = metadata, Cluster = cluster, Config = config, ControlConnection = (ControlConnection)internalMetadata.ControlConnection, @@ -208,7 +212,7 @@ public void Should_NotAttemptDownOrIgnoredHosts() Mock.Get(cluster) .Setup(c => c.RetrieveAndSetDistance(It.IsAny())) - .Returns(h => config.Policies.LoadBalancingPolicy.Distance(metadata, h)); + .Returns(h => config.Policies.LoadBalancingPolicy.Distance(cluster, h)); config.Policies.LoadBalancingPolicy.InitializeAsync(metadata); connectionOpenEnabled = false; @@ -263,7 +267,7 @@ public async Task Should_NotLeakConnections_When_DisposeAndReconnectHappenSimult Mock.Get(cluster) .Setup(c => c.RetrieveAndSetDistance(It.IsAny())) - .Returns(h => config.Policies.LoadBalancingPolicy.Distance(metadata, h)); + .Returns(h => config.Policies.LoadBalancingPolicy.Distance(cluster, h)); config.LocalDatacenterProvider.Initialize(cluster, createResult.InternalMetadata); await config.Policies.LoadBalancingPolicy.InitializeAsync(metadata).ConfigureAwait(false); @@ -364,12 +368,15 @@ private ControlConnectionCreateResult CreateForContactPointTest(bool keepContact _localhost }); var metadata = new FakeMetadata(internalMetadata); + var cluster = Mock.Of(); + Mock.Get(cluster).SetupGet(c => c.Metadata).Returns(metadata); return new ControlConnectionCreateResult { ConnectionFactory = connectionFactory, ControlConnection = (ControlConnection)metadata.InternalMetadata.ControlConnection, - Metadata = new Metadata(internalMetadata), - InternalMetadata = internalMetadata + Metadata = new Metadata(internalMetadata, default), + InternalMetadata = internalMetadata, + Cluster = cluster }; } diff --git a/src/Cassandra.Tests/Connections/TestHelpers/FakeControlConnectionFactory.cs b/src/Cassandra.Tests/Connections/TestHelpers/FakeControlConnectionFactory.cs index 8d1e317d3..65b59d29e 100644 --- a/src/Cassandra.Tests/Connections/TestHelpers/FakeControlConnectionFactory.cs +++ b/src/Cassandra.Tests/Connections/TestHelpers/FakeControlConnectionFactory.cs @@ -17,6 +17,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading; using System.Threading.Tasks; using Cassandra.Connections; @@ -38,7 +39,7 @@ public IControlConnection Create( IEnumerable contactPoints) { var cc = Mock.Of(); - Mock.Get(cc).Setup(c => c.InitAsync()).Returns(Task.Run(async () => + Mock.Get(cc).Setup(c => c.InitAsync(It.IsAny())).Returns(Task.Run(async () => { var cps = new Dictionary>(); foreach (var cp in contactPoints) diff --git a/src/Cassandra.Tests/Connections/TestHelpers/FakeInternalMetadata.cs b/src/Cassandra.Tests/Connections/TestHelpers/FakeInternalMetadata.cs index 0cda792b3..65b133439 100644 --- a/src/Cassandra.Tests/Connections/TestHelpers/FakeInternalMetadata.cs +++ b/src/Cassandra.Tests/Connections/TestHelpers/FakeInternalMetadata.cs @@ -17,6 +17,7 @@ using System; using System.Collections.Generic; using System.Net; +using System.Threading; using System.Threading.Tasks; using Cassandra.Collections; @@ -73,7 +74,7 @@ public FakeInternalMetadata(Configuration config) public KeyValuePair[] KeyspacesSnapshot => throw new NotImplementedException(); - public Task InitAsync() + public Task InitAsync(CancellationToken token) { throw new NotImplementedException(); } diff --git a/src/Cassandra.Tests/Connections/TestHelpers/FakeMetadata.cs b/src/Cassandra.Tests/Connections/TestHelpers/FakeMetadata.cs index 964d7ce51..a902ca5c4 100644 --- a/src/Cassandra.Tests/Connections/TestHelpers/FakeMetadata.cs +++ b/src/Cassandra.Tests/Connections/TestHelpers/FakeMetadata.cs @@ -32,12 +32,17 @@ public FakeMetadata(Configuration config) SetupEventForwarding(InternalMetadata); } - public FakeMetadata(IInternalMetadata internalMetadata) + public FakeMetadata(ICluster cluster, IInternalMetadata internalMetadata) { + Cluster = cluster; Configuration = internalMetadata.Configuration; InternalMetadata = internalMetadata; SetupEventForwarding(internalMetadata); } + + public FakeMetadata(IInternalMetadata internalMetadata) : this(null, internalMetadata) + { + } public event HostsEventHandler HostsEvent; @@ -47,6 +52,8 @@ public FakeMetadata(IInternalMetadata internalMetadata) public event Action HostRemoved; + public ICluster Cluster { get; } + public Configuration Configuration { get; } internal IInternalMetadata InternalMetadata { get; } diff --git a/src/Cassandra.Tests/ExecutionProfiles/ClusterTests.cs b/src/Cassandra.Tests/ExecutionProfiles/ClusterTests.cs index 137fb7ded..f926be6bb 100644 --- a/src/Cassandra.Tests/ExecutionProfiles/ClusterTests.cs +++ b/src/Cassandra.Tests/ExecutionProfiles/ClusterTests.cs @@ -332,13 +332,13 @@ public Task ShutdownAsync() return TaskHelper.Completed; } - public Task InitializeAsync(IMetadata metadata) + public Task InitializeAsync(IMetadataSnapshotProvider metadata) { InitializeCount++; return TaskHelper.Completed; } - public ISpeculativeExecutionPlan NewPlan(IMetadata metadata, string keyspace, IStatement statement) + public ISpeculativeExecutionPlan NewPlan(ICluster cluster, string keyspace, IStatement statement) { throw new System.NotImplementedException(); } @@ -348,20 +348,20 @@ internal class FakeLoadBalancingPolicy : ILoadBalancingPolicy { public volatile int InitializeCount; - public Task InitializeAsync(IMetadata metadata) + public Task InitializeAsync(IMetadataSnapshotProvider metadata) { InitializeCount++; return TaskHelper.Completed; } - public HostDistance Distance(IMetadata metadata, Host host) + public HostDistance Distance(ICluster cluster, Host host) { return HostDistance.Local; } - public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) + public IEnumerable NewQueryPlan(ICluster cluster, string keyspace, IStatement query) { - return metadata.AllHosts(); + return cluster.Metadata.AllHosts(); } } } diff --git a/src/Cassandra.Tests/ExecutionProfiles/RequestHandlerTests.cs b/src/Cassandra.Tests/ExecutionProfiles/RequestHandlerTests.cs index 3725ecfd5..6df33dcac 100644 --- a/src/Cassandra.Tests/ExecutionProfiles/RequestHandlerTests.cs +++ b/src/Cassandra.Tests/ExecutionProfiles/RequestHandlerTests.cs @@ -371,17 +371,17 @@ private class FakeLoadBalancingPolicy : ILoadBalancingPolicy { public long Count; - public Task InitializeAsync(IMetadata metadata) + public Task InitializeAsync(IMetadataSnapshotProvider metadata) { return TaskHelper.Completed; } - public HostDistance Distance(IMetadata metadata, Host host) + public HostDistance Distance(ICluster cluster, Host host) { return HostDistance.Local; } - public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) + public IEnumerable NewQueryPlan(ICluster cluster, string keyspace, IStatement query) { Interlocked.Increment(ref Count); return new List @@ -458,15 +458,15 @@ public Task ShutdownAsync() return TaskHelper.Completed; } - public Task InitializeAsync(IMetadata metadata) + public Task InitializeAsync(IMetadataSnapshotProvider metadata) { return TaskHelper.Completed; } - public ISpeculativeExecutionPlan NewPlan(IMetadata metadata, string keyspace, IStatement statement) + public ISpeculativeExecutionPlan NewPlan(ICluster cluster, string keyspace, IStatement statement) { Interlocked.Increment(ref Count); - return new ConstantSpeculativeExecutionPolicy(10, 1).NewPlan(metadata, keyspace, statement); + return new ConstantSpeculativeExecutionPolicy(10, 1).NewPlan(cluster, keyspace, statement); } } } diff --git a/src/Cassandra.Tests/PoliciesUnitTests.cs b/src/Cassandra.Tests/PoliciesUnitTests.cs index bbd623401..c7e5e4292 100644 --- a/src/Cassandra.Tests/PoliciesUnitTests.cs +++ b/src/Cassandra.Tests/PoliciesUnitTests.cs @@ -46,11 +46,13 @@ public async Task RoundRobinIsCyclicTest() .Setup(c => c.AllHostsSnapshot()) .Returns(hostList) .Verifiable(); + var clusterMock = new Mock(); + clusterMock.SetupGet(c => c.Metadata).Returns(metadataMock.Object); //Initialize the balancing policy var policy = new RoundRobinPolicy(); await policy.InitializeAsync(metadataMock.Object).ConfigureAwait(false); - var balancedHosts = policy.NewQueryPlan(metadataMock.Object, null, new SimpleStatement()); + var balancedHosts = policy.NewQueryPlan(clusterMock.Object, null, new SimpleStatement()); //Take a list of hosts of 4, it should get 1 of every one in a cyclic order. var firstRound = balancedHosts.ToList(); @@ -65,7 +67,7 @@ public async Task RoundRobinIsCyclicTest() var followingRounds = new List(); for (var i = 0; i < 10; i++) { - followingRounds.AddRange(policy.NewQueryPlan(metadataMock.Object, null, new SimpleStatement())); + followingRounds.AddRange(policy.NewQueryPlan(clusterMock.Object, null, new SimpleStatement())); } Assert.AreEqual(10 * hostLength, followingRounds.Count); @@ -91,6 +93,8 @@ public async Task RoundRobinIsCyclicTestInParallel() .Setup(c => c.AllHostsSnapshot()) .Returns(hostList) .Verifiable(); + var clusterMock = new Mock(); + clusterMock.SetupGet(c => c.Metadata).Returns(metadataMock.Object); //Initialize the balancing policy var policy = new RoundRobinPolicy(); @@ -99,7 +103,7 @@ public async Task RoundRobinIsCyclicTestInParallel() Func action = async _ => { var resultingHosts = new List(); - var hostEnumerator = policy.NewQueryPlan(metadataMock.Object, null, new SimpleStatement()); + var hostEnumerator = policy.NewQueryPlan(clusterMock.Object, null, new SimpleStatement()); foreach (var h in hostEnumerator) { //Slow down to try to execute it at the same time @@ -128,8 +132,8 @@ public async Task DcInferringPolicyInitializeInfersLocalDc(bool implicitContactP var metadataMock = CreateMetadataMock(hostList, implicitContactPoint: implicitContactPoint); var policy = new DcInferringLoadBalancingPolicy(); await policy.InitializeAsync(metadataMock).ConfigureAwait(false); - Assert.AreEqual(HostDistance.Local, policy.Distance(metadataMock, hostList[0])); - Assert.AreEqual(HostDistance.Remote, policy.Distance(metadataMock, hostList[1])); + Assert.AreEqual(HostDistance.Local, policy.Distance(metadataMock.Cluster, hostList[0])); + Assert.AreEqual(HostDistance.Remote, policy.Distance(metadataMock.Cluster, hostList[1])); } [Test] @@ -150,7 +154,7 @@ public async Task DCAwareRoundRobinPolicyNeverHitsRemote() //0 used nodes per remote dc var policy = new DCAwareRoundRobinPolicy("local"); await policy.InitializeAsync(metadataMock).ConfigureAwait(false); - var balancedHosts = policy.NewQueryPlan(metadataMock, null, new SimpleStatement()); + var balancedHosts = policy.NewQueryPlan(metadataMock.Cluster, null, new SimpleStatement()); var firstRound = balancedHosts.ToList(); //Returns only local hosts @@ -161,7 +165,7 @@ public async Task DCAwareRoundRobinPolicyNeverHitsRemote() var followingRounds = new List(); for (var i = 0; i < 10; i++) { - followingRounds.AddRange(policy.NewQueryPlan(metadataMock, null, new SimpleStatement()).ToList()); + followingRounds.AddRange(policy.NewQueryPlan(metadataMock.Cluster, null, new SimpleStatement()).ToList()); } Assert.AreEqual(10 * (hostLength - 2), followingRounds.Count); @@ -180,8 +184,8 @@ public async Task DCAwareRoundRobinInitializeUsesBuilderLocalDc() var metadataMock = CreateMetadataMock(hostList, "dc2"); var policy = new DCAwareRoundRobinPolicy(); await policy.InitializeAsync(metadataMock).ConfigureAwait(false); - Assert.AreEqual(HostDistance.Remote, policy.Distance(metadataMock, hostList[0])); - Assert.AreEqual(HostDistance.Local, policy.Distance(metadataMock, hostList[1])); + Assert.AreEqual(HostDistance.Remote, policy.Distance(metadataMock.Cluster, hostList[0])); + Assert.AreEqual(HostDistance.Local, policy.Distance(metadataMock.Cluster, hostList[1])); } [Test] @@ -214,8 +218,8 @@ public async Task DCAwareRoundRobinInitializeInfersLocalDcImplicitContactPoint() var metadataMock = CreateMetadataMock(hostList, implicitContactPoint: true); var policy = new DCAwareRoundRobinPolicy(); await policy.InitializeAsync(metadataMock).ConfigureAwait(false); - Assert.AreEqual(HostDistance.Local, policy.Distance(metadataMock, hostList[0])); - Assert.AreEqual(HostDistance.Remote, policy.Distance(metadataMock, hostList[1])); + Assert.AreEqual(HostDistance.Local, policy.Distance(metadataMock.Cluster, hostList[0])); + Assert.AreEqual(HostDistance.Remote, policy.Distance(metadataMock.Cluster, hostList[1])); } [Test] @@ -279,7 +283,7 @@ public async Task DCAwareRoundRobinPolicyTestInParallel() var firstHosts = new ConcurrentBag(); Action action = () => { - var hosts = policy.NewQueryPlan(metadataMock, null, null).ToList(); + var hosts = policy.NewQueryPlan(metadataMock.Cluster, null, null).ToList(); //Check that the value is not repeated Assert.AreEqual(0, hosts.GroupBy(x => x) .Where(g => g.Count() > 1) @@ -378,7 +382,7 @@ public async Task DCAwareRoundRobinPolicyWithNodesChanging() await policy.InitializeAsync(metadataMock).ConfigureAwait(false); var hostYielded = new ConcurrentBag>(); - Action action = () => hostYielded.Add(policy.NewQueryPlan(metadataMock, null, null).ToList()); + Action action = () => hostYielded.Add(policy.NewQueryPlan(metadataMock.Cluster, null, null).ToList()); //Invoke without nodes changing TestHelper.ParallelInvoke(action, 100); @@ -505,7 +509,7 @@ public async Task TokenAwarePolicyReturnsLocalReplicasOnly() //key for host :::1 and :::3 var k = new RoutingKey { RawRoutingKey = new byte[] { 1 } }; - var hosts = policy.NewQueryPlan(metadataMock, null, new SimpleStatement().SetRoutingKey(k)).ToList(); + var hosts = policy.NewQueryPlan(metadataMock.Cluster, null, new SimpleStatement().SetRoutingKey(k)).ToList(); //5 local hosts Assert.AreEqual(5, hosts.Count); //local replica first @@ -515,7 +519,7 @@ public async Task TokenAwarePolicyReturnsLocalReplicasOnly() //key for host :::2 and :::5 k = new RoutingKey { RawRoutingKey = new byte[] { 2 } }; n = 3; - hosts = policy.NewQueryPlan(metadataMock, null, new SimpleStatement().SetRoutingKey(k)).ToList(); + hosts = policy.NewQueryPlan(metadataMock.Cluster, null, new SimpleStatement().SetRoutingKey(k)).ToList(); Assert.AreEqual(5, hosts.Count); //local replicas first CollectionAssert.AreEquivalent(new[] { 2, 5 }, hosts.Take(2).Select(TestHelper.GetLastAddressByte)); @@ -566,7 +570,7 @@ public async Task TokenAwarePolicyRoundRobinsOnLocalReplicas() const int times = 10000; Action action = () => { - var h = policy.NewQueryPlan(metadataMock, null, new SimpleStatement().SetRoutingKey(k)).First(); + var h = policy.NewQueryPlan(metadataMock.Cluster, null, new SimpleStatement().SetRoutingKey(k)).First(); firstHosts.Add(h); }; TestHelper.ParallelInvoke(action, times); @@ -595,16 +599,16 @@ public async Task TokenAwarePolicyReturnsChildHostsIfNoRoutingKey() var policy = new TokenAwarePolicy(new DCAwareRoundRobinPolicy("dc1")); await policy.InitializeAsync(metadataMock).ConfigureAwait(false); //No routing key - var hosts = policy.NewQueryPlan(metadataMock, null, new SimpleStatement()).ToList(); + var hosts = policy.NewQueryPlan(metadataMock.Cluster, null, new SimpleStatement()).ToList(); //2 localhosts - Assert.AreEqual(2, hosts.Count(h => policy.Distance(metadataMock, h) == HostDistance.Local)); + Assert.AreEqual(2, hosts.Count(h => policy.Distance(metadataMock.Cluster, h) == HostDistance.Local)); Assert.AreEqual("dc1", hosts[0].Datacenter); Assert.AreEqual("dc1", hosts[1].Datacenter); Mock.Get(metadataMock).Verify(); //No statement - hosts = policy.NewQueryPlan(metadataMock, null, null).ToList(); + hosts = policy.NewQueryPlan(metadataMock.Cluster, null, null).ToList(); //2 localhosts - Assert.AreEqual(2, hosts.Count(h => policy.Distance(metadataMock, h) == HostDistance.Local)); + Assert.AreEqual(2, hosts.Count(h => policy.Distance(metadataMock.Cluster, h) == HostDistance.Local)); Assert.AreEqual("dc1", hosts[0].Datacenter); Assert.AreEqual("dc1", hosts[1].Datacenter); Mock.Get(metadataMock).Verify(); @@ -666,7 +670,7 @@ private FakeMetadata CreateMetadataMock( var config = new TestConfigurationBuilder { LocalDatacenter = localDc }.Build(); var cluster = Mock.Of(); var internalMetadata = Mock.Of(); - var metadata = new FakeMetadata(internalMetadata); + var metadata = new FakeMetadata(cluster, internalMetadata); Mock.Get(cluster).SetupGet(c => c.Configuration).Returns(config); Mock.Get(cluster).SetupGet(c => c.InternalMetadata).Returns(internalMetadata); Mock.Get(cluster).SetupGet(c => c.Metadata).Returns(metadata); diff --git a/src/Cassandra.Tests/RequestHandlerMockTests.cs b/src/Cassandra.Tests/RequestHandlerMockTests.cs index 2befd132f..46ab30931 100644 --- a/src/Cassandra.Tests/RequestHandlerMockTests.cs +++ b/src/Cassandra.Tests/RequestHandlerMockTests.cs @@ -84,7 +84,7 @@ public void Should_ThrowNoHostAvailableException_When_QueryPlanMoveNextReturnsFa Mock.Get(enumerator).Setup(m => m.MoveNext()).Returns(false); Mock.Get(enumerable).Setup(m => m.GetEnumerator()).Returns(enumerator); Mock.Get(lbpMock) - .Setup(m => m.NewQueryPlan(It.IsAny(), It.IsAny(), It.IsAny())) + .Setup(m => m.NewQueryPlan(It.IsAny(), It.IsAny(), It.IsAny())) .Returns(enumerable); var triedHosts = new Dictionary(); @@ -106,7 +106,7 @@ public void Should_ThrowNoHostAvailableException_When_QueryPlanMoveNextReturnsTr Mock.Get(enumerator).SetupGet(m => m.Current).Returns((Host)null); Mock.Get(enumerable).Setup(m => m.GetEnumerator()).Returns(enumerator); Mock.Get(lbpMock) - .Setup(m => m.NewQueryPlan(It.IsAny(), It.IsAny(), It.IsAny())) + .Setup(m => m.NewQueryPlan(It.IsAny(), It.IsAny(), It.IsAny())) .Returns(enumerable); var triedHosts = new Dictionary(); @@ -128,9 +128,9 @@ public void Should_ReturnHost_When_QueryPlanMoveNextReturnsTrueAndCurrentReturns Mock.Get(enumerator).SetupGet(m => m.Current).Returns(host); Mock.Get(enumerable).Setup(m => m.GetEnumerator()).Returns(enumerator); Mock.Get(lbpMock) - .Setup(m => m.NewQueryPlan(It.IsAny(), It.IsAny(), It.IsAny())) + .Setup(m => m.NewQueryPlan(It.IsAny(), It.IsAny(), It.IsAny())) .Returns(enumerable); - Mock.Get(lbpMock).Setup(m => m.Distance(It.IsAny(), host)).Returns(HostDistance.Local); + Mock.Get(lbpMock).Setup(m => m.Distance(It.IsAny(), host)).Returns(HostDistance.Local); var triedHosts = new Dictionary(); var sut = new RequestHandler(sessionMock, metadata, new SerializerManager(ProtocolVersion.V4).GetCurrentSerializer()); diff --git a/src/Cassandra.Tests/Requests/PrepareHandlerTests.cs b/src/Cassandra.Tests/Requests/PrepareHandlerTests.cs index 88bdc6934..1800c7aee 100644 --- a/src/Cassandra.Tests/Requests/PrepareHandlerTests.cs +++ b/src/Cassandra.Tests/Requests/PrepareHandlerTests.cs @@ -553,18 +553,18 @@ private class FakeLoadBalancingPolicy : ILoadBalancingPolicy public long DistanceCount; public long NewQueryPlanCount; - public Task InitializeAsync(IMetadata metadata) + public Task InitializeAsync(IMetadataSnapshotProvider metadata) { return TaskHelper.Completed; } - public HostDistance Distance(IMetadata metadata, Host host) + public HostDistance Distance(ICluster cluster, Host host) { Interlocked.Increment(ref DistanceCount); return HostDistance.Local; } - public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) + public IEnumerable NewQueryPlan(ICluster cluster, string keyspace, IStatement query) { Interlocked.Increment(ref NewQueryPlanCount); throw new NotImplementedException(); diff --git a/src/Cassandra.Tests/StatementTests.cs b/src/Cassandra.Tests/StatementTests.cs index 46d465064..ec6769d7e 100644 --- a/src/Cassandra.Tests/StatementTests.cs +++ b/src/Cassandra.Tests/StatementTests.cs @@ -336,6 +336,8 @@ public async Task BatchStatement_Should_UseRoutingKeyAndKeyspaceOfFirstStatement .Returns(new List()); Mock.Get(metadataMock).Setup(c => c.AllHosts()) .Returns(new List()); + var clusterMock = Mock.Of(); + Mock.Get(clusterMock).SetupGet(c => c.Metadata).Returns(metadataMock); await lbp.InitializeAsync(metadataMock).ConfigureAwait(false); var s1Mock = new Mock(MockBehavior.Loose); @@ -343,7 +345,7 @@ public async Task BatchStatement_Should_UseRoutingKeyAndKeyspaceOfFirstStatement s1Mock.Setup(s => s.Keyspace).Returns("ks1"); var batch = new BatchStatement().Add(s1Mock.Object); - var _ = lbp.NewQueryPlan(metadataMock, "ks2", batch).ToList(); + var _ = lbp.NewQueryPlan(clusterMock, "ks2", batch).ToList(); Mock.Get(metadataMock).Verify(c => c.GetReplicas("ks1", rawRoutingKey), Times.Once); } diff --git a/src/Cassandra.Tests/TestConfigurationBuilder.cs b/src/Cassandra.Tests/TestConfigurationBuilder.cs index cdd553dba..86c09a28e 100644 --- a/src/Cassandra.Tests/TestConfigurationBuilder.cs +++ b/src/Cassandra.Tests/TestConfigurationBuilder.cs @@ -98,6 +98,8 @@ internal class TestConfigurationBuilder public string LocalDatacenter { get; set; } + public long? InitializationTimeoutMs { get; set; } + public IContactPointParser ContactPointParser { get; set; } public ILocalDatacenterProvider LocalDatacenterProvider { get; set; } = new LocalDatacenterProvider(); @@ -180,7 +182,8 @@ public Configuration Build() protocolVersionNegotiator: ProtocolVersionNegotiator, serverEventsSubscriber: ServerEventsSubscriber, localDatacenterProvider: LocalDatacenterProvider, - serializerManager: SerializerManager); + serializerManager: SerializerManager, + initializationTimeoutMs: InitializationTimeoutMs); } } } \ No newline at end of file diff --git a/src/Cassandra.Tests/TestHelper.cs b/src/Cassandra.Tests/TestHelper.cs index 61d479ccf..f0ab7765b 100644 --- a/src/Cassandra.Tests/TestHelper.cs +++ b/src/Cassandra.Tests/TestHelper.cs @@ -684,6 +684,10 @@ public void Error(string message, Exception ex = null) { } + public void Error(Exception ex, string message, params object[] args) + { + } + public void Error(string message, params object[] args) { } @@ -728,20 +732,20 @@ public OrderedLoadBalancingPolicy() _childPolicy = new RoundRobinPolicy(); } - public Task InitializeAsync(IMetadata metadata) + public Task InitializeAsync(IMetadataSnapshotProvider metadata) { - _hosts = metadata.AllHosts(); + _hosts = metadata.AllHostsSnapshot(); return _childPolicy.InitializeAsync(metadata); } - public HostDistance Distance(IMetadata metadata, Host host) + public HostDistance Distance(ICluster cluster, Host host) { - return _childPolicy.Distance(metadata, host); + return _childPolicy.Distance(cluster, host); } - public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) + public IEnumerable NewQueryPlan(ICluster cluster, string keyspace, IStatement query) { - return !_useRoundRobin ? _hosts : _childPolicy.NewQueryPlan(metadata, keyspace, query); + return !_useRoundRobin ? _hosts : _childPolicy.NewQueryPlan(cluster, keyspace, query); } } @@ -751,32 +755,32 @@ public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStat /// internal class CustomLoadBalancingPolicy : ILoadBalancingPolicy { - private volatile IMetadata _metadata; - private readonly Func _distanceHandler; - private readonly Func> _queryPlanHandler; + private volatile IMetadataSnapshotProvider _metadata; + private readonly Func _distanceHandler; + private readonly Func> _queryPlanHandler; public CustomLoadBalancingPolicy( - Func> queryPlanHandler = null, - Func distanceHandler = null) + Func> queryPlanHandler = null, + Func distanceHandler = null) { - _queryPlanHandler = queryPlanHandler ?? ((cluster, ks, statement) => cluster.AllHosts()); + _queryPlanHandler = queryPlanHandler ?? ((cluster, ks, statement) => cluster.Metadata.AllHostsSnapshot()); _distanceHandler = distanceHandler ?? ((_, __) => HostDistance.Local); } - public Task InitializeAsync(IMetadata metadata) + public Task InitializeAsync(IMetadataSnapshotProvider metadata) { _metadata = metadata; return TaskHelper.Completed; } - public HostDistance Distance(IMetadata metadata, Host host) + public HostDistance Distance(ICluster cluster, Host host) { - return _distanceHandler(_metadata, host); + return _distanceHandler(cluster, host); } - public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) + public IEnumerable NewQueryPlan(ICluster cluster, string keyspace, IStatement query) { - return _queryPlanHandler(metadata, keyspace, query); + return _queryPlanHandler(cluster, keyspace, query); } } } diff --git a/src/Cassandra/Cluster.cs b/src/Cassandra/Cluster.cs index 069125c7f..50c8d10de 100644 --- a/src/Cassandra/Cluster.cs +++ b/src/Cassandra/Cluster.cs @@ -46,9 +46,10 @@ public class Cluster : IInternalCluster internal static readonly Logger Logger = new Logger(typeof(Cluster)); private readonly CopyOnWriteList _connectedSessions = new CopyOnWriteList(); private readonly bool _implicitContactPoint = false; - private volatile Exception _initException; + private volatile InitFatalErrorException _initException; private volatile bool _initialized = false; - private volatile TaskCompletionSource _initTaskCompletionSource; + private volatile TaskCompletionSource _initTaskCompletionSource + = new TaskCompletionSource(); private readonly SemaphoreSlim _sessionCreateLock = new SemaphoreSlim(1, 1); private long _sessionCounter = -1; @@ -67,7 +68,7 @@ public class Cluster : IInternalCluster private bool IsDisposed => Interlocked.Read(ref _state) == Cluster.Disposed; - Exception IInternalCluster.InitException => _initException; + InitFatalErrorException IInternalCluster.InitException => _initException; /// ConcurrentDictionary IInternalCluster.PreparedQueries { get; } @@ -135,9 +136,8 @@ private Cluster(IEnumerable contactPoints, Configuration configuration) var parsedContactPoints = configuration.ContactPointParser.ParseContactPoints(contactPointsList); _internalMetadata = new InternalMetadata(this, configuration, parsedContactPoints); - _lazyMetadata = new Metadata(_internalMetadata); + _lazyMetadata = new Metadata(_internalMetadata, _initCancellationTokenSource.Token); - _initTaskCompletionSource = new TaskCompletionSource(); _initTask = Task.Run(InitInternalAsync); } @@ -187,7 +187,8 @@ private async Task InitInternalAsync() { try { - await _lazyMetadata.TryInitializeAsync(_initCancellationTokenSource.Token).ConfigureAwait(false); + await _lazyMetadata.TryInitializeAsync().ConfigureAwait(false); + break; } catch (Exception ex) { @@ -468,14 +469,13 @@ public async Task ShutdownAsync(int timeoutMs = Timeout.Infinite) { Cluster.Logger.Warning("Exception occured while disposing session instances: {0}", ex.ToString()); } - - _initCancellationTokenSource.Cancel(); - - if (previousState == Cluster.Initialized) + + if (previousState == Cluster.Initializing) { - await ShutdownInternalAsync().ConfigureAwait(false); + _initCancellationTokenSource.Cancel(); } - else + + if (previousState != Cluster.Initialized) { try { @@ -486,6 +486,16 @@ public async Task ShutdownAsync(int timeoutMs = Timeout.Infinite) // ignored } } + + if (previousState != Cluster.Disposed) + { + _initCancellationTokenSource.Dispose(); + } + + if (previousState == Cluster.Initialized) + { + await ShutdownInternalAsync().ConfigureAwait(false); + } Cluster.Logger.Info("Cluster [" + _internalMetadata.ClusterName + "] has been shut down."); } diff --git a/src/Cassandra/Connections/Control/ControlConnection.cs b/src/Cassandra/Connections/Control/ControlConnection.cs index 677c39bd1..93e684df9 100644 --- a/src/Cassandra/Connections/Control/ControlConnection.cs +++ b/src/Cassandra/Connections/Control/ControlConnection.cs @@ -191,7 +191,7 @@ private IEnumerable>> DefaultLbpHostsEnume ConcurrentDictionary attemptedContactPoints, ConcurrentDictionary attemptedHosts) { - foreach (var host in _config.DefaultRequestOptions.LoadBalancingPolicy.NewQueryPlan(_cluster.Metadata, null, null)) + foreach (var host in _config.DefaultRequestOptions.LoadBalancingPolicy.NewQueryPlan(_cluster, null, null)) { if (attemptedHosts.TryAdd(host, null)) { diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DataCentersInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DataCentersInfoProvider.cs index 78ce92b7c..7c54d75b2 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DataCentersInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DataCentersInfoProvider.cs @@ -40,7 +40,7 @@ public HashSet GetInformation( continue; } - var distance = cluster.Configuration.Policies.LoadBalancingPolicy.Distance(cluster.Metadata, h); + var distance = cluster.Configuration.Policies.LoadBalancingPolicy.Distance(cluster, h); if (distance == HostDistance.Local || (distance == HostDistance.Remote && remoteConnectionsLength > 0)) { dataCenters.Add(h.Datacenter); diff --git a/src/Cassandra/Metadata.cs b/src/Cassandra/Metadata.cs index ef48cb409..a2eb6c076 100644 --- a/src/Cassandra/Metadata.cs +++ b/src/Cassandra/Metadata.cs @@ -34,6 +34,7 @@ internal class Metadata : IMetadata private const int NotInitialized = 0; private readonly int _queryAbortTimeout; + private readonly CancellationToken _cancellationToken; private volatile Task _initTask; private volatile bool _initialized = false; @@ -42,8 +43,9 @@ internal class Metadata : IMetadata internal IInternalMetadata InternalMetadata { get; } - internal Metadata(IInternalMetadata internalMetadata) + internal Metadata(IInternalMetadata internalMetadata, CancellationToken cancellationToken) { + _cancellationToken = cancellationToken; Configuration = internalMetadata.Configuration; _queryAbortTimeout = Configuration.DefaultRequestOptions.QueryAbortTimeout; InternalMetadata = internalMetadata; @@ -307,7 +309,7 @@ public async Task CheckSchemaAgreementAsync() return await InternalMetadata.CheckSchemaAgreementAsync().ConfigureAwait(false); } - internal Task TryInitializeAsync(CancellationToken token = default(CancellationToken)) + internal Task TryInitializeAsync() { if (_initialized) { @@ -315,7 +317,7 @@ public async Task CheckSchemaAgreementAsync() return TaskHelper.Completed; } - TryLaunchInitTask(token); + TryLaunchInitTask(); return _initTask; } @@ -331,7 +333,7 @@ internal void TryInitialize() _initTask.GetAwaiter().GetResult(); } - private void TryLaunchInitTask(CancellationToken token = default(CancellationToken)) + private void TryLaunchInitTask() { var currentState = Interlocked.Read(ref _state); if (currentState == Metadata.Disposed) @@ -342,7 +344,7 @@ internal void TryInitialize() if (Interlocked.CompareExchange(ref _state, Metadata.Initializing, Metadata.NotInitialized) == Metadata.NotInitialized) { - _initTask = Task.Run(() => InitializeInternalAsync(token)); + _initTask = Task.Run(() => InitializeInternalAsync(_cancellationToken)); } } diff --git a/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs b/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs index 864451207..6f189befd 100644 --- a/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs +++ b/src/Cassandra/Policies/ConstantSpeculativeExecutionPolicy.cs @@ -56,7 +56,7 @@ public Task InitializeAsync(IMetadataSnapshotProvider metadata) return TaskHelper.Completed; } - public ISpeculativeExecutionPlan NewPlan(IMetadata metadata, string keyspace, IStatement statement) + public ISpeculativeExecutionPlan NewPlan(ICluster cluster, string keyspace, IStatement statement) { return new ConstantSpeculativeExecutionPlan(Delay, MaxSpeculativeExecutions); } diff --git a/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs b/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs index 8524b7e07..19deef120 100644 --- a/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs +++ b/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs @@ -67,10 +67,10 @@ public DefaultLoadBalancingPolicy(string localDc) /// in the local datacenter as Local and the rest /// is Ignored. /// - /// The information about the session instance for which the policy is created. + /// The cluster instance for which the policy is created. /// the host of which to return the distance of. /// the HostDistance to host. - public HostDistance Distance(IMetadata metadata, Host host) + public HostDistance Distance(ICluster cluster, Host host) { var lastPreferredHost = _lastPreferredHost; if (lastPreferredHost != null && host == lastPreferredHost) @@ -80,13 +80,13 @@ public HostDistance Distance(IMetadata metadata, Host host) return HostDistance.Local; } - return ChildPolicy.Distance(metadata, host); + return ChildPolicy.Distance(cluster, host); } /// /// Initializes the policy. /// - public Task InitializeAsync(IMetadata metadata) + public Task InitializeAsync(IMetadataSnapshotProvider metadata) { return ChildPolicy.InitializeAsync(metadata); } @@ -94,21 +94,21 @@ public Task InitializeAsync(IMetadata metadata) /// /// Returns the hosts to used for a query. /// - public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement statement) + public IEnumerable NewQueryPlan(ICluster cluster, string keyspace, IStatement statement) { if (statement is TargettedSimpleStatement targetedStatement && targetedStatement.PreferredHost != null) { _lastPreferredHost = targetedStatement.PreferredHost; - return YieldPreferred(metadata, keyspace, targetedStatement); + return YieldPreferred(cluster, keyspace, targetedStatement); } - return ChildPolicy.NewQueryPlan(metadata, keyspace, statement); + return ChildPolicy.NewQueryPlan(cluster, keyspace, statement); } - private IEnumerable YieldPreferred(IMetadata metadata, string keyspace, TargettedSimpleStatement statement) + private IEnumerable YieldPreferred(ICluster cluster, string keyspace, TargettedSimpleStatement statement) { yield return statement.PreferredHost; - foreach (var h in ChildPolicy.NewQueryPlan(metadata, keyspace, statement)) + foreach (var h in ChildPolicy.NewQueryPlan(cluster, keyspace, statement)) { yield return h; } diff --git a/src/Cassandra/Policies/NoSpeculativeExecutionPolicy.cs b/src/Cassandra/Policies/NoSpeculativeExecutionPolicy.cs index 9adfd630a..100824c62 100644 --- a/src/Cassandra/Policies/NoSpeculativeExecutionPolicy.cs +++ b/src/Cassandra/Policies/NoSpeculativeExecutionPolicy.cs @@ -33,12 +33,12 @@ private NoSpeculativeExecutionPolicy() } - public Task InitializeAsync(IMetadata metadata) + public Task InitializeAsync(IMetadataSnapshotProvider metadata) { return TaskHelper.Completed; } - public ISpeculativeExecutionPlan NewPlan(IMetadata metadata, string keyspace, IStatement statement) + public ISpeculativeExecutionPlan NewPlan(ICluster cluster, string keyspace, IStatement statement) { return Plan; } diff --git a/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs b/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs index ff255336e..d06768ce0 100644 --- a/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs +++ b/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs @@ -35,22 +35,22 @@ public RetryLoadBalancingPolicy(ILoadBalancingPolicy loadBalancingPolicy, IRecon public ILoadBalancingPolicy LoadBalancingPolicy { get; } - public Task InitializeAsync(IMetadata metadata) + public Task InitializeAsync(IMetadataSnapshotProvider metadata) { return LoadBalancingPolicy.InitializeAsync(metadata); } - public HostDistance Distance(IMetadata metadata, Host host) + public HostDistance Distance(ICluster cluster, Host host) { - return LoadBalancingPolicy.Distance(metadata, host); + return LoadBalancingPolicy.Distance(cluster, host); } - public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) + public IEnumerable NewQueryPlan(ICluster cluster, string keyspace, IStatement query) { IReconnectionSchedule schedule = ReconnectionPolicy.NewSchedule(); while (true) { - IEnumerable childQueryPlan = LoadBalancingPolicy.NewQueryPlan(metadata, keyspace, query); + IEnumerable childQueryPlan = LoadBalancingPolicy.NewQueryPlan(cluster, keyspace, query); foreach (Host host in childQueryPlan) yield return host; diff --git a/src/Cassandra/Policies/RoundRobinPolicy.cs b/src/Cassandra/Policies/RoundRobinPolicy.cs index 54b517533..00b9f1146 100644 --- a/src/Cassandra/Policies/RoundRobinPolicy.cs +++ b/src/Cassandra/Policies/RoundRobinPolicy.cs @@ -38,7 +38,7 @@ public class RoundRobinPolicy : ILoadBalancingPolicy { private int _index; - public Task InitializeAsync(IMetadata metadata) + public Task InitializeAsync(IMetadataSnapshotProvider metadata) { return TaskHelper.Completed; } @@ -49,10 +49,10 @@ public Task InitializeAsync(IMetadata metadata) /// datacenter deployment. If you use multiple datacenter, see /// DCAwareRoundRobinPolicy instead.

/// - /// The information about the session instance for which the policy is created. + /// The cluster instance for which the policy is created. /// the host of which to return the distance of. /// the HostDistance to host. - public HostDistance Distance(IMetadata metadata, Host host) + public HostDistance Distance(ICluster cluster, Host host) { return HostDistance.Local; } @@ -63,15 +63,15 @@ public HostDistance Distance(IMetadata metadata, Host host) /// plans returned will cycle over all the host of the cluster in a round-robin /// fashion.

/// - /// The information about the session instance for which the policy is created. + /// The cluster instance for which the policy is created. /// Keyspace on which the query is going to be executed /// the query for which to build the plan. /// a new query plan, i.e. an iterator indicating which host to try /// first for querying, which one to use as failover, etc... - public IEnumerable NewQueryPlan(IMetadata metadata, string keyspace, IStatement query) + public IEnumerable NewQueryPlan(ICluster cluster, string keyspace, IStatement query) { //shallow copy the all hosts - var hosts = (from h in metadata.AllHostsSnapshot() select h).ToArray(); + var hosts = (from h in cluster.Metadata.AllHostsSnapshot() select h).ToArray(); var startIndex = Interlocked.Increment(ref _index); //Simplified overflow protection diff --git a/src/Cassandra/Policies/TokenAwarePolicy.cs b/src/Cassandra/Policies/TokenAwarePolicy.cs index 8e40437cc..437f250c3 100644 --- a/src/Cassandra/Policies/TokenAwarePolicy.cs +++ b/src/Cassandra/Policies/TokenAwarePolicy.cs @@ -27,8 +27,8 @@ namespace Cassandra /// This policy encapsulates another policy. The resulting policy works in the following way: /// /// - /// The method is inherited from the child policy. - /// The host yielded by the method will first return the + /// The method is inherited from the child policy. + /// The host yielded by the method will first return the /// replicas for the statement, based on the . /// /// @@ -52,7 +52,7 @@ public TokenAwarePolicy(ILoadBalancingPolicy childPolicy) public ILoadBalancingPolicy ChildPolicy { get; } - public Task InitializeAsync(IMetadata metadata) + public Task InitializeAsync(IMetadataSnapshotProvider metadata) { return ChildPolicy.InitializeAsync(metadata); } @@ -60,14 +60,14 @@ public Task InitializeAsync(IMetadata metadata) /// /// Return the HostDistance for the provided host. /// - /// The information about the session instance for which the policy is created. + /// The cluster instance for which the policy is created. /// the host of which to return the distance of. /// /// the HostDistance to host as returned by the wrapped /// policy. - public HostDistance Distance(IMetadata metadata, Host host) + public HostDistance Distance(ICluster cluster, Host host) { - return ChildPolicy.Distance(metadata, host); + return ChildPolicy.Distance(cluster, host); } /// @@ -77,17 +77,17 @@ public HostDistance Distance(IMetadata metadata, Host host) /// IStatement.RoutingKey is not null). Following what /// it will return the plan of the child policy.

/// - /// The information about the session instance for which the policy is created. + /// The cluster instance for which the policy is created. /// Keyspace on which the query is going to be executed /// the query for which to build the plan. /// the new query plan. - public IEnumerable NewQueryPlan(IMetadata metadata, string loggedKeyspace, IStatement query) + public IEnumerable NewQueryPlan(ICluster cluster, string loggedKeyspace, IStatement query) { var routingKey = query?.RoutingKey; IEnumerable childIterator; if (routingKey == null) { - childIterator = ChildPolicy.NewQueryPlan(metadata, loggedKeyspace, query); + childIterator = ChildPolicy.NewQueryPlan(cluster, loggedKeyspace, query); foreach (var h in childIterator) { yield return h; @@ -96,12 +96,12 @@ public IEnumerable NewQueryPlan(IMetadata metadata, string loggedKeyspace, } var keyspace = query.Keyspace ?? loggedKeyspace; - var replicas = metadata.GetReplicasSnapshot(keyspace, routingKey.RawRoutingKey); + var replicas = cluster.Metadata.GetReplicasSnapshot(keyspace, routingKey.RawRoutingKey); var localReplicaSet = new HashSet(); var localReplicaList = new List(replicas.Count); // We can't do it lazily as we need to balance the load between local replicas - foreach (var localReplica in replicas.Where(h => ChildPolicy.Distance(metadata, h) == HostDistance.Local)) + foreach (var localReplica in replicas.Where(h => ChildPolicy.Distance(cluster, h) == HostDistance.Local)) { localReplicaSet.Add(localReplica); localReplicaList.Add(localReplica); @@ -118,7 +118,7 @@ public IEnumerable NewQueryPlan(IMetadata metadata, string loggedKeyspace, } // Then, return the rest of child policy hosts - childIterator = ChildPolicy.NewQueryPlan(metadata, loggedKeyspace, query); + childIterator = ChildPolicy.NewQueryPlan(cluster, loggedKeyspace, query); foreach (var h in childIterator) { if (localReplicaSet.Contains(h)) diff --git a/src/Cassandra/Requests/RequestHandler.cs b/src/Cassandra/Requests/RequestHandler.cs index 0ed9731b0..327807f8f 100644 --- a/src/Cassandra/Requests/RequestHandler.cs +++ b/src/Cassandra/Requests/RequestHandler.cs @@ -131,7 +131,7 @@ private static IEnumerable GetQueryPlan(ISession session, IMetadata metada var host = (statement as Statement)?.Host; return host == null - ? lbp.NewQueryPlan(metadata, session.Keyspace, statement) + ? lbp.NewQueryPlan(session.Cluster, session.Keyspace, statement) : Enumerable.Repeat(host, 1); } @@ -526,7 +526,7 @@ private void ScheduleNext(Host currentHost) if (_executionPlan == null) { _executionPlan = RequestOptions.SpeculativeExecutionPolicy.NewPlan( - _session.Cluster.Metadata, _session.Keyspace, Statement); + _session.Cluster, _session.Keyspace, Statement); } var delay = _executionPlan.NextExecution(currentHost); if (delay <= 0) diff --git a/src/Cassandra/Session.cs b/src/Cassandra/Session.cs index 1b070c464..198d827bf 100644 --- a/src/Cassandra/Session.cs +++ b/src/Cassandra/Session.cs @@ -49,12 +49,16 @@ public class Session : IInternalSession private readonly IMetricsManager _metricsManager; private readonly IObserverFactory _observerFactory; private readonly IInsightsClient _insightsClient; + private readonly CancellationTokenSource _initCancellationTokenSource = new CancellationTokenSource(); private readonly Task _initTask; private long _state = Session.Initializing; private volatile string _keyspace; private volatile bool _initialized = false; + + private volatile TaskCompletionSource _initTaskCompletionSource + = new TaskCompletionSource(); internal IInternalSession InternalRef => this; @@ -220,12 +224,35 @@ public async Task ShutdownAsync() //Only dispose once var previousState = Interlocked.Exchange(ref _state, Session.Disposed); _initialized = false; + + if (previousState == Session.Initializing) + { + _initCancellationTokenSource.Cancel(); + } + if (previousState != Session.Initialized) { - return; + try + { + await _initTask.ConfigureAwait(false); + } + catch (Exception) + { + // ignored + } + } + + if (previousState != Session.Disposed) + { + _initCancellationTokenSource.Dispose(); + } + + if (previousState == Session.Initialized) + { + await ShutdownInternalAsync().ConfigureAwait(false); } - await ShutdownInternalAsync().ConfigureAwait(false); + Logger.Info("Session [" + SessionName + "] has been shut down."); } private async Task ShutdownInternalAsync() @@ -313,7 +340,7 @@ private void ValidateState() private void WaitInit() { - using (var waiter = new TaskTimeoutHelper(_initTask, _cluster.GetInitTimeout())) + using (var waiter = new TaskTimeoutHelper(_initTaskCompletionSource.Task, _cluster.GetInitTimeout())) { waiter.WaitWithTimeout(); } @@ -323,11 +350,11 @@ private void WaitInit() private IInternalMetadata WaitInitAndGetMetadata() { - using (var waiter = new TaskTimeoutHelper(_initTask, _cluster.GetInitTimeout())) + using (var waiter = new TaskTimeoutHelper(_initTaskCompletionSource.Task, _cluster.GetInitTimeout())) { if (waiter.WaitWithTimeout()) { - return _initTask.Result; + return _initTaskCompletionSource.Task.Result; } } @@ -336,11 +363,11 @@ private IInternalMetadata WaitInitAndGetMetadata() private async Task WaitInitAndGetMetadataAsync() { - using (var waiter = new TaskTimeoutHelper(_initTask, _cluster.GetInitTimeout())) + using (var waiter = new TaskTimeoutHelper(_initTaskCompletionSource.Task, _cluster.GetInitTimeout())) { if (await waiter.WaitWithTimeoutAsync().ConfigureAwait(false)) { - return _initTask.Result; + return _initTaskCompletionSource.Task.Result; } } @@ -349,7 +376,7 @@ private async Task WaitInitAndGetMetadataAsync() private async Task WaitInitAsync() { - using (var waiter = new TaskTimeoutHelper(_initTask, _cluster.GetInitTimeout())) + using (var waiter = new TaskTimeoutHelper(_initTaskCompletionSource.Task, _cluster.GetInitTimeout())) { await waiter.WaitWithTimeoutAsync().ConfigureAwait(false); } @@ -359,35 +386,86 @@ private async Task WaitInitAsync() private async Task InitInternalAsync() { - var internalMetadata = await InternalRef.InternalCluster.TryInitAndGetMetadataAsync().ConfigureAwait(false); + try + { + IInternalMetadata internalMetadata = null; + do + { + try + { + internalMetadata = + await InternalRef.InternalCluster + .TryInitAndGetMetadataAsync() + .WithCancellation(_initCancellationTokenSource.Token).ConfigureAwait(false); + break; + } + catch (Exception ex) + { + if (InternalRef.InternalCluster.InitException != null) + { + throw InternalRef.InternalCluster.InitException; + } + + if (IsDisposed) + { + throw new ObjectDisposedException("Session instance was disposed before initialization finished."); + } + + var currentTcs = _initTaskCompletionSource; + Task.Run(() => currentTcs.TrySetException(ex)).Forget(); + await Task.Delay(500, _initCancellationTokenSource.Token).ConfigureAwait(false); + _initTaskCompletionSource = new TaskCompletionSource(); + } + } while (!IsDisposed); + + if (IsDisposed) + { + throw new ObjectDisposedException("Session instance was disposed before initialization finished."); + } - InternalRef.InternalCluster.Metadata.HostRemoved += OnHostRemoved; + InternalRef.InternalCluster.Metadata.HostRemoved += OnHostRemoved; - var serializerManager = _cluster.Configuration.SerializerManager; - if (Configuration.GetOrCreatePoolingOptions(serializerManager.CurrentProtocolVersion).GetWarmup()) - { - await WarmupAsync(internalMetadata).ConfigureAwait(false); - } + var serializerManager = _cluster.Configuration.SerializerManager; + if (Configuration.GetOrCreatePoolingOptions(serializerManager.CurrentProtocolVersion).GetWarmup()) + { + await WarmupAsync(internalMetadata).ConfigureAwait(false); + } - if (Keyspace != null) - { - // Borrow a connection, trying to fail fast - var handler = Configuration.RequestHandlerFactory.Create(this, internalMetadata, serializerManager.GetCurrentSerializer()); - await handler.GetNextConnectionAsync(new Dictionary()).ConfigureAwait(false); - } + if (Keyspace != null) + { + // Borrow a connection, trying to fail fast + var handler = Configuration.RequestHandlerFactory.Create(this, internalMetadata, serializerManager.GetCurrentSerializer()); + await handler.GetNextConnectionAsync(new Dictionary()).ConfigureAwait(false); + } - _insightsClient.Initialize(internalMetadata); + _insightsClient.Initialize(internalMetadata); - var previousState = Interlocked.CompareExchange(ref _state, Session.Initialized, Session.Initializing); - if (previousState == Session.Disposed) - { - await ShutdownInternalAsync().ConfigureAwait(false); - throw new ObjectDisposedException("Session instance was disposed before initialization finished."); - } + var previousState = Interlocked.CompareExchange(ref _state, Session.Initialized, Session.Initializing); + if (previousState == Session.Disposed) + { + await ShutdownInternalAsync().ConfigureAwait(false); + throw new ObjectDisposedException("Session instance was disposed before initialization finished."); + } + + _initialized = true; - _initialized = true; + Task.Run(() => _initTaskCompletionSource.TrySetResult(internalMetadata)).Forget(); - return internalMetadata; + return internalMetadata; + + } + catch (Exception ex) + { + if (IsDisposed) + { + var newEx = new ObjectDisposedException("Session instance was disposed before initialization finished."); + Task.Run(() => _initTaskCompletionSource.TrySetException(newEx)).Forget(); + throw newEx; + } + + Task.Run(() => _initTaskCompletionSource.TrySetException(ex)).Forget(); + throw; + } } /// diff --git a/src/Cassandra/SessionManagement/IInternalCluster.cs b/src/Cassandra/SessionManagement/IInternalCluster.cs index c23a13b16..9e5338e11 100644 --- a/src/Cassandra/SessionManagement/IInternalCluster.cs +++ b/src/Cassandra/SessionManagement/IInternalCluster.cs @@ -42,7 +42,7 @@ internal interface IInternalCluster : ICluster /// ConcurrentDictionary PreparedQueries { get; } - Exception InitException { get; } + InitFatalErrorException InitException { get; } /// /// Executes the prepare request on the first host selected by the load balancing policy. From 301ff05adeeee90e5237d0285d642e5f56111274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Tue, 7 Jul 2020 14:01:49 +0100 Subject: [PATCH 20/31] fix init bug --- src/Cassandra/Session.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Cassandra/Session.cs b/src/Cassandra/Session.cs index 198d827bf..4647cfcca 100644 --- a/src/Cassandra/Session.cs +++ b/src/Cassandra/Session.cs @@ -342,7 +342,10 @@ private void WaitInit() { using (var waiter = new TaskTimeoutHelper(_initTaskCompletionSource.Task, _cluster.GetInitTimeout())) { - waiter.WaitWithTimeout(); + if (waiter.WaitWithTimeout()) + { + return; + } } throw new InitializationTimeoutException(); @@ -374,11 +377,14 @@ private async Task WaitInitAndGetMetadataAsync() throw new InitializationTimeoutException(); } - private async Task WaitInitAsync() + private async Task WaitInitAsync() { using (var waiter = new TaskTimeoutHelper(_initTaskCompletionSource.Task, _cluster.GetInitTimeout())) { - await waiter.WaitWithTimeoutAsync().ConfigureAwait(false); + if (await waiter.WaitWithTimeoutAsync().ConfigureAwait(false)) + { + return; + } } throw new InitializationTimeoutException(); From a571479a8b714b3cc1e6f3a406f0955b739a55bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Tue, 7 Jul 2020 22:27:26 +0100 Subject: [PATCH 21/31] moved init logic to single component --- .../Core/ControlConnectionTests.cs | 13 +- .../Control/ControlConnectionTests.cs | 18 +- .../FakeControlConnectionFactory.cs | 3 +- src/Cassandra.sln | 6 - src/Cassandra/Cluster.cs | 239 +++--------- .../Connections/Control/ControlConnection.cs | 26 +- .../Connections/Control/IControlConnection.cs | 3 +- .../Connections/Control/IInternalMetadata.cs | 6 +- .../Connections/Control/ITopologyMetadata.cs | 21 + .../Connections/Control/InternalMetadata.cs | 13 +- .../Connections/Control/TopologyMetadata.cs | 22 ++ src/Cassandra/Helpers/ClusterInitializer.cs | 365 ++++++++++++++++++ src/Cassandra/Helpers/SessionInitializer.cs | 271 +++++++++++++ src/Cassandra/Metadata.cs | 102 +---- src/Cassandra/Requests/TaskTimeoutHelper.cs | 16 + src/Cassandra/Session.cs | 247 +----------- .../SessionManagement/IInternalCluster.cs | 18 +- .../SessionManagement/IInternalSession.cs | 4 + 18 files changed, 835 insertions(+), 558 deletions(-) create mode 100644 src/Cassandra/Connections/Control/ITopologyMetadata.cs create mode 100644 src/Cassandra/Connections/Control/TopologyMetadata.cs create mode 100644 src/Cassandra/Helpers/ClusterInitializer.cs create mode 100644 src/Cassandra/Helpers/SessionInitializer.cs diff --git a/src/Cassandra.IntegrationTests/Core/ControlConnectionTests.cs b/src/Cassandra.IntegrationTests/Core/ControlConnectionTests.cs index d5a250a52..3b0276c2d 100644 --- a/src/Cassandra.IntegrationTests/Core/ControlConnectionTests.cs +++ b/src/Cassandra.IntegrationTests/Core/ControlConnectionTests.cs @@ -19,11 +19,13 @@ using System.Net; using Cassandra.Connections; using Cassandra.Connections.Control; +using Cassandra.Helpers; using Cassandra.IntegrationTests.TestBase; using Cassandra.ProtocolEvents; using NUnit.Framework; using Cassandra.IntegrationTests.TestClusterManagement; using Cassandra.SessionManagement; +using Cassandra.Tasks; using Cassandra.Tests; using Cassandra.Tests.Connections.TestHelpers; using Moq; @@ -35,18 +37,21 @@ public class ControlConnectionTests : TestGlobals { private const int InitTimeout = 2000; private ITestCluster _testCluster; + private IClusterInitializer _clusterInitializer; [OneTimeSetUp] public void SetupFixture() { _testCluster = TestClusterManager.CreateNew(); + _clusterInitializer = Mock.Of(); + Mock.Get(_clusterInitializer).Setup(c => c.PostInitializeAsync()).Returns(TaskHelper.Completed); } [Test] public void Should_Use_Maximum_Protocol_Version_Supported() { var cc = NewInstance(ProtocolVersion.MaxSupported, out var config); - cc.InitAsync().Wait(InitTimeout); + cc.InitAsync(_clusterInitializer).Wait(InitTimeout); Assert.AreEqual(GetProtocolVersion(), config.SerializerManager.CurrentProtocolVersion); cc.Dispose(); } @@ -61,7 +66,7 @@ public void Should_Use_Maximum_Protocol_Version_Provided() version = ProtocolVersion.V3; } var cc = NewInstance(version, out var config); - cc.InitAsync().Wait(InitTimeout); + cc.InitAsync(_clusterInitializer).Wait(InitTimeout); Assert.AreEqual(version, config.SerializerManager.CurrentProtocolVersion); cc.Dispose(); } @@ -72,7 +77,7 @@ public void Should_Downgrade_The_Protocol_Version() //Use a higher protocol version var version = (ProtocolVersion)(GetProtocolVersion() + 1); var cc = NewInstance(version, out var config); - cc.InitAsync().Wait(InitTimeout); + cc.InitAsync(_clusterInitializer).Wait(InitTimeout); Assert.AreEqual(version - 1, config.SerializerManager.CurrentProtocolVersion); } @@ -82,7 +87,7 @@ public void Should_Downgrade_The_Protocol_Version_With_Higher_Version_Than_Suppo // Use a non-existent higher cassandra protocol version var version = (ProtocolVersion)0x0f; var cc = NewInstance(version, out var config); - cc.InitAsync().Wait(InitTimeout); + cc.InitAsync(_clusterInitializer).Wait(InitTimeout); Assert.AreEqual(ProtocolVersion.V4, config.SerializerManager.CurrentProtocolVersion); } diff --git a/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs b/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs index 1e9d97f8c..83d8679d6 100644 --- a/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs +++ b/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs @@ -24,9 +24,11 @@ using System.Threading.Tasks; using Cassandra.Connections; using Cassandra.Connections.Control; +using Cassandra.Helpers; using Cassandra.ProtocolEvents; using Cassandra.Serialization; using Cassandra.SessionManagement; +using Cassandra.Tasks; using Cassandra.Tests.Connections.TestHelpers; using Cassandra.Tests.MetadataHelpers.TestHelpers; using Moq; @@ -135,9 +137,10 @@ private ControlConnectionCreateResult NewInstance( [Test] public async Task Should_SetCurrentHost_When_ANewConnectionIsOpened() { - using (var cc = NewInstance().ControlConnection) + var createResult = NewInstance(); + using (var cc = createResult.ControlConnection) { - await cc.InitAsync().ConfigureAwait(false); + await createResult.ControlConnection.InitAsync(createResult.Cluster.ClusterInitializer).ConfigureAwait(false); Assert.AreEqual("ut-dc", cc.Host.Datacenter); Assert.AreEqual("ut-rack", cc.Host.Rack); Assert.AreEqual(Version.Parse("2.2.1"), cc.Host.CassandraVersion); @@ -202,7 +205,7 @@ public void Should_NotAttemptDownOrIgnoredHosts() var config = createResult.Config; var cluster = createResult.Cluster; var cc = createResult.ControlConnection; - cc.InitAsync().GetAwaiter().GetResult(); + cc.InitAsync(cluster.ClusterInitializer).GetAwaiter().GetResult(); Assert.AreEqual(4, metadata.AllHosts().Count); var host2 = metadata.GetHost(new IPEndPoint(hostAddress2, ProtocolOptions.DefaultPort)); Assert.NotNull(host2); @@ -262,7 +265,7 @@ public async Task Should_NotLeakConnections_When_DisposeAndReconnectHappenSimult var config = createResult.Config; var cluster = createResult.Cluster; var cc = createResult.ControlConnection; - cc.InitAsync().GetAwaiter().GetResult(); + cc.InitAsync(cluster.ClusterInitializer).GetAwaiter().GetResult(); Assert.AreEqual(4, metadata.AllHosts().Count); Mock.Get(cluster) @@ -313,7 +316,7 @@ public void Should_ResolveContactPointsAndAttemptEveryOne_When_ContactPointResol var createResult = CreateForContactPointTest(keepContactPointsUnresolved); var target = createResult.ControlConnection; - Assert.ThrowsAsync(() => target.InitAsync()); + Assert.ThrowsAsync(() => target.InitAsync(createResult.Cluster.ClusterInitializer)); if (keepContactPointsUnresolved) { @@ -369,12 +372,15 @@ private ControlConnectionCreateResult CreateForContactPointTest(bool keepContact }); var metadata = new FakeMetadata(internalMetadata); var cluster = Mock.Of(); + var clusterInitializer = Mock.Of(); + Mock.Get(clusterInitializer).Setup(c => c.PostInitializeAsync()).Returns(TaskHelper.Completed); + Mock.Get(cluster).SetupGet(c => c.ClusterInitializer).Returns(clusterInitializer); Mock.Get(cluster).SetupGet(c => c.Metadata).Returns(metadata); return new ControlConnectionCreateResult { ConnectionFactory = connectionFactory, ControlConnection = (ControlConnection)metadata.InternalMetadata.ControlConnection, - Metadata = new Metadata(internalMetadata, default), + Metadata = new Metadata(cluster.ClusterInitializer, internalMetadata), InternalMetadata = internalMetadata, Cluster = cluster }; diff --git a/src/Cassandra.Tests/Connections/TestHelpers/FakeControlConnectionFactory.cs b/src/Cassandra.Tests/Connections/TestHelpers/FakeControlConnectionFactory.cs index 65b59d29e..2d41ff1c9 100644 --- a/src/Cassandra.Tests/Connections/TestHelpers/FakeControlConnectionFactory.cs +++ b/src/Cassandra.Tests/Connections/TestHelpers/FakeControlConnectionFactory.cs @@ -22,6 +22,7 @@ using Cassandra.Connections; using Cassandra.Connections.Control; +using Cassandra.Helpers; using Cassandra.ProtocolEvents; using Cassandra.Serialization; using Cassandra.SessionManagement; @@ -39,7 +40,7 @@ public IControlConnection Create( IEnumerable contactPoints) { var cc = Mock.Of(); - Mock.Get(cc).Setup(c => c.InitAsync(It.IsAny())).Returns(Task.Run(async () => + Mock.Get(cc).Setup(c => c.InitAsync(It.IsAny(), It.IsAny())).Returns(Task.Run(async () => { var cps = new Dictionary>(); foreach (var cp in contactPoints) diff --git a/src/Cassandra.sln b/src/Cassandra.sln index 36e9ff758..8fed67441 100644 --- a/src/Cassandra.sln +++ b/src/Cassandra.sln @@ -15,12 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cassandra.AppMetrics", "Extensions\Cassandra.AppMetrics\Cassandra.AppMetrics.csproj", "{93FA7B24-7B58-42E5-89E6-7F8023B03BA3}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B18A61A0-8552-476C-AE41-ED8F39396754}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - stylecop.json = stylecop.json - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/src/Cassandra/Cluster.cs b/src/Cassandra/Cluster.cs index 50c8d10de..ab64e1f5a 100644 --- a/src/Cassandra/Cluster.cs +++ b/src/Cassandra/Cluster.cs @@ -46,8 +46,6 @@ public class Cluster : IInternalCluster internal static readonly Logger Logger = new Logger(typeof(Cluster)); private readonly CopyOnWriteList _connectedSessions = new CopyOnWriteList(); private readonly bool _implicitContactPoint = false; - private volatile InitFatalErrorException _initException; - private volatile bool _initialized = false; private volatile TaskCompletionSource _initTaskCompletionSource = new TaskCompletionSource(); private readonly SemaphoreSlim _sessionCreateLock = new SemaphoreSlim(1, 1); @@ -55,21 +53,16 @@ private volatile TaskCompletionSource _initTaskCompletionSour private readonly IInternalMetadata _internalMetadata; private readonly Metadata _lazyMetadata; - private IReadOnlyList _loadBalancingPolicies; - - private readonly Task _initTask; - private readonly CancellationTokenSource _initCancellationTokenSource = new CancellationTokenSource(); - - private long _state = Cluster.Initializing; + private readonly IClusterInitializer _clusterInitializer; + private readonly IReadOnlyList _loadBalancingPolicies; + private readonly IReadOnlyList _speculativeExecutionPolicies; internal IInternalCluster InternalRef => this; IInternalMetadata IInternalCluster.InternalMetadata => _internalMetadata; - private bool IsDisposed => Interlocked.Read(ref _state) == Cluster.Disposed; - - InitFatalErrorException IInternalCluster.InitException => _initException; - + IClusterInitializer IInternalCluster.ClusterInitializer => _clusterInitializer; + /// ConcurrentDictionary IInternalCluster.PreparedQueries { get; } = new ConcurrentDictionary(new ByteArrayComparer()); @@ -124,6 +117,18 @@ public static Builder Builder() private Cluster(IEnumerable contactPoints, Configuration configuration) { Configuration = configuration; + + // Collect all policies in collections + var loadBalancingPolicies = new HashSet(new ReferenceEqualityComparer()); + var speculativeExecutionPolicies = new HashSet(new ReferenceEqualityComparer()); + foreach (var options in Configuration.RequestOptions.Values) + { + loadBalancingPolicies.Add(options.LoadBalancingPolicy); + speculativeExecutionPolicies.Add(options.SpeculativeExecutionPolicy); + } + + _loadBalancingPolicies = loadBalancingPolicies.ToList(); + _speculativeExecutionPolicies = speculativeExecutionPolicies.ToList(); var contactPointsList = contactPoints.ToList(); if (contactPointsList.Count == 0) @@ -136,146 +141,41 @@ private Cluster(IEnumerable contactPoints, Configuration configuration) var parsedContactPoints = configuration.ContactPointParser.ParseContactPoints(contactPointsList); _internalMetadata = new InternalMetadata(this, configuration, parsedContactPoints); - _lazyMetadata = new Metadata(_internalMetadata, _initCancellationTokenSource.Token); + _clusterInitializer = new ClusterInitializer(this, _internalMetadata); + _lazyMetadata = new Metadata(_clusterInitializer, _internalMetadata); - _initTask = Task.Run(InitInternalAsync); + _clusterInitializer.Initialize(); } - - /// - Task IInternalCluster.TryInitAndGetMetadataAsync() + + async Task IInternalCluster.PostInitializeAsync() { - if (_initialized) - { - //It was already initialized - return Task.FromResult(_internalMetadata); - } - - var currentState = Interlocked.Read(ref _state); - if (currentState == Cluster.Disposed) + _lazyMetadata.SetupEventForwarding(); + SetMetadataDependentOptions(); + + // initialize the local datacenter provider + Configuration.LocalDatacenterProvider.Initialize(this, _internalMetadata); + + // Initialize policies + foreach (var lbp in _loadBalancingPolicies) { - throw new ObjectDisposedException("This cluster object has been disposed."); + await lbp.InitializeAsync(Metadata).ConfigureAwait(false); } - if (_initException != null) + foreach (var sep in _speculativeExecutionPolicies) { - //There was an exception that is not possible to recover from - throw _initException; + await sep.InitializeAsync(Metadata).ConfigureAwait(false); } - return _initTaskCompletionSource.Task; - } + InitializeHostDistances(); - private async Task InitInternalAsync() + _internalMetadata.Hosts.Up += OnHostUp; + } + + private void SetMetadataDependentOptions() { - Cluster.Logger.Info("Connecting to cluster using {0}", Cluster.GetAssemblyInfo()); - try + if (_internalMetadata.IsDbaas) { - // Collect all policies in collections - var loadBalancingPolicies = new HashSet(new ReferenceEqualityComparer()); - var speculativeExecutionPolicies = new HashSet(new ReferenceEqualityComparer()); - foreach (var options in Configuration.RequestOptions.Values) - { - loadBalancingPolicies.Add(options.LoadBalancingPolicy); - speculativeExecutionPolicies.Add(options.SpeculativeExecutionPolicy); - } - - _loadBalancingPolicies = loadBalancingPolicies.ToList(); - - var reconnectionSchedule = Configuration.Policies.ReconnectionPolicy.NewSchedule(); - - do - { - try - { - await _lazyMetadata.TryInitializeAsync().ConfigureAwait(false); - break; - } - catch (Exception ex) - { - if (IsDisposed) - { - throw new ObjectDisposedException("Cluster instance was disposed before initialization finished."); - } - - var currentTcs = _initTaskCompletionSource; - - var delay = reconnectionSchedule.NextDelayMs(); - Cluster.Logger.Error(ex, "Cluster initialization failed. Retrying in {0} ms.", delay); - Task.Run(() => currentTcs.TrySetException( - new InitializationErrorException( - "Cluster initialization failed. See inner exception. " + - "The driver will attempt to retry the initialization according to the reconnection policy " + - "schedule."))).Forget(); - - try - { - await Task.Delay( - TimeSpan.FromMilliseconds(delay), - _initCancellationTokenSource.Token).ConfigureAwait(false); - } - finally - { - _initTaskCompletionSource = new TaskCompletionSource(); - } - - } - } while (!IsDisposed); - - if (IsDisposed) - { - throw new ObjectDisposedException("Cluster instance was disposed before initialization finished."); - } - - // initialize the local datacenter provider - Configuration.LocalDatacenterProvider.Initialize(this, _internalMetadata); - - // Initialize policies - foreach (var lbp in loadBalancingPolicies) - { - await lbp.InitializeAsync(Metadata).ConfigureAwait(false); - } - - foreach (var sep in speculativeExecutionPolicies) - { - await sep.InitializeAsync(Metadata).ConfigureAwait(false); - } - - InitializeHostDistances(); - - _internalMetadata.Hosts.Up += OnHostUp; - - var previousState = Interlocked.CompareExchange(ref _state, Cluster.Initialized, Cluster.Initializing); - if (previousState == Cluster.Disposed) - { - await ShutdownInternalAsync().ConfigureAwait(false); - throw new ObjectDisposedException("Cluster instance was disposed before initialization finished."); - } - - _initialized = true; - - Cluster.Logger.Info("Cluster Connected using binary protocol version: [" - + Configuration.SerializerManager.CurrentProtocolVersion - + "]"); - Cluster.Logger.Info("Cluster [" + _internalMetadata.ClusterName + "] has been initialized."); - - Task.Run(() => _initTaskCompletionSource.TrySetResult(_internalMetadata)).Forget(); - return _internalMetadata; - } - catch (Exception ex) - { - if (IsDisposed) - { - var newEx = new ObjectDisposedException("Cluster instance was disposed before initialization finished."); - Task.Run(() => _initTaskCompletionSource.TrySetException(newEx)).Forget(); - throw newEx; - } - - //There was an error that the driver is not able to recover from - //Store the exception for the following times - _initException = new InitFatalErrorException(ex); - //Throw the actual exception for the first time - Task.Run(() => _initTaskCompletionSource.TrySetException(ex)).Forget(); - throw; + Configuration.SetDefaultConsistencyLevel(ConsistencyLevel.LocalQuorum); } } @@ -299,14 +199,7 @@ TimeSpan IInternalCluster.GetInitTimeout() initialAbortTimeoutMs = Math.Max(initialAbortTimeoutMs, Configuration.SocketOptions.MetadataAbortTimeoutMs); return TimeSpan.FromMilliseconds(initialAbortTimeoutMs); } - - private static string GetAssemblyInfo() - { - var assembly = typeof(ISession).GetTypeInfo().Assembly; - var info = FileVersionInfo.GetVersionInfo(assembly.Location); - return $"{info.ProductName} v{info.FileVersion}"; - } - + IReadOnlyDictionary> IInternalCluster.GetResolvedEndpoints() { return _internalMetadata.ResolvedContactPoints; @@ -346,7 +239,7 @@ public async Task ConnectAsync(string keyspace) await _sessionCreateLock.WaitAsync().ConfigureAwait(false); try { - if (IsDisposed) + if (_clusterInitializer.IsDisposed) { throw new ObjectDisposedException("This cluster instance is disposed."); } @@ -439,11 +332,13 @@ public void Shutdown(int timeoutMs = Timeout.Infinite) } /// - public async Task ShutdownAsync(int timeoutMs = Timeout.Infinite) + public Task ShutdownAsync(int timeoutMs = Timeout.Infinite) { - var previousState = Interlocked.Exchange(ref _state, Cluster.Disposed); - _initialized = false; + return _clusterInitializer.ShutdownAsync(timeoutMs); + } + async Task IInternalCluster.PreShutdownAsync(int timeoutMs) + { IEnumerable sessions; await _sessionCreateLock.WaitAsync().ConfigureAwait(false); try @@ -469,50 +364,14 @@ public async Task ShutdownAsync(int timeoutMs = Timeout.Infinite) { Cluster.Logger.Warning("Exception occured while disposing session instances: {0}", ex.ToString()); } - - if (previousState == Cluster.Initializing) - { - _initCancellationTokenSource.Cancel(); - } - - if (previousState != Cluster.Initialized) - { - try - { - await _initTask.ConfigureAwait(false); - } - catch (Exception) - { - // ignored - } - } - - if (previousState != Cluster.Disposed) - { - _initCancellationTokenSource.Dispose(); - } - - if (previousState == Cluster.Initialized) - { - await ShutdownInternalAsync().ConfigureAwait(false); - } - - Cluster.Logger.Info("Cluster [" + _internalMetadata.ClusterName + "] has been shut down."); } - private async Task ShutdownInternalAsync() + async Task IInternalCluster.PostShutdownAsync() { - await _lazyMetadata.ShutdownAsync().ConfigureAwait(false); Configuration.Timer.Dispose(); // Dispose policies - var speculativeExecutionPolicies = new HashSet(new ReferenceEqualityComparer()); - foreach (var options in Configuration.RequestOptions.Values) - { - speculativeExecutionPolicies.Add(options.SpeculativeExecutionPolicy); - } - - foreach (var sep in speculativeExecutionPolicies) + foreach (var sep in _speculativeExecutionPolicies) { await sep.ShutdownAsync().ConfigureAwait(false); } diff --git a/src/Cassandra/Connections/Control/ControlConnection.cs b/src/Cassandra/Connections/Control/ControlConnection.cs index 93e684df9..180e0c5c6 100644 --- a/src/Cassandra/Connections/Control/ControlConnection.cs +++ b/src/Cassandra/Connections/Control/ControlConnection.cs @@ -22,7 +22,7 @@ using System.Net.Sockets; using System.Threading; using System.Threading.Tasks; - +using Cassandra.Helpers; using Cassandra.ProtocolEvents; using Cassandra.Responses; using Cassandra.SessionManagement; @@ -51,6 +51,7 @@ internal class ControlConnection : IControlConnection private volatile Host _host; private volatile IConnectionEndPoint _currentConnectionEndPoint; private volatile IConnection _connection; + private volatile IClusterInitializer _clusterInitializer; private bool IsShutdown => Interlocked.Read(ref _isShutdown) > 0L; @@ -93,8 +94,9 @@ public void Dispose() } /// - public async Task InitAsync(CancellationToken token = default(CancellationToken)) + public async Task InitAsync(IClusterInitializer clusterInitializer, CancellationToken token = default) { + _clusterInitializer = clusterInitializer; ControlConnection.Logger.Info("Trying to connect the ControlConnection"); await Connect(true, token).ConfigureAwait(false); } @@ -233,12 +235,12 @@ private bool IsHostValid(Host host, bool initializing) /// and Connection events. /// /// - /// Determines whether the ControlConnection is connecting for the first time as part of the initialization. + /// Whether this connection attempt is part of the initialization process. /// /// Used to cancel initialization /// /// - private async Task Connect(bool isInitializing, CancellationToken token = default(CancellationToken)) + private async Task Connect(bool isInitializing, CancellationToken token = default) { // lazy iterator of endpoints to try for the control connection IEnumerable>> endPointResolutionTasksLazyIterator = @@ -250,7 +252,6 @@ private bool IsHostValid(Host host, bool initializing) // start with endpoints from the default LBP if it is already initialized if (!isInitializing) { - await _cluster.TryInitAndGetMetadataAsync().ConfigureAwait(false); endPointResolutionTasksLazyIterator = DefaultLbpHostsEnumerable(attemptedContactPoints, attemptedHosts); } @@ -329,7 +330,8 @@ await _config.ProtocolVersionNegotiator.ChangeProtocolVersion( { await _supportedOptionsInitializer.ApplySupportedOptionsAsync(connection).ConfigureAwait(false); } - + + await _config.ServerEventsSubscriber.SubscribeToServerEvents(connection, OnConnectionCassandraEvent).ConfigureAwait(false); var currentHost = await _topologyRefresher.RefreshNodeListAsync( endPoint, connection, _config.SerializerManager.GetCurrentSerializer()).ConfigureAwait(false); @@ -340,12 +342,16 @@ await _config.ProtocolVersionNegotiator.ChangeProtocolVersion( await _config.ProtocolVersionNegotiator.NegotiateVersionAsync( _config, _internalMetadata, connection).ConfigureAwait(false); } - - await _config.ServerEventsSubscriber.SubscribeToServerEvents(connection, OnConnectionCassandraEvent).ConfigureAwait(false); + await _internalMetadata.RebuildTokenMapAsync(false, _config.MetadataSyncOptions.MetadataSyncEnabled).ConfigureAwait(false); - _host.Down += OnHostDown; + if (isInitializing) + { + await _clusterInitializer.PostInitializeAsync().ConfigureAwait(false); + } + _host.Down += OnHostDown; + return; } catch (Exception ex) @@ -534,7 +540,7 @@ private async void OnConnectionCassandraEvent(object sender, CassandraEventArgs try { // make sure the cluster object has finished initializing before processing protocol events - await _cluster.TryInitAndGetMetadataAsync().ConfigureAwait(false); + await _clusterInitializer.WaitInitAsync().ConfigureAwait(false); //This event is invoked from a worker thread (not a IO thread) if (e is TopologyChangeEventArgs tce) diff --git a/src/Cassandra/Connections/Control/IControlConnection.cs b/src/Cassandra/Connections/Control/IControlConnection.cs index 4fa426ddd..f407f7fc1 100644 --- a/src/Cassandra/Connections/Control/IControlConnection.cs +++ b/src/Cassandra/Connections/Control/IControlConnection.cs @@ -17,6 +17,7 @@ using System; using System.Threading; using System.Threading.Tasks; +using Cassandra.Helpers; namespace Cassandra.Connections.Control { @@ -34,7 +35,7 @@ internal interface IControlConnection : IMetadataQueryProvider, IDisposable /// /// /// - Task InitAsync(CancellationToken token = default(CancellationToken)); + Task InitAsync(IClusterInitializer clusterInitializer, CancellationToken token = default); /// /// Updates keyspace metadata and token map if necessary. diff --git a/src/Cassandra/Connections/Control/IInternalMetadata.cs b/src/Cassandra/Connections/Control/IInternalMetadata.cs index 2606e8b61..230faf3dc 100644 --- a/src/Cassandra/Connections/Control/IInternalMetadata.cs +++ b/src/Cassandra/Connections/Control/IInternalMetadata.cs @@ -62,11 +62,7 @@ internal interface IInternalMetadata ProtocolVersion ProtocolVersion { get; } KeyValuePair[] KeyspacesSnapshot { get; } - - Task InitAsync(CancellationToken token = default(CancellationToken)); - - Task ShutdownAsync(); - + void SetResolvedContactPoints( IDictionary> resolvedContactPoints); diff --git a/src/Cassandra/Connections/Control/ITopologyMetadata.cs b/src/Cassandra/Connections/Control/ITopologyMetadata.cs new file mode 100644 index 000000000..105c6b9dc --- /dev/null +++ b/src/Cassandra/Connections/Control/ITopologyMetadata.cs @@ -0,0 +1,21 @@ +// +// Copyright (C) DataStax Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +namespace Cassandra.Connections.Control +{ + internal interface ITopologyMetadata + { + } +} \ No newline at end of file diff --git a/src/Cassandra/Connections/Control/InternalMetadata.cs b/src/Cassandra/Connections/Control/InternalMetadata.cs index 6b0c2217a..a533dd281 100644 --- a/src/Cassandra/Connections/Control/InternalMetadata.cs +++ b/src/Cassandra/Connections/Control/InternalMetadata.cs @@ -121,18 +121,7 @@ internal InternalMetadata( _schemaParser = schemaParser; } - - public Task InitAsync(CancellationToken token = default(CancellationToken)) - { - return ControlConnection.InitAsync(token); - } - - public Task ShutdownAsync() - { - ControlConnection.Dispose(); - return Configuration.ProtocolEventDebouncer.ShutdownAsync(); - } - + public void SetResolvedContactPoints( IDictionary> resolvedContactPoints) { diff --git a/src/Cassandra/Connections/Control/TopologyMetadata.cs b/src/Cassandra/Connections/Control/TopologyMetadata.cs new file mode 100644 index 000000000..3bd277d13 --- /dev/null +++ b/src/Cassandra/Connections/Control/TopologyMetadata.cs @@ -0,0 +1,22 @@ +// +// Copyright (C) DataStax Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +namespace Cassandra.Connections.Control +{ + internal class TopologyMetadata : ITopologyMetadata + { + + } +} \ No newline at end of file diff --git a/src/Cassandra/Helpers/ClusterInitializer.cs b/src/Cassandra/Helpers/ClusterInitializer.cs new file mode 100644 index 000000000..3da5e92de --- /dev/null +++ b/src/Cassandra/Helpers/ClusterInitializer.cs @@ -0,0 +1,365 @@ +// +// Copyright (C) DataStax Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Reflection; +using System.Threading; +using System.Threading.Tasks; +using Cassandra.Connections.Control; +using Cassandra.Requests; +using Cassandra.SessionManagement; +using Cassandra.Tasks; + +namespace Cassandra.Helpers +{ + internal class ClusterInitializer : IClusterInitializer + { + private const int Disposed = 10; + private const int Initialized = 5; + private const int Initializing = 1; + + private static readonly Logger Logger = new Logger(typeof(ClusterInitializer)); + + private readonly IInternalCluster _cluster; + private readonly IInternalMetadata _internalMetadata; + private readonly CancellationTokenSource _initCancellationTokenSource = new CancellationTokenSource(); + private readonly IList> _initCallbacks = new List>(); + private readonly object _initCallbackLock = new object(); + + private volatile bool _initialized = false; + private volatile Task _initTask; + private volatile TaskCompletionSource _initTaskCompletionSource + = new TaskCompletionSource(); + + private volatile InitFatalErrorException _initException; + + private long _state = ClusterInitializer.Initializing; + + public ClusterInitializer( + IInternalCluster cluster, IInternalMetadata internalMetadata) + { + _cluster = cluster; + _internalMetadata = internalMetadata; + } + + public void Initialize() + { + _initTask = Task.Run(InitInternalAsync); + } + + /// + /// Called by the control connection after initializing + /// + /// + public async Task PostInitializeAsync() + { + await _cluster.PostInitializeAsync().ConfigureAwait(false); + } + + private static string GetAssemblyInfo() + { + var assembly = typeof(ISession).GetTypeInfo().Assembly; + var info = FileVersionInfo.GetVersionInfo(assembly.Location); + return $"{info.ProductName} v{info.FileVersion}"; + } + + public bool TryAttachInitCallback(Func callback) + { + if (_initialized) + { + return false; + } + + if (IsDisposed) + { + return false; + } + + lock (_initCallbackLock) + { + if (_initialized) + { + return false; + } + + if (IsDisposed) + { + return false; + } + + _initCallbacks.Add(callback); + return true; + } + } + + public bool IsDisposed => Interlocked.Read(ref _state) == ClusterInitializer.Disposed; + + private async Task InitInternalAsync() + { + ClusterInitializer.Logger.Info("Connecting to cluster using {0}", GetAssemblyInfo()); + try + { + var reconnectionSchedule = _cluster.Configuration.Policies.ReconnectionPolicy.NewSchedule(); + + do + { + try + { + await _internalMetadata.ControlConnection.InitAsync(this).ConfigureAwait(false); + break; + } + catch (Exception ex) + { + if (IsDisposed) + { + throw new ObjectDisposedException("Cluster instance was disposed before initialization finished."); + } + + var currentTcs = _initTaskCompletionSource; + + var delay = reconnectionSchedule.NextDelayMs(); + ClusterInitializer.Logger.Error(ex, "Cluster initialization failed. Retrying in {0} ms.", delay); + Task.Run(() => currentTcs.TrySetException( + new InitializationErrorException( + "Cluster initialization failed. See inner exception. " + + "The driver will attempt to retry the initialization according to the reconnection policy " + + "schedule."))).Forget(); + + try + { + await Task.Delay( + TimeSpan.FromMilliseconds(delay), + _initCancellationTokenSource.Token).ConfigureAwait(false); + } + finally + { + _initTaskCompletionSource = new TaskCompletionSource(); + } + + } + } while (!IsDisposed); + + if (IsDisposed) + { + throw new ObjectDisposedException("Cluster instance was disposed before initialization finished."); + } + + var previousState = Interlocked.CompareExchange(ref _state, ClusterInitializer.Initialized, ClusterInitializer.Initializing); + if (previousState == ClusterInitializer.Disposed) + { + await ShutdownInternalAsync().ConfigureAwait(false); + throw new ObjectDisposedException("Cluster instance was disposed before initialization finished."); + } + + _initialized = true; + + ClusterInitializer.Logger.Info("Cluster Connected using binary protocol version: [" + + _cluster.Configuration.SerializerManager.CurrentProtocolVersion + + "]"); + ClusterInitializer.Logger.Info("Cluster [" + _internalMetadata.ClusterName + "] has been initialized."); + + Task.Run(() => _initTaskCompletionSource.TrySetResult(_internalMetadata)).Forget(); + + Task.Run(async () => + { + IList> callbacks; + lock (_initCallbackLock) + { + callbacks = new List>(_initCallbacks); + _initCallbacks.Clear(); + } + + await Task.WhenAll(callbacks.Select(c => c.Invoke())).ConfigureAwait(false); + }).Forget(); + return; + } + catch (Exception ex) + { + if (IsDisposed) + { + var newEx = new ObjectDisposedException("Cluster instance was disposed before initialization finished."); + Task.Run(() => _initTaskCompletionSource.TrySetException(newEx)).Forget(); + throw newEx; + } + + //There was an error that the driver is not able to recover from + //Store the exception for the following times + _initException = new InitFatalErrorException(ex); + //Throw the actual exception for the first time + Task.Run(() => _initTaskCompletionSource.TrySetException(ex)).Forget(); + throw; + } + } + + public void WaitInit() + { + if (_initialized) + { + //It was already initialized + return; + } + + WaitInitInternal(); + } + + public IInternalMetadata WaitInitAndGetMetadata() + { + if (_initialized) + { + //It was already initialized + return _internalMetadata; + } + + return WaitInitInternal(); + } + + public Task WaitInitAndGetMetadataAsync() + { + if (_initialized) + { + //It was already initialized + return Task.FromResult(_internalMetadata); + } + + return WaitInitInternalAsync(); + } + + public Task WaitInitAsync() + { + if (_initialized) + { + //It was already initialized + return TaskHelper.Completed; + } + + return WaitInitInternalAsync(); + } + private IInternalMetadata WaitInitInternal() + { + ValidateState(); + + using (var waiter = new TaskTimeoutHelper(_initTaskCompletionSource.Task, _cluster.GetInitTimeout())) + { + if (waiter.WaitWithTimeout()) + { + return _initTaskCompletionSource.Task.Result; + } + } + + throw new InitializationTimeoutException(); + } + + private async Task WaitInitInternalAsync() + { + ValidateState(); + + using (var waiter = new TaskTimeoutHelper(_initTaskCompletionSource.Task, _cluster.GetInitTimeout())) + { + if (await waiter.WaitWithTimeoutAsync().ConfigureAwait(false)) + { + return _initTaskCompletionSource.Task.Result; + } + } + + throw new InitializationTimeoutException(); + } + + private void ValidateState() + { + var currentState = Interlocked.Read(ref _state); + if (currentState == ClusterInitializer.Disposed) + { + throw new ObjectDisposedException("This cluster object has been disposed."); + } + + if (_initException != null) + { + //There was an exception that is not possible to recover from + throw _initException; + } + } + + public async Task ShutdownAsync(int timeoutMs = Timeout.Infinite) + { + var previousState = Interlocked.Exchange(ref _state, ClusterInitializer.Disposed); + _initialized = false; + + if (previousState != ClusterInitializer.Disposed) + { + await _cluster.PreShutdownAsync(timeoutMs).ConfigureAwait(false); + } + + if (previousState == ClusterInitializer.Initializing) + { + _initCancellationTokenSource.Cancel(); + } + + if (previousState != ClusterInitializer.Initialized) + { + try + { + await _initTask.ConfigureAwait(false); + } + catch (Exception) + { + // ignored + } + } + + if (previousState != ClusterInitializer.Disposed) + { + _initCancellationTokenSource.Dispose(); + } + + if (previousState == ClusterInitializer.Initialized) + { + await ShutdownInternalAsync().ConfigureAwait(false); + ClusterInitializer.Logger.Info("Cluster [" + _internalMetadata.ClusterName + "] has been shut down."); + } + } + + private async Task ShutdownInternalAsync() + { + _internalMetadata.ControlConnection.Dispose(); + await _cluster.Configuration.ProtocolEventDebouncer.ShutdownAsync().ConfigureAwait(false); + await _cluster.PostShutdownAsync().ConfigureAwait(false); + } + } + + internal interface IClusterInitializer + { + bool TryAttachInitCallback(Func callback); + + bool IsDisposed { get; } + + void Initialize(); + + Task PostInitializeAsync(); + + void WaitInit(); + + IInternalMetadata WaitInitAndGetMetadata(); + + Task WaitInitAndGetMetadataAsync(); + + Task WaitInitAsync(); + + Task ShutdownAsync(int timeoutMs = Timeout.Infinite); + } +} \ No newline at end of file diff --git a/src/Cassandra/Helpers/SessionInitializer.cs b/src/Cassandra/Helpers/SessionInitializer.cs new file mode 100644 index 000000000..65bb3b427 --- /dev/null +++ b/src/Cassandra/Helpers/SessionInitializer.cs @@ -0,0 +1,271 @@ +// +// Copyright (C) DataStax Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using System; +using System.Diagnostics; +using System.Reflection; +using System.Threading; +using System.Threading.Tasks; +using Cassandra.Connections.Control; +using Cassandra.Requests; +using Cassandra.SessionManagement; +using Cassandra.Tasks; + +namespace Cassandra.Helpers +{ + internal class SessionInitializer : ISessionInitializer + { + private const int Disposed = 10; + private const int Initialized = 5; + private const int Initializing = 1; + + private static readonly Logger Logger = new Logger(typeof(SessionInitializer)); + + private readonly IInternalSession _session; + private readonly CancellationTokenSource _initCancellationTokenSource = new CancellationTokenSource(); + + private volatile bool _initialized = false; + private volatile Task _initTask; + private volatile TaskCompletionSource _initTaskCompletionSource + = new TaskCompletionSource(); + + private volatile InitFatalErrorException _initException; + + private long _state = SessionInitializer.Initializing; + + public SessionInitializer(IInternalSession session) + { + _session = session; + } + + public bool IsInitialized => _initialized; + + public void Initialize() + { + if (_session.InternalCluster.ClusterInitializer.TryAttachInitCallback(InitInternalAsync)) + { + return; + } + + if (_session.InternalCluster.ClusterInitializer.IsDisposed) + { + return; + } + + _initTask = Task.Run(InitInternalAsync); + } + + public bool IsDisposed => Interlocked.Read(ref _state) == SessionInitializer.Disposed; + + private async Task InitInternalAsync() + { + SessionInitializer.Logger.Info("Connecting to session [{0}]", _session.SessionName); + try + { + if (IsDisposed) + { + throw new ObjectDisposedException("Session instance was disposed before initialization finished."); + } + + await _session.PostInitializeAsync().ConfigureAwait(false); + + var previousState = Interlocked.CompareExchange(ref _state, SessionInitializer.Initialized, SessionInitializer.Initializing); + if (previousState == SessionInitializer.Disposed) + { + await _session.OnShutdownAsync().ConfigureAwait(false); + throw new ObjectDisposedException("Session instance was disposed before initialization finished."); + } + + _initialized = true; + + SessionInitializer.Logger.Info("Session [{0}] has been initialized.", _session.SessionName); + + Task.Run(() => _initTaskCompletionSource.TrySetResult(_session.InternalCluster.InternalMetadata)).Forget(); + return; + } + catch (Exception ex) + { + if (IsDisposed) + { + var newEx = new ObjectDisposedException("Session instance was disposed before initialization finished."); + Task.Run(() => _initTaskCompletionSource.TrySetException(newEx)).Forget(); + throw newEx; + } + + //There was an error that the driver is not able to recover from + //Store the exception for the following times + _initException = new InitFatalErrorException(ex); + //Throw the actual exception for the first time + Task.Run(() => _initTaskCompletionSource.TrySetException(ex)).Forget(); + throw; + } + } + + public void WaitInit() + { + if (_initialized) + { + //It was already initialized + return; + } + + WaitInitInternal(); + } + + public IInternalMetadata WaitInitAndGetMetadata() + { + if (_initialized) + { + //It was already initialized + return _session.InternalCluster.InternalMetadata; + } + + return WaitInitInternal(); + } + + public Task WaitInitAndGetMetadataAsync() + { + if (_initialized) + { + //It was already initialized + return Task.FromResult(_session.InternalCluster.InternalMetadata); + } + + return WaitInitInternalAsync(); + } + + public Task WaitInitAsync() + { + if (_initialized) + { + //It was already initialized + return TaskHelper.Completed; + } + + return WaitInitInternalAsync(); + } + private IInternalMetadata WaitInitInternal() + { + ValidateState(); + + using (var waiter = new TaskTimeoutHelper( + new [] + { + _session.InternalCluster.ClusterInitializer.WaitInitAsync(), + _initTaskCompletionSource.Task + }, + _session.InternalCluster.GetInitTimeout())) + { + if (waiter.WaitWithTimeout()) + { + return _initTaskCompletionSource.Task.Result; + } + } + + throw new InitializationTimeoutException(); + } + + private async Task WaitInitInternalAsync() + { + ValidateState(); + + using (var waiter = new TaskTimeoutHelper( + new [] + { + _session.InternalCluster.ClusterInitializer.WaitInitAsync(), + _initTaskCompletionSource.Task + }, + _session.InternalCluster.GetInitTimeout())) + { + if (await waiter.WaitWithTimeoutAsync().ConfigureAwait(false)) + { + return _initTaskCompletionSource.Task.Result; + } + } + + throw new InitializationTimeoutException(); + } + + private void ValidateState() + { + var currentState = Interlocked.Read(ref _state); + if (currentState == SessionInitializer.Disposed) + { + throw new ObjectDisposedException("This session object has been disposed."); + } + + if (_initException != null) + { + //There was an exception that is not possible to recover from + throw _initException; + } + } + + public async Task ShutdownAsync(int timeoutMs = Timeout.Infinite) + { + var previousState = Interlocked.Exchange(ref _state, SessionInitializer.Disposed); + _initialized = false; + + if (previousState == SessionInitializer.Initializing) + { + _initCancellationTokenSource.Cancel(); + } + + if (previousState != SessionInitializer.Initialized) + { + try + { + if (_initTask != null) + { + await _initTask.ConfigureAwait(false); + } + } + catch (Exception) + { + // ignored + } + } + + if (previousState != SessionInitializer.Disposed) + { + _initCancellationTokenSource.Dispose(); + } + + if (previousState == SessionInitializer.Initialized) + { + await _session.OnShutdownAsync().ConfigureAwait(false); + SessionInitializer.Logger.Info("Session [{0}] has been shut down.", _session.SessionName); + } + } + } + + internal interface ISessionInitializer + { + bool IsDisposed { get; } + bool IsInitialized { get; } + + void Initialize(); + + void WaitInit(); + + IInternalMetadata WaitInitAndGetMetadata(); + + Task WaitInitAndGetMetadataAsync(); + + Task WaitInitAsync(); + + Task ShutdownAsync(int timeoutMs = Timeout.Infinite); + } +} \ No newline at end of file diff --git a/src/Cassandra/Metadata.cs b/src/Cassandra/Metadata.cs index a2eb6c076..b95bc9815 100644 --- a/src/Cassandra/Metadata.cs +++ b/src/Cassandra/Metadata.cs @@ -21,6 +21,7 @@ using System.Threading.Tasks; using Cassandra.Connections.Control; +using Cassandra.Helpers; using Cassandra.Tasks; namespace Cassandra @@ -28,24 +29,14 @@ namespace Cassandra /// internal class Metadata : IMetadata { - private const int Disposed = 10; - private const int Initialized = 5; - private const int Initializing = 1; - private const int NotInitialized = 0; - + private readonly IClusterInitializer _clusterInitializer; private readonly int _queryAbortTimeout; - private readonly CancellationToken _cancellationToken; - - private volatile Task _initTask; - private volatile bool _initialized = false; - - private long _state = Metadata.NotInitialized; internal IInternalMetadata InternalMetadata { get; } - internal Metadata(IInternalMetadata internalMetadata, CancellationToken cancellationToken) + internal Metadata(IClusterInitializer clusterInitializer, IInternalMetadata internalMetadata) { - _cancellationToken = cancellationToken; + _clusterInitializer = clusterInitializer; Configuration = internalMetadata.Configuration; _queryAbortTimeout = Configuration.DefaultRequestOptions.QueryAbortTimeout; InternalMetadata = internalMetadata; @@ -311,71 +302,12 @@ public async Task CheckSchemaAgreementAsync() internal Task TryInitializeAsync() { - if (_initialized) - { - //It was already initialized - return TaskHelper.Completed; - } - - TryLaunchInitTask(); - return _initTask; + return _clusterInitializer.WaitInitAsync(); } internal void TryInitialize() { - if (_initialized) - { - //It was already initialized - return; - } - - TryLaunchInitTask(); - _initTask.GetAwaiter().GetResult(); - } - - private void TryLaunchInitTask() - { - var currentState = Interlocked.Read(ref _state); - if (currentState == Metadata.Disposed) - { - throw new ObjectDisposedException("This metadata object has been disposed."); - } - - if (Interlocked.CompareExchange(ref _state, Metadata.Initializing, Metadata.NotInitialized) - == Metadata.NotInitialized) - { - _initTask = Task.Run(() => InitializeInternalAsync(_cancellationToken)); - } - } - - private async Task InitializeInternalAsync(CancellationToken token = default(CancellationToken)) - { - await InternalMetadata.InitAsync(token).ConfigureAwait(false); - SetupEventForwarding(InternalMetadata); - - var previousState = Interlocked.CompareExchange(ref _state, Metadata.Initialized, Metadata.Initializing); - if (previousState == Metadata.Disposed) - { - await InternalMetadata.ShutdownAsync().ConfigureAwait(false); - throw new ObjectDisposedException("Metadata instance was disposed before initialization finished."); - } - - // Set metadata dependent options - SetMetadataDependentOptions(); - - _initialized = true; - } - - internal async Task ShutdownAsync() - { - var previousState = Interlocked.Exchange(ref _state, Metadata.Disposed); - _initialized = false; - if (previousState != Metadata.Initialized) - { - return; - } - - await InternalMetadata.ShutdownAsync().ConfigureAwait(false); + _clusterInitializer.WaitInit(); } private void OnInternalHostRemoved(Host h) @@ -398,22 +330,14 @@ private void OnInternalSchemaChangedEvent(object sender, SchemaChangedEventArgs SchemaChangedEvent?.Invoke(sender, args); } - private void SetupEventForwarding(IInternalMetadata internalMetadata) - { - internalMetadata.Hosts.Added += internalMetadata.OnHostAdded; - internalMetadata.Hosts.Removed += internalMetadata.OnHostRemoved; - internalMetadata.HostAdded += OnInternalHostAdded; - internalMetadata.HostRemoved += OnInternalHostRemoved; - internalMetadata.HostsEvent += OnInternalHostsEvent; - internalMetadata.SchemaChangedEvent += OnInternalSchemaChangedEvent; - } - - private void SetMetadataDependentOptions() + internal void SetupEventForwarding() { - if (InternalMetadata.IsDbaas) - { - Configuration.SetDefaultConsistencyLevel(ConsistencyLevel.LocalQuorum); - } + InternalMetadata.Hosts.Added += InternalMetadata.OnHostAdded; + InternalMetadata.Hosts.Removed += InternalMetadata.OnHostRemoved; + InternalMetadata.HostAdded += OnInternalHostAdded; + InternalMetadata.HostRemoved += OnInternalHostRemoved; + InternalMetadata.HostsEvent += OnInternalHostsEvent; + InternalMetadata.SchemaChangedEvent += OnInternalSchemaChangedEvent; } } } \ No newline at end of file diff --git a/src/Cassandra/Requests/TaskTimeoutHelper.cs b/src/Cassandra/Requests/TaskTimeoutHelper.cs index 69fe97bba..146643ef7 100644 --- a/src/Cassandra/Requests/TaskTimeoutHelper.cs +++ b/src/Cassandra/Requests/TaskTimeoutHelper.cs @@ -14,6 +14,7 @@ // limitations under the License. using System; +using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; @@ -31,6 +32,21 @@ public TaskTimeoutHelper(Task taskToWait, TimeSpan timeout) _tcs = new CancellationTokenSource(); _timeoutTask = Task.Delay(timeout, _tcs.Token); } + + public TaskTimeoutHelper(IEnumerable tasksToWait, TimeSpan timeout) + { + foreach (var task in tasksToWait) + { + _taskToWait = _taskToWait == null + ? task + : _taskToWait.ContinueWith( + prevTask => prevTask.IsFaulted + ? prevTask + : task, TaskContinuationOptions.ExecuteSynchronously).Unwrap(); + } + _tcs = new CancellationTokenSource(); + _timeoutTask = Task.Delay(timeout, _tcs.Token); + } public bool WaitWithTimeout() { diff --git a/src/Cassandra/Session.cs b/src/Cassandra/Session.cs index 4647cfcca..66ef5f412 100644 --- a/src/Cassandra/Session.cs +++ b/src/Cassandra/Session.cs @@ -27,6 +27,7 @@ using Cassandra.DataStax.Graph; using Cassandra.DataStax.Insights; using Cassandra.ExecutionProfiles; +using Cassandra.Helpers; using Cassandra.Metrics; using Cassandra.Metrics.Internal; using Cassandra.Observers.Abstractions; @@ -39,23 +40,16 @@ namespace Cassandra /// public class Session : IInternalSession { - private const int Disposed = 10; - private const int Initialized = 5; - private const int Initializing = 1; - private static readonly Logger Logger = new Logger(typeof(Session)); private readonly IThreadSafeDictionary _connectionPool; private readonly IInternalCluster _cluster; private readonly IMetricsManager _metricsManager; private readonly IObserverFactory _observerFactory; private readonly IInsightsClient _insightsClient; - private readonly CancellationTokenSource _initCancellationTokenSource = new CancellationTokenSource(); - private readonly Task _initTask; - private long _state = Session.Initializing; + private readonly SessionInitializer _sessionInitializer; private volatile string _keyspace; - private volatile bool _initialized = false; private volatile TaskCompletionSource _initTaskCompletionSource = new TaskCompletionSource(); @@ -79,7 +73,7 @@ private volatile TaskCompletionSource _initTaskCompletionSour /// /// Determines if the session is already disposed /// - public bool IsDisposed => Interlocked.Read(ref _state) == Session.Disposed; + public bool IsDisposed => _sessionInitializer.IsDisposed; /// /// Gets or sets the keyspace @@ -141,8 +135,8 @@ internal Session( _observerFactory = configuration.ObserverFactoryBuilder.Build(_metricsManager); _insightsClient = configuration.InsightsClientFactory.Create(cluster, this); UserDefinedTypes = new UdtMappingDefinitions(this); - _initTask = Task.Run(InitInternalAsync); - + _sessionInitializer = new SessionInitializer(this); + _sessionInitializer.Initialize(); } /// @@ -219,43 +213,12 @@ public void Dispose() } /// - public async Task ShutdownAsync() + public Task ShutdownAsync() { - //Only dispose once - var previousState = Interlocked.Exchange(ref _state, Session.Disposed); - _initialized = false; - - if (previousState == Session.Initializing) - { - _initCancellationTokenSource.Cancel(); - } - - if (previousState != Session.Initialized) - { - try - { - await _initTask.ConfigureAwait(false); - } - catch (Exception) - { - // ignored - } - } - - if (previousState != Session.Disposed) - { - _initCancellationTokenSource.Dispose(); - } - - if (previousState == Session.Initialized) - { - await ShutdownInternalAsync().ConfigureAwait(false); - } - - Logger.Info("Session [" + SessionName + "] has been shut down."); + return _sessionInitializer.ShutdownAsync(); } - private async Task ShutdownInternalAsync() + async Task IInternalSession.OnShutdownAsync() { if (_insightsClient != null) { @@ -275,203 +238,35 @@ private async Task ShutdownInternalAsync() Task IInternalSession.TryInitAsync() { - if (_initialized) - { - return TaskHelper.Completed; - } - - ValidateState(); - return WaitInitAsync(); + return _sessionInitializer.WaitInitAsync(); } Task IInternalSession.TryInitAndGetMetadataAsync() { - if (_initialized) - { - return Task.FromResult(_cluster.InternalMetadata); - } - - ValidateState(); - return WaitInitAndGetMetadataAsync(); + return _sessionInitializer.WaitInitAndGetMetadataAsync(); } void IInternalSession.TryInit() { - if (_initialized) - { - return; - } - - ValidateState(); - WaitInit(); + _sessionInitializer.WaitInit(); } IInternalMetadata IInternalSession.TryInitAndGetMetadata() { - if (_initialized) - { - return _cluster.InternalMetadata; - } - - ValidateState(); - return WaitInitAndGetMetadata(); - } - - /// - /// Validates if the session is not disposed and checks whether it is already initialized. - /// Throws the initialization exception if the initialization failed. - /// - /// true if session is initialized, false otherwise - private void ValidateState() - { - var currentState = Interlocked.Read(ref _state); - - if (currentState == Session.Disposed) - { - throw new ObjectDisposedException("This session object has been disposed."); - } - - if (_cluster.InitException != null) - { - //There was an exception that is not possible to recover from - throw _cluster.InitException; - } - } - - private void WaitInit() - { - using (var waiter = new TaskTimeoutHelper(_initTaskCompletionSource.Task, _cluster.GetInitTimeout())) - { - if (waiter.WaitWithTimeout()) - { - return; - } - } - - throw new InitializationTimeoutException(); - } - - private IInternalMetadata WaitInitAndGetMetadata() - { - using (var waiter = new TaskTimeoutHelper(_initTaskCompletionSource.Task, _cluster.GetInitTimeout())) - { - if (waiter.WaitWithTimeout()) - { - return _initTaskCompletionSource.Task.Result; - } - } - - throw new InitializationTimeoutException(); + return _sessionInitializer.WaitInitAndGetMetadata(); } - private async Task WaitInitAndGetMetadataAsync() + async Task IInternalSession.PostInitializeAsync() { - using (var waiter = new TaskTimeoutHelper(_initTaskCompletionSource.Task, _cluster.GetInitTimeout())) - { - if (await waiter.WaitWithTimeoutAsync().ConfigureAwait(false)) - { - return _initTaskCompletionSource.Task.Result; - } - } + InternalRef.InternalCluster.Metadata.HostRemoved += OnHostRemoved; - throw new InitializationTimeoutException(); - } - - private async Task WaitInitAsync() - { - using (var waiter = new TaskTimeoutHelper(_initTaskCompletionSource.Task, _cluster.GetInitTimeout())) + var serializerManager = _cluster.Configuration.SerializerManager; + if (Configuration.GetOrCreatePoolingOptions(serializerManager.CurrentProtocolVersion).GetWarmup()) { - if (await waiter.WaitWithTimeoutAsync().ConfigureAwait(false)) - { - return; - } - } - - throw new InitializationTimeoutException(); - } - - private async Task InitInternalAsync() - { - try - { - IInternalMetadata internalMetadata = null; - do - { - try - { - internalMetadata = - await InternalRef.InternalCluster - .TryInitAndGetMetadataAsync() - .WithCancellation(_initCancellationTokenSource.Token).ConfigureAwait(false); - break; - } - catch (Exception ex) - { - if (InternalRef.InternalCluster.InitException != null) - { - throw InternalRef.InternalCluster.InitException; - } - - if (IsDisposed) - { - throw new ObjectDisposedException("Session instance was disposed before initialization finished."); - } - - var currentTcs = _initTaskCompletionSource; - Task.Run(() => currentTcs.TrySetException(ex)).Forget(); - await Task.Delay(500, _initCancellationTokenSource.Token).ConfigureAwait(false); - _initTaskCompletionSource = new TaskCompletionSource(); - } - } while (!IsDisposed); - - if (IsDisposed) - { - throw new ObjectDisposedException("Session instance was disposed before initialization finished."); - } - - InternalRef.InternalCluster.Metadata.HostRemoved += OnHostRemoved; - - var serializerManager = _cluster.Configuration.SerializerManager; - if (Configuration.GetOrCreatePoolingOptions(serializerManager.CurrentProtocolVersion).GetWarmup()) - { - await WarmupAsync(internalMetadata).ConfigureAwait(false); - } - - if (Keyspace != null) - { - // Borrow a connection, trying to fail fast - var handler = Configuration.RequestHandlerFactory.Create(this, internalMetadata, serializerManager.GetCurrentSerializer()); - await handler.GetNextConnectionAsync(new Dictionary()).ConfigureAwait(false); - } - - _insightsClient.Initialize(internalMetadata); - - var previousState = Interlocked.CompareExchange(ref _state, Session.Initialized, Session.Initializing); - if (previousState == Session.Disposed) - { - await ShutdownInternalAsync().ConfigureAwait(false); - throw new ObjectDisposedException("Session instance was disposed before initialization finished."); - } - - _initialized = true; - - Task.Run(() => _initTaskCompletionSource.TrySetResult(internalMetadata)).Forget(); - - return internalMetadata; - - } - catch (Exception ex) - { - if (IsDisposed) - { - var newEx = new ObjectDisposedException("Session instance was disposed before initialization finished."); - Task.Run(() => _initTaskCompletionSource.TrySetException(newEx)).Forget(); - throw newEx; - } - - Task.Run(() => _initTaskCompletionSource.TrySetException(ex)).Forget(); - throw; + await WarmupAsync(_cluster.InternalMetadata).ConfigureAwait(false); } + + _insightsClient.Initialize(_cluster.InternalMetadata); } /// @@ -512,7 +307,7 @@ public RowSet EndExecute(IAsyncResult ar) { var task = (Task)ar; var initTimeout = _cluster.GetInitTimeout(); - var timeout = _initialized + var timeout = _sessionInitializer.IsInitialized ? Configuration.DefaultRequestOptions.QueryAbortTimeout + initTimeout.TotalMilliseconds : initTimeout.TotalMilliseconds; TaskHelper.WaitToCompleteWithMetrics(_metricsManager, task, (int)timeout); @@ -524,7 +319,7 @@ public PreparedStatement EndPrepare(IAsyncResult ar) { var task = (Task)ar; var initTimeout = _cluster.GetInitTimeout(); - var timeout = _initialized + var timeout = _sessionInitializer.IsInitialized ? Configuration.DefaultRequestOptions.QueryAbortTimeout + initTimeout.TotalMilliseconds : initTimeout.TotalMilliseconds; TaskHelper.WaitToCompleteWithMetrics(_metricsManager, task, (int)timeout); diff --git a/src/Cassandra/SessionManagement/IInternalCluster.cs b/src/Cassandra/SessionManagement/IInternalCluster.cs index 9e5338e11..682c43ed5 100644 --- a/src/Cassandra/SessionManagement/IInternalCluster.cs +++ b/src/Cassandra/SessionManagement/IInternalCluster.cs @@ -21,6 +21,7 @@ using Cassandra.Connections; using Cassandra.Connections.Control; +using Cassandra.Helpers; namespace Cassandra.SessionManagement { @@ -29,6 +30,8 @@ internal interface IInternalCluster : ICluster { IInternalMetadata InternalMetadata { get; } + IClusterInitializer ClusterInitializer { get; } + bool AnyOpenConnections(Host host); /// @@ -41,9 +44,7 @@ internal interface IInternalCluster : ICluster /// Gets the the prepared statements cache /// ConcurrentDictionary PreparedQueries { get; } - - InitFatalErrorException InitException { get; } - + /// /// Executes the prepare request on the first host selected by the load balancing policy. /// When is enabled, it prepares on the rest of the hosts in @@ -58,12 +59,13 @@ internal interface IInternalCluster : ICluster /// Helper method to retrieve the aggregate distance from all configured LoadBalancingPolicies and set it at Host level. /// HostDistance RetrieveAndSetDistance(Host host); + + TimeSpan GetInitTimeout(); - /// - /// Initializes once (Thread-safe) the control connection and retrieve the internal metadata object. - /// - Task TryInitAndGetMetadataAsync(); + Task PostInitializeAsync(); - TimeSpan GetInitTimeout(); + Task PreShutdownAsync(int timeoutMs); + + Task PostShutdownAsync(); } } \ No newline at end of file diff --git a/src/Cassandra/SessionManagement/IInternalSession.cs b/src/Cassandra/SessionManagement/IInternalSession.cs index 529eccfd3..98025f4e6 100644 --- a/src/Cassandra/SessionManagement/IInternalSession.cs +++ b/src/Cassandra/SessionManagement/IInternalSession.cs @@ -36,6 +36,10 @@ internal interface IInternalSession : ISession /// Unique Session ID generated by the driver. /// Guid InternalSessionId { get; } + + Task PostInitializeAsync(); + + Task OnShutdownAsync(); void TryInit(); From 68910879893c9df0de72aad0b6431013f816f92b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Tue, 7 Jul 2020 22:46:31 +0100 Subject: [PATCH 22/31] replace .Result with GetAwaiter --- src/Cassandra/Helpers/ClusterInitializer.cs | 4 ++-- src/Cassandra/Helpers/SessionInitializer.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Cassandra/Helpers/ClusterInitializer.cs b/src/Cassandra/Helpers/ClusterInitializer.cs index 3da5e92de..b54014716 100644 --- a/src/Cassandra/Helpers/ClusterInitializer.cs +++ b/src/Cassandra/Helpers/ClusterInitializer.cs @@ -258,7 +258,7 @@ private IInternalMetadata WaitInitInternal() { if (waiter.WaitWithTimeout()) { - return _initTaskCompletionSource.Task.Result; + return _initTaskCompletionSource.Task.GetAwaiter().GetResult(); } } @@ -273,7 +273,7 @@ private async Task WaitInitInternalAsync() { if (await waiter.WaitWithTimeoutAsync().ConfigureAwait(false)) { - return _initTaskCompletionSource.Task.Result; + return _initTaskCompletionSource.Task.GetAwaiter().GetResult(); } } diff --git a/src/Cassandra/Helpers/SessionInitializer.cs b/src/Cassandra/Helpers/SessionInitializer.cs index 65bb3b427..d6f0428a9 100644 --- a/src/Cassandra/Helpers/SessionInitializer.cs +++ b/src/Cassandra/Helpers/SessionInitializer.cs @@ -170,7 +170,7 @@ private IInternalMetadata WaitInitInternal() { if (waiter.WaitWithTimeout()) { - return _initTaskCompletionSource.Task.Result; + return _initTaskCompletionSource.Task.GetAwaiter().GetResult(); } } @@ -191,7 +191,7 @@ private async Task WaitInitInternalAsync() { if (await waiter.WaitWithTimeoutAsync().ConfigureAwait(false)) { - return _initTaskCompletionSource.Task.Result; + return _initTaskCompletionSource.Task.GetAwaiter().GetResult(); } } From 9b9054c02cddaa8d5eea0d7c2fffa6f012be193b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Tue, 7 Jul 2020 22:49:34 +0100 Subject: [PATCH 23/31] add inner exception to init error --- src/Cassandra/Helpers/ClusterInitializer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cassandra/Helpers/ClusterInitializer.cs b/src/Cassandra/Helpers/ClusterInitializer.cs index b54014716..58ca55c0d 100644 --- a/src/Cassandra/Helpers/ClusterInitializer.cs +++ b/src/Cassandra/Helpers/ClusterInitializer.cs @@ -139,7 +139,7 @@ private async Task InitInternalAsync() new InitializationErrorException( "Cluster initialization failed. See inner exception. " + "The driver will attempt to retry the initialization according to the reconnection policy " + - "schedule."))).Forget(); + "schedule.", ex))).Forget(); try { From 30a715c056b1f678d949408dcd78170b42da23f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Tue, 7 Jul 2020 23:08:47 +0100 Subject: [PATCH 24/31] change LBP API to remove deadlock --- .../Core/ClusterTests.cs | 2 +- .../Core/ConnectionSimulacronTests.cs | 4 ++-- .../Core/PoolShortTests.cs | 2 +- .../Core/SessionTests.cs | 2 +- .../Core/SpeculativeExecutionShortTests.cs | 2 +- .../Policies/Tests/RetryPolicyShortTests.cs | 2 +- src/Cassandra.Tests/BaseUnitTest.cs | 2 +- src/Cassandra.Tests/ClusterTests.cs | 2 +- .../Control/ControlConnectionTests.cs | 4 ++-- .../ExecutionProfiles/ClusterTests.cs | 2 +- .../ExecutionProfiles/RequestHandlerTests.cs | 2 +- src/Cassandra.Tests/PoliciesUnitTests.cs | 16 ++++++++-------- src/Cassandra.Tests/RequestHandlerMockTests.cs | 2 +- .../Requests/PrepareHandlerTests.cs | 2 +- src/Cassandra.Tests/TestHelper.cs | 12 ++++++------ src/Cassandra/Cluster.cs | 4 ++-- .../StartupMessage/DataCentersInfoProvider.cs | 2 +- .../Policies/DCAwareRoundRobinPolicy.cs | 4 ++-- .../Policies/DefaultLoadBalancingPolicy.cs | 6 +++--- src/Cassandra/Policies/ILoadBalancingPolicy.cs | 4 ++-- .../Policies/RetryLoadBalancingPolicy.cs | 4 ++-- src/Cassandra/Policies/RoundRobinPolicy.cs | 4 ++-- src/Cassandra/Policies/TokenAwarePolicy.cs | 10 +++++----- 23 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/Cassandra.IntegrationTests/Core/ClusterTests.cs b/src/Cassandra.IntegrationTests/Core/ClusterTests.cs index e0eba19cf..c8e9a33a5 100644 --- a/src/Cassandra.IntegrationTests/Core/ClusterTests.cs +++ b/src/Cassandra.IntegrationTests/Core/ClusterTests.cs @@ -245,7 +245,7 @@ public Task InitializeAsync(IMetadataSnapshotProvider metadata) return TaskHelper.Completed; } - public HostDistance Distance(ICluster cluster, Host host) + public HostDistance Distance(IMetadataSnapshotProvider metadata, Host host) { return HostDistance.Local; } diff --git a/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs b/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs index a9fffe0b0..2eacdd005 100644 --- a/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs +++ b/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs @@ -387,9 +387,9 @@ public Task InitializeAsync(IMetadataSnapshotProvider metadata) return _parent.InitializeAsync(metadata); } - public HostDistance Distance(ICluster cluster, Host host) + public HostDistance Distance(IMetadataSnapshotProvider metadata, Host host) { - return _parent.Distance(cluster, host); + return _parent.Distance(metadata, host); } public IEnumerable NewQueryPlan(ICluster cluster, string keyspace, IStatement query) diff --git a/src/Cassandra.IntegrationTests/Core/PoolShortTests.cs b/src/Cassandra.IntegrationTests/Core/PoolShortTests.cs index 127e5896d..7f5413d60 100644 --- a/src/Cassandra.IntegrationTests/Core/PoolShortTests.cs +++ b/src/Cassandra.IntegrationTests/Core/PoolShortTests.cs @@ -593,7 +593,7 @@ public void Should_Throw_NoHostAvailableException_When_Targeting_Single_Ignored_ // Mark the last host as ignored var lbp = new TestHelper.CustomLoadBalancingPolicy( (cluster, ks, stmt) => cluster.Metadata.AllHosts(), - (cluster, host) => host.Equals(cluster.Metadata.AllHosts().Last()) ? HostDistance.Ignored : HostDistance.Local); + (metadata, host) => host.Equals(metadata.AllHostsSnapshot().Last()) ? HostDistance.Ignored : HostDistance.Local); var builder = ClusterBuilder().WithLoadBalancingPolicy(lbp); using (var testCluster = SimulacronCluster.CreateNew(new SimulacronOptions { Nodes = "3" })) diff --git a/src/Cassandra.IntegrationTests/Core/SessionTests.cs b/src/Cassandra.IntegrationTests/Core/SessionTests.cs index 6837a2466..d5301ee95 100644 --- a/src/Cassandra.IntegrationTests/Core/SessionTests.cs +++ b/src/Cassandra.IntegrationTests/Core/SessionTests.cs @@ -313,7 +313,7 @@ public Task InitializeAsync(IMetadataSnapshotProvider metadata) return _childPolicy.InitializeAsync(metadata); } - public HostDistance Distance(ICluster cluster, Host host) + public HostDistance Distance(IMetadataSnapshotProvider metadata, Host host) { return host == _ignoredHost ? HostDistance.Ignored : HostDistance.Local; } diff --git a/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionShortTests.cs b/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionShortTests.cs index 7c7228be2..532337be9 100644 --- a/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionShortTests.cs +++ b/src/Cassandra.IntegrationTests/Core/SpeculativeExecutionShortTests.cs @@ -213,7 +213,7 @@ public Task InitializeAsync(IMetadataSnapshotProvider metadata) return TaskHelper.Completed; } - public HostDistance Distance(ICluster cluster, Host host) + public HostDistance Distance(IMetadataSnapshotProvider metadata, Host host) { return HostDistance.Local; } diff --git a/src/Cassandra.IntegrationTests/Policies/Tests/RetryPolicyShortTests.cs b/src/Cassandra.IntegrationTests/Policies/Tests/RetryPolicyShortTests.cs index 9d3633a10..56482b747 100644 --- a/src/Cassandra.IntegrationTests/Policies/Tests/RetryPolicyShortTests.cs +++ b/src/Cassandra.IntegrationTests/Policies/Tests/RetryPolicyShortTests.cs @@ -279,7 +279,7 @@ public Task InitializeAsync(IMetadataSnapshotProvider metadata) return TaskHelper.Completed; } - public HostDistance Distance(ICluster cluster, Host host) + public HostDistance Distance(IMetadataSnapshotProvider metadata, Host host) { return HostDistance.Local; } diff --git a/src/Cassandra.Tests/BaseUnitTest.cs b/src/Cassandra.Tests/BaseUnitTest.cs index 656e6a505..cae0da116 100644 --- a/src/Cassandra.Tests/BaseUnitTest.cs +++ b/src/Cassandra.Tests/BaseUnitTest.cs @@ -75,7 +75,7 @@ public Task InitializeAsync(IMetadataSnapshotProvider metadata) return TaskHelper.Completed; } - public HostDistance Distance(ICluster cluster, Host host) + public HostDistance Distance(IMetadataSnapshotProvider metadata, Host host) { return _distance; } diff --git a/src/Cassandra.Tests/ClusterTests.cs b/src/Cassandra.Tests/ClusterTests.cs index 554d02cb3..fc3cf7e79 100644 --- a/src/Cassandra.Tests/ClusterTests.cs +++ b/src/Cassandra.Tests/ClusterTests.cs @@ -255,7 +255,7 @@ public Task InitializeAsync(IMetadataSnapshotProvider metadata) return TaskHelper.Completed; } - public HostDistance Distance(ICluster cluster, Host host) + public HostDistance Distance(IMetadataSnapshotProvider metadata, Host host) { return _distances[host.Address.Address.ToString()]; } diff --git a/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs b/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs index 83d8679d6..7f81f5eee 100644 --- a/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs +++ b/src/Cassandra.Tests/Connections/Control/ControlConnectionTests.cs @@ -215,7 +215,7 @@ public void Should_NotAttemptDownOrIgnoredHosts() Mock.Get(cluster) .Setup(c => c.RetrieveAndSetDistance(It.IsAny())) - .Returns(h => config.Policies.LoadBalancingPolicy.Distance(cluster, h)); + .Returns(h => config.Policies.LoadBalancingPolicy.Distance(cluster.Metadata, h)); config.Policies.LoadBalancingPolicy.InitializeAsync(metadata); connectionOpenEnabled = false; @@ -270,7 +270,7 @@ public async Task Should_NotLeakConnections_When_DisposeAndReconnectHappenSimult Mock.Get(cluster) .Setup(c => c.RetrieveAndSetDistance(It.IsAny())) - .Returns(h => config.Policies.LoadBalancingPolicy.Distance(cluster, h)); + .Returns(h => config.Policies.LoadBalancingPolicy.Distance(cluster.Metadata, h)); config.LocalDatacenterProvider.Initialize(cluster, createResult.InternalMetadata); await config.Policies.LoadBalancingPolicy.InitializeAsync(metadata).ConfigureAwait(false); diff --git a/src/Cassandra.Tests/ExecutionProfiles/ClusterTests.cs b/src/Cassandra.Tests/ExecutionProfiles/ClusterTests.cs index f926be6bb..423aa358f 100644 --- a/src/Cassandra.Tests/ExecutionProfiles/ClusterTests.cs +++ b/src/Cassandra.Tests/ExecutionProfiles/ClusterTests.cs @@ -354,7 +354,7 @@ public Task InitializeAsync(IMetadataSnapshotProvider metadata) return TaskHelper.Completed; } - public HostDistance Distance(ICluster cluster, Host host) + public HostDistance Distance(IMetadataSnapshotProvider metadata, Host host) { return HostDistance.Local; } diff --git a/src/Cassandra.Tests/ExecutionProfiles/RequestHandlerTests.cs b/src/Cassandra.Tests/ExecutionProfiles/RequestHandlerTests.cs index 6df33dcac..b92023830 100644 --- a/src/Cassandra.Tests/ExecutionProfiles/RequestHandlerTests.cs +++ b/src/Cassandra.Tests/ExecutionProfiles/RequestHandlerTests.cs @@ -376,7 +376,7 @@ public Task InitializeAsync(IMetadataSnapshotProvider metadata) return TaskHelper.Completed; } - public HostDistance Distance(ICluster cluster, Host host) + public HostDistance Distance(IMetadataSnapshotProvider metadata, Host host) { return HostDistance.Local; } diff --git a/src/Cassandra.Tests/PoliciesUnitTests.cs b/src/Cassandra.Tests/PoliciesUnitTests.cs index c7e5e4292..9299ae970 100644 --- a/src/Cassandra.Tests/PoliciesUnitTests.cs +++ b/src/Cassandra.Tests/PoliciesUnitTests.cs @@ -132,8 +132,8 @@ public async Task DcInferringPolicyInitializeInfersLocalDc(bool implicitContactP var metadataMock = CreateMetadataMock(hostList, implicitContactPoint: implicitContactPoint); var policy = new DcInferringLoadBalancingPolicy(); await policy.InitializeAsync(metadataMock).ConfigureAwait(false); - Assert.AreEqual(HostDistance.Local, policy.Distance(metadataMock.Cluster, hostList[0])); - Assert.AreEqual(HostDistance.Remote, policy.Distance(metadataMock.Cluster, hostList[1])); + Assert.AreEqual(HostDistance.Local, policy.Distance(metadataMock, hostList[0])); + Assert.AreEqual(HostDistance.Remote, policy.Distance(metadataMock, hostList[1])); } [Test] @@ -184,8 +184,8 @@ public async Task DCAwareRoundRobinInitializeUsesBuilderLocalDc() var metadataMock = CreateMetadataMock(hostList, "dc2"); var policy = new DCAwareRoundRobinPolicy(); await policy.InitializeAsync(metadataMock).ConfigureAwait(false); - Assert.AreEqual(HostDistance.Remote, policy.Distance(metadataMock.Cluster, hostList[0])); - Assert.AreEqual(HostDistance.Local, policy.Distance(metadataMock.Cluster, hostList[1])); + Assert.AreEqual(HostDistance.Remote, policy.Distance(metadataMock, hostList[0])); + Assert.AreEqual(HostDistance.Local, policy.Distance(metadataMock, hostList[1])); } [Test] @@ -218,8 +218,8 @@ public async Task DCAwareRoundRobinInitializeInfersLocalDcImplicitContactPoint() var metadataMock = CreateMetadataMock(hostList, implicitContactPoint: true); var policy = new DCAwareRoundRobinPolicy(); await policy.InitializeAsync(metadataMock).ConfigureAwait(false); - Assert.AreEqual(HostDistance.Local, policy.Distance(metadataMock.Cluster, hostList[0])); - Assert.AreEqual(HostDistance.Remote, policy.Distance(metadataMock.Cluster, hostList[1])); + Assert.AreEqual(HostDistance.Local, policy.Distance(metadataMock, hostList[0])); + Assert.AreEqual(HostDistance.Remote, policy.Distance(metadataMock, hostList[1])); } [Test] @@ -601,14 +601,14 @@ public async Task TokenAwarePolicyReturnsChildHostsIfNoRoutingKey() //No routing key var hosts = policy.NewQueryPlan(metadataMock.Cluster, null, new SimpleStatement()).ToList(); //2 localhosts - Assert.AreEqual(2, hosts.Count(h => policy.Distance(metadataMock.Cluster, h) == HostDistance.Local)); + Assert.AreEqual(2, hosts.Count(h => policy.Distance(metadataMock, h) == HostDistance.Local)); Assert.AreEqual("dc1", hosts[0].Datacenter); Assert.AreEqual("dc1", hosts[1].Datacenter); Mock.Get(metadataMock).Verify(); //No statement hosts = policy.NewQueryPlan(metadataMock.Cluster, null, null).ToList(); //2 localhosts - Assert.AreEqual(2, hosts.Count(h => policy.Distance(metadataMock.Cluster, h) == HostDistance.Local)); + Assert.AreEqual(2, hosts.Count(h => policy.Distance(metadataMock, h) == HostDistance.Local)); Assert.AreEqual("dc1", hosts[0].Datacenter); Assert.AreEqual("dc1", hosts[1].Datacenter); Mock.Get(metadataMock).Verify(); diff --git a/src/Cassandra.Tests/RequestHandlerMockTests.cs b/src/Cassandra.Tests/RequestHandlerMockTests.cs index 46ab30931..37d2741a2 100644 --- a/src/Cassandra.Tests/RequestHandlerMockTests.cs +++ b/src/Cassandra.Tests/RequestHandlerMockTests.cs @@ -130,7 +130,7 @@ public void Should_ReturnHost_When_QueryPlanMoveNextReturnsTrueAndCurrentReturns Mock.Get(lbpMock) .Setup(m => m.NewQueryPlan(It.IsAny(), It.IsAny(), It.IsAny())) .Returns(enumerable); - Mock.Get(lbpMock).Setup(m => m.Distance(It.IsAny(), host)).Returns(HostDistance.Local); + Mock.Get(lbpMock).Setup(m => m.Distance(It.IsAny(), host)).Returns(HostDistance.Local); var triedHosts = new Dictionary(); var sut = new RequestHandler(sessionMock, metadata, new SerializerManager(ProtocolVersion.V4).GetCurrentSerializer()); diff --git a/src/Cassandra.Tests/Requests/PrepareHandlerTests.cs b/src/Cassandra.Tests/Requests/PrepareHandlerTests.cs index 1800c7aee..26ae01fe0 100644 --- a/src/Cassandra.Tests/Requests/PrepareHandlerTests.cs +++ b/src/Cassandra.Tests/Requests/PrepareHandlerTests.cs @@ -558,7 +558,7 @@ public Task InitializeAsync(IMetadataSnapshotProvider metadata) return TaskHelper.Completed; } - public HostDistance Distance(ICluster cluster, Host host) + public HostDistance Distance(IMetadataSnapshotProvider metadata, Host host) { Interlocked.Increment(ref DistanceCount); return HostDistance.Local; diff --git a/src/Cassandra.Tests/TestHelper.cs b/src/Cassandra.Tests/TestHelper.cs index f0ab7765b..d2b7e934c 100644 --- a/src/Cassandra.Tests/TestHelper.cs +++ b/src/Cassandra.Tests/TestHelper.cs @@ -738,9 +738,9 @@ public Task InitializeAsync(IMetadataSnapshotProvider metadata) return _childPolicy.InitializeAsync(metadata); } - public HostDistance Distance(ICluster cluster, Host host) + public HostDistance Distance(IMetadataSnapshotProvider metadata, Host host) { - return _childPolicy.Distance(cluster, host); + return _childPolicy.Distance(metadata, host); } public IEnumerable NewQueryPlan(ICluster cluster, string keyspace, IStatement query) @@ -756,12 +756,12 @@ public IEnumerable NewQueryPlan(ICluster cluster, string keyspace, IStatem internal class CustomLoadBalancingPolicy : ILoadBalancingPolicy { private volatile IMetadataSnapshotProvider _metadata; - private readonly Func _distanceHandler; + private readonly Func _distanceHandler; private readonly Func> _queryPlanHandler; public CustomLoadBalancingPolicy( Func> queryPlanHandler = null, - Func distanceHandler = null) + Func distanceHandler = null) { _queryPlanHandler = queryPlanHandler ?? ((cluster, ks, statement) => cluster.Metadata.AllHostsSnapshot()); _distanceHandler = distanceHandler ?? ((_, __) => HostDistance.Local); @@ -773,9 +773,9 @@ public Task InitializeAsync(IMetadataSnapshotProvider metadata) return TaskHelper.Completed; } - public HostDistance Distance(ICluster cluster, Host host) + public HostDistance Distance(IMetadataSnapshotProvider metadata, Host host) { - return _distanceHandler(cluster, host); + return _distanceHandler(metadata, host); } public IEnumerable NewQueryPlan(ICluster cluster, string keyspace, IStatement query) diff --git a/src/Cassandra/Cluster.cs b/src/Cassandra/Cluster.cs index ab64e1f5a..4b78c751d 100644 --- a/src/Cassandra/Cluster.cs +++ b/src/Cassandra/Cluster.cs @@ -380,12 +380,12 @@ async Task IInternalCluster.PostShutdownAsync() /// HostDistance IInternalCluster.RetrieveAndSetDistance(Host host) { - var distance = _loadBalancingPolicies[0].Distance(this, host); + var distance = _loadBalancingPolicies[0].Distance(_lazyMetadata, host); for (var i = 1; i < _loadBalancingPolicies.Count; i++) { var lbp = _loadBalancingPolicies[i]; - var lbpDistance = lbp.Distance(this, host); + var lbpDistance = lbp.Distance(_lazyMetadata, host); if (lbpDistance < distance) { distance = lbpDistance; diff --git a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DataCentersInfoProvider.cs b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DataCentersInfoProvider.cs index 7c54d75b2..78ce92b7c 100644 --- a/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DataCentersInfoProvider.cs +++ b/src/Cassandra/DataStax/Insights/InfoProviders/StartupMessage/DataCentersInfoProvider.cs @@ -40,7 +40,7 @@ public HashSet GetInformation( continue; } - var distance = cluster.Configuration.Policies.LoadBalancingPolicy.Distance(cluster, h); + var distance = cluster.Configuration.Policies.LoadBalancingPolicy.Distance(cluster.Metadata, h); if (distance == HostDistance.Local || (distance == HostDistance.Remote && remoteConnectionsLength > 0)) { dataCenters.Add(h.Datacenter); diff --git a/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs b/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs index 86236431b..5c2c1dc25 100644 --- a/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs +++ b/src/Cassandra/Policies/DCAwareRoundRobinPolicy.cs @@ -97,10 +97,10 @@ public Task InitializeAsync(IMetadataSnapshotProvider metadata) /// is Ignored.

To configure how many host in each remote /// datacenter is considered Remote.

/// - /// The cluster instance for which the policy is created. + /// The metadata instance associated with the cluster for which the policy is created. /// the host of which to return the distance of. /// the HostDistance to host. - public HostDistance Distance(ICluster cluster, Host host) + public HostDistance Distance(IMetadataSnapshotProvider metadata, Host host) { var dc = GetDatacenter(host); return dc == LocalDc ? HostDistance.Local : HostDistance.Remote; diff --git a/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs b/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs index 19deef120..8093612a1 100644 --- a/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs +++ b/src/Cassandra/Policies/DefaultLoadBalancingPolicy.cs @@ -67,10 +67,10 @@ public DefaultLoadBalancingPolicy(string localDc) /// in the local datacenter as Local and the rest /// is Ignored. /// - /// The cluster instance for which the policy is created. + /// The metadata instance associated with the cluster for which the policy is created. /// the host of which to return the distance of. /// the HostDistance to host. - public HostDistance Distance(ICluster cluster, Host host) + public HostDistance Distance(IMetadataSnapshotProvider metadata, Host host) { var lastPreferredHost = _lastPreferredHost; if (lastPreferredHost != null && host == lastPreferredHost) @@ -80,7 +80,7 @@ public HostDistance Distance(ICluster cluster, Host host) return HostDistance.Local; } - return ChildPolicy.Distance(cluster, host); + return ChildPolicy.Distance(metadata, host); } /// diff --git a/src/Cassandra/Policies/ILoadBalancingPolicy.cs b/src/Cassandra/Policies/ILoadBalancingPolicy.cs index e26bacb4d..8b467ae15 100644 --- a/src/Cassandra/Policies/ILoadBalancingPolicy.cs +++ b/src/Cassandra/Policies/ILoadBalancingPolicy.cs @@ -52,11 +52,11 @@ public interface ILoadBalancingPolicy /// host in remote datacenters when the policy itself always picks host in the /// local datacenter first.

/// - /// Cluster instance for which the policy is created. + /// Metadata snapshot provider of the session for which the policy is created. /// the host of which to return the distance of. /// /// the HostDistance to host. - HostDistance Distance(ICluster cluster, Host host); + HostDistance Distance(IMetadataSnapshotProvider metadata, Host host); /// /// Returns the hosts to use for a new query.

Each new query will call this diff --git a/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs b/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs index d06768ce0..5fc4ad0dd 100644 --- a/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs +++ b/src/Cassandra/Policies/RetryLoadBalancingPolicy.cs @@ -40,9 +40,9 @@ public Task InitializeAsync(IMetadataSnapshotProvider metadata) return LoadBalancingPolicy.InitializeAsync(metadata); } - public HostDistance Distance(ICluster cluster, Host host) + public HostDistance Distance(IMetadataSnapshotProvider metadata, Host host) { - return LoadBalancingPolicy.Distance(cluster, host); + return LoadBalancingPolicy.Distance(metadata, host); } public IEnumerable NewQueryPlan(ICluster cluster, string keyspace, IStatement query) diff --git a/src/Cassandra/Policies/RoundRobinPolicy.cs b/src/Cassandra/Policies/RoundRobinPolicy.cs index 00b9f1146..909f13012 100644 --- a/src/Cassandra/Policies/RoundRobinPolicy.cs +++ b/src/Cassandra/Policies/RoundRobinPolicy.cs @@ -49,10 +49,10 @@ public Task InitializeAsync(IMetadataSnapshotProvider metadata) /// datacenter deployment. If you use multiple datacenter, see /// DCAwareRoundRobinPolicy instead.

/// - /// The cluster instance for which the policy is created. + /// The metadata instance associated with the cluster for which the policy is created. /// the host of which to return the distance of. /// the HostDistance to host. - public HostDistance Distance(ICluster cluster, Host host) + public HostDistance Distance(IMetadataSnapshotProvider metadata, Host host) { return HostDistance.Local; } diff --git a/src/Cassandra/Policies/TokenAwarePolicy.cs b/src/Cassandra/Policies/TokenAwarePolicy.cs index 437f250c3..a756fadb3 100644 --- a/src/Cassandra/Policies/TokenAwarePolicy.cs +++ b/src/Cassandra/Policies/TokenAwarePolicy.cs @@ -27,7 +27,7 @@ namespace Cassandra /// This policy encapsulates another policy. The resulting policy works in the following way: /// /// - /// The method is inherited from the child policy. + /// The method is inherited from the child policy. /// The host yielded by the method will first return the /// replicas for the statement, based on the . /// @@ -60,14 +60,14 @@ public Task InitializeAsync(IMetadataSnapshotProvider metadata) /// /// Return the HostDistance for the provided host. /// - /// The cluster instance for which the policy is created. + /// The metadata instance associated with the cluster for which the policy is created. /// the host of which to return the distance of. /// /// the HostDistance to host as returned by the wrapped /// policy. - public HostDistance Distance(ICluster cluster, Host host) + public HostDistance Distance(IMetadataSnapshotProvider metadata, Host host) { - return ChildPolicy.Distance(cluster, host); + return ChildPolicy.Distance(metadata, host); } /// @@ -101,7 +101,7 @@ public IEnumerable NewQueryPlan(ICluster cluster, string loggedKeyspace, I var localReplicaSet = new HashSet(); var localReplicaList = new List(replicas.Count); // We can't do it lazily as we need to balance the load between local replicas - foreach (var localReplica in replicas.Where(h => ChildPolicy.Distance(cluster, h) == HostDistance.Local)) + foreach (var localReplica in replicas.Where(h => ChildPolicy.Distance(cluster.Metadata, h) == HostDistance.Local)) { localReplicaSet.Add(localReplica); localReplicaList.Add(localReplica); From de70171872f72a8af97357ac96b144380041398c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Tue, 7 Jul 2020 23:47:58 +0100 Subject: [PATCH 25/31] fix init bugs and couple of tests --- .../Core/ClusterSimulacronTests.cs | 61 ++++++------------- src/Cassandra/Helpers/ClusterInitializer.cs | 16 +++-- src/Cassandra/Helpers/SessionInitializer.cs | 53 ++++++++-------- .../InitializationTimeoutException.cs | 2 +- src/Cassandra/Requests/TaskTimeoutHelper.cs | 21 ++++--- src/Cassandra/Session.cs | 9 ++- 6 files changed, 74 insertions(+), 88 deletions(-) diff --git a/src/Cassandra.IntegrationTests/Core/ClusterSimulacronTests.cs b/src/Cassandra.IntegrationTests/Core/ClusterSimulacronTests.cs index 7d1b5d041..aa8ca64cf 100644 --- a/src/Cassandra.IntegrationTests/Core/ClusterSimulacronTests.cs +++ b/src/Cassandra.IntegrationTests/Core/ClusterSimulacronTests.cs @@ -51,6 +51,7 @@ public async Task Cluster_Should_StopSendingPeersV2Requests_When_InvalidQueryIsT .ThenServerError(ServerError.Invalid, "error")); SetupNewSession(b => b.WithPoolingOptions(new PoolingOptions().SetHeartBeatInterval(3000))); + await Session.ConnectAsync().ConfigureAwait(false); var peersV2Queries = TestCluster.GetQueries("SELECT * FROM system.peers_v2"); var peersQueries = TestCluster.GetQueries("SELECT * FROM system.peers"); @@ -181,8 +182,8 @@ public void Cluster_Connect_With_Wrong_Keyspace_Name_Test() .WithDefaultKeyspace("MY_WRONG_KEYSPACE") .Build()) { - Assert.Throws(() => cluster.Connect()); - Assert.Throws(() => cluster.Connect("ANOTHER_THAT_DOES_NOT_EXIST")); + Assert.Throws(() => cluster.Connect().Connect()); + Assert.Throws(() => cluster.Connect("ANOTHER_THAT_DOES_NOT_EXIST").Connect()); } } @@ -206,7 +207,7 @@ public void Cluster_Should_Resolve_Names() { try { - cluster.Connect("system"); + cluster.Connect("system").Connect(); Assert.IsTrue( cluster.Metadata.AllHosts().Any(h => addressList.Contains(h.Address.Address)), string.Join(";", cluster.Metadata.AllHosts().Select(h => h.Address.ToString())) + " | " + TestCluster.InitialContactPoint.Address); @@ -217,36 +218,7 @@ public void Cluster_Should_Resolve_Names() } } } - - [Test] - public void RepeatedClusterConnectCallsAfterTimeoutErrorThrowCachedInitErrorException() - { - TestCluster.DisableConnectionListener(type: "reject_startup"); - var timeoutMessage = "Cluster initialization was aborted after timing out. This mechanism is put in place to" + - " avoid blocking the calling thread forever. This usually caused by a networking issue" + - " between the client driver instance and the cluster. You can increase this timeout via " + - "the SocketOptions.ConnectTimeoutMillis config setting. This can also be related to deadlocks " + - "caused by mixing synchronous and asynchronous code."; - var cachedError = "An error occured during the initialization of the cluster instance. Further initialization attempts " + - "for this cluster instance will never succeed and will return this exception instead. The InnerException property holds " + - "a reference to the exception that originally caused the initialization error."; - using (var cluster = CreateClusterAndWaitUntilConnectException( - b => b - .WithSocketOptions( - new SocketOptions() - .SetConnectTimeoutMillis(500) - .SetMetadataAbortTimeout(500)), - out var ex)) - { - Assert.AreEqual(typeof(TimeoutException), ex.GetType()); - Assert.AreEqual(timeoutMessage, ex.Message); - var ex2 = Assert.Throws(() => cluster.Connect("sample_ks")); - Assert.AreEqual(cachedError, ex2.Message); - Assert.AreEqual(typeof(TimeoutException), ex2.InnerException.GetType()); - Assert.AreEqual(timeoutMessage, ex2.InnerException.Message); - } - } - + [Test] public void RepeatedClusterConnectCallsAfterTimeoutErrorEventuallyThrowNoHostException() { @@ -259,12 +231,11 @@ public void RepeatedClusterConnectCallsAfterTimeoutErrorEventuallyThrowNoHostExc .SetMetadataAbortTimeout(500)), out var ex)) { - Assert.AreEqual(typeof(TimeoutException), ex.GetType()); + Assert.AreEqual(typeof(InitializationTimeoutException), ex.GetType()); TestHelper.RetryAssert( () => { - var ex2 = Assert.Throws(() => cluster.Connect("sample_ks")); - Assert.AreEqual(typeof(NoHostAvailableException), ex2.InnerException.GetType()); + var ex2 = Assert.Throws(() => cluster.Connect("sample_ks").Connect()); }, 1000, 30); @@ -276,12 +247,20 @@ public void RepeatedClusterConnectCallsAfterNoHostErrorDontThrowCachedInitErrorE { TestCluster.DisableConnectionListener(type: "reject_startup"); using (var cluster = CreateClusterAndWaitUntilConnectException( - b => b.WithSocketOptions(new SocketOptions().SetConnectTimeoutMillis(1).SetReadTimeoutMillis(1)), + b => b + .WithReconnectionPolicy(new ConstantReconnectionPolicy(5000)) + .WithSocketOptions(new SocketOptions().SetConnectTimeoutMillis(1).SetReadTimeoutMillis(1)), out _)) { - var ex = Assert.Throws(() => cluster.Connect()); - var ex2 = Assert.Throws(() => cluster.Connect("sample_ks")); - Assert.AreNotSame(ex, ex2); + var ex = Assert.Throws(() => cluster.Connect().Connect()); + var ex2 = Assert.Throws(() => cluster.Connect("sample_ks").Connect()); + Assert.AreSame(ex, ex2); + Task.Delay(5000).GetAwaiter().GetResult(); + TestHelper.RetryAssert(() => + { + var ex3 = Assert.Throws(() => cluster.Connect("sample_ks3").Connect()); + Assert.AreNotSame(ex2, ex3); + }, 100, 20); } } @@ -297,7 +276,7 @@ private ICluster CreateClusterAndWaitUntilConnectException(Action b, ou cluster = builder.Build(); try { - tempEx = Assert.Catch(() => cluster.Connect()); + tempEx = Assert.Catch(() => cluster.Connect().Connect()); } catch (Exception) { diff --git a/src/Cassandra/Helpers/ClusterInitializer.cs b/src/Cassandra/Helpers/ClusterInitializer.cs index 58ca55c0d..f4c6635c9 100644 --- a/src/Cassandra/Helpers/ClusterInitializer.cs +++ b/src/Cassandra/Helpers/ClusterInitializer.cs @@ -135,11 +135,7 @@ private async Task InitInternalAsync() var delay = reconnectionSchedule.NextDelayMs(); ClusterInitializer.Logger.Error(ex, "Cluster initialization failed. Retrying in {0} ms.", delay); - Task.Run(() => currentTcs.TrySetException( - new InitializationErrorException( - "Cluster initialization failed. See inner exception. " + - "The driver will attempt to retry the initialization according to the reconnection policy " + - "schedule.", ex))).Forget(); + Task.Run(() => currentTcs.TrySetException(ex)).Forget(); try { @@ -254,11 +250,12 @@ private IInternalMetadata WaitInitInternal() { ValidateState(); - using (var waiter = new TaskTimeoutHelper(_initTaskCompletionSource.Task, _cluster.GetInitTimeout())) + using (var waiter = new TaskTimeoutHelper( + _initTaskCompletionSource.Task, _cluster.GetInitTimeout())) { if (waiter.WaitWithTimeout()) { - return _initTaskCompletionSource.Task.GetAwaiter().GetResult(); + return waiter.TaskToWait.GetAwaiter().GetResult(); } } @@ -269,11 +266,12 @@ private async Task WaitInitInternalAsync() { ValidateState(); - using (var waiter = new TaskTimeoutHelper(_initTaskCompletionSource.Task, _cluster.GetInitTimeout())) + using (var waiter = new TaskTimeoutHelper( + _initTaskCompletionSource.Task, _cluster.GetInitTimeout())) { if (await waiter.WaitWithTimeoutAsync().ConfigureAwait(false)) { - return _initTaskCompletionSource.Task.GetAwaiter().GetResult(); + return await waiter.TaskToWait.ConfigureAwait(false); } } diff --git a/src/Cassandra/Helpers/SessionInitializer.cs b/src/Cassandra/Helpers/SessionInitializer.cs index d6f0428a9..5602ea4ce 100644 --- a/src/Cassandra/Helpers/SessionInitializer.cs +++ b/src/Cassandra/Helpers/SessionInitializer.cs @@ -1,12 +1,12 @@ -// +// // Copyright (C) DataStax Inc. -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -14,10 +14,9 @@ // limitations under the License. using System; -using System.Diagnostics; -using System.Reflection; using System.Threading; using System.Threading.Tasks; + using Cassandra.Connections.Control; using Cassandra.Requests; using Cassandra.SessionManagement; @@ -38,7 +37,8 @@ internal class SessionInitializer : ISessionInitializer private volatile bool _initialized = false; private volatile Task _initTask; - private volatile TaskCompletionSource _initTaskCompletionSource + + private volatile TaskCompletionSource _initTaskCompletionSource = new TaskCompletionSource(); private volatile InitFatalErrorException _initException; @@ -66,7 +66,7 @@ public void Initialize() _initTask = Task.Run(InitInternalAsync); } - + public bool IsDisposed => Interlocked.Read(ref _state) == SessionInitializer.Disposed; private async Task InitInternalAsync() @@ -80,7 +80,7 @@ private async Task InitInternalAsync() } await _session.PostInitializeAsync().ConfigureAwait(false); - + var previousState = Interlocked.CompareExchange(ref _state, SessionInitializer.Initialized, SessionInitializer.Initializing); if (previousState == SessionInitializer.Disposed) { @@ -89,7 +89,7 @@ private async Task InitInternalAsync() } _initialized = true; - + SessionInitializer.Logger.Info("Session [{0}] has been initialized.", _session.SessionName); Task.Run(() => _initTaskCompletionSource.TrySetResult(_session.InternalCluster.InternalMetadata)).Forget(); @@ -112,7 +112,7 @@ private async Task InitInternalAsync() throw; } } - + public void WaitInit() { if (_initialized) @@ -156,21 +156,22 @@ public Task WaitInitAsync() return WaitInitInternalAsync(); } + private IInternalMetadata WaitInitInternal() { ValidateState(); - - using (var waiter = new TaskTimeoutHelper( - new [] + + using (var waiter = new TaskTimeoutHelper( + new[] { - _session.InternalCluster.ClusterInitializer.WaitInitAsync(), + _session.InternalCluster.ClusterInitializer.WaitInitAndGetMetadataAsync(), _initTaskCompletionSource.Task - }, + }, _session.InternalCluster.GetInitTimeout())) { if (waiter.WaitWithTimeout()) { - return _initTaskCompletionSource.Task.GetAwaiter().GetResult(); + return waiter.TaskToWait.GetAwaiter().GetResult(); } } @@ -180,18 +181,18 @@ private IInternalMetadata WaitInitInternal() private async Task WaitInitInternalAsync() { ValidateState(); - - using (var waiter = new TaskTimeoutHelper( - new [] + + using (var waiter = new TaskTimeoutHelper( + new[] { - _session.InternalCluster.ClusterInitializer.WaitInitAsync(), + _session.InternalCluster.ClusterInitializer.WaitInitAndGetMetadataAsync(), _initTaskCompletionSource.Task - }, + }, _session.InternalCluster.GetInitTimeout())) { if (await waiter.WaitWithTimeoutAsync().ConfigureAwait(false)) { - return _initTaskCompletionSource.Task.GetAwaiter().GetResult(); + return await waiter.TaskToWait.ConfigureAwait(false); } } @@ -217,7 +218,7 @@ public async Task ShutdownAsync(int timeoutMs = Timeout.Infinite) { var previousState = Interlocked.Exchange(ref _state, SessionInitializer.Disposed); _initialized = false; - + if (previousState == SessionInitializer.Initializing) { _initCancellationTokenSource.Cancel(); @@ -237,7 +238,7 @@ public async Task ShutdownAsync(int timeoutMs = Timeout.Infinite) // ignored } } - + if (previousState != SessionInitializer.Disposed) { _initCancellationTokenSource.Dispose(); @@ -257,7 +258,7 @@ internal interface ISessionInitializer bool IsInitialized { get; } void Initialize(); - + void WaitInit(); IInternalMetadata WaitInitAndGetMetadata(); diff --git a/src/Cassandra/InitializationTimeoutException.cs b/src/Cassandra/InitializationTimeoutException.cs index 93b720ccd..81a3f6b1f 100644 --- a/src/Cassandra/InitializationTimeoutException.cs +++ b/src/Cassandra/InitializationTimeoutException.cs @@ -22,7 +22,7 @@ namespace Cassandra [Serializable] public class InitializationTimeoutException : DriverException { - internal InitializationTimeoutException() : base("Cluster initialization was aborted after timing out. This mechanism is put in place to" + + internal InitializationTimeoutException() : base("Timed out while waiting for cluster initialization to finish. This mechanism is put in place to" + " avoid blocking the calling thread forever. This usually caused by a networking issue" + " between the client driver instance and the cluster. You can increase this timeout via " + "the SocketOptions.ConnectTimeoutMillis config setting. This can also be related to deadlocks " + diff --git a/src/Cassandra/Requests/TaskTimeoutHelper.cs b/src/Cassandra/Requests/TaskTimeoutHelper.cs index 146643ef7..f4250ec65 100644 --- a/src/Cassandra/Requests/TaskTimeoutHelper.cs +++ b/src/Cassandra/Requests/TaskTimeoutHelper.cs @@ -20,26 +20,25 @@ namespace Cassandra.Requests { - internal class TaskTimeoutHelper : IDisposable + internal class TaskTimeoutHelper : IDisposable { - private readonly Task _taskToWait; private readonly CancellationTokenSource _tcs; private readonly Task _timeoutTask; - public TaskTimeoutHelper(Task taskToWait, TimeSpan timeout) + public TaskTimeoutHelper(Task taskToWait, TimeSpan timeout) { - _taskToWait = taskToWait; + TaskToWait = taskToWait; _tcs = new CancellationTokenSource(); _timeoutTask = Task.Delay(timeout, _tcs.Token); } - public TaskTimeoutHelper(IEnumerable tasksToWait, TimeSpan timeout) + public TaskTimeoutHelper(IEnumerable> tasksToWait, TimeSpan timeout) { foreach (var task in tasksToWait) { - _taskToWait = _taskToWait == null + TaskToWait = TaskToWait == null ? task - : _taskToWait.ContinueWith( + : TaskToWait.ContinueWith( prevTask => prevTask.IsFaulted ? prevTask : task, TaskContinuationOptions.ExecuteSynchronously).Unwrap(); @@ -48,14 +47,16 @@ public TaskTimeoutHelper(IEnumerable tasksToWait, TimeSpan timeout) _timeoutTask = Task.Delay(timeout, _tcs.Token); } + public Task TaskToWait { get; } + public bool WaitWithTimeout() - { - return Task.WaitAny(_taskToWait, _timeoutTask) == 0; + { + return Task.WaitAny(TaskToWait, _timeoutTask) == 0; } public async Task WaitWithTimeoutAsync() { - return (await Task.WhenAny(_taskToWait, _timeoutTask).ConfigureAwait(false)) == _taskToWait; + return (await Task.WhenAny(TaskToWait, _timeoutTask).ConfigureAwait(false)) == TaskToWait; } public void Dispose() diff --git a/src/Cassandra/Session.cs b/src/Cassandra/Session.cs index 66ef5f412..3c0003948 100644 --- a/src/Cassandra/Session.cs +++ b/src/Cassandra/Session.cs @@ -265,7 +265,14 @@ async Task IInternalSession.PostInitializeAsync() { await WarmupAsync(_cluster.InternalMetadata).ConfigureAwait(false); } - + + if (Keyspace != null) + { + // Borrow a connection, trying to fail fast if keyspace is invalid + var handler = Configuration.RequestHandlerFactory.Create(this, _cluster.InternalMetadata, serializerManager.GetCurrentSerializer()); + await handler.GetNextConnectionAsync(new Dictionary()).ConfigureAwait(false); + } + _insightsClient.Initialize(_cluster.InternalMetadata); } From ec0ffe85a82b88c3f72419da84b4a0aa6808635b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Wed, 8 Jul 2020 15:56:49 +0100 Subject: [PATCH 26/31] fix couple of tests and fix memory leak --- .../Core/ClientTimeoutTests.cs | 38 ++++++---- src/Cassandra/Cluster.cs | 24 ++++++- .../DataStax/Insights/InsightsClient.cs | 9 ++- src/Cassandra/Helpers/ClusterInitializer.cs | 69 +++++++++++++------ src/Cassandra/Helpers/SessionInitializer.cs | 41 +++++++---- src/Cassandra/Session.cs | 17 ++++- .../SessionManagement/IInternalCluster.cs | 2 + src/Cassandra/Tasks/TaskHelper.cs | 15 +--- 8 files changed, 149 insertions(+), 66 deletions(-) diff --git a/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs b/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs index a184ca40c..f53e72855 100644 --- a/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs +++ b/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs @@ -306,6 +306,7 @@ public void Should_Not_Leak_Connections_Test() var clusters = Enumerable.Range(0, 100).Select( b => ClusterBuilder() .AddContactPoint(_testCluster.InitialContactPoint) + .WithReconnectionPolicy(new ConstantReconnectionPolicy(120 * 1000)) .WithSocketOptions(socketOptions) .Build()).ToList(); @@ -315,7 +316,15 @@ public void Should_Not_Leak_Connections_Test() { try { - await c.ConnectAsync().ConfigureAwait(false); + var session = await c.ConnectAsync().ConfigureAwait(false); + try + { + await session.ConnectAsync().ConfigureAwait(false); + } + finally + { + await session.ShutdownAsync().ConfigureAwait(false); + } } catch (NoHostAvailableException ex) { @@ -332,11 +341,11 @@ public void Should_Not_Leak_Connections_Test() { t.Dispose(); } - + tasks = null; - GC.Collect(); - Thread.Sleep(1000); + Thread.Sleep(3000); + GC.Collect(GC.MaxGeneration, GCCollectionMode.Forced, true, true); decimal initialMemory = GC.GetTotalMemory(true); @@ -348,7 +357,15 @@ public void Should_Not_Leak_Connections_Test() { try { - await c.ConnectAsync().ConfigureAwait(false); + var session = await c.ConnectAsync().ConfigureAwait(false); + try + { + await session.ConnectAsync().ConfigureAwait(false); + } + finally + { + await session.ShutdownAsync().ConfigureAwait(false); + } } catch (NoHostAvailableException ex) { @@ -368,19 +385,16 @@ public void Should_Not_Leak_Connections_Test() } tasks = null; - - GC.Collect(); - Thread.Sleep(1000); + + GC.Collect(GC.MaxGeneration, GCCollectionMode.Forced, true); + Assert.Less(GC.GetTotalMemory(true) / initialMemory, 1.5M, "Should not exceed a 50% (1.5) more than was previously allocated"); } finally { - foreach (var c in clusters) - { - c.Dispose(); - } + Task.WhenAll(clusters.Select(c => Task.Run(() => c.ShutdownAsync()))).GetAwaiter().GetResult(); } } } diff --git a/src/Cassandra/Cluster.cs b/src/Cassandra/Cluster.cs index 4b78c751d..711ae96d4 100644 --- a/src/Cassandra/Cluster.cs +++ b/src/Cassandra/Cluster.cs @@ -248,7 +248,6 @@ public async Task ConnectAsync(string keyspace) var session = Configuration.SessionFactory.CreateSession(this, keyspace, newSessionName); _connectedSessions.Add(session); - Cluster.Logger.Info("Session connected ({0})", session.GetHashCode()); return session; } finally @@ -396,6 +395,29 @@ HostDistance IInternalCluster.RetrieveAndSetDistance(Host host) return distance; } + async Task IInternalCluster.OnSessionShutdownAsync(IInternalSession session) + { + await _sessionCreateLock.WaitAsync().ConfigureAwait(false); + try + { + var list = new List(); + foreach (var s in _connectedSessions) + { + if (!ReferenceEquals(s, session)) + { + list.Add(s); + } + } + + _connectedSessions.ClearAndGet(); + _connectedSessions.AddRange(list.ToArray()); + } + finally + { + _sessionCreateLock.Release(); + } + } + /// async Task IInternalCluster.PrepareAsync( IInternalSession session, string cqlQuery, string keyspace, IDictionary customPayload) diff --git a/src/Cassandra/DataStax/Insights/InsightsClient.cs b/src/Cassandra/DataStax/Insights/InsightsClient.cs index a44bcb5a5..a1557040b 100644 --- a/src/Cassandra/DataStax/Insights/InsightsClient.cs +++ b/src/Cassandra/DataStax/Insights/InsightsClient.cs @@ -122,15 +122,18 @@ public void Initialize(IInternalMetadata internalMetadata) _insightsTask = Task.Run(() => MainLoopAsync(internalMetadata)); } - public Task ShutdownAsync() + public async Task ShutdownAsync() { if (!Initialized) { - return TaskHelper.Completed; + return; } _cancellationTokenSource.Cancel(); - return _insightsTask; + + await _insightsTask.ConfigureAwait(false); + + _cancellationTokenSource.Dispose(); } public void Dispose() diff --git a/src/Cassandra/Helpers/ClusterInitializer.cs b/src/Cassandra/Helpers/ClusterInitializer.cs index f4c6635c9..690ff77c9 100644 --- a/src/Cassandra/Helpers/ClusterInitializer.cs +++ b/src/Cassandra/Helpers/ClusterInitializer.cs @@ -39,7 +39,8 @@ internal class ClusterInitializer : IClusterInitializer private readonly IInternalCluster _cluster; private readonly IInternalMetadata _internalMetadata; private readonly CancellationTokenSource _initCancellationTokenSource = new CancellationTokenSource(); - private readonly IList> _initCallbacks = new List>(); + private readonly ISet _initCallbacks = + new HashSet(new ReferenceEqualityComparer()); private readonly object _initCallbackLock = new object(); private volatile bool _initialized = false; @@ -79,7 +80,35 @@ private static string GetAssemblyInfo() return $"{info.ProductName} v{info.FileVersion}"; } - public bool TryAttachInitCallback(Func callback) + public void RemoveCallback(ISessionInitializer callback) + { + if (_initialized) + { + return; + } + + if (IsDisposed) + { + return; + } + + lock (_initCallbackLock) + { + if (_initialized) + { + return; + } + + if (IsDisposed) + { + return; + } + + _initCallbacks.Remove(callback); + } + } + + public bool TryAttachInitCallback(ISessionInitializer callback) { if (_initialized) { @@ -128,7 +157,7 @@ private async Task InitInternalAsync() { if (IsDisposed) { - throw new ObjectDisposedException("Cluster instance was disposed before initialization finished."); + break; } var currentTcs = _initTaskCompletionSource; @@ -151,11 +180,6 @@ await Task.Delay( } } while (!IsDisposed); - if (IsDisposed) - { - throw new ObjectDisposedException("Cluster instance was disposed before initialization finished."); - } - var previousState = Interlocked.CompareExchange(ref _state, ClusterInitializer.Initialized, ClusterInitializer.Initializing); if (previousState == ClusterInitializer.Disposed) { @@ -174,14 +198,14 @@ await Task.Delay( Task.Run(async () => { - IList> callbacks; + IList callbacks; lock (_initCallbackLock) { - callbacks = new List>(_initCallbacks); + callbacks = new List(_initCallbacks); _initCallbacks.Clear(); } - await Task.WhenAll(callbacks.Select(c => c.Invoke())).ConfigureAwait(false); + await Task.WhenAll(callbacks.Select(c => c.ClusterInitCallbackAsync())).ConfigureAwait(false); }).Forget(); return; } @@ -307,18 +331,17 @@ public async Task ShutdownAsync(int timeoutMs = Timeout.Infinite) { _initCancellationTokenSource.Cancel(); } - - if (previousState != ClusterInitializer.Initialized) + + try { - try - { - await _initTask.ConfigureAwait(false); - } - catch (Exception) - { - // ignored - } + await _initTask.ConfigureAwait(false); } + catch (Exception) + { + // ignored + } + + _initialized = false; if (previousState != ClusterInitializer.Disposed) { @@ -342,7 +365,9 @@ private async Task ShutdownInternalAsync() internal interface IClusterInitializer { - bool TryAttachInitCallback(Func callback); + bool TryAttachInitCallback(ISessionInitializer callback); + + void RemoveCallback(ISessionInitializer callback); bool IsDisposed { get; } diff --git a/src/Cassandra/Helpers/SessionInitializer.cs b/src/Cassandra/Helpers/SessionInitializer.cs index 5602ea4ce..3f50f0897 100644 --- a/src/Cassandra/Helpers/SessionInitializer.cs +++ b/src/Cassandra/Helpers/SessionInitializer.cs @@ -43,6 +43,8 @@ private volatile TaskCompletionSource _initTaskCompletionSour private volatile InitFatalErrorException _initException; + private volatile bool _addedCallback = true; + private long _state = SessionInitializer.Initializing; public SessionInitializer(IInternalSession session) @@ -54,8 +56,9 @@ public SessionInitializer(IInternalSession session) public void Initialize() { - if (_session.InternalCluster.ClusterInitializer.TryAttachInitCallback(InitInternalAsync)) + if (_session.InternalCluster.ClusterInitializer.TryAttachInitCallback(this)) { + _addedCallback = true; return; } @@ -67,10 +70,17 @@ public void Initialize() _initTask = Task.Run(InitInternalAsync); } + public Task ClusterInitCallbackAsync() + { + return InitInternalAsync(); + } + public bool IsDisposed => Interlocked.Read(ref _state) == SessionInitializer.Disposed; private async Task InitInternalAsync() { + _addedCallback = false; + SessionInitializer.Logger.Info("Connecting to session [{0}]", _session.SessionName); try { @@ -223,25 +233,30 @@ public async Task ShutdownAsync(int timeoutMs = Timeout.Infinite) { _initCancellationTokenSource.Cancel(); } - - if (previousState != SessionInitializer.Initialized) + + try { - try - { - if (_initTask != null) - { - await _initTask.ConfigureAwait(false); - } - } - catch (Exception) + if (_initTask != null) { - // ignored + await _initTask.ConfigureAwait(false); } } + catch (Exception) + { + // ignored + } + + _initialized = false; + + if (_addedCallback) + { + _session.InternalCluster.ClusterInitializer.RemoveCallback(this); + } if (previousState != SessionInitializer.Disposed) { _initCancellationTokenSource.Dispose(); + await _session.InternalCluster.OnSessionShutdownAsync(_session).ConfigureAwait(false); } if (previousState == SessionInitializer.Initialized) @@ -268,5 +283,7 @@ internal interface ISessionInitializer Task WaitInitAsync(); Task ShutdownAsync(int timeoutMs = Timeout.Infinite); + + Task ClusterInitCallbackAsync(); } } \ No newline at end of file diff --git a/src/Cassandra/Session.cs b/src/Cassandra/Session.cs index 3c0003948..6280cdc0c 100644 --- a/src/Cassandra/Session.cs +++ b/src/Cassandra/Session.cs @@ -45,7 +45,9 @@ public class Session : IInternalSession private readonly IInternalCluster _cluster; private readonly IMetricsManager _metricsManager; private readonly IObserverFactory _observerFactory; + private readonly IInsightsClient _insightsClient; + private readonly UdtMappingDefinitions _udtMappingDefinitions; private readonly SessionInitializer _sessionInitializer; @@ -94,7 +96,18 @@ string IInternalSession.Keyspace } /// - public UdtMappingDefinitions UserDefinedTypes { get; private set; } + public UdtMappingDefinitions UserDefinedTypes + { + get + { + if (IsDisposed) + { + throw new ObjectDisposedException("Session is disposed."); + } + + return _udtMappingDefinitions; + } + } public string SessionName { get; } @@ -134,7 +147,7 @@ internal Session( SessionName); _observerFactory = configuration.ObserverFactoryBuilder.Build(_metricsManager); _insightsClient = configuration.InsightsClientFactory.Create(cluster, this); - UserDefinedTypes = new UdtMappingDefinitions(this); + _udtMappingDefinitions = new UdtMappingDefinitions(this); _sessionInitializer = new SessionInitializer(this); _sessionInitializer.Initialize(); } diff --git a/src/Cassandra/SessionManagement/IInternalCluster.cs b/src/Cassandra/SessionManagement/IInternalCluster.cs index 682c43ed5..6b46a7f25 100644 --- a/src/Cassandra/SessionManagement/IInternalCluster.cs +++ b/src/Cassandra/SessionManagement/IInternalCluster.cs @@ -67,5 +67,7 @@ internal interface IInternalCluster : ICluster Task PreShutdownAsync(int timeoutMs); Task PostShutdownAsync(); + + Task OnSessionShutdownAsync(IInternalSession session); } } \ No newline at end of file diff --git a/src/Cassandra/Tasks/TaskHelper.cs b/src/Cassandra/Tasks/TaskHelper.cs index 9389d429c..1188b9cc9 100644 --- a/src/Cassandra/Tasks/TaskHelper.cs +++ b/src/Cassandra/Tasks/TaskHelper.cs @@ -467,20 +467,7 @@ public static async Task WithCancellation( return await task.ConfigureAwait(false); } - - /// - /// Simple helper to create a CancellationToken that is cancelled after - /// the provided . - /// - /// Timespan after which the returned - /// is canceled. - /// A newly created that will be canceled - /// after the specified . - public static CancellationToken CancelTokenAfterDelay(TimeSpan timespan) - { - return new CancellationTokenSource(timespan).Token; - } - + /// /// Calls Task.Delay with a cancellation token. /// From 75d498a6763c02eb06a2937ed1aa4ea62f464409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Wed, 8 Jul 2020 17:32:13 +0100 Subject: [PATCH 27/31] fix leak related to Task.Delay with cancellation --- .../Core/ClientTimeoutTests.cs | 4 +- .../Core/ConnectionSimulacronTests.cs | 3 +- src/Cassandra/Helpers/ClusterInitializer.cs | 20 +++---- src/Cassandra/Helpers/SessionInitializer.cs | 27 ++++----- src/Cassandra/Requests/TaskTimeoutHelper.cs | 58 +++++++++++++------ 5 files changed, 61 insertions(+), 51 deletions(-) diff --git a/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs b/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs index f53e72855..4f237ca02 100644 --- a/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs +++ b/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs @@ -349,7 +349,7 @@ public void Should_Not_Leak_Connections_Test() decimal initialMemory = GC.GetTotalMemory(true); - const int length = 100; + const int length = 200; tasks = clusters.Select(c => Task.Run(async () => { @@ -385,7 +385,7 @@ public void Should_Not_Leak_Connections_Test() } tasks = null; - + GC.Collect(GC.MaxGeneration, GCCollectionMode.Forced, true); Assert.Less(GC.GetTotalMemory(true) / initialMemory, 1.5M, diff --git a/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs b/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs index 2eacdd005..42d625804 100644 --- a/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs +++ b/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs @@ -246,6 +246,7 @@ public async Task Should_KeepOperationsInWriteQueue_When_ServerAppliesTcpBackPre .SetReadTimeoutMillis(360000) .SetStreamMode(streamMode))); + await Session.ConnectAsync().ConfigureAwait(false); var clusterDescription = await Session.Cluster.Metadata.GetClusterDescriptionAsync().ConfigureAwait(false); var maxRequestsPerConnection = Session.Cluster.Configuration @@ -344,7 +345,7 @@ public async Task Should_KeepOperationsInWriteQueue_When_ServerAppliesTcpBackPre } private async Task AssertRetryUntilWriteQueueStabilizesAsync( - IEnumerable connections, int? maxPerConnection = null, int msPerRetry = 1000, int maxRetries = 30) + IEnumerable connections, int? maxPerConnection = null, int msPerRetry = 5000, int maxRetries = 30) { foreach (var connection in connections) { diff --git a/src/Cassandra/Helpers/ClusterInitializer.cs b/src/Cassandra/Helpers/ClusterInitializer.cs index 690ff77c9..450021ae9 100644 --- a/src/Cassandra/Helpers/ClusterInitializer.cs +++ b/src/Cassandra/Helpers/ClusterInitializer.cs @@ -274,13 +274,10 @@ private IInternalMetadata WaitInitInternal() { ValidateState(); - using (var waiter = new TaskTimeoutHelper( - _initTaskCompletionSource.Task, _cluster.GetInitTimeout())) + var waiter = new TaskTimeoutHelper(_initTaskCompletionSource.Task); + if (waiter.WaitWithTimeout(_cluster.GetInitTimeout())) { - if (waiter.WaitWithTimeout()) - { - return waiter.TaskToWait.GetAwaiter().GetResult(); - } + return waiter.TaskToWait.GetAwaiter().GetResult(); } throw new InitializationTimeoutException(); @@ -289,14 +286,11 @@ private IInternalMetadata WaitInitInternal() private async Task WaitInitInternalAsync() { ValidateState(); - - using (var waiter = new TaskTimeoutHelper( - _initTaskCompletionSource.Task, _cluster.GetInitTimeout())) + + var waiter = new TaskTimeoutHelper(_initTaskCompletionSource.Task); + if (await waiter.WaitWithTimeoutAsync(_cluster.GetInitTimeout()).ConfigureAwait(false)) { - if (await waiter.WaitWithTimeoutAsync().ConfigureAwait(false)) - { - return await waiter.TaskToWait.ConfigureAwait(false); - } + return await waiter.TaskToWait.ConfigureAwait(false); } throw new InitializationTimeoutException(); diff --git a/src/Cassandra/Helpers/SessionInitializer.cs b/src/Cassandra/Helpers/SessionInitializer.cs index 3f50f0897..1331cdcc0 100644 --- a/src/Cassandra/Helpers/SessionInitializer.cs +++ b/src/Cassandra/Helpers/SessionInitializer.cs @@ -170,19 +170,16 @@ public Task WaitInitAsync() private IInternalMetadata WaitInitInternal() { ValidateState(); - - using (var waiter = new TaskTimeoutHelper( + var waiter = new TaskTimeoutHelper( new[] { _session.InternalCluster.ClusterInitializer.WaitInitAndGetMetadataAsync(), _initTaskCompletionSource.Task - }, - _session.InternalCluster.GetInitTimeout())) + }); + + if (waiter.WaitWithTimeout(_session.InternalCluster.GetInitTimeout())) { - if (waiter.WaitWithTimeout()) - { - return waiter.TaskToWait.GetAwaiter().GetResult(); - } + return waiter.TaskToWait.GetAwaiter().GetResult(); } throw new InitializationTimeoutException(); @@ -191,19 +188,17 @@ private IInternalMetadata WaitInitInternal() private async Task WaitInitInternalAsync() { ValidateState(); - - using (var waiter = new TaskTimeoutHelper( + + var waiter = new TaskTimeoutHelper( new[] { _session.InternalCluster.ClusterInitializer.WaitInitAndGetMetadataAsync(), _initTaskCompletionSource.Task - }, - _session.InternalCluster.GetInitTimeout())) + }); + + if (await waiter.WaitWithTimeoutAsync(_session.InternalCluster.GetInitTimeout()).ConfigureAwait(false)) { - if (await waiter.WaitWithTimeoutAsync().ConfigureAwait(false)) - { - return await waiter.TaskToWait.ConfigureAwait(false); - } + return await waiter.TaskToWait.ConfigureAwait(false); } throw new InitializationTimeoutException(); diff --git a/src/Cassandra/Requests/TaskTimeoutHelper.cs b/src/Cassandra/Requests/TaskTimeoutHelper.cs index f4250ec65..cc21b1349 100644 --- a/src/Cassandra/Requests/TaskTimeoutHelper.cs +++ b/src/Cassandra/Requests/TaskTimeoutHelper.cs @@ -20,19 +20,14 @@ namespace Cassandra.Requests { - internal class TaskTimeoutHelper : IDisposable + internal class TaskTimeoutHelper { - private readonly CancellationTokenSource _tcs; - private readonly Task _timeoutTask; - - public TaskTimeoutHelper(Task taskToWait, TimeSpan timeout) + public TaskTimeoutHelper(Task taskToWait) { TaskToWait = taskToWait; - _tcs = new CancellationTokenSource(); - _timeoutTask = Task.Delay(timeout, _tcs.Token); } - public TaskTimeoutHelper(IEnumerable> tasksToWait, TimeSpan timeout) + public TaskTimeoutHelper(IEnumerable> tasksToWait) { foreach (var task in tasksToWait) { @@ -43,25 +38,50 @@ public TaskTimeoutHelper(IEnumerable> tasksToWait, TimeSpan timeout) ? prevTask : task, TaskContinuationOptions.ExecuteSynchronously).Unwrap(); } - _tcs = new CancellationTokenSource(); - _timeoutTask = Task.Delay(timeout, _tcs.Token); } public Task TaskToWait { get; } - public bool WaitWithTimeout() - { - return Task.WaitAny(TaskToWait, _timeoutTask) == 0; - } - - public async Task WaitWithTimeoutAsync() + public bool WaitWithTimeout(TimeSpan timeout) { - return (await Task.WhenAny(TaskToWait, _timeoutTask).ConfigureAwait(false)) == TaskToWait; + using (var tcs = new CancellationTokenSource()) + { + var timeoutTask = Task.Delay(timeout, tcs.Token); + + var finishedTask = Task.WaitAny(TaskToWait, timeoutTask); + + tcs.Cancel(); + try + { + timeoutTask.GetAwaiter().GetResult(); + } + catch + { + } + + return finishedTask == 0; + } } - public void Dispose() + public async Task WaitWithTimeoutAsync(TimeSpan timeout) { - _tcs.Dispose(); + using (var tcs = new CancellationTokenSource()) + { + var timeoutTask = Task.Delay(timeout, tcs.Token); + + var finishedTask = await Task.WhenAny(TaskToWait, timeoutTask).ConfigureAwait(false); + + tcs.Cancel(); + try + { + await timeoutTask.ConfigureAwait(false); + } + catch + { + } + + return finishedTask == TaskToWait; + } } } } \ No newline at end of file From b709c433e0f4188844ed912880b9cad4d01c0efb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Wed, 8 Jul 2020 17:43:30 +0100 Subject: [PATCH 28/31] add session connect to backpressure tests --- .../Core/ConnectionSimulacronTests.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs b/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs index 42d625804..6044e4273 100644 --- a/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs +++ b/src/Cassandra.IntegrationTests/Core/ConnectionSimulacronTests.cs @@ -51,6 +51,7 @@ public async Task Should_ThrowOperationTimedOut_When_ServerAppliesTcpBackPressur .SetStreamMode(streamMode) .SetDefunctReadTimeoutThreshold(int.MaxValue))); + await Session.ConnectAsync().ConfigureAwait(false); var clusterDescription = await Session.Cluster.Metadata.GetClusterDescriptionAsync().ConfigureAwait(false); var maxRequestsPerConnection = Session.Cluster.Configuration @@ -101,6 +102,7 @@ public async Task Should_RetryOnNextNodes_When_ANodeIsPaused(bool streamMode) .SetStreamMode(streamMode) .SetDefunctReadTimeoutThreshold(int.MaxValue))); + await Session.ConnectAsync().ConfigureAwait(false); var clusterDescription = await Session.Cluster.Metadata.GetClusterDescriptionAsync().ConfigureAwait(false); var pausedNode = TestCluster.GetNode(2); @@ -165,7 +167,8 @@ public async Task Should_ContinueRoutingTrafficToNonPausedNodes_When_ANodeIsPaus .WithLoadBalancingPolicy( new TestDisallowListLbp( Cassandra.Policies.NewDefaultLoadBalancingPolicy("dc1")))))); - + + await Session.ConnectAsync().ConfigureAwait(false); var clusterDescription = await Session.Cluster.Metadata.GetClusterDescriptionAsync().ConfigureAwait(false); var pausedNode = TestCluster.GetNode(2); From 8ab4fe2125b5d51d1b6c3b6f02e43a54b52ffc76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Wed, 8 Jul 2020 17:56:50 +0100 Subject: [PATCH 29/31] fix net452 build --- src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs b/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs index 4f237ca02..7e98f74df 100644 --- a/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs +++ b/src/Cassandra.IntegrationTests/Core/ClientTimeoutTests.cs @@ -345,7 +345,7 @@ public void Should_Not_Leak_Connections_Test() tasks = null; Thread.Sleep(3000); - GC.Collect(GC.MaxGeneration, GCCollectionMode.Forced, true, true); + GC.Collect(GC.MaxGeneration, GCCollectionMode.Forced, true); decimal initialMemory = GC.GetTotalMemory(true); From e27af05bf7599ec1727c4e368dd8c1501f8bcb4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Wed, 8 Jul 2020 21:17:15 +0100 Subject: [PATCH 30/31] update upgrade guide --- doc/upgrade-guide/upgrade-to-4x/README.md | 58 +++++++++++++---------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/doc/upgrade-guide/upgrade-to-4x/README.md b/doc/upgrade-guide/upgrade-to-4x/README.md index 2e515f4bf..f7402dfe8 100644 --- a/doc/upgrade-guide/upgrade-to-4x/README.md +++ b/doc/upgrade-guide/upgrade-to-4x/README.md @@ -29,52 +29,62 @@ In C# driver 4.0, when you create an `ISession` instance, the initialization tas If you want to explicitely wait for the initialization to be finished, you can use one of these new methods: `ISession.ConnectAsync()` / `ISession.Connect()`. -## Addition of several async methods (e.g. `ICluster.GetMetadataAsync()`) +## Session initialization retries + +When the control connection initialization fails because it wasn't able to reach any of the contact points, the driver will retry the initialization according to the configured reconnection policy. + +While an initialization attempt is in progress, the session methods that require initialization (e.g. `session.Execute()`) block until it is finished. If the initialization fails, the methods that were blocked will throw an exception. Until a new initialization attempt begins, any call to a method that requires initialization will throw the same exception. + +## Addition of several async methods (e.g. `Metadata.AllHostsAsync()`) The `ICluster.Metadata` property has always blocked until the initialization task is finished but until now there weren't many issues with this behavior because the user would create a session right away which would initialize the `ICluster` instance in a blocking manner. -Now that the initialization happens in the background, it's more likely that the user faces a scenario where the `ICluster.Metadata` blocks which is really bad if the application uses TPL (e.g. `async/await`) because it could block a thread of the shared threadpool. +Now that the initialization happens in the background, the `ICluster.Metadata` property no longer blocks but the methods on `IMetadata` block until the initialization is finished. For users who use `async/await` we added `async` variants for all methods (e.g. `Metadata.AllHostsAsync()`). -To fix this, we added an `async` way to retrieve the `Metadata` instance: `ICluster.GetMetadataAsync()`. +Some methods were added that return a snapshot of the current metadata cache (e.g. `Metadata.AllHostsSnapshot()`). These methods do not block but will return empty collections if the initialization is not done: -If you would like to keep using the `ICluster.Metadata` property, please make sure that you explicitly initialize the session before accessing it in case your application uses `async/await` to avoid blocking the thread. +- `IMetadata.AllHostsSnapshot()` +- `IMetadata.AllReplicasSnapshot()` +- `IMetadata.GetReplicasSnapshot()` -There were some methods that used the `ICluster.Metadata` property so we have added async variants of those methods as well: +There are also some extension methods that require a session to be initialized so we have added async variants of those methods as well: | Existing method | New async method | Namespace | |------------------------------|-------------------------------|-----------------------| | `CreateBatch(this ISession)` | `ISession.CreateBatchAsync()` | `Cassandra.Data.Linq` | | `GetState(this ISession)` | `ISession.GetStateAsync()` | `Cassandra` | -## `Metadata` API changes +There are also some properties that were moved to the `ClusterDescription` class. You can obtain a `ClusterDescription` instance via the `IMetadata.GetClusterDescriptionAsync()` method (or `IMetadata.GetClusterDescription()`). + +| `Metadata.ClusterName` | `ClusterDescription.ClusterName` | `Cassandra` | +| `Metadata.IsDbaas` | `ClusterDescription.IsDbaas` | `Cassandra` | -Several methods of the `ICluster` interface were actually wrappers around methods that are implemented in the `Metadata` class. We decided to move all metadata related elements from `ICluster`/`ISession` to `Metadata` because of two reasons: +## `Metadata` API changes -- Simplification of the driver's API, it makes more sense to have metadata related methods, properties and events on the `Metadata` class -- The cluster/session initialization happens in the background, which means that we would have to add a lot of `async` methods to the `ICluster` interface if we kept them (similar to what we did with `GetMetadataAsync()`) +Several methods of the `ICluster` interface were actually wrappers around methods that are implemented in the `Metadata` class. We decided to move all metadata related elements from `ICluster`/`ISession` to the new `IMetadata` interface to simplify the driver's API, it makes more sense to have metadata related methods, properties and events on the `IMetadata` interface. -If you are using one of theses elements that were moved to the `Metadata` class, you can use `ICluster.Metadata` or `ICluster.GetMetadataAsync()` to access it (see previous section for a brief explanation about this). +If you are using one of theses elements that were moved to the `IMetadata` interface, you can use `ICluster.Metadata` to access it. Note that some of these methods now block until the initialization is done so we added `async` variants for them (see previous section for an explanation about this). These are the methods, properties and events that were affected: | Old API | New API | |------------------------------------|-----------------------------------| -| `ICluster.AllHosts()` | `Metadata.AllHosts()` | -| `ICluster.GetHost()` | `Metadata.GetHost()` | -| `ICluster.GetReplicas()` | `Metadata.GetReplicas()` | -| `ICluster.RefreshSchema()` | `Metadata.RefreshSchema()` | -| `ICluster.RefreshSchemaAsync()` | `Metadata.RefreshSchemaAsync()` | -| `ICluster.HostAdded` | `Metadata.HostAdded` | -| `ICluster.HostRemoved` | `Metadata.HostRemoved` | -| `ISession.BinaryProtocolVersion` | `Metadata.ProtocolVersion` | +| `ICluster.AllHosts()` | `IMetadata.AllHosts()` | +| `ICluster.GetHost()` | `IMetadata.GetHost()` | +| `ICluster.GetReplicas()` | `IMetadata.GetReplicas()` | +| `ICluster.RefreshSchema()` | `IMetadata.RefreshSchema()` | +| `ICluster.RefreshSchemaAsync()` | `IMetadata.RefreshSchemaAsync()` | +| `ICluster.HostAdded` | `IMetadata.HostAdded` | +| `ICluster.HostRemoved` | `IMetadata.HostRemoved` | +| `ISession.BinaryProtocolVersion` | `IMetadata.GetClusterDescription().ProtocolVersion` | -Note: `Metadata.ProtocolVersion` returns an `enum` instead of `int`, you can cast this `enum` to `int` if you need it (`ISession.BinaryProtocolVersion` did this internally). +Note: `ClusterDescription.ProtocolVersion` returns an `enum` instead of `int`, you can cast this `enum` to `int` if you need it (`ISession.BinaryProtocolVersion` did this internally). ## Removal of `ISession.WaitForSchemaAgreement()` When a DDL request is executed, the driver will wait for schema agreement before returning control to the user. See `ProtocolOptions.MaxSchemaAgreementWaitSeconds` for more info. -If you want to manually check for schema agreement you can use the `Metadata.CheckSchemaAgreementAsync()` method. +If you want to manually check for schema agreement you can use the `IMetadata.CheckSchemaAgreementAsync()` method. ## `Metadata` no longer implements `IDisposable` @@ -90,15 +100,15 @@ You are only affected by these changes if you implemented a custom load balancin The `Initialize()` method is now `InitializeAsync()` and returns a `Task`. If the implementation is not async, we recommend returning `Task.CompletedTask` or `Task.FromResult(0)`. - `InitializeAsync()` now has a `Metadata` parameter instead of `ICluster`. You can obtain the hosts collection and replicas using the `Metadata` class (see the earlier section related to `Metadata` API changes for more information on these changes). + `InitializeAsync()` now has a `IMetadataSnapshotProvider` parameter instead of `ICluster`. You can obtain the hosts collection and replicas using this instance (see the earlier section related to `Metadata` API changes for more information on these changes). -### `ILoadBalancingPolicy.NewQueryPlan()` +### `ILoadBalancingPolicy.NewQueryPlan()` and `ILoadBalancingPolicy.Distance()` -The `NewQueryPlan()` method now has a `Metadata` parameter in addition to `string` (keyspace) and `IStatement`. +The `NewQueryPlan()` and `Distance()` methods now have a `ICluster` parameter. This is to simplify the process of implementing a custom load balancing policy. Previously, all implementations had to be stateful and threadsafe, i.e., the `cluster` object that was provided in the `Initialize()` was necessary in order to implement the `NewQueryPlan()` method. -Now you can build a completely stateless load balancing policy (which is guaranteed to be threadsafe) by obtaining the hosts / replicas via the `Metadata` parameter in the `NewQueryPlan()` method. In this scenario you can have an implementation of the `InitializeAsync()` method that just returns `Task.CompletedTask` or `Task.FromResult(0)`. +Now you can build a completely stateless load balancing policy (which is guaranteed to be threadsafe) by obtaining the hosts / replicas via the `ICluster` parameter in the `NewQueryPlan()` method. In this scenario you can have an implementation of the `InitializeAsync()` method that just returns `Task.CompletedTask` or `Task.FromResult(0)`. You can still build more complex load balancing policies that access some kind of metadata service for example by implementing the `InitializeAsync()` method. From bbf51810c1c826e09929152b0c00008de3a2a560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Fri, 10 Jul 2020 12:28:27 +0100 Subject: [PATCH 31/31] remove unnecessary code --- .../Connections/Control/TopologyMetadata.cs | 22 ------------------- src/Cassandra/Session.cs | 18 ++++----------- .../SessionManagement/IInternalSession.cs | 4 ---- 3 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 src/Cassandra/Connections/Control/TopologyMetadata.cs diff --git a/src/Cassandra/Connections/Control/TopologyMetadata.cs b/src/Cassandra/Connections/Control/TopologyMetadata.cs deleted file mode 100644 index 3bd277d13..000000000 --- a/src/Cassandra/Connections/Control/TopologyMetadata.cs +++ /dev/null @@ -1,22 +0,0 @@ -// -// Copyright (C) DataStax Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -namespace Cassandra.Connections.Control -{ - internal class TopologyMetadata : ITopologyMetadata - { - - } -} \ No newline at end of file diff --git a/src/Cassandra/Session.cs b/src/Cassandra/Session.cs index 6280cdc0c..1ee5e013e 100644 --- a/src/Cassandra/Session.cs +++ b/src/Cassandra/Session.cs @@ -114,7 +114,7 @@ public UdtMappingDefinitions UserDefinedTypes /// public void Connect() { - InternalRef.TryInit(); + _sessionInitializer.WaitInit(); } /// @@ -249,21 +249,11 @@ async Task IInternalSession.OnShutdownAsync() } } - Task IInternalSession.TryInitAsync() - { - return _sessionInitializer.WaitInitAsync(); - } - Task IInternalSession.TryInitAndGetMetadataAsync() { return _sessionInitializer.WaitInitAndGetMetadataAsync(); } - - void IInternalSession.TryInit() - { - _sessionInitializer.WaitInit(); - } - + IInternalMetadata IInternalSession.TryInitAndGetMetadata() { return _sessionInitializer.WaitInitAndGetMetadata(); @@ -495,7 +485,7 @@ public PreparedStatement Prepare(string cqlQuery, string keyspace) /// public PreparedStatement Prepare(string cqlQuery, string keyspace, IDictionary customPayload) { - InternalRef.TryInit(); + _sessionInitializer.WaitInit(); var task = _cluster.PrepareAsync(this, cqlQuery, keyspace, customPayload); TaskHelper.WaitToCompleteWithMetrics(_metricsManager, task, Configuration.ClientOptions.QueryAbortTimeout); return task.Result; @@ -523,7 +513,7 @@ public Task PrepareAsync(string cqlQuery, string keyspace) public async Task PrepareAsync( string cqlQuery, string keyspace, IDictionary customPayload) { - await InternalRef.TryInitAsync().ConfigureAwait(false); + await _sessionInitializer.WaitInitAsync().ConfigureAwait(false); return await _cluster.PrepareAsync(this, cqlQuery, keyspace, customPayload).ConfigureAwait(false); } diff --git a/src/Cassandra/SessionManagement/IInternalSession.cs b/src/Cassandra/SessionManagement/IInternalSession.cs index 98025f4e6..cf1c3d935 100644 --- a/src/Cassandra/SessionManagement/IInternalSession.cs +++ b/src/Cassandra/SessionManagement/IInternalSession.cs @@ -40,10 +40,6 @@ internal interface IInternalSession : ISession Task PostInitializeAsync(); Task OnShutdownAsync(); - - void TryInit(); - - Task TryInitAsync(); IInternalMetadata TryInitAndGetMetadata();