Author: fapeeler
Date: Wed Aug 4 15:34:02 2010
New Revision: 982304
URL: http://svn.apache.org/viewvc?rev=982304&view=rev
Log:
VCL-224
DEFAULTURL is not being used.
lib/VCL/utils.pm
etc/vcl/vcld.conf
VCL-254
lib/VCL/blockrequest.pm
additional information in error msg, reduced the amount of email notifications
when an error is detected.
Modified:
incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf
incubator/vcl/trunk/managementnode/lib/VCL/blockrequest.pm
incubator/vcl/trunk/managementnode/lib/VCL/utils.pm
Modified: incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf?rev=982304&r1=982303&r2=982304&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf (original)
+++ incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf Wed Aug 4 15:34:02
2010
@@ -118,10 +118,6 @@ RETURNPATH=
# reservations, upcoming timeouts and image creations
sharedmailbox=
-# default url for end-user notifications if not listed in affilation
-# database table - this is usually the core www site address
-DEFAULTURL=http://vcl.your.domain
-
# default from email address for end-user notifications if not listed in
# affilation
# database table - normally this would be a list or a help system - but
Modified: incubator/vcl/trunk/managementnode/lib/VCL/blockrequest.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/blockrequest.pm?rev=982304&r1=982303&r2=982304&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/blockrequest.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/blockrequest.pm Wed Aug 4
15:34:02 2010
@@ -131,6 +131,9 @@ sub process {
my $blocktime_processed =
$self->data->get_blocktime_processed();
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();
+
#Set local timer
my $localtimer = convert_to_epoch_seconds();
@@ -155,6 +158,7 @@ sub process {
my $completed = 0;
my $loop_control = 0;
my $xmlcall;
+ my ($warningmsg, $errormsg);
my($allocated,$unallocated) = 0;
@@ -166,7 +170,7 @@ sub process {
}
else{
$completed=1;
- notify($ERRORS{'CRITICAL'}, 0, "attempted
$loop_control passes to complete block_request $blockrequest_id\n allocated=
$allocated \nblockrequest_number_machines= $blockrequest_number_machines");
+ notify($ERRORS{'DEBUG'}, 0, "attempted
$loop_control passes to complete block_request $blockrequest_id\n allocated=
$allocated \nblockrequest_number_machines= $blockrequest_number_machines");
last;
}
@@ -180,12 +184,12 @@ sub process {
}
if ($xmlcall->{status} =~ /warning|fault/) {
- my $warningmsg = $xmlcall->{warningmsg} if
(defined($xmlcall->{warningmsg}));
- notify($ERRORS{'CRITICAL'}, 0, "xmlrpc warning:
$warningmsg allocated= $allocated unallocated= $unallocated");
+ $warningmsg = $xmlcall->{warningmsg} if
(defined($xmlcall->{warningmsg}));
+ notify($ERRORS{'DEBUG'}, 0, "xmlrpc warning:
$warningmsg allocated= $allocated unallocated= $unallocated");
}
if ($xmlcall->{status} =~ /error/) {
- my $errormsg = $xmlcall->{errormsg} if
(defined($xmlcall->{errormsg}));
- notify($ERRORS{'CRITICAL'}, 0, "xmlrpc error on
blockrequest_id=$blockrequest_id blocktime_id=$blocktime_id : $errormsg");
+ $errormsg = $xmlcall->{errormsg} if
(defined($xmlcall->{errormsg}));
+ notify($ERRORS{'DEBUG'}, 0, "xmlrpc error on
blockrequest_id=$blockrequest_id blocktime_id=$blocktime_id : $errormsg");
}
if ($xmlcall->{status} =~ /completed/) {
$completed=1;
@@ -194,6 +198,24 @@ sub process {
sleep 5 if(!$completed);
}
+
+ my $body;
+
+ 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 .= "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");
+
+ }
#pause
if (pauseprocessing($localtimer)) {
Modified: incubator/vcl/trunk/managementnode/lib/VCL/utils.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/utils.pm?rev=982304&r1=982303&r2=982304&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/utils.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/utils.pm Wed Aug 4 15:34:02 2010
@@ -209,7 +209,6 @@ our @EXPORT = qw(
$DAEMON_MODE
$DATABASE
$DEFAULTHELPEMAIL
- $DEFAULTURL
$ETHDEVICE
$GATEWAY
$FQDN
@@ -247,7 +246,7 @@ INIT {
our ($JABBER, $jabServer, $jabUser, $jabPass, $jabResource, $jabPort) =
0;
our ($LOGFILE, $PIDFILE, $PROCESSNAME);
our ($DATABASE, $SERVER, $WRTUSER, $WRTPASS, $LockerRdUser, $rdPass) =
0;
- our ($SYSADMIN, $SHARED_MAILBOX, $DEFAULTURL, $DEFAULTHELPEMAIL,
$RETURNPATH) = 0;
+ our ($SYSADMIN, $SHARED_MAILBOX, $DEFAULTHELPEMAIL, $RETURNPATH) = 0;
our ($XCATROOT) = 0;
our ($FQDN) = 0;
our ($MYSQL_SSL, $MYSQL_SSL_CERT);
@@ -320,10 +319,6 @@ INIT {
$PIDFILE = $1;
}
- if ($l =~ /^DEFAULTURL=(.*)/) {
- $DEFAULTURL = $1;
- }
-
if ($l =~ /^DEFAULTHELPEMAIL=(.*)/) {
$DEFAULTHELPEMAIL = $1;
}
@@ -501,7 +496,7 @@ our ($JABBER, $PROCESSNAME);
our %ERRORS = ('DEPENDENT' => 4, 'UNKNOWN' => 3, 'OK' => 0, 'WARNING' => 1,
'CRITICAL' => 2, 'MAILMASTERS' => 5, 'DEBUG' => 6);
our ($LockerWrtUser, $wrtPass, $database, $server);
our ($jabServer, $jabUser, $jabPass, $jabResource, $jabPort);
-our ($vcldquerykey, $SYSADMIN, $SHARED_MAILBOX, $DEFAULTURL,
$DEFAULTHELPEMAIL,$RETURNPATH);
+our ($vcldquerykey, $SYSADMIN, $SHARED_MAILBOX,
$DEFAULTHELPEMAIL,$RETURNPATH);
our ($LOGFILE, $PIDFILE, $VCLDRPCQUERYKEY);
our ($SERVER, $DATABASE, $WRTUSER, $WRTPASS);
our ($MYSQL_SSL, $MYSQL_SSL_CERT);
