Author: arkurth
Date: Wed Mar 6 19:43:45 2013
New Revision: 1453511
URL: http://svn.apache.org/r1453511
Log:
VCL-16
Fixed problem from last commit to vcld. Reservation ID wasn't being set for
each cluster child reservation.
Modified:
vcl/trunk/managementnode/bin/vcld
Modified: vcl/trunk/managementnode/bin/vcld
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/bin/vcld?rev=1453511&r1=1453510&r2=1453511&view=diff
==============================================================================
--- vcl/trunk/managementnode/bin/vcld (original)
+++ vcl/trunk/managementnode/bin/vcld Wed Mar 6 19:43:45 2013
@@ -285,9 +285,6 @@ sub main () {
if (%request_info =
get_request_info($request_id)) {
notify($ERRORS{'DEBUG'},
$LOGFILE, "retrieved request information from database");
- # Add the reservation ID to be
processed to the hash
- $request_info{RESERVATIONID} =
$reservation_id;
-
# Set request variables that
may have changed by other processes to their original values
# They may change if this is a
cluster reservation
$request_info{state}{name}
= $request_state_name;
@@ -306,10 +303,13 @@ sub main () {
}
else {
notify($ERRORS{'WARNING'},
$LOGFILE, "could not retrieve request information from database");
- next RESERVATION;
+ next REQUEST;
}
}
+ # Add the reservation ID to be processed to the
hash
+ $request_info{RESERVATIONID} = $reservation_id;
+
# Get a new data structure object
my $data_structure;
eval {$data_structure = new
VCL::DataStructure({request_data => \%request_info, reservation_id =>
$reservation_id});};
