Author: arkurth
Date: Thu Sep 5 20:14:40 2013
New Revision: 1520408
URL: http://svn.apache.org/r1520408
Log:
VCL-16
Added code to delete any existing computerloadlog 'exited' entries when a
reservation process is forked in vcld. Added computerloadstate 'exited' entry
to vcl.sql.
Other
Fixed call to sleep_uninterrupted in vcld.
Modified:
vcl/trunk/managementnode/bin/vcld
vcl/trunk/mysql/vcl.sql
Modified: vcl/trunk/managementnode/bin/vcld
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/bin/vcld?rev=1520408&r1=1520407&r2=1520408&view=diff
==============================================================================
--- vcl/trunk/managementnode/bin/vcld (original)
+++ vcl/trunk/managementnode/bin/vcld Thu Sep 5 20:14:40 2013
@@ -155,7 +155,7 @@ sub main () {
}
else {
#notify($ERRORS{'DEBUG'}, $LOGFILE, "sleeping for
$management_node_checkin_interval seconds");
- sleep_uninterupted($management_node_checkin_interval);
+ sleep_uninterrupted($management_node_checkin_interval);
}
#===========================================================================
@@ -352,7 +352,10 @@ sub main () {
# Add the DataStructure reference to %ENV so it
can be accessed from non-object methods
$ENV{data} = $data_structure;
- # Insert a computerloadlog entry to indicate
processing has begin for this reservation
+ # Remove any existing 'exited' computerloadlog
entries
+
delete_computerloadlog_reservation($reservation_id, 'exited');
+
+ # Insert a computerloadlog 'begin' entry to
indicate processing has begun for this reservation
my $computer_id =
$data_structure->get_computer_id();
insertloadlog($reservation_id, $computer_id,
"begin", "beginning to process, state is $request_state_name");
Modified: vcl/trunk/mysql/vcl.sql
URL:
http://svn.apache.org/viewvc/vcl/trunk/mysql/vcl.sql?rev=1520408&r1=1520407&r2=1520408&view=diff
==============================================================================
--- vcl/trunk/mysql/vcl.sql (original)
+++ vcl/trunk/mysql/vcl.sql Thu Sep 5 20:14:40 2013
@@ -376,7 +376,7 @@ CREATE TABLE IF NOT EXISTS `image` (
`prettyname` varchar(60) NOT NULL default '',
`ownerid` mediumint(8) unsigned default '1',
`imagetypeid` smallint(5) unsigned NOT NULL default '1',
- `platformid` tinyint(3) unsigned NOT NULL default '0',
+ `platformid` tinyint(3) unsigned NOT NULL default '1',
`OSid` tinyint(3) unsigned NOT NULL default '0',
`imagemetaid` smallint(5) unsigned default NULL,
`minram` mediumint(8) unsigned NOT NULL default '0',
@@ -391,7 +391,7 @@ CREATE TABLE IF NOT EXISTS `image` (
`forcheckout` tinyint(1) unsigned NOT NULL default '1',
`maxinitialtime` smallint(5) unsigned NOT NULL default '0',
`project` enum('vcl','hpc','vclhpc') NOT NULL default 'vcl',
- `size` smallint(5) unsigned NOT NULL default '1450',
+ `size` smallint(5) unsigned NOT NULL default '0',
`architecture` enum('x86','x86_64') NOT NULL default 'x86',
`description` text,
`usage` text,
@@ -1402,7 +1402,8 @@ INSERT INTO `computerloadstate` (`id`, `
(51, 'imageloadcomplete', 'node ready to add user', 0),
(52, 'repeat', 'repeat', 0),
(53, 'deleted', 'deleted', NULL),
-(54, 'begin', 'beginning to process reservation', 0);
+(54, 'begin', 'beginning to process reservation', 0),
+(55, 'exited', 'vcld process exited', 0);
--
-- Dumping data for table `connectmethod`
