From ef459eac2b32847b82a9e4d7d9700c37ee979cf1 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Thu, 19 Apr 2012 10:06:00 +0200 Subject: [PATCH] feature #1222: Add missing failure triggers, for some error conditions --- src/tm/TransferManager.cc | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/tm/TransferManager.cc b/src/tm/TransferManager.cc index 17f08649ec..9e8448d980 100644 --- a/src/tm/TransferManager.cc +++ b/src/tm/TransferManager.cc @@ -410,7 +410,6 @@ void TransferManager::prolog_action(int vid) tm_md->transfer(vid,xfr_name); vm->unlock(); - return; error_history: @@ -551,7 +550,6 @@ void TransferManager::prolog_migr_action(int vid) tm_md->transfer(vid,xfr_name); vm->unlock(); - return; error_history: @@ -674,7 +672,6 @@ void TransferManager::prolog_resume_action(int vid) tm_md->transfer(vid,xfr_name); vm->unlock(); - return; error_history: @@ -829,7 +826,6 @@ void TransferManager::epilog_action(int vid) tm_md->transfer(vid,xfr_name); vm->unlock(); - return; error_history: @@ -1071,7 +1067,6 @@ void TransferManager::epilog_delete_action(int vid) tm_md->transfer(vid,xfr_name); vm->unlock(); - return; error_history: @@ -1088,8 +1083,9 @@ error_file: error_common: vm->log("TM", Log::ERROR, os); - vm->unlock(); + (nd.get_lcm())->trigger(LifeCycleManager::EPILOG_FAILURE,vid); + vm->unlock(); return; } @@ -1191,7 +1187,6 @@ void TransferManager::epilog_delete_previous_action(int vid) tm_md->transfer(vid,xfr_name); vm->unlock(); - return; error_history: @@ -1207,9 +1202,10 @@ error_file: goto error_common; error_common: + (nd.get_lcm())->trigger(LifeCycleManager::EPILOG_FAILURE,vid); vm->log("TM", Log::ERROR, os); - vm->unlock(); + vm->unlock(); return; } @@ -1250,7 +1246,6 @@ void TransferManager::driver_cancel_action(int vid) tm_md->driver_cancel(vid); vm->unlock(); - return; }