Author: fapeeler
Date: Fri Dec 5 20:30:46 2014
New Revision: 1643420
URL: http://svn.apache.org/r1643420
Log:
VCL-568, VCL-308
more tweaks on the flow
Modified:
vcl/trunk/mysql/update-vcl.sql
vcl/trunk/mysql/vcl.sql
Modified: vcl/trunk/mysql/update-vcl.sql
URL:
http://svn.apache.org/viewvc/vcl/trunk/mysql/update-vcl.sql?rev=1643420&r1=1643419&r2=1643420&view=diff
==============================================================================
--- vcl/trunk/mysql/update-vcl.sql (original)
+++ vcl/trunk/mysql/update-vcl.sql Fri Dec 5 20:30:46 2014
@@ -1360,6 +1360,8 @@ INSERT IGNORE INTO `computerloadstate` (
INSERT IGNORE INTO `computerloadstate` (`loadstatename`,`prettyname`,`est`)
VALUES ('copyfrompartnerMN','Copy Image from Partner Management node','20');
INSERT IGNORE INTO `computerloadstate` (`loadstatename`,`prettyname`) VALUES
('postreserve','Post reserve completed');
+UPDATE `computerloadstate` SET loadstatename = 'machinebooted' WHERE
loadstatename = 'vmstage4';
+
-- --------------------------------------------------------
--
@@ -1374,7 +1376,8 @@ INSERT IGNORE INTO `computerloadflow` (`
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'rinstall'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'xcatstage2'),"blade");
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'xcatstage2'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'xcatstage5'),"blade");
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'xcatstage5'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'bootstate'),"blade");
-INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'bootstate'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'loadimagecomplete'),"blade");
+INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'bootstate'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'machinebooted'),"blade");
+INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'machinebooted'),(SELECT `id` FROM `computerloadstate` WHERE
`loadstatename` LIKE 'loadimagecomplete'),"blade");
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'loadimagecomplete'),(SELECT `id` FROM `computerloadstate` WHERE
`loadstatename` LIKE 'nodeready'),"blade");
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'nodeready'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'addinguser'),"blade");
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'addinguser'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'reserved'),"blade");
@@ -1387,8 +1390,8 @@ INSERT IGNORE INTO `computerloadflow` (`
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'startload'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'transfervm'),"virtualmachine");
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'transfervm'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'vmsetupconfig'),"virtualmachine");
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'vmsetupconfig'),(SELECT `id` FROM `computerloadstate` WHERE
`loadstatename` LIKE 'startvm'),"virtualmachine");
-INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'startvm'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'vmstage4'),"virtualmachine");
-INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'vmstage4'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'loadimagecomplete'),"virtualmachine");
+INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'startvm'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'machinebooted'),"virtualmachine");
+INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'machinebooted'),(SELECT `id` FROM `computerloadstate` WHERE
`loadstatename` LIKE 'loadimagecomplete'),"virtualmachine");
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'loadimagecomplete'),(SELECT `id` FROM `computerloadstate` WHERE
`loadstatename` LIKE 'nodeready'),"virtualmachine");
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'nodeready'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'addinguser'),"virtualmachine");
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'addinguser'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'reserved'),"virtualmachine");
Modified: vcl/trunk/mysql/vcl.sql
URL:
http://svn.apache.org/viewvc/vcl/trunk/mysql/vcl.sql?rev=1643420&r1=1643419&r2=1643420&view=diff
==============================================================================
--- vcl/trunk/mysql/vcl.sql (original)
+++ vcl/trunk/mysql/vcl.sql Fri Dec 5 20:30:46 2014
@@ -1498,7 +1498,7 @@ INSERT IGNORE INTO `computerloadstate` (
(43, 'nodeready', 'resource ready', 0),
(44, 'inuseend10', '10 minute warning ', 2),
(45, 'inuseend5', '5 minute warning', 2),
-(46, 'vmstage4', 'machine booting', 68),
+(46, 'machinebooted', 'machine booting', 68),
(47, 'checklabstatus', 'checking computer status', 2),
(48, 'startvm', 'starting virtual machine', 3),
(49, 'vmstage5', 'detected stage 5 of 5 loading process', 1),
@@ -1523,7 +1523,8 @@ INSERT IGNORE INTO `computerloadflow` (`
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'rinstall'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'xcatstage2'),"blade");
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'xcatstage2'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'xcatstage5'),"blade");
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'xcatstage5'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'bootstate'),"blade");
-INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'bootstate'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'loadimagecomplete'),"blade");
+INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'bootstate'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'machinebooted'),"blade");
+INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'machinebooted'),(SELECT `id` FROM `computerloadstate` WHERE
`loadstatename` LIKE 'loadimagecomplete'),"blade");
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'loadimagecomplete'),(SELECT `id` FROM `computerloadstate` WHERE
`loadstatename` LIKE 'nodeready'),"blade");
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'nodeready'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'addinguser'),"blade");
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'addinguser'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'reserved'),"blade");
@@ -1535,8 +1536,8 @@ INSERT IGNORE INTO `computerloadflow` (`
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'startload'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'transfervm'),"virtualmachine");
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'transfervm'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'vmsetupconfig'),"virtualmachine");
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'vmsetupconfig'),(SELECT `id` FROM `computerloadstate` WHERE
`loadstatename` LIKE 'startvm'),"virtualmachine");
-INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'startvm'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'vmstage4'),"virtualmachine");
-INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'vmstage4'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'loadimagecomplete'),"virtualmachine");
+INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'startvm'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'machinebooted'),"virtualmachine");
+INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'machinebooted'),(SELECT `id` FROM `computerloadstate` WHERE
`loadstatename` LIKE 'loadimagecomplete'),"virtualmachine");
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'loadimagecomplete'),(SELECT `id` FROM `computerloadstate` WHERE
`loadstatename` LIKE 'nodeready'),"virtualmachine");
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'nodeready'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'addinguser'),"virtualmachine");
INSERT IGNORE INTO `computerloadflow` (`computerloadstateid`, `nextstateid`,
`type`) VALUES ((SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'addinguser'),(SELECT `id` FROM `computerloadstate` WHERE `loadstatename`
LIKE 'reserved'),"virtualmachine");
