[XrdCl] FileSystem get last URL.

Add new property 'LastURL', closes #1092
xrootd · Jan 21, 2020 · bf5df01 · bf5df01
1 parent 7d51d78
commit bf5df01
Showing 1 changed file with 75 additions and 7 deletions.
diff --git a/src/XrdCl/XrdClFileSystem.cc b/src/XrdCl/XrdClFileSystem.cc
@@ -889,6 +889,32 @@ namespace XrdCl
       ResponseHandler *pUserHandler;
   };
 
+  //----------------------------------------------------------------------------
+  //! Wrapper class used to assign last URL
+  //----------------------------------------------------------------------------
+  class AssignLastURLHandler: public ResponseHandler
+  {
+    public:
+      //------------------------------------------------------------------------
+      // Constructor and destructor
+      //------------------------------------------------------------------------
+      AssignLastURLHandler( FileSystemImpl *fs, ResponseHandler *userHandler ):
+        pFS(fs), pUserHandler(userHandler) {}
+
+      virtual ~AssignLastURLHandler() {}
+
+      //------------------------------------------------------------------------
+      // Response callback
+      //------------------------------------------------------------------------
+      virtual void HandleResponseWithHosts( XRootDStatus *status,
+                                            AnyObject    *response,
+                                            HostList     *hostList );
+
+    private:
+      FileSystemImpl  *pFS;
+      ResponseHandler *pUserHandler;
+  };
+
   //----------------------------------------------------------------------------
   //! Implementation holding the data members
   //----------------------------------------------------------------------------
@@ -919,6 +945,8 @@ namespace XrdCl
       log->Dump( FileSystemMsg, "[0x%x@%s] Sending %s", this,
                  pUrl->GetHostId().c_str(), msg->GetDescription().c_str() );
 
+      handler = new AssignLastURLHandler( this, handler );
+
       if( !pLoadBalancerLookupDone && pFollowRedirects )
         handler = new AssignLBHandler( this, handler ); // TODO
 
@@ -927,7 +955,6 @@ namespace XrdCl
       return MessageUtils::SendMessage( *pUrl, msg, handler, params, 0 );
     }
 
-
     //----------------------------------------------------------------------------
     // Assign a load balancer if it has not already been assigned
     //----------------------------------------------------------------------------
@@ -947,18 +974,33 @@ namespace XrdCl
       pLoadBalancerLookupDone = true;
     }
 
-    XrdSysMutex       pMutex;
-    bool              pLoadBalancerLookupDone;
-    bool              pFollowRedirects;
-    URL              *pUrl;
+    //----------------------------------------------------------------------------
+    // Assign last URL
+    //----------------------------------------------------------------------------
+    void AssignLastURL( const URL &url )
+    {
+      Log *log = DefaultEnv::GetLog();
+      XrdSysMutexHelper scopedLock( pMutex );
+
+      log->Dump( FileSystemMsg, "[0x%x@%s] Assigning %s as last URL", this,
+                 pUrl->GetHostId().c_str(), url.GetHostId().c_str() );
+
+      pLastUrl.reset( new URL( url ) );
+    }
+
+    XrdSysMutex           pMutex;
+    bool                  pLoadBalancerLookupDone;
+    bool                  pFollowRedirects;
+    URL                  *pUrl;
+    std::unique_ptr<URL>  pLastUrl;
   };
 
   //------------------------------------------------------------------------
   // Response callback
   //------------------------------------------------------------------------
   void AssignLBHandler::HandleResponseWithHosts( XRootDStatus *status,
-                                        AnyObject    *response,
-                                        HostList     *hostList )
+                                                 AnyObject    *response,
+                                                 HostList     *hostList )
   {
     if( status->IsOK() )
     {
@@ -977,6 +1019,22 @@ namespace XrdCl
       delete this;
   }
 
+  //------------------------------------------------------------------------
+  // Response callback
+  //------------------------------------------------------------------------
+  void AssignLastURLHandler::HandleResponseWithHosts( XRootDStatus *status,
+                                               AnyObject    *response,
+                                               HostList     *hostList )
+  {
+    if( status->IsOK() && hostList )
+      pFS->AssignLastURL( hostList->front().url );
+
+    bool finalrsp = !( status->IsOK() && status->code == suContinue );
+    pUserHandler->HandleResponseWithHosts( status, response, hostList );
+    if( finalrsp )
+      delete this;
+  }
+
   //----------------------------------------------------------------------------
   // Constructor
   //----------------------------------------------------------------------------
@@ -2023,6 +2081,16 @@ namespace XrdCl
       else value = "false";
       return true;
     }
+    else if( name == "LastURL" )
+    {
+      if( pImpl->pLastUrl )
+      {
+        value = pImpl->pLastUrl->GetURL();
+        return true;
+      }
+      else return false;
+    }
+
     return false;
   }