[XrdCl] Refactor TPC fall-back logic.

src/XrdCl/XrdClCopy.cc

@@ -31,8 +31,8 @@
 #include "XrdCl/XrdClFileSystem.hh"
 #include "XrdCl/XrdClUtils.hh"
 #include "XrdCl/XrdClRedirectorRegistry.hh"
+#include "XrdCl/XrdClDlgEnv.hh"
 #include "XrdSys/XrdSysPthread.hh"
-#include "XrdOuc/XrdOucEnv.hh"
 
 #include <stdio.h>
 #include <iostream>
@@ -548,15 +548,12 @@ int main( int argc, char **argv )
     // inhere and we need the env var when we are establishing the
     // connection and authenticating), but we are also setting a delegate
     // parameter for CopyJob so it can be used on its own.
-    XrdOucEnv env;
-    env.Export( "XrdSecGSIDELEGPROXY", 1 );
+    DlgEnv::Instance().Enable();
     delegate = true;
   }
   else
-  {
-    XrdOucEnv env;
-    env.Export( "XrdSecGSIDELEGPROXY", 0 );
-  }
+    DlgEnv::Instance().Disable();
+
   if( config.Want( XrdCpConfig::DoRecurse ) )  makedir    = true;
   if( config.Want( XrdCpConfig::DoPath    ) )  makedir    = true;
   if( config.Want( XrdCpConfig::DoDynaSrc ) )  dynSrc     = true;
@@ -911,6 +908,7 @@ int main( int argc, char **argv )
     return st.GetShellCode();
   }
   CleanUpResults( resultVect );
+
   return 0;
 }
 

src/XrdCl/XrdClDlgEnv.hh

@@ -0,0 +1,80 @@
+/*
+ * XrdClDlgEnv.hh
+ *
+ *  Created on: Oct 17, 2018
+ *      Author: simonm
+ */
+
+#ifndef SRC_XRDCL_XRDCLDLGENV_HH_
+#define SRC_XRDCL_XRDCLDLGENV_HH_
+
+#include <stdlib.h>
+
+
+namespace XrdCl
+{
+
+  //----------------------------------------------------------------------------
+  //! Helper class for setting and unsetting the 'XrdSecGSIDELEGPROXY'
+  //! environment variable.
+  //----------------------------------------------------------------------------
+  class DlgEnv
+  {
+    public:
+
+      //------------------------------------------------------------------------
+      //! @return : instance of DlgEnv
+      //------------------------------------------------------------------------
+      static DlgEnv& Instance()
+      {
+        static DlgEnv instance;
+        return instance;
+      }
+
+      //------------------------------------------------------------------------
+      //! Destructor
+      //!
+      //! Release the memory used to set environment
+      //------------------------------------------------------------------------
+      ~DlgEnv()
+      {
+        unsetenv( "XrdSecGSIDELEGPROXY" );
+      }
+
+      //------------------------------------------------------------------------
+      //! Enable delegation in the environment
+      //------------------------------------------------------------------------
+      void Enable()
+      {
+        setenv( "XrdSecGSIDELEGPROXY", "1", 1 );
+      }
+
+      //------------------------------------------------------------------------
+      //! Disable delegation in the environment
+      //------------------------------------------------------------------------
+      void Disable()
+      {
+        setenv( "XrdSecGSIDELEGPROXY", "0", 1 );
+      }
+
+    private:
+
+      //------------------------------------------------------------------------
+      //! Default constructor
+      //------------------------------------------------------------------------
+      DlgEnv() { }
+
+      //------------------------------------------------------------------------
+      //! Copy constructor - deleted
+      //------------------------------------------------------------------------
+      DlgEnv( const DlgEnv& );
+
+      //------------------------------------------------------------------------
+      //! Assigment operator - deleted
+      //------------------------------------------------------------------------
+      DlgEnv& operator=( const DlgEnv& );
+  };
+
+}
+
+#endif /* SRC_XRDCL_XRDCLDLGENV_HH_ */

src/XrdCl/XrdClTPFallBackCopyJob.cc

@@ -70,19 +70,21 @@ namespace XrdCl
     if( tmp == "first" )
       tpcFallBack = true;
 
-    XRootDStatus st = ThirdPartyCopyJob::CanDo( GetSource(), GetTarget(),
-                                                pProperties );
+    pJob = new ThirdPartyCopyJob( pJobId, pProperties, pResults );
+    XRootDStatus st = pJob->Run( progress );
+    if( st.IsOK() ) return st; // we are done
 
-    if( st.IsOK() )
-      pJob = new ThirdPartyCopyJob( pJobId, pProperties, pResults );
-    else if( tpcFallBack && !st.IsFatal() )
+    // check if we can fall back to streaming
+    if( tpcFallBack && ( st.code == errNotSupported || st.code == errOperationExpired ) )
+    {
+      Log *log = DefaultEnv::GetLog();
+      log->Debug( UtilityMsg, "TPC is not supported, falling back to streaming mode." );
+
+      delete pJob;
       pJob = new ClassicCopyJob( pJobId, pProperties, pResults );
-    else
-      return st;
+      return pJob->Run( progress );
+    }
 
-    //--------------------------------------------------------------------------
-    // Run the job
-    //--------------------------------------------------------------------------
-    return pJob->Run( progress );
+    return st;
   }
 }