Author: arkurth
Date: Wed Dec 10 00:08:45 2014
New Revision: 1644255
URL: http://svn.apache.org/r1644255
Log:
VCL-702
Cleaned up more sloppy indentation and mixed space/tab strings.
Modified:
vcl/trunk/managementnode/lib/VCL/DataStructure.pm
vcl/trunk/managementnode/lib/VCL/Module/OS.pm
vcl/trunk/managementnode/lib/VCL/Module/OS/OSX.pm
vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm
vcl/trunk/managementnode/lib/VCL/Module/Provisioning.pm
vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
vcl/trunk/managementnode/lib/VCL/blockrequest.pm
vcl/trunk/managementnode/lib/VCL/healthcheck.pm
vcl/trunk/managementnode/lib/VCL/inuse.pm
vcl/trunk/managementnode/lib/VCL/new.pm
vcl/trunk/managementnode/lib/VCL/reclaim.pm
vcl/trunk/managementnode/lib/VCL/utils.pm
Modified: vcl/trunk/managementnode/lib/VCL/DataStructure.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/DataStructure.pm?rev=1644255&r1=1644254&r2=1644255&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/DataStructure.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/DataStructure.pm Wed Dec 10 00:08:45 2014
@@ -144,14 +144,14 @@ $SUBROUTINE_MAPPINGS{request_preload_onl
$SUBROUTINE_MAPPINGS{request_reservation_count} =
'$self->request_data->{RESERVATIONCOUNT}';
$SUBROUTINE_MAPPINGS{request_start_time} = '$self->request_data->{start}';
$SUBROUTINE_MAPPINGS{request_duration_epoch} =
'$self->request_data->{DURATION}';
-$SUBROUTINE_MAPPINGS{request_checkuser} =
'$self->request_data->{checkuser}';
-#$SUBROUTINE_MAPPINGS{request_stateid} =
'$self->request_data->{stateid}';
-$SUBROUTINE_MAPPINGS{request_is_cluster_child} =
'$self->request_data->{SUBIMAGE}';
-$SUBROUTINE_MAPPINGS{request_test} = '$self->request_data->{test}';
-$SUBROUTINE_MAPPINGS{request_updated} = '$self->request_data->{UPDATED}';
-#$SUBROUTINE_MAPPINGS{request_userid} =
'$self->request_data->{userid}';
-$SUBROUTINE_MAPPINGS{request_state_name} =
'$self->request_data->{state}{name}';
-$SUBROUTINE_MAPPINGS{request_laststate_name} =
'$self->request_data->{laststate}{name}';
+$SUBROUTINE_MAPPINGS{request_checkuser} = '$self->request_data->{checkuser}';
+#$SUBROUTINE_MAPPINGS{request_stateid} = '$self->request_data->{stateid}';
+$SUBROUTINE_MAPPINGS{request_is_cluster_child} =
'$self->request_data->{SUBIMAGE}';
+$SUBROUTINE_MAPPINGS{request_test} = '$self->request_data->{test}';
+$SUBROUTINE_MAPPINGS{request_updated} = '$self->request_data->{UPDATED}';
+#$SUBROUTINE_MAPPINGS{request_userid} = '$self->request_data->{userid}';
+$SUBROUTINE_MAPPINGS{request_state_name} =
'$self->request_data->{state}{name}';
+$SUBROUTINE_MAPPINGS{request_laststate_name} =
'$self->request_data->{laststate}{name}';
$SUBROUTINE_MAPPINGS{log_userid} = '$self->request_data->{log}{userid}';
$SUBROUTINE_MAPPINGS{log_nowfuture} = '$self->request_data->{log}{nowfuture}';
Modified: vcl/trunk/managementnode/lib/VCL/Module/OS.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/OS.pm?rev=1644255&r1=1644254&r2=1644255&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/OS.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/OS.pm Wed Dec 10 00:08:45 2014
@@ -2534,10 +2534,10 @@ sub manage_server_access {
my $server_request_logingroupid =
$self->data->get_server_request_logingroupid();
my $user_login_id_owner = $self->data->get_user_login_id();
my $user_ssh_public_keys =
$self->data->get_user_ssh_public_keys(0);
- my $user_id_owner = $self->data->get_user_id();
- my $image_os_type =
$self->data->get_image_os_type();
+ my $user_id_owner = $self->data->get_user_id();
+ my $image_os_type = $self->data->get_image_os_type();
my $request_laststate_name =
$self->data->get_request_laststate_name();
- my $reservation_users =
$self->data->get_reservation_users();
+ my $reservation_users = $self->data->get_reservation_users();
# Build list of users.
# If in admin group set admin flag
Modified: vcl/trunk/managementnode/lib/VCL/Module/OS/OSX.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/OS/OSX.pm?rev=1644255&r1=1644254&r2=1644255&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/OS/OSX.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/OS/OSX.pm Wed Dec 10 00:08:45 2014
@@ -125,7 +125,7 @@ sub pre_capture {
return 0;
}
- my $computer_node_name = $self->data->get_computer_node_name();
+ my $computer_node_name = $self->data->get_computer_node_name();
my $args = shift;
@@ -140,24 +140,6 @@ sub pre_capture {
$self->{end_state} = 'off';
}
- # my $request_id =
$self->data->get_request_id();
- # my $reservation_id =
$self->data->get_reservation_id();
- # my $image_id =
$self->data->get_image_id();
- # my $image_os_name =
$self->data->get_image_os_name();
- # my $management_node_keys =
$self->data->get_management_node_keys();
- # my $image_os_type =
$self->data->get_image_os_type();
- # my $image_name =
$self->data->get_image_name();
- # my $computer_id =
$self->data->get_computer_id();
- # my $computer_short_name =
$self->data->get_computer_short_name();
- # my $computer_type =
$self->data->get_computer_type();
- # my $user_id =
$self->data->get_user_id();
- # my $user_unityid =
$self->data->get_user_login_id();
- # my $managementnode_shortname =
$self->data->get_management_node_short_name();
- # my $computer_private_ip =
$self->data->get_computer_private_ip_address();
- # my $ip_configuration =
$self->data->get_management_node_public_ip_configuration();
- # my $image_os_install_type =
$self->data->get_image_os_install_type();
-
-
notify($ERRORS{'OK'}, 0, "beginning OSX image PRE_CAPTURE() preparation
tasks on $computer_node_name");
# copy pre_capture configuration files to the computer ( scripts, etc )
@@ -245,9 +227,9 @@ sub post_load {
return 0;
}
- my $computer_node_name = $self->data->get_computer_node_name();
+ my $computer_node_name = $self->data->get_computer_node_name();
my $management_node_keys = $self->data->get_management_node_keys();
- my $image_name = $self->data->get_image_name();
+ my $image_name = $self->data->get_image_name();
my $computer_short_name = $self->data->get_computer_short_name();
my $image_os_install_type = $self->data->get_image_os_install_type();
my $imagemeta_postoption = $self->data->get_imagemeta_postoption();
Modified: vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm?rev=1644255&r1=1644254&r2=1644255&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm Wed Dec 10 00:08:45
2014
@@ -3889,7 +3889,7 @@ sub get_service_configuration {
my $services_key =
'HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Services';
- my $cygwin_path = $self->get_cygwin_path();
+ my $cygwin_path = $self->get_cygwin_path();
my $node_reg_file_path = $cygwin_path .
"/tmp/services_$computer_node_name.reg";
my $mn_reg_file_path = "/tmp/vcl/services_$computer_node_name.reg";
@@ -6826,7 +6826,7 @@ sub clean_hard_drive {
my $computer_node_name = $self->data->get_computer_node_name();
my $system32_path = $self->get_system32_path() || return;
- my $cygwin_path = $self->get_cygwin_path();
+ my $cygwin_path = $self->get_cygwin_path();
# Run dism.exe
# The dism.exe file may not be present
Modified: vcl/trunk/managementnode/lib/VCL/Module/Provisioning.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/Provisioning.pm?rev=1644255&r1=1644254&r2=1644255&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/Provisioning.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/Provisioning.pm Wed Dec 10 00:08:45
2014
@@ -272,8 +272,8 @@ sub retrieve_image {
return;
}
- my $reservation_id = $self->data->get_reservation_id();
- my $computer_id = $self->data->get_computer_id();
+ 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();
Modified: vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm?rev=1644255&r1=1644254&r2=1644255&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
(original)
+++ vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm Wed
Dec 10 00:08:45 2014
@@ -8010,53 +8010,53 @@ sub setup_purge_datastore_images {
}
# Find image revisions which have multiple characteristics by finding
the intersection of the arrays
- my @deleted_has_reservations =
get_array_intersection(\@deleted, \@has_reservations);
- my @deleted_has_reservations_loaded =
get_array_intersection(\@deleted, \@has_reservations, \@loaded);
- my @deleted_has_reservations_not_loaded =
get_array_intersection(\@deleted, \@has_reservations, \@not_loaded);
- my @deleted_no_reservations =
get_array_intersection(\@deleted, \@no_reservations);
- my @deleted_no_reservations_loaded =
get_array_intersection(\@deleted, \@no_reservations, \@loaded);
- my @deleted_no_reservations_not_loaded =
get_array_intersection(\@deleted, \@no_reservations, \@not_loaded);
- my @not_deleted_has_reservations =
get_array_intersection(\@not_deleted, \@has_reservations);
- my @not_deleted_has_reservations_loaded =
get_array_intersection(\@not_deleted, \@has_reservations, \@loaded);
- my @not_deleted_has_reservations_not_loaded =
get_array_intersection(\@not_deleted, \@has_reservations, \@not_loaded);
- my @not_deleted_no_reservations
= get_array_intersection(\@not_deleted, \@no_reservations);
- my @not_deleted_no_reservations_loaded =
get_array_intersection(\@not_deleted, \@no_reservations, \@loaded);
- my @not_deleted_no_reservations_not_loaded =
get_array_intersection(\@not_deleted, \@no_reservations, \@not_loaded);
- my @not_deleted_candidate
=
get_array_intersection(\@not_deleted, \@no_reservations, \@not_loaded,
\@in_repository);
- my @not_deleted_no_reservations_not_loaded_not_in_repository =
get_array_intersection(\@not_deleted, \@no_reservations, \@not_loaded,
\@not_in_repository);
- my @not_deleted_candidate_older_than_production
=
get_array_intersection(\@not_deleted_candidate, \@older_than_production); #
Purgable
- my @not_deleted_candidate_production
= get_array_intersection(\@not_deleted_candidate, \@production);
- my @not_deleted_candidate_production_recently_created
=
get_array_intersection(\@not_deleted_candidate, \@production,
\@recently_created);
- my @not_deleted_candidate_production_not_recently_created
=
get_array_intersection(\@not_deleted_candidate, \@production,
\@not_recently_created);
- my
@not_deleted_candidate_production_not_recently_created_recently_reserved
= get_array_intersection(\@not_deleted_candidate, \@production,
\@not_recently_created, \@recently_reserved);
- my
@not_deleted_candidate_production_not_recently_created_not_recently_reserved
= get_array_intersection(\@not_deleted_candidate, \@production,
\@not_recently_created, \@not_recently_reserved); # Purgable
- my @not_deleted_candidate_newer_than_production
=
get_array_intersection(\@not_deleted_candidate, \@newer_than_production);
- my @not_deleted_candidate_newer_than_production_recently_created
=
get_array_intersection(\@not_deleted_candidate, \@newer_than_production,
\@recently_created);
- my @not_deleted_candidate_newer_than_production_not_recently_created
= get_array_intersection(\@not_deleted_candidate,
\@newer_than_production, \@not_recently_created); # Purgable
+ my @deleted_has_reservations =
get_array_intersection(\@deleted, \@has_reservations);
+ my @deleted_has_reservations_loaded =
get_array_intersection(\@deleted, \@has_reservations, \@loaded);
+ my @deleted_has_reservations_not_loaded =
get_array_intersection(\@deleted, \@has_reservations, \@not_loaded);
+ my @deleted_no_reservations =
get_array_intersection(\@deleted, \@no_reservations);
+ my @deleted_no_reservations_loaded =
get_array_intersection(\@deleted, \@no_reservations, \@loaded);
+ my @deleted_no_reservations_not_loaded =
get_array_intersection(\@deleted, \@no_reservations, \@not_loaded);
+ my @not_deleted_has_reservations =
get_array_intersection(\@not_deleted, \@has_reservations);
+ my @not_deleted_has_reservations_loaded =
get_array_intersection(\@not_deleted, \@has_reservations, \@loaded);
+ my @not_deleted_has_reservations_not_loaded =
get_array_intersection(\@not_deleted, \@has_reservations, \@not_loaded);
+ my @not_deleted_no_reservations =
get_array_intersection(\@not_deleted, \@no_reservations);
+ my @not_deleted_no_reservations_loaded =
get_array_intersection(\@not_deleted, \@no_reservations, \@loaded);
+ my @not_deleted_no_reservations_not_loaded =
get_array_intersection(\@not_deleted, \@no_reservations, \@not_loaded);
+ my @not_deleted_candidate =
get_array_intersection(\@not_deleted, \@no_reservations, \@not_loaded,
\@in_repository);
+ my @not_deleted_no_reservations_not_loaded_not_in_repository =
get_array_intersection(\@not_deleted, \@no_reservations, \@not_loaded,
\@not_in_repository);
+ my @not_deleted_candidate_older_than_production
= get_array_intersection(\@not_deleted_candidate,
\@older_than_production); # Purgable
+ my @not_deleted_candidate_production
= get_array_intersection(\@not_deleted_candidate, \@production);
+ my @not_deleted_candidate_production_recently_created
= get_array_intersection(\@not_deleted_candidate, \@production,
\@recently_created);
+ my @not_deleted_candidate_production_not_recently_created
= get_array_intersection(\@not_deleted_candidate, \@production,
\@not_recently_created);
+ my
@not_deleted_candidate_production_not_recently_created_recently_reserved =
get_array_intersection(\@not_deleted_candidate, \@production,
\@not_recently_created, \@recently_reserved);
+ my
@not_deleted_candidate_production_not_recently_created_not_recently_reserved =
get_array_intersection(\@not_deleted_candidate, \@production,
\@not_recently_created, \@not_recently_reserved); # Purgable
+ my @not_deleted_candidate_newer_than_production
= get_array_intersection(\@not_deleted_candidate,
\@newer_than_production);
+ my @not_deleted_candidate_newer_than_production_recently_created
= get_array_intersection(\@not_deleted_candidate,
\@newer_than_production, \@recently_created);
+ my @not_deleted_candidate_newer_than_production_not_recently_created
= get_array_intersection(\@not_deleted_candidate,
\@newer_than_production, \@not_recently_created); # Purgable
setup_print_break('-');
print "Analyzed image revisions stored in the virtual disk path
datastore:\n";
- print "|- Deleted: "
. scalar(@deleted) . "\n";
- print " |- Has reservation: "
. scalar(@deleted_has_reservations) . "\n";
- print " |- No reservations: "
. scalar(@deleted_no_reservations) . "\n";
- print " |- Loaded: "
. scalar(@deleted_no_reservations_loaded) . "\n";
- print " |- Not loaded: "
. scalar(@deleted_no_reservations_not_loaded) . " (*)\n";
- print "|- Not deleted: "
. scalar(@not_deleted) . "\n";
- print " |- Has reservation: "
. scalar(@not_deleted_has_reservations) . "\n";
- print " |- No reservations: "
. scalar(@not_deleted_no_reservations) . "\n";
- print " |- Loaded: "
. scalar(@not_deleted_no_reservations_loaded) . "\n";
- print " |- Not loaded: "
. scalar(@not_deleted_no_reservations_not_loaded) . "\n";
- print " |- Not in_repository: "
. scalar(@not_deleted_no_reservations_not_loaded_not_in_repository) . "\n";
- print " |- In repository: "
. scalar(@not_deleted_candidate) . "\n";
- print " |- Production: "
. scalar(@not_deleted_candidate_production) . "\n";
- print " |- Created in last $min_imagerevision_age days: "
.
scalar(@not_deleted_candidate_production_recently_created) . "\n";
- print " |- Not created in last $min_imagerevision_age
days: " .
scalar(@not_deleted_candidate_production_not_recently_created) . "\n";
- print " |- Reserved in last $min_reservation_days
days: " .
scalar(@not_deleted_candidate_production_not_recently_created_recently_reserved)
. "\n";
- print " |- Not reserved in last $min_reservation_days
days: " .
scalar(@not_deleted_candidate_production_not_recently_created_not_recently_reserved)
. " (*)\n";
- print " |- Older than production: "
.
scalar(@not_deleted_candidate_older_than_production) . " (*)\n";
- print " |- Newer than production: "
.
scalar(@not_deleted_candidate_newer_than_production) . "\n";
- print " |- Created in last $min_imagerevision_age days: "
.
scalar(@not_deleted_candidate_newer_than_production_recently_created) . "\n";
- print " |- Not created in last $min_imagerevision_age
days: " .
scalar(@not_deleted_candidate_newer_than_production_not_recently_created) . "
(*)\n";
+ print "|- Deleted: "
. scalar(@deleted) . "\n";
+ print " |- Has reservation: "
. scalar(@deleted_has_reservations) . "\n";
+ print " |- No reservations: "
. scalar(@deleted_no_reservations) . "\n";
+ print " |- Loaded: "
. scalar(@deleted_no_reservations_loaded) . "\n";
+ print " |- Not loaded: "
. scalar(@deleted_no_reservations_not_loaded) . " (*)\n";
+ print "|- Not deleted: "
. scalar(@not_deleted) . "\n";
+ print " |- Has reservation: "
. scalar(@not_deleted_has_reservations) . "\n";
+ print " |- No reservations: "
. scalar(@not_deleted_no_reservations) . "\n";
+ print " |- Loaded: "
. scalar(@not_deleted_no_reservations_loaded) . "\n";
+ print " |- Not loaded: "
. scalar(@not_deleted_no_reservations_not_loaded) . "\n";
+ print " |- Not in_repository: "
. scalar(@not_deleted_no_reservations_not_loaded_not_in_repository) .
"\n";
+ print " |- In repository: "
. scalar(@not_deleted_candidate) . "\n";
+ print " |- Production: "
. scalar(@not_deleted_candidate_production) . "\n";
+ print " |- Created in last $min_imagerevision_age days: "
. scalar(@not_deleted_candidate_production_recently_created) . "\n";
+ print " |- Not created in last $min_imagerevision_age
days: " . scalar(@not_deleted_candidate_production_not_recently_created) .
"\n";
+ print " |- Reserved in last $min_reservation_days
days: " .
scalar(@not_deleted_candidate_production_not_recently_created_recently_reserved)
. "\n";
+ print " |- Not reserved in last $min_reservation_days
days: " .
scalar(@not_deleted_candidate_production_not_recently_created_not_recently_reserved)
. " (*)\n";
+ print " |- Older than production: "
. scalar(@not_deleted_candidate_older_than_production) . " (*)\n";
+ print " |- Newer than production: "
. scalar(@not_deleted_candidate_newer_than_production) . "\n";
+ print " |- Created in last $min_imagerevision_age days: "
.
scalar(@not_deleted_candidate_newer_than_production_recently_created) . "\n";
+ print " |- Not created in last $min_imagerevision_age
days: " .
scalar(@not_deleted_candidate_newer_than_production_not_recently_created) . "
(*)\n";
print "(*) May be safely purged\n\n";
my @purgable_imagerevisions;
@@ -8224,21 +8224,21 @@ sub setup_purge_repository_images {
}
# Find image revisions which have multiple characteristics by finding
the intersection of the arrays
- my @deleted_has_reservations =
get_array_intersection(\@deleted, \@has_reservations);
- my @deleted_has_reservations_loaded =
get_array_intersection(\@deleted, \@has_reservations, \@loaded);
- my @deleted_has_reservations_not_loaded =
get_array_intersection(\@deleted, \@has_reservations, \@not_loaded);
- my @deleted_no_reservations =
get_array_intersection(\@deleted, \@no_reservations);
- my @deleted_no_reservations_loaded =
get_array_intersection(\@deleted, \@no_reservations, \@loaded);
- my @deleted_no_reservations_not_loaded =
get_array_intersection(\@deleted, \@no_reservations, \@not_loaded);
+ my @deleted_has_reservations =
get_array_intersection(\@deleted, \@has_reservations);
+ my @deleted_has_reservations_loaded =
get_array_intersection(\@deleted, \@has_reservations, \@loaded);
+ my @deleted_has_reservations_not_loaded =
get_array_intersection(\@deleted, \@has_reservations, \@not_loaded);
+ my @deleted_no_reservations =
get_array_intersection(\@deleted, \@no_reservations);
+ my @deleted_no_reservations_loaded =
get_array_intersection(\@deleted, \@no_reservations, \@loaded);
+ my @deleted_no_reservations_not_loaded =
get_array_intersection(\@deleted, \@no_reservations, \@not_loaded);
setup_print_break('-');
print "Analyzed image revisions stored in the repository datastore:\n";
- print "|- Deleted: " .
scalar(@deleted) . "\n";
- print " |- Has reservation: " .
scalar(@deleted_has_reservations) . "\n";
- print " |- No reservations: " .
scalar(@deleted_no_reservations) . "\n";
- print " |- Loaded: " .
scalar(@deleted_no_reservations_loaded) . "\n";
- print " |- Not loaded: " .
scalar(@deleted_no_reservations_not_loaded) . " (*)\n";
- print "|- Not deleted: " .
scalar(@not_deleted) . "\n";
+ print "|- Deleted: " . scalar(@deleted) . "\n";
+ print " |- Has reservation: " .
scalar(@deleted_has_reservations) . "\n";
+ print " |- No reservations: " .
scalar(@deleted_no_reservations) . "\n";
+ print " |- Loaded: " .
scalar(@deleted_no_reservations_loaded) . "\n";
+ print " |- Not loaded: " .
scalar(@deleted_no_reservations_not_loaded) . " (*)\n";
+ print "|- Not deleted: " . scalar(@not_deleted) . "\n";
print "(*) May be safely purged\n\n";
my @purgable_imagerevisions;
Modified: vcl/trunk/managementnode/lib/VCL/blockrequest.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/blockrequest.pm?rev=1644255&r1=1644254&r2=1644255&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/blockrequest.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/blockrequest.pm Wed Dec 10 00:08:45 2014
@@ -131,9 +131,9 @@ sub process {
my $blocktime_start = $self->data->get_blocktime_start();
my $blocktime_end = $self->data->get_blocktime_end();
my $blockrequest_name = $self->data->get_blockrequest_name();
- my $blockrequest_owner_id =
$self->data->get_blockrequest_owner_id();
- my $block_group_id =
$self->data->get_blockrequest_group_id();
- my $block_group_name =
$self->data->get_blockrequest_group_name();
+ my $blockrequest_owner_id =
$self->data->get_blockrequest_owner_id();
+ my $block_group_id =
$self->data->get_blockrequest_group_id();
+ my $block_group_name =
$self->data->get_blockrequest_group_name();
# Get user info
my $user_info;
@@ -229,15 +229,15 @@ sub process {
if (defined($warningmsg) || defined($errormsg) || ($allocated <
$blockrequest_number_machines)) {
$body .= "Problem processing block allocation \n\n";
- $body .= "Block id = $blockrequest_id\n";
- $body .= "Block name = $blockrequest_name\n";
- $body .= "Block start time = $blocktime_start\n";
- $body .= "Block end time = $blocktime_end\n";
- $body .= "Environment name = $image_prettyname\n";
- $body .= "Allocated = $allocated\n";
- $body .= "Block requested =
$blockrequest_number_machines\n";
- $body .= "xmlrpc warn msg = $warningmsg\n"
if(defined($warningmsg));
- $body .= "xmlrpc error msg = $errormsg\n"
if(defined($errormsg));
+ $body .= "Block id = $blockrequest_id\n";
+ $body .= "Block name = $blockrequest_name\n";
+ $body .= "Block start time = $blocktime_start\n";
+ $body .= "Block end time = $blocktime_end\n";
+ $body .= "Environment name = $image_prettyname\n";
+ $body .= "Allocated = $allocated\n";
+ $body .= "Block requested =
$blockrequest_number_machines\n";
+ $body .= "xmlrpc warn msg = $warningmsg\n"
if(defined($warningmsg));
+ $body .= "xmlrpc error msg = $errormsg\n"
if(defined($errormsg));
$body .= "\n";
notify($ERRORS{'CRITICAL'}, 0, "$body");
Modified: vcl/trunk/managementnode/lib/VCL/healthcheck.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/healthcheck.pm?rev=1644255&r1=1644254&r2=1644255&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/healthcheck.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/healthcheck.pm Wed Dec 10 00:08:45 2014
@@ -221,9 +221,9 @@ sub process {
$info->{"computerschecked"} += 1;
} ## end if (defined($last_check) && $computer_state !~...
- my $computer_hostname =
$data->get_computer_host_name();
- my $computer_short_name = $1 if ($computer_hostname =~
/([-_a-zA-Z0-9]*)(\.?)/);
- my $computer_type = $data->get_computer_type();
+ my $computer_hostname = $data->get_computer_host_name();
+ my $computer_short_name = $1 if ($computer_hostname =~
/([-_a-zA-Z0-9]*)(\.?)/);
+ my $computer_type = $data->get_computer_type();
if ($computer_type eq "lab") {
#next;
@@ -287,7 +287,7 @@ sub process {
$node_status{status} = "ready";
next;
}
- my @currentimage_txt_contents =
get_current_image_contents_no_data_structure($computer_short_name);
+ my @currentimage_txt_contents =
get_current_image_contents_no_data_structure($computer_short_name);
foreach my $l (@currentimage_txt_contents) {
#notify($ERRORS{'OK'}, 0, "NODE l=$l");
if ( $l =~ /imagerevision_id/i ) {
@@ -478,17 +478,17 @@ sub _blade_investigator {
sub powerdown_event {
my ($self) = @_;
- my $management_node_keys = $self->{managementnode}->{keys};
- my $computer_host_name = $self->{computer}->{hostname};
- my $computer_short_name = 0;
- my $computer_ip_address = $self->{computer}->{IPaddress};
- my $image_name = $self->{imagerevision}->{imagename};
- my $image_os_type = $self->{image}->{OS}->{type};
+ my $management_node_keys = $self->{managementnode}->{keys};
+ my $computer_host_name = $self->{computer}->{hostname};
+ my $computer_short_name = 0;
+ my $computer_ip_address = $self->{computer}->{IPaddress};
+ my $image_name = $self->{imagerevision}->{imagename};
+ my $image_os_type = $self->{image}->{OS}->{type};
my $provisioning_perl_package =
$self->{computer}->{provisioning}->{module}->{perlpackage};
- my $computer_type = $self->{computer}->{type};
- my $computer_state =
$self->{computer}->{state}->{name};
- my $computer_node_name = $self->{computer}->{hostname};
- my $power_down_stage =
$self->{powerdownstage};
+ my $computer_type = $self->{computer}->{type};
+ my $computer_state = $self->{computer}->{state}->{name};
+ my $computer_node_name = $self->{computer}->{hostname};
+ my $power_down_stage = $self->{powerdownstage};
$computer_short_name = $1 if ($computer_node_name =~
/([-_a-zA-Z0-9]*)(\.?)/);
Modified: vcl/trunk/managementnode/lib/VCL/inuse.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/inuse.pm?rev=1644255&r1=1644254&r2=1644255&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/inuse.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/inuse.pm Wed Dec 10 00:08:45 2014
@@ -368,18 +368,18 @@ sub user_connected {
return;
}
- my $request_id =
$self->data->get_request_id();
- my @reservation_ids =
$self->data->get_reservation_ids();
- my $reservation_id =
$self->data->get_reservation_id();
- my $reservation_lastcheck =
$self->data->get_reservation_lastcheck_time();
- 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();
- my $request_duration_epoch_secs =
$self->data->get_request_duration_epoch();
- my $request_duration_hrs =
floor($request_duration_epoch_secs / 60 / 60);
- my $ignore_connections_gte_min =
$self->os->get_timings('ignore_connections_gte');
- my $ignore_connections_gte =
floor($ignore_connections_gte_min / 60);
+ my $request_id = $self->data->get_request_id();
+ my @reservation_ids = $self->data->get_reservation_ids();
+ my $reservation_id = $self->data->get_reservation_id();
+ my $reservation_lastcheck =
$self->data->get_reservation_lastcheck_time();
+ 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();
+ my $request_duration_epoch_secs =
$self->data->get_request_duration_epoch();
+ my $request_duration_hrs = floor($request_duration_epoch_secs /
60 / 60);
+ my $ignore_connections_gte_min =
$self->os->get_timings('ignore_connections_gte');
+ my $ignore_connections_gte = floor($ignore_connections_gte_min /
60);
# Check if user deleted the request
$self->state_exit() if is_request_deleted($request_id);
@@ -469,7 +469,7 @@ sub _notify_user_endtime {
my $user_emailnotices =
$self->data->get_user_emailnotices();
my $user_imtype_name =
$self->data->get_user_imtype_name();
my $user_im_id = $self->data->get_user_im_id();
- my $request_forimaging =
$self->_check_imaging_request();
+ my $request_forimaging = $self->_check_imaging_request();
my $request_id = $self->data->get_request_id();
my $message;
Modified: vcl/trunk/managementnode/lib/VCL/new.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/new.pm?rev=1644255&r1=1644254&r2=1644255&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/new.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/new.pm Wed Dec 10 00:08:45 2014
@@ -463,8 +463,8 @@ sub reload_image {
my $image_name = $self->data->get_image_name();
my $image_os_install_type =
$self->data->get_image_os_install_type();
my $imagerevision_id =
$self->data->get_imagerevision_id();
- my $server_request_id =
$self->data->get_server_request_id();
- my $server_request_fixed_ip =
$self->data->get_server_request_fixed_ip();
+ my $server_request_id =
$self->data->get_server_request_id();
+ my $server_request_fixed_ip =
$self->data->get_server_request_fixed_ip();
# Try to get the node status if the provisioning engine has implemented
a node_status() subroutine
my $node_status;
Modified: vcl/trunk/managementnode/lib/VCL/reclaim.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/reclaim.pm?rev=1644255&r1=1644254&r2=1644255&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/reclaim.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/reclaim.pm Wed Dec 10 00:08:45 2014
@@ -97,9 +97,9 @@ 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();
- my $public_ip_configuration =
$self->data->get_management_node_public_ip_configuration() || return;
- my @reservation_ids
= $self->data->get_reservation_ids();
+ 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,0,1);
@@ -238,7 +238,7 @@ sub insert_reload_and_exit {
my $self = shift;
my $request_data = $self->data->get_request_data;
my $computer_id = $self->data->get_computer_id();
- my $computer_shortname =
$self->data->get_computer_short_name();
+ my $computer_shortname = $self->data->get_computer_short_name();
# Run any vcl_post_reservation scripts (if exists)
if ($self->os->can("post_reservation")) {
Modified: vcl/trunk/managementnode/lib/VCL/utils.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/utils.pm?rev=1644255&r1=1644254&r2=1644255&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/utils.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/utils.pm Wed Dec 10 00:08:45 2014
@@ -4407,7 +4407,7 @@ sub write_currentimage_txt {
my $image_prettyname = $data->get_image_prettyname();
my $imagerevision_id = $data->get_imagerevision_id();
my $imagerevision_date_created =
$data->get_imagerevision_date_created();
- my $image_os_type =
$data->get_image_os_type();
+ my $image_os_type = $data->get_image_os_type();
my @current_image_lines;
push @current_image_lines, "$image_name";
@@ -6376,8 +6376,8 @@ sub get_computers_controlled_by_mn {
#set some local variables
my $management_node_resourceid = $managementnode{resource_id};
- my $management_node_id = $managementnode{id};
- my $management_node_hostname = $managementnode{hostname};
+ my $management_node_id = $managementnode{id};
+ my $management_node_hostname = $managementnode{hostname};
# Collect resource group this management node is a member of
if ($info{managementnode}{resoucegroups} =
get_resource_groups($management_node_resourceid)) {
