Author: fapeeler
Date: Fri Apr 17 17:05:05 2009
New Revision: 766085
URL: http://svn.apache.org/viewvc?rev=766085&view=rev
Log:
VCL-132
Corrected return start flag for requests with start times greater than
17 minutes. This was a needless setting. If a requests start time is past NOW
then process.
utils:
removed 'old' conditional check from from check_time routine
vcld:
removed check for 'old' checktime return value
Modified:
incubator/vcl/trunk/managementnode/bin/vcld
incubator/vcl/trunk/managementnode/lib/VCL/utils.pm
Modified: incubator/vcl/trunk/managementnode/bin/vcld
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/bin/vcld?rev=766085&r1=766084&r2=766085&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/bin/vcld (original)
+++ incubator/vcl/trunk/managementnode/bin/vcld Fri Apr 17 17:05:05 2009
@@ -244,11 +244,6 @@
#notify($ERRORS{'DEBUG'}, $LOGFILE,
"request will not be processed");
next RESERVATION;
}
- elsif ($check_time_result eq "old") {
- # Only complain
- notify($ERRORS{'WARNING'}, $LOGFILE,
"this is an old request");
- next RESERVATION;
- }
elsif ($check_time_result eq "remove") {
# Remove the request and associated
reservations from database
# This also removes rows from
computerloadlog table for associated reservations
Modified: incubator/vcl/trunk/managementnode/lib/VCL/utils.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/utils.pm?rev=766085&r1=766084&r2=766085&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/utils.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/utils.pm Fri Apr 17 17:05:05 2009
@@ -1164,14 +1164,14 @@
else {
# Start time is in past, $start_diff_minutes is negative
- if ($start_diff_minutes >= -17) {
- notify($ERRORS{'DEBUG'}, 0, "reservation start
time was in the past 17 minutes ($start_diff_minutes)");
- return "start";
- }
- else {
- notify($ERRORS{'DEBUG'}, 0, "reservation start
time was more than 17 minutes ago ($start_diff_minutes)");
- return "old";
+ #Start time is fairly old - something is off
+ #send warning to log for tracking purposes
+ if ($start_diff_minutes < -17) {
+ notify($ERRORS{'WARNING'}, 0, "reservation
start time was in the past 17 minutes ($start_diff_minutes)");
}
+
+ return "start";
+
} ## end else [ if ($start_diff_minutes > 0)
} ## end if ($request_state_name =~
/new|imageprep|reload|tomaintenance|tovmhostinuse/)
