Fix redundant connect (#371)

The logic had gotten a bit messed up in the recent service level change.
cognitedata · Mar 14, 2023 · 96022f6 · 96022f6
1 parent b4078b5
commit 96022f6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/Extractor/SessionManager.cs b/Extractor/SessionManager.cs
@@ -309,32 +309,30 @@ private async Task<SessionRedundancyResult> CreateSessionWithRedundancy(string i
             string? bestUrl = null;
             byte bestServiceLevel = 0;
 
-            if (initialServiceLevel != null)
-            {
-                if (initialSession == null) throw new InvalidOperationException("InitialSession must be passed along with initialServiceLevel");
-                bestServiceLevel = initialServiceLevel.Value;
-            }
-
             endpointUrls = endpointUrls.Prepend(initialUrl).Distinct().ToList();
+            log.LogInformation("Create session with redundant connections to {Urls}", string.Join(", ", endpointUrls));
 
             ISession? activeSession = initialSession;
 
-            string? activeEndpoint = null;
             if (activeSession != null)
             {
+                if (initialServiceLevel == null) throw new InvalidOperationException("InitialServiceLevel required when initialSession is non-null");
                 if (EndpointUrl == null) throw new InvalidOperationException("EndpointUrl must be set if initialSession is passed");
                 bestUrl = EndpointUrl;
+                bestServiceLevel = initialServiceLevel.Value;
             }
+
+            string? activeEndpoint = null;
             var exceptions = new List<Exception>();
 
             foreach (var url in endpointUrls)
             {
                 try
                 {
                     ISession session;
-                    if (url == EndpointUrl)
+                    if (url == bestUrl && activeSession != null)
                     {
-                        session = initialSession!;
+                        session = activeSession;
                     }
                     else
                     {
@@ -359,6 +357,7 @@ private async Task<SessionRedundancyResult> CreateSessionWithRedundancy(string i
                 }
                 catch (Exception ex)
                 {
+                    log.LogError("Failed to connect to endpoint {Url}: {Error}", url, ex.Message);
                     exceptions.Add(ex);
                 }
             }

diff --git a/manifest.yml b/manifest.yml
@@ -60,6 +60,11 @@ schema:
    - "https://raw.githubusercontent.com/"
 
 versions:
+  "2.15.1":
+    description: Fix connecting to redundant servers
+    changelog:
+      fixed:
+        - "Fix issue causing the extractor to only connect to alt endpoints"
   "2.15.0":
     description: Add live monitoring of ServiceLevel, variable subscription config
     changelog: