Set storage node right on session creation

Author: alex-kulakov

Orm/Xtensive.Orm/Orm/Domain.cs

@@ -231,33 +231,34 @@ public Session OpenSession(SessionConfiguration configuration)
     {
       ArgumentValidator.EnsureArgumentNotNull(configuration, "configuration");
 
-      return OpenSession(configuration, configuration.Supports(SessionOptions.AutoActivation));
+      return OpenSessionInternal(configuration,
+        null,
+        configuration.Supports(SessionOptions.AutoActivation));
     }
 
-    internal Session OpenSession(SessionConfiguration configuration, bool activate)
+    internal Session OpenSessionInternal(SessionConfiguration configuration, StorageNode storageNode, bool activate)
     {
-      ArgumentValidator.EnsureArgumentNotNull(configuration, "configuration");
+      ArgumentValidator.EnsureArgumentNotNull(configuration, nameof(configuration));
       configuration.Lock(true);
 
       if (isDebugEventLoggingEnabled) {
         OrmLog.Debug(Strings.LogOpeningSessionX, configuration);
       }
 
       Session session;
-
       if (SingleConnection!=null) {
         // Ensure that we check shared connection availability
         // and acquire connection atomically.
         lock (singleConnectionGuard) {
           if (singleConnectionOwner!=null)
             throw new InvalidOperationException(string.Format(
               Strings.ExSessionXStillUsesSingleAvailableConnection, singleConnectionOwner));
-          session = new Session(this, configuration, activate);
+          session = new Session(this, storageNode, configuration, activate);
           singleConnectionOwner = session;
         }
       }
       else
-        session = new Session(this, configuration, activate);
+        session = new Session(this, storageNode, configuration, activate);
 
       NotifySessionOpen(session);
       return session;
@@ -372,12 +373,14 @@ public Task<Session> OpenSessionAsync(SessionConfiguration configuration)
     /// <seealso cref="Session"/>
     public Task<Session> OpenSessionAsync(SessionConfiguration configuration, CancellationToken cancellationToken)
     {
-      return OpenSessionInternalAsync(configuration, configuration.Supports(SessionOptions.AutoActivation), cancellationToken);
+      return OpenSessionInternalAsync(configuration, null,
+        configuration.Supports(SessionOptions.AutoActivation), cancellationToken);
     }
 
-    internal async Task<Session> OpenSessionInternalAsync(SessionConfiguration configuration, bool activate, CancellationToken cancellationToken)
+    internal async Task<Session> OpenSessionInternalAsync(SessionConfiguration configuration, StorageNode storageNode, bool activate, CancellationToken cancellationToken)
     {
-      ArgumentValidator.EnsureArgumentNotNull(configuration, "configuration");
+      ArgumentValidator.EnsureArgumentNotNull(configuration, nameof(configuration));
+
       configuration.Lock(true);
 
       if (isDebugEventLoggingEnabled) {
@@ -392,15 +395,15 @@ internal async Task<Session> OpenSessionInternalAsync(SessionConfiguration confi
           if (singleConnectionOwner!=null)
             throw new InvalidOperationException(string.Format(
               Strings.ExSessionXStillUsesSingleAvailableConnection, singleConnectionOwner));
-          session = new Session(this, configuration, false);
+          session = new Session(this, storageNode, configuration, false);
           singleConnectionOwner = session;
         }
       }
       else {
         // DO NOT make session active right from constructor.
         // That would make session accessible for user before
         // connection become opened.
-        session = new Session(this, configuration, false);
+        session = new Session(this, storageNode, configuration, false);
         try {
           await ((SqlSessionHandler)session.Handler).OpenConnectionAsync(cancellationToken).ContinueWith((t) => {
             if (activate)

Orm/Xtensive.Orm/Orm/Session.cs

@@ -506,7 +506,7 @@ private SessionHandler CreateSessionHandler()
 
     // Constructors
 
-    internal Session(Domain domain, SessionConfiguration configuration, bool activate)
+    internal Session(Domain domain, StorageNode selectedStorageNode, SessionConfiguration configuration, bool activate)
       : base(domain)
     {
       Guid = Guid.NewGuid();
@@ -519,6 +519,7 @@ internal Session(Domain domain, SessionConfiguration configuration, bool activat
       identifier = Interlocked.Increment(ref lastUsedIdentifier);
       CommandTimeout = configuration.DefaultCommandTimeout;
       allowSwitching = configuration.Supports(SessionOptions.AllowSwitching);
+      storageNode = selectedStorageNode;
 
       // Handlers
       Handlers = domain.Handlers;