Author: fapeeler
Date: Wed Oct 16 17:57:48 2013
New Revision: 1532835
URL: http://svn.apache.org/r1532835
Log:
Skip the is_user_connected checks for server reservations. No need to check
during the inuse states, with many server reservations this can add
unneccessary cload/checks on a management node.
Modified:
vcl/trunk/managementnode/lib/VCL/inuse.pm
Modified: vcl/trunk/managementnode/lib/VCL/inuse.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/inuse.pm?rev=1532835&r1=1532834&r2=1532835&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/inuse.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/inuse.pm Wed Oct 16 17:57:48 2013
@@ -369,12 +369,20 @@ sub user_connected {
my $reservation_count = $self->data->get_request_reservation_count();
my $computer_id = $self->data->get_computer_id();
my $computer_short_name = $self->data->get_computer_short_name();
+ my $server_request_id = $self->data->get_server_request_id();
# Check if user deleted the request
$self->state_exit() if is_request_deleted($request_id);
# Check if this is an imaging request, causes process to exit if state
or laststate = image
$self->_check_imaging_request();
+
+ # Check if this is a server request, causes process to exit if server
request
+ if ($server_request_id) {
+ notify($ERRORS{'DEBUG'}, 0, "Server reservation
detected, set as user is connected");
+ insertloadlog($reservation_id, $computer_id,
"connected", "user connected to $computer_short_name");
+ return 1;
+ }
# Check if the user has connected to the reservation being processed
if ($self->os->is_user_connected()) {
