Author: jfthomps
Date: Wed Sep 24 16:12:12 2014
New Revision: 1627356
URL: http://svn.apache.org/r1627356
Log:
VCL-5 - multiple web servers
VCL-584 - Extend features of Server loads
vcl.sql, update-vcl.sql:
-added availablenetworks to managementnode table
-added semaphore table
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=1627356&r1=1627355&r2=1627356&view=diff
==============================================================================
--- vcl/trunk/mysql/update-vcl.sql (original)
+++ vcl/trunk/mysql/update-vcl.sql Wed Sep 24 16:12:12 2014
@@ -850,6 +850,7 @@ CALL AddColumnIfNotExists('managementnod
CALL AddColumnIfNotExists('managementnode', 'sysadminEmailAddress',
"varchar(128) default NULL");
CALL AddColumnIfNotExists('managementnode', 'sharedMailBox', "varchar(128)
default NULL");
CALL AddColumnIfNotExists('managementnode', 'NOT_STANDALONE', "varchar(128)
default NULL");
+CALL AddColumnIfNotExists('managementnode', 'availablenetworks', "text NOT
NULL");
-- --------------------------------------------------------
@@ -920,6 +921,27 @@ CALL AddManageMapping();
-- --------------------------------------------------------
--
+-- Table structure for table `semaphore`
+--
+
+CREATE TABLE IF NOT EXISTS `semaphore` (
+ `computerid` smallint(5) unsigned NOT NULL,
+ `imageid` smallint(5) unsigned NOT NULL,
+ `imagerevisionid` mediumint(8) unsigned NOT NULL,
+ `managementnodeid` smallint(5) unsigned NOT NULL,
+ `expires` timestamp NOT NULL default CURRENT_TIMESTAMP on update
CURRENT_TIMESTAMP,
+ `procid` varchar(255) NOT NULL,
+ KEY `computerid` (`computerid`),
+ KEY `imageid` (`imageid`),
+ KEY `imagerevisionid` (`imagerevisionid`),
+ KEY `managementnodeid` (`managementnodeid`),
+ KEY `expires` (`expires`),
+ KEY `procid` (`procid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+-- --------------------------------------------------------
+
+--
-- Table structure for table `serverprofile`
--
Modified: vcl/trunk/mysql/vcl.sql
URL:
http://svn.apache.org/viewvc/vcl/trunk/mysql/vcl.sql?rev=1627356&r1=1627355&r2=1627356&view=diff
==============================================================================
--- vcl/trunk/mysql/vcl.sql (original)
+++ vcl/trunk/mysql/vcl.sql Wed Sep 24 16:12:12 2014
@@ -592,6 +592,7 @@ CREATE TABLE IF NOT EXISTS `managementno
`sysadminEmailAddress` varchar(128) default NULL,
`sharedMailBox` varchar(128) default NULL,
`NOT_STANDALONE` varchar(128) default NULL,
+ `availablenetworks` text NOT NULL,
PRIMARY KEY (`id`),
KEY `stateid` (`stateid`),
KEY `ownerid` (`ownerid`),
@@ -921,6 +922,27 @@ CREATE TABLE IF NOT EXISTS `scheduletime
-- --------------------------------------------------------
+--
+-- Table structure for table `semaphore`
+--
+
+CREATE TABLE IF NOT EXISTS `semaphore` (
+ `computerid` smallint(5) unsigned NOT NULL,
+ `imageid` smallint(5) unsigned NOT NULL,
+ `imagerevisionid` mediumint(8) unsigned NOT NULL,
+ `managementnodeid` smallint(5) unsigned NOT NULL,
+ `expires` timestamp NOT NULL default CURRENT_TIMESTAMP on update
CURRENT_TIMESTAMP,
+ `procid` varchar(255) NOT NULL,
+ KEY `computerid` (`computerid`),
+ KEY `imageid` (`imageid`),
+ KEY `imagerevisionid` (`imagerevisionid`),
+ KEY `managementnodeid` (`managementnodeid`),
+ KEY `expires` (`expires`),
+ KEY `procid` (`procid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+-- --------------------------------------------------------
+
--
-- Table structure for table `serverprofile`
--
@@ -2170,6 +2192,15 @@ ALTER TABLE `resourcepriv`
ALTER TABLE `schedule`
ADD CONSTRAINT `schedule_ibfk_1` FOREIGN KEY (`ownerid`) REFERENCES `user`
(`id`) ON UPDATE CASCADE;
+--
+-- Constraints for table `semaphore`
+--
+ALTER TABLE `semaphore`
+ ADD CONSTRAINT `semaphore_ibfk_1` FOREIGN KEY (`managementnodeid`)
REFERENCES `managementnode` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ ADD CONSTRAINT `semaphore_ibfk_2` FOREIGN KEY (`computerid`) REFERENCES
`computer` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ ADD CONSTRAINT `semaphore_ibfk_3` FOREIGN KEY (`imageid`) REFERENCES `image`
(`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ ADD CONSTRAINT `semaphore_ibfk_4` FOREIGN KEY (`imagerevisionid`) REFERENCES
`imagerevision` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+
--
-- Constraints for table `serverprofile`
--
