Author: arkurth
Date: Thu Jul 7 19:23:31 2016
New Revision: 1751828
URL: http://svn.apache.org/viewvc?rev=1751828&view=rev
Log:
VCL-898
Removed log ID argument from utils.pm::insert_request and updated calls to it.
Added argument to suppress warning from calls to get_request_log_id if it is
NULL.
Modified:
vcl/trunk/managementnode/lib/VCL/Module/State.pm
vcl/trunk/managementnode/lib/VCL/image.pm
vcl/trunk/managementnode/lib/VCL/utils.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=1751828&r1=1751827&r2=1751828&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/State.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/State.pm Thu Jul 7 19:23:31 2016
@@ -372,7 +372,6 @@ sub reservation_failed {
# Get the required data
my $request_id = $self->data->get_request_id();
- my $request_logid = $self->data->get_request_log_id();
my $reservation_id = $self->data->get_reservation_id();
my $computer_id = $self->data->get_computer_id();
my $computer_short_name =
$self->data->get_computer_short_name();
@@ -866,7 +865,7 @@ sub state_exit {
my $calling_sub = get_calling_subroutine();
my $request_id = $self->data->get_request_id();
- my $request_logid = $self->data->get_request_log_id();
+ my $request_logid = $self->data->get_request_log_id(0);
my $reservation_id = $self->data->get_reservation_id();
my @reservation_ids = $self->data->get_reservation_ids();
my $reservation_count = $self->data->get_reservation_count();
@@ -974,7 +973,7 @@ sub state_exit {
}
# Update log.ending if this is the parent reservation and
argument was supplied
- if ($request_log_ending) {
+ if ($request_logid && $request_log_ending) {
if (!update_log_ending($request_logid,
$request_log_ending)) {
notify($ERRORS{'CRITICAL'}, 0, "failed to set
log ending to $request_log_ending, log ID: $request_logid");
}
Modified: vcl/trunk/managementnode/lib/VCL/image.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/image.pm?rev=1751828&r1=1751827&r2=1751828&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/image.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/image.pm Thu Jul 7 19:23:31 2016
@@ -840,7 +840,7 @@ EOF
print " resource.id: $resource_id\n\n";
- ($request_id, $reservation_id) = insert_request($management_node_id,
'image', 'image', 0, $username, $computer_id, $image_id, $imagerevision_id, 0,
60);
+ ($request_id, $reservation_id) = insert_request($management_node_id,
'image', 'image', $username, $computer_id, $image_id, $imagerevision_id, 0, 60);
if (!defined($request_id) || !defined($reservation_id)) {
print "ERROR: failed to insert new imaging request\n";
return;
Modified: vcl/trunk/managementnode/lib/VCL/utils.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/utils.pm?rev=1751828&r1=1751827&r2=1751828&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/utils.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/utils.pm Thu Jul 7 19:23:31 2016
@@ -8315,14 +8315,14 @@ EOF
=head2 insert_request
- Parameters : $managementnode_id, $request_state_name,
$request_laststate_name, $end_minutes_in_future, $user_unityid,
$computer_identifier, $image_id, $imagerevision_id
- Returns : 1 if successful, 0 if failed
+ Parameters : $managementnode_id, $request_state_name,
$request_laststate_name, $user_unityid, $computer_identifier, $image_id,
$imagerevision_id, $start_minutes_in_future, $end_minutes_in_future
+ Returns : boolean
Description :
=cut
sub insert_request {
- my ($managementnode_id, $request_state_name, $request_laststate_name,
$request_logid, $user_unityid, $computer_identifier, $image_id,
$imagerevision_id, $start_minutes_in_future, $end_minutes_in_future) = @_;
+ my ($managementnode_id, $request_state_name, $request_laststate_name,
$user_unityid, $computer_identifier, $image_id, $imagerevision_id,
$start_minutes_in_future, $end_minutes_in_future) = @_;
if (!$request_state_name) {
@@ -8374,7 +8374,6 @@ sub insert_request {
request.stateid,
request.laststateid,
request.userid,
- request.logid,
request.forimaging,
request.test,
request.preload,
@@ -8387,7 +8386,6 @@ sub insert_request {
(SELECT id FROM state WHERE state.name = '$request_state_name'),
(SELECT id FROM state WHERE state.name = '$request_laststate_name'),
(SELECT id FROM user WHERE user.unityid = '$user_unityid'),
- '$request_logid',
'0',
'0',
'0',
@@ -8506,7 +8504,7 @@ sub insert_reload_request {
# Attempt to create a new reload request
my $request_id_reload;
- if ($request_id_reload = insert_request($managementnode_id, 'reload',
$request_laststate_name, '0', 'vclreload', $computer_id, $image_id,
$imagerevision_id, '0', '30')) {
+ if ($request_id_reload = insert_request($managementnode_id, 'reload',
$request_laststate_name, 'vclreload', $computer_id, $image_id,
$imagerevision_id, '0', '30')) {
notify($ERRORS{'OK'}, 0, "$notify_prefix inserted new reload
request, id=$request_id_reload nodeid=$computer_id, imageid=$image_id,
imagerevision_id=$imagerevision_id");
insertloadlog($reservation_id, $computer_id, "info",
"$calling_sub: created new reload request");
}
