[XrdEc] StrmWriter::Close : make sure user handler is always called.

xrootd · Jan 14, 2021 · be6906a · be6906a
1 parent 395c3e7
commit be6906a
Showing 1 changed file with 19 additions and 34 deletions.
diff --git a/src/XrdEc/XrdEcStrmWriter.hh b/src/XrdEc/XrdEcStrmWriter.hh
@@ -395,27 +395,26 @@ namespace XrdEc
           // Find a server where we can append the next data chunk
           //-------------------------------------------------------------------
           XrdCl::Ctx<XrdCl::ZipArchive> zip;
-          XrdCl::XRootDStatus st;
-          do
+          size_t srvid;
+          if( !servers->dequeue( srvid ) )
           {
-            size_t srvid;
-            if( !servers->dequeue( srvid ) )
-            {
-              XrdCl::XRootDStatus err( XrdCl::stError, XrdCl::errNoMoreReplicas,
-                                       0, "No more data servers to try." );
-              global_status.report_wrt( err, strpsize );
-              return;
-            }
-
-            zip = *dataarchs[srvid];
-            st = zip->OpenFile( fn, XrdCl::OpenFlags::New, strpsize, crc32c );
+            XrdCl::XRootDStatus err( XrdCl::stError, XrdCl::errNoMoreReplicas,
+                                     0, "No more data servers to try." );
+            //-----------------------------------------------------------------
+            // calculate the full block size, otherwise the user handler
+            // will be never called
+            //-----------------------------------------------------------------
+            for( size_t i = strpnb + 1; i < objcfg.nbdata; ++i )
+              blksize += wrtbuff->GetStrpSize( i );
+            global_status.report_wrt( err, blksize );
+            return;
           }
-          while( !st.IsOK() );
+          zip = *dataarchs[srvid];
 
           //-------------------------------------------------------------------
           // Create the Write request
           //-------------------------------------------------------------------
-          XrdCl::Pipeline p = XrdCl::Write( zip, strpsize, strpbuff ) >>
+          XrdCl::Pipeline p = XrdCl::Write( zip, strpsize, strpbuff ) >>       // TODO replace Write with WriteTo
                               [=]( XrdCl::XRootDStatus &st ) mutable
                               {
                                 //---------------------------------------------
@@ -424,32 +423,18 @@ namespace XrdEc
                                 if( !st.IsOK() )
                                 {
                                   //-------------------------------------------
-                                  // First clean up the ZipArchive object
+                                  // Select another server
                                   //-------------------------------------------
-                                  zip->CloseFile();
-                                  //-------------------------------------------
-                                  // Then select another server
-                                  //-------------------------------------------
-                                  XrdCl::XRootDStatus status;
-                                  do
-                                  {
-                                    size_t srvid;
-                                    if( !servers->dequeue( srvid ) ) return; // if there are no more servers we simply fail
-                                    zip = *dataarchs[srvid];
-                                    st = zip->OpenFile( fn, XrdCl::OpenFlags::New, strpsize, crc32c );
-                                  } while( !status.IsOK() );
+                                  size_t srvid;
+                                  if( !servers->dequeue( srvid ) ) return; // if there are no more servers we simply fail
+                                  zip = *dataarchs[srvid];
                                   //-------------------------------------------
                                   // Retry this operation at different server
                                   //-------------------------------------------
                                   XrdCl::Pipeline::Repeat();
                                 }
                               }
-                            | XrdCl::Final(
-                              [=]( const XrdCl::XRootDStatus &st ) mutable
-                              {
-                                zip->CloseFile();
-                                wrtbuff.reset();
-                              } );
+                            | XrdCl::Final( [wrtbuff]( const XrdCl::XRootDStatus &st ){ } );
           writes.emplace_back( std::move( p ) );
         }