[XrdEc] StrmWriter: use ZipArchive::AppendFile.

xrootd · Jan 15, 2021 · fbf8002 · fbf8002
1 parent 7b53cba
commit fbf8002
Showing 1 changed file with 25 additions and 21 deletions.
diff --git a/src/XrdEc/XrdEcStrmWriter.hh b/src/XrdEc/XrdEcStrmWriter.hh
@@ -414,27 +414,31 @@ namespace XrdEc
           //-------------------------------------------------------------------
           // Create the Write request
           //-------------------------------------------------------------------
-          XrdCl::Pipeline p = XrdCl::Write( zip, strpsize, strpbuff ) >>       // TODO replace Write with WriteTo
-                              [=]( XrdCl::XRootDStatus &st ) mutable
-                              {
-                                //---------------------------------------------
-                                // Try to recover from error
-                                //---------------------------------------------
-                                if( !st.IsOK() )
-                                {
-                                  //-------------------------------------------
-                                  // Select another server
-                                  //-------------------------------------------
-                                  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( [wrtbuff]( const XrdCl::XRootDStatus &st ){ } );
+          XrdCl::Pipeline p = XrdCl::AppendFile( zip, fn, crc32c, strpsize, strpbuff ) >>
+                               [=]( XrdCl::XRootDStatus &st ) mutable
+                               {
+                                 //---------------------------------------------
+                                 // Try to recover from error
+                                 //---------------------------------------------
+                                 if( !st.IsOK() )
+                                 {
+                                   //-------------------------------------------
+                                   // Select another server
+                                   //-------------------------------------------
+                                   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();
+                                 }
+                                 //---------------------------------------------
+                                 // Make sure the buffer is only deallocated
+                                 // after the handler is called
+                                 //---------------------------------------------
+                                 wrtbuff.reset();
+                               };
           writes.emplace_back( std::move( p ) );
         }