Author: fapeeler
Date: Tue Dec 9 20:21:10 2014
New Revision: 1644167
URL: http://svn.apache.org/r1644167
Log:
VCL-308
continued work on load flow states
Modified:
vcl/trunk/managementnode/lib/VCL/Module/State.pm
vcl/trunk/managementnode/lib/VCL/inuse.pm
Modified: vcl/trunk/managementnode/lib/VCL/Module/State.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/State.pm?rev=1644167&r1=1644166&r2=1644167&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/State.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/State.pm Tue Dec 9 20:21:10 2014
@@ -711,7 +711,7 @@ sub state_exit {
# Delete all computerloadlog rows with loadstatename = 'begin'
for all reservations in this request
# beginacknowledgetimeout required for web gui
- delete_computerloadlog_reservation(\@reservation_ids,
'!beginacknowledgetimeout');
+ #delete_computerloadlog_reservation(\@reservation_ids,
'!beginacknowledgetimeout');
# Update log.ending if this is the parent reservation and
argument was supplied
if ($request_log_ending) {
Modified: vcl/trunk/managementnode/lib/VCL/inuse.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/inuse.pm?rev=1644167&r1=1644166&r2=1644167&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/inuse.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/inuse.pm Tue Dec 9 20:21:10 2014
@@ -149,8 +149,6 @@ sub process {
$self->state_exit('inuse', 'inuse');
}
- # Remove rows from computerloadlog for this reservation, don't remove
the loadstate=begin row
- delete_computerloadlog_reservation($reservation_id,
'!beginacknowledgetimeout');
my $now_epoch_seconds = time;
@@ -302,6 +300,10 @@ sub process {
# Check to see if user is connected. user_connected will true(1) for
servers and requests > 24 hours
if (!$self->code_loop_timeout(sub{$self->user_connected()}, [],
"waiting for user to connect to $computer_short_name",
($connect_timeout_minutes*60), 15)) {
+
+ # Remove rows from computerloadlog for this reservation if
connected, don't remove the loadstate=begin row
+ delete_computerloadlog_reservation($reservation_id,
'!beginacknowledgetimeout');
+
if (!$imagemeta_checkuser || !$request_checkuser) {
notify($ERRORS{'OK'}, 0, "never detected user
connection, skipping timeout, imagemeta checkuser: $imagemeta_checkuser,
request checkuser: $request_checkuser");
}
