pgbackrest.git / summary / log / commit / refs

commit    3b2dd68aac9bc00e1b45d2a8d6dfd74da17112f7
Author:   David Steele <github@thelabyrinth.net>
Date:     Sat Feb 15 15:31:57 2014 +0000

    More robust join code.


pg_backrest_backup.pm | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/pg_backrest_backup.pm b/pg_backrest_backup.pm index 536a7819b..8b84553d2 100644 --- a/pg_backrest_backup.pm +++ b/pg_backrest_backup.pm @@ -878,20 +878,32 @@ sub backup_file $oyThreadData[$iThreadIdx]{size}); } - # Rejoin the threads - for (my $iThreadIdx = 0; $iThreadIdx < $iThreadLocalMax; $iThreadIdx++) - { - $oThread[$iThreadIdx]->join(); - } + # Wait for all threads to complete and handle errors + my $iThreadComplete = 0; - # Look for errors - for (my $iThreadIdx = 0; $iThreadIdx < $iThreadLocalMax; $iThreadIdx++) + # Rejoin the threads + while ($iThreadComplete < $iThreadLocalMax) { - if (defined($oThread[$iThreadIdx]->error())) + sleep(1); + + for (my $iThreadIdx = 0; $iThreadIdx < $iThreadLocalMax; $iThreadIdx++) { - confess &log(ERROR, "error in thread ${iThreadIdx}: check log for details"); + if ($oThread[$iThreadIdx]->is_joinable()) + { + $oThread[$iThreadIdx]->join(); + $iThreadComplete++; + } } } + +# # Look for errors +# for (my $iThreadIdx = 0; $iThreadIdx < $iThreadLocalMax; $iThreadIdx++) +# { +# if (defined($oThread[$iThreadIdx]->error())) +# { +# confess &log(ERROR, "error in thread ${iThreadIdx}: check log for details"); +# } +# } } sub backup_file_thread [parent: 27bf9b65720e]