[XrdCl] Do not reuse sessionId when a new Stream object is made

xrootd · Mar 21, 2023 · 87340a4 · 87340a4
1 parent 8e4965c
commit 87340a4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/XrdCl/XrdClStream.cc b/src/XrdCl/XrdClStream.cc
@@ -44,6 +44,11 @@
 
 namespace XrdCl
 {
+  //----------------------------------------------------------------------------
+  // Statics
+  //----------------------------------------------------------------------------
+  RAtomic_uint64_t        Stream::sSessCntGen{0};
+
   //----------------------------------------------------------------------------
   // Incoming message helper
   //----------------------------------------------------------------------------
@@ -615,7 +620,7 @@ namespace XrdCl
       pLastFatalError  = XRootDStatus();
       pConnectionCount = 0;
       uint16_t numSub = pTransport->SubStreamNumber( *pChannelData );
-      ++pSessionId;
+      pSessionId = ++sSessCntGen;
 
       //------------------------------------------------------------------------
       // Create the streams if they don't exist yet

diff --git a/src/XrdCl/XrdClStream.hh b/src/XrdCl/XrdClStream.hh
@@ -29,6 +29,7 @@
 #include "XrdCl/XrdClUtils.hh"
 
 #include "XrdSys/XrdSysPthread.hh"
+#include "XrdSys/XrdSysRAtomic.hh"
 #include "XrdNet/XrdNetAddr.hh"
 #include <list>
 #include <vector>
@@ -371,6 +372,11 @@ namespace XrdCl
       // Data stream on-connect handler
       //------------------------------------------------------------------------
       std::shared_ptr<Job>           pOnDataConnJob;
+
+      //------------------------------------------------------------------------
+      // Track last assigned Id across all Streams, to ensure unique sessionId
+      //------------------------------------------------------------------------
+      static RAtomic_uint64_t        sSessCntGen;
   };
 }