Revert "[XrdCl] Avoid segv caused by reconnect vs force disconnect."

This reverts commit ce1954b.
amadio · May 7, 2023 · a4d12c3 · a4d12c3
1 parent ba9a395
commit a4d12c3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 51 deletions.
diff --git a/src/XrdCl/XrdClChannel.cc b/src/XrdCl/XrdClChannel.cc
@@ -169,15 +169,6 @@ namespace XrdCl
     return Status();
   }
 
-  //----------------------------------------------------------------------------
-  // Force reconnect
-  //----------------------------------------------------------------------------
-  Status Channel::ForceReconnect()
-  {
-    pStream->ForceConnect();
-    return Status();
-  }
-
   //------------------------------------------------------------------------
   // Get the number of connected data streams
   //------------------------------------------------------------------------

diff --git a/src/XrdCl/XrdClChannel.hh b/src/XrdCl/XrdClChannel.hh
@@ -125,11 +125,6 @@ namespace XrdCl
       //------------------------------------------------------------------------
       Status ForceDisconnect();
 
-      //------------------------------------------------------------------------
-      //! Force reconnect
-      //------------------------------------------------------------------------
-      Status ForceReconnect();
-
       //------------------------------------------------------------------------
       //! Get the number of connected data streams
       //------------------------------------------------------------------------

diff --git a/src/XrdCl/XrdClPostMaster.cc b/src/XrdCl/XrdClPostMaster.cc
@@ -245,11 +245,7 @@ namespace XrdCl
                                      AnyObject &result )
   {
     XrdSysRWLockHelper scopedLock( pImpl->pDisconnectLock );
-    PostMasterImpl::ChannelMap::iterator it =
-        pImpl->pChannelMap.find( url.GetChannelId() );
-    if( it == pImpl->pChannelMap.end() )
-      return Status( stError, errInvalidOp );
-    Channel *channel = it->second;
+    Channel *channel = GetChannel( url );
 
     if( !channel )
       return Status( stError, errNotSupported );
@@ -324,19 +320,6 @@ namespace XrdCl
     return Status();
   }
 
-  Status PostMaster::ForceReconnect( const URL &url )
-  {
-    XrdSysRWLockHelper scopedLock( pImpl->pDisconnectLock, false );
-    PostMasterImpl::ChannelMap::iterator it =
-        pImpl->pChannelMap.find( url.GetChannelId() );
-
-    if( it == pImpl->pChannelMap.end() )
-      return Status( stError, errInvalidOp );
-
-    it->second->ForceReconnect();
-    return Status();
-  }
-
   //------------------------------------------------------------------------
   // Get the number of connected data streams
   //------------------------------------------------------------------------

diff --git a/src/XrdCl/XrdClPostMaster.hh b/src/XrdCl/XrdClPostMaster.hh
@@ -152,11 +152,6 @@ namespace XrdCl
       //------------------------------------------------------------------------
       Status ForceDisconnect( const URL &url );
 
-      //------------------------------------------------------------------------
-      //! Reconnect the channel
-      //------------------------------------------------------------------------
-      Status ForceReconnect( const URL &url );
-
       //------------------------------------------------------------------------
       //! Get the number of connected data streams
       //------------------------------------------------------------------------

diff --git a/src/XrdCl/XrdClStream.cc b/src/XrdCl/XrdClStream.cc
@@ -347,14 +347,11 @@ namespace XrdCl
   void Stream::ForceConnect()
   {
     XrdSysMutexHelper scopedLock( pMutex );
-    if( pSubStreams[0]->status == Socket::Connecting )
-    {
-      pSubStreams[0]->status = Socket::Disconnected;
-      XrdCl::PathID path( 0, 0 );
-      XrdCl::XRootDStatus st = EnableLink( path );
-      if( !st.IsOK() )
-        OnConnectError( 0, st );
-    }
+    pSubStreams[0]->status = Socket::Disconnected;
+    XrdCl::PathID path( 0, 0 );
+    XrdCl::XRootDStatus st = EnableLink( path );
+    if( !st.IsOK() )
+      OnConnectError( 0, st );
   }
 
   //----------------------------------------------------------------------------
@@ -402,11 +399,11 @@ namespace
       //------------------------------------------------------------------------
       // Constructor
       //------------------------------------------------------------------------
-      StreamConnectorTask( const XrdCl::URL &url, const std::string &n ):
-        url( url )
+      StreamConnectorTask( XrdCl::Stream *stream ):
+        pStream( stream )
       {
         std::string name = "StreamConnectorTask for ";
-        name += n;
+        name += stream->GetName();
         SetName( name );
       }
 
@@ -415,12 +412,12 @@ namespace
       //------------------------------------------------------------------------
       time_t Run( time_t )
       {
-        XrdCl::DefaultEnv::GetPostMaster()->ForceReconnect( url );
+        pStream->ForceConnect();
         return 0;
       }
 
     private:
-      XrdCl::URL url;
+      XrdCl::Stream *pStream;
   };
 }
 
@@ -778,7 +775,7 @@ namespace XrdCl
       log->Info( PostMasterMsg, "[%s] Attempting reconnection in %d "
                  "seconds.", pStreamName.c_str(), pConnectionWindow-elapsed );
 
-      Task *task = new ::StreamConnectorTask( *pUrl, pStreamName );
+      Task *task = new ::StreamConnectorTask( this );
       pTaskManager->RegisterTask( task, pConnectionInitTime+pConnectionWindow );
       return;
     }