[XrdCl] Fix zip ls timeout.

xrootd · Oct 11, 2018 · 2ffef37 · 2ffef37
1 parent 459973a
commit 2ffef37
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/XrdCl/XrdClZipListHandler.cc b/src/XrdCl/XrdClZipListHandler.cc
@@ -33,6 +33,12 @@ namespace XrdCl
     std::unique_ptr<XRootDStatus> status( statusptr );
     std::unique_ptr<AnyObject>    response( responseptr );
 
+    if( pStep == DONE )
+    {
+      delete this;
+      return;
+    }
+
     if( !status->IsOK() )
     {
       pHandler->HandleResponse( status.release(), response.release() );
@@ -45,7 +51,13 @@ namespace XrdCl
     {
       *status = XRootDStatus( stError, errOperationExpired );
       pHandler->HandleResponse( status.release(), 0 );
-      delete this;
+      if( pZip.IsOpen() )
+      {
+        DoZipClose( 1 );
+        pStep = DONE;
+      }
+      else
+        delete this;
       return;
     }
     uint16_t left = pTimeout - took;

diff --git a/src/XrdCl/XrdClZipListHandler.hh b/src/XrdCl/XrdClZipListHandler.hh
@@ -29,6 +29,8 @@
 #include "XrdCl/XrdClFileSystem.hh"
 #include "XrdCl/XrdClFile.hh"
 #include "XrdCl/XrdClZipArchiveReader.hh"
+#include "XrdCl/XrdClConstants.hh"
+#include "XrdCl/XrdClDefaultEnv.hh"
 
 #include <string>
 #include <memory>
@@ -77,6 +79,13 @@ namespace XrdCl
         pTimeout( timeout ), pStartTime( time( 0 ) ),
         pZip( pFile ), pStep( STAT )
       {
+        if( !pTimeout )
+        {
+          int val = DefaultRequestTimeout;
+          DefaultEnv::GetEnv()->GetInt( "RequestTimeout", val );
+          pTimeout = val;
+        }
+
         pUrl.SetPath( path );
       }