You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/01/16 20:22:51 UTC

git commit: updated refs/heads/4.3 to 386b467

Updated Branches:
  refs/heads/4.3 c375ec62e -> 386b467ef


CLOUDSTACK-5886: set cidr field-width to 2048

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/386b467e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/386b467e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/386b467e

Branch: refs/heads/4.3
Commit: 386b467ef34125ab1c6716dcf6afe9d3f1a34eb1
Parents: c375ec6
Author: Daan Hoogland <dh...@schubergphilis.com>
Authored: Thu Jan 16 20:22:42 2014 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Thu Jan 16 20:22:42 2014 +0100

----------------------------------------------------------------------
 setup/db/db/schema-410to420.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/386b467e/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index 37e6826..b0be6c7 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -2021,7 +2021,7 @@ CREATE TABLE `cloud`.`network_acl_item` (
   `icmp_code` int(10) COMMENT 'The ICMP code (if protocol=ICMP). A value of -1 means all codes for the given ICMP type.',
   `icmp_type` int(10) COMMENT 'The ICMP type (if protocol=ICMP). A value of -1 means all types.',
   `traffic_type` char(32) COMMENT 'the traffic type of the rule, can be Ingress or Egress',
-  `cidr` varchar(255) COMMENT 'comma seperated cidr list',
+  `cidr` varchar(2048) COMMENT 'comma seperated cidr list',
   `number` int(10) NOT NULL COMMENT 'priority number of the acl item',
   `action` varchar(10) NOT NULL COMMENT 'rule action, allow or deny',
   PRIMARY KEY  (`id`),


Re: git commit: updated refs/heads/4.3 to 386b467

Posted by Daan Hoogland <da...@gmail.com>.
sorry Wei Zou, David, I take that back. only people with large cidr
lists that upgrade to 4.2.1 will suffer indeed.

On Thu, Jan 16, 2014 at 9:36 PM, Daan Hoogland <da...@gmail.com> wrote:
> it seems to me it is not for those who will run into a to large cidr
> list. For those installations the management server upgrade step will
> fail and the ms will stop. both the alter table and the altered create
> statement are needed.
>
> On Thu, Jan 16, 2014 at 9:23 PM, Wei ZHOU <us...@gmail.com> wrote:
>> alter table is good enough.
>>
>>
>> 2014/1/16 Daan Hoogland <da...@gmail.com>
>>
>>> On Thu, Jan 16, 2014 at 8:46 PM, Daan Hoogland <da...@gmail.com>
>>> wrote:
>>> > but that won't help people doing
>>> > an upgrade as they will pass by the 410to420 script.
>>>
>>>
>>> reading the source we are both right. I will add the alter table
>>> statement as well (to 4.3 and 4.4 scripts)
>>>

Re: git commit: updated refs/heads/4.3 to 386b467

Posted by Daan Hoogland <da...@gmail.com>.
it seems to me it is not for those who will run into a to large cidr
list. For those installations the management server upgrade step will
fail and the ms will stop. both the alter table and the altered create
statement are needed.

On Thu, Jan 16, 2014 at 9:23 PM, Wei ZHOU <us...@gmail.com> wrote:
> alter table is good enough.
>
>
> 2014/1/16 Daan Hoogland <da...@gmail.com>
>
>> On Thu, Jan 16, 2014 at 8:46 PM, Daan Hoogland <da...@gmail.com>
>> wrote:
>> > but that won't help people doing
>> > an upgrade as they will pass by the 410to420 script.
>>
>>
>> reading the source we are both right. I will add the alter table
>> statement as well (to 4.3 and 4.4 scripts)
>>

Re: git commit: updated refs/heads/4.3 to 386b467

Posted by Wei ZHOU <us...@gmail.com>.
alter table is good enough.


2014/1/16 Daan Hoogland <da...@gmail.com>

> On Thu, Jan 16, 2014 at 8:46 PM, Daan Hoogland <da...@gmail.com>
> wrote:
> > but that won't help people doing
> > an upgrade as they will pass by the 410to420 script.
>
>
> reading the source we are both right. I will add the alter table
> statement as well (to 4.3 and 4.4 scripts)
>

Re: git commit: updated refs/heads/4.3 to 386b467

Posted by Daan Hoogland <da...@gmail.com>.
On Thu, Jan 16, 2014 at 8:46 PM, Daan Hoogland <da...@gmail.com> wrote:
> but that won't help people doing
> an upgrade as they will pass by the 410to420 script.


reading the source we are both right. I will add the alter table
statement as well (to 4.3 and 4.4 scripts)

Re: git commit: updated refs/heads/4.3 to 386b467

Posted by Daan Hoogland <da...@gmail.com>.
On Thu, Jan 16, 2014 at 8:32 PM, David Nalley <da...@gnsa.us> wrote:
> Why do this in 410to420? It won't get corrected on upgrades that are
> already at 4.2.x - realistically it probably needs to be in a 421to422
> if we plan on a 4.2.2 or 421to430.


it doesn't mean it won't be done.
alter table network_acl_item modify cidr varchar(2048)
can be added in those files as well, but that won't help people doing
an upgrade as they will pass by the 410to420 script.

Re: git commit: updated refs/heads/4.3 to 386b467

Posted by David Nalley <da...@gnsa.us>.
Why do this in 410to420? It won't get corrected on upgrades that are
already at 4.2.x - realistically it probably needs to be in a 421to422
if we plan on a 4.2.2 or 421to430.

--David

On Thu, Jan 16, 2014 at 2:22 PM,  <da...@apache.org> wrote:
> Updated Branches:
>   refs/heads/4.3 c375ec62e -> 386b467ef
>
>
> CLOUDSTACK-5886: set cidr field-width to 2048
>
> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
> Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/386b467e
> Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/386b467e
> Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/386b467e
>
> Branch: refs/heads/4.3
> Commit: 386b467ef34125ab1c6716dcf6afe9d3f1a34eb1
> Parents: c375ec6
> Author: Daan Hoogland <dh...@schubergphilis.com>
> Authored: Thu Jan 16 20:22:42 2014 +0100
> Committer: Daan Hoogland <dh...@schubergphilis.com>
> Committed: Thu Jan 16 20:22:42 2014 +0100
>
> ----------------------------------------------------------------------
>  setup/db/db/schema-410to420.sql | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/386b467e/setup/db/db/schema-410to420.sql
> ----------------------------------------------------------------------
> diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
> index 37e6826..b0be6c7 100644
> --- a/setup/db/db/schema-410to420.sql
> +++ b/setup/db/db/schema-410to420.sql
> @@ -2021,7 +2021,7 @@ CREATE TABLE `cloud`.`network_acl_item` (
>    `icmp_code` int(10) COMMENT 'The ICMP code (if protocol=ICMP). A value of -1 means all codes for the given ICMP type.',
>    `icmp_type` int(10) COMMENT 'The ICMP type (if protocol=ICMP). A value of -1 means all types.',
>    `traffic_type` char(32) COMMENT 'the traffic type of the rule, can be Ingress or Egress',
> -  `cidr` varchar(255) COMMENT 'comma seperated cidr list',
> +  `cidr` varchar(2048) COMMENT 'comma seperated cidr list',
>    `number` int(10) NOT NULL COMMENT 'priority number of the acl item',
>    `action` varchar(10) NOT NULL COMMENT 'rule action, allow or deny',
>    PRIMARY KEY  (`id`),
>