You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by fa...@apache.org on 2012/05/03 22:44:03 UTC
svn commit: r1333613 - /incubator/vcl/trunk/managementnode/lib/VCL/reclaim.pm
Author: fapeeler
Date: Thu May 3 20:44:02 2012
New Revision: 1333613
URL: http://svn.apache.org/viewvc?rev=1333613&view=rev
Log:
VCL-463
small changes to server requests
- set firewall to initial IP if no login detected
- automatically reload if requestor deletes reservation and request in reserved state
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/reclaim.pm
Modified: incubator/vcl/trunk/managementnode/lib/VCL/reclaim.pm
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/reclaim.pm?rev=1333613&r1=1333612&r2=1333613&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/reclaim.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/reclaim.pm Thu May 3 20:44:02 2012
@@ -97,6 +97,7 @@ sub process {
my $computer_shortname = $self->data->get_computer_short_name();
my $computer_state_name = $self->data->get_computer_state_name();
my $computer_currentimage_name = $self->data->get_computer_currentimage_name(0);
+ my $server_request_id = $self->data->get_server_request_id();
# Insert into computerloadlog if request state = timeout
if ($request_state_name =~ /timeout|deleted/) {
@@ -123,6 +124,12 @@ sub process {
elsif ($request_laststate_name =~ /reserved/) {
notify($ERRORS{'DEBUG'}, 0, "request laststate is $request_laststate_name, checking if computer table current image matches image currently loaded on $computer_shortname");
+ # If server reservations and in reserved - reload
+ if ($server_request_id) {
+ notify($ERRORS{'OK'}, 0, "Detected server reservations, computer will be reloaded");
+ $self->insert_reload_and_exit();
+ }
+
# Make sure computer current image name was retrieved from the database
if (!$computer_currentimage_name) {
notify($ERRORS{'WARNING'}, 0, "failed to retrieve computer current image name from the database, computer will be reloaded");