Author: fapeeler
Date: Fri Nov 21 19:56:58 2014
New Revision: 1640986
URL: http://svn.apache.org/r1640986
Log:
VCL-308
inserted loadlog entry for image copy
VCL-568
added loadstatenames for frontend to montior connect for refresh
VCL-758
removed check/restriction for connecttimeout. Previously it would not allow
less than 10min. Now can allow down to 1 min
VCL-799
update_cluster, changed routine name in reserved
Modified:
vcl/trunk/managementnode/lib/VCL/Module/Provisioning.pm
vcl/trunk/managementnode/lib/VCL/Module/State.pm
vcl/trunk/managementnode/lib/VCL/inuse.pm
vcl/trunk/managementnode/lib/VCL/reclaim.pm
vcl/trunk/managementnode/lib/VCL/reserved.pm
Modified: vcl/trunk/managementnode/lib/VCL/Module/Provisioning.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/Provisioning.pm?rev=1640986&r1=1640985&r2=1640986&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/Provisioning.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/Provisioning.pm Fri Nov 21 19:56:58
2014
@@ -272,6 +272,9 @@ sub retrieve_image {
return;
}
+ my $reservation_id = $self->data->get_reservation_id();
+ my $computer_id = $self->data->get_computer_id();
+
# Make sure image library functions are enabled
my $image_lib_enable =
$self->data->get_management_node_image_lib_enable();
if (!$image_lib_enable) {
@@ -472,6 +475,7 @@ sub retrieve_image {
}
notify($ERRORS{'OK'}, 0, "found $image_name on partner management
nodes:\n" . join("\n", map { $partner_info{$_}{hostname} } (sort
@partners_with_image)));
+ insertloadlog($reservation_id, $computer_id, "copyfrompartnerMN",
"copying image files from partner management node");
# Choose a random partner so that the same management node isn't used
for most transfers
my $random_index = int(rand(scalar(@partners_with_image)));
Modified: vcl/trunk/managementnode/lib/VCL/Module/State.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/State.pm?rev=1640986&r1=1640985&r2=1640986&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/State.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/State.pm Fri Nov 21 19:56:58 2014
@@ -705,7 +705,7 @@ sub state_exit {
}
# Delete all computerloadlog rows with loadstatename = 'begin'
for all reservations in this request
- delete_computerloadlog_reservation(\@reservation_ids, 'begin');
+ 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=1640986&r1=1640985&r2=1640986&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/inuse.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/inuse.pm Fri Nov 21 19:56:58 2014
@@ -122,10 +122,6 @@ sub process {
# It has to be a bit longer than the ~5 minute period between inuse
checks due to cluster reservations
# If too short, a user may be connected to one computer in a cluster
and another inuse process times out before the connected computer is checked
my $connect_timeout_minutes = ceil($connect_timeout_seconds / 60);
- if ($connect_timeout_minutes < 10) {
- notify($ERRORS{'WARNING'}, 0, "connect timeout is set to
$connect_timeout_minutes minutes, it must be 10 minutes or more");
- $connect_timeout_minutes = 10;
- }
# Connect timeout must be in whole minutes
$connect_timeout_seconds = ($connect_timeout_minutes * 60);
@@ -154,7 +150,7 @@ sub process {
}
# Remove rows from computerloadlog for this reservation, don't remove
the loadstate=begin row
- delete_computerloadlog_reservation($reservation_id, '!begin');
+ delete_computerloadlog_reservation($reservation_id,
'!beginacknowledgetimeout');
my $now_epoch_seconds = time;
Modified: vcl/trunk/managementnode/lib/VCL/reclaim.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/reclaim.pm?rev=1640986&r1=1640985&r2=1640986&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/reclaim.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/reclaim.pm Fri Nov 21 19:56:58 2014
@@ -99,6 +99,10 @@ sub process {
my $computer_currentimage_name =
$self->data->get_computer_currentimage_name(0);
my $server_request_id =
$self->data->get_server_request_id();
my $public_ip_configuration =
$self->data->get_management_node_public_ip_configuration() || return;
+ my @reservation_ids
= $self->data->get_reservation_ids();
+
+ # Delete all computerloadlog rows with loadstatename =
'beginacknowledgetimeout' for all reservations in this request
+ delete_computerloadlog_reservation(\@reservation_ids,
'beginacknowledgetimeout');
# Remove related fixedIPsr variable, if it exists
if ($server_request_id) {
Modified: vcl/trunk/managementnode/lib/VCL/reserved.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/reserved.pm?rev=1640986&r1=1640985&r2=1640986&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/reserved.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/reserved.pm Fri Nov 21 19:56:58 2014
@@ -102,6 +102,8 @@ sub process {
my $is_parent_reservation = $self->data->is_parent_reservation();
my $server_request_id = $self->data->get_server_request_id();
my $acknowledge_timeout_seconds =
$self->os->get_timings('acknowledgetimeout');
+
+ insertloadlog($reservation_id, $computer_id, "beginacknowledgetimeout",
"begin connect timeout");
# Update the log loaded time to now for this request
update_log_loaded_time($request_logid);
@@ -128,8 +130,8 @@ sub process {
# User acknowledged request
# Add the cluster information to the loaded computers if this is a
cluster reservation
- if ($reservation_count > 1 && !$self->os->update_cluster_info()) {
- $self->reservation_failed("update_cluster_info failed");
+ if ($reservation_count > 1 && !$self->os->update_cluster()) {
+ $self->reservation_failed("update_cluster failed");
}
# Check if OS module's post_reserve() subroutine exists
