You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2017/03/29 23:11:40 UTC
[1/5] incubator-trafficcontrol git commit: This closes #413
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master 4cb23802a -> c4485eba9
This closes #413
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/c4485eba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/c4485eba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/c4485eba
Branch: refs/heads/master
Commit: c4485eba9b5edb653baa850577d81deb3f78abd4
Parents: 3608c1e
Author: Dewayne Richardson <de...@apache.org>
Authored: Wed Mar 29 17:11:31 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Wed Mar 29 17:11:31 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/5] incubator-trafficcontrol git commit: don't add
use_reval_pending value by default.
Posted by de...@apache.org.
don't add use_reval_pending value by default.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/c28b77c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/c28b77c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/c28b77c3
Branch: refs/heads/master
Commit: c28b77c35583ff64bc05af39d0964db2b97b2be4
Parents: 4cb2380
Author: Derek Gelinas <mr...@gmail.com>
Authored: Tue Mar 28 19:13:33 2017 +0000
Committer: Dewayne Richardson <de...@apache.org>
Committed: Wed Mar 29 17:11:31 2017 -0600
----------------------------------------------------------------------
.../app/db/migrations/20170226190747_add_reval_pending.sql | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c28b77c3/traffic_ops/app/db/migrations/20170226190747_add_reval_pending.sql
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/migrations/20170226190747_add_reval_pending.sql b/traffic_ops/app/db/migrations/20170226190747_add_reval_pending.sql
index 74864d5..f177253 100644
--- a/traffic_ops/app/db/migrations/20170226190747_add_reval_pending.sql
+++ b/traffic_ops/app/db/migrations/20170226190747_add_reval_pending.sql
@@ -16,11 +16,9 @@
-- +goose Up
-- SQL in section 'Up' is executed when this migration is applied
ALTER TABLE server ADD COLUMN reval_pending boolean NOT NULL DEFAULT false;
-INSERT INTO parameter (name, config_file, value, secure) VALUES ('use_reval_pending', 'global', '0', False);
-insert into profile_parameter (profile, parameter) values ((select id from profile where name = 'GLOBAL'), (select id from parameter where name = 'use_reval_pending'));
-- +goose Down
-- SQL section 'Down' is executed when this migration is rolled back
ALTER TABLE server DROP COLUMN reval_pending;
delete from profile_parameter where parameter = (select id from parameter where name = 'use_reval_pending');
-delete from parameter where name = 'use_reval_pending';
\ No newline at end of file
+delete from parameter where name = 'use_reval_pending';
[4/5] incubator-trafficcontrol git commit: remove client_steering
goose migration. uses seeds.sql. Add missing statuses.
Posted by de...@apache.org.
remove client_steering goose migration. uses seeds.sql. Add missing statuses.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/3608c1ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/3608c1ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/3608c1ea
Branch: refs/heads/master
Commit: 3608c1eab65c5c81bd97398e459fcc6266872e1c
Parents: fbe43fb
Author: Derek Gelinas <mr...@gmail.com>
Authored: Wed Mar 29 16:13:37 2017 +0000
Committer: Dewayne Richardson <de...@apache.org>
Committed: Wed Mar 29 17:11:31 2017 -0600
----------------------------------------------------------------------
.../app/db/migrations/20170224163900_add_client_steering.sql | 8 --------
traffic_ops/app/db/seeds.sql | 6 ++++++
2 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3608c1ea/traffic_ops/app/db/migrations/20170224163900_add_client_steering.sql
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/migrations/20170224163900_add_client_steering.sql b/traffic_ops/app/db/migrations/20170224163900_add_client_steering.sql
deleted file mode 100644
index 1617d5e..0000000
--- a/traffic_ops/app/db/migrations/20170224163900_add_client_steering.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-
--- +goose Up
--- SQL in section 'Up' is executed when this migration is applied
-insert into type (name, description, use_in_table) select 'CLIENT_STEERING', 'Client-Controlled Steering Delivery Service', 'deliveryservice' WHERE NOT EXISTS (select 1 FROM type WHERE name='CLIENT_STEERING');
-
--- +goose Down
--- SQL section 'Down' is executed when this migration is rolled back
-delete from type where name = 'CLIENT_STEERING';
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3608c1ea/traffic_ops/app/db/seeds.sql
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/seeds.sql b/traffic_ops/app/db/seeds.sql
index 16a6964..8a6db49 100644
--- a/traffic_ops/app/db/seeds.sql
+++ b/traffic_ops/app/db/seeds.sql
@@ -27,6 +27,7 @@ insert into role (id, name, description, priv_level) values (8, 'steering', 'Rol
insert into type (name, description, use_in_table) values ('ANY_MAP', 'No Content Routing - arbitrary remap at the edge, no Traffic Router config', 'deliveryservice') ON CONFLICT DO NOTHING;
insert into type (name, description, use_in_table) values ('ORG_LOC', 'Origin Logical Site', 'cachegroup') ON CONFLICT DO NOTHING;
insert into type (name, description, use_in_table) values ('STEERING', 'Steering Delivery Service', 'deliveryservice') ON CONFLICT DO NOTHING;
+insert into type (name, description, use_in_table) values ('CLIENT_STEERING', 'Client-Controlled Steering Delivery Service', 'deliveryservice') ON CONFLICT DO NOTHING;
insert into type (name, description, use_in_table) values ('STEERING_REGEXP', 'Steering target filter regular expression', 'regex') ON CONFLICT DO NOTHING;
insert into type (name, description, use_in_table) values ('CHECK_EXTENSION_BOOL', 'Extension for checkmark in Server Check', 'to_extension') ON CONFLICT DO NOTHING;
insert into type (name, description, use_in_table) values ('CHECK_EXTENSION_NUM', 'Extension for int value in Server Check', 'to_extension') ON CONFLICT DO NOTHING;
@@ -41,6 +42,11 @@ insert into type (name, description, use_in_table) values ('TRAFFIC_PORTAL', 'tr
insert into type (name, description, use_in_table) values ('INFLUXDB', 'influxDb server', 'server') ON CONFLICT DO NOTHING;
-- statuses
+insert into status (name, description) values ('OFFLINE', 'Server is Offline. Not active in any configuration.') ON CONFLICT DO NOTHING;
+insert into status (name, description) values ('ONLINE', 'Server is online.') ON CONFLICT DO NOTHING;
+insert into status (name, description) values ('REPORTED', 'Server is online and reporeted in the health protocol.') ON CONFLICT DO NOTHING;
+insert into status (name, description) values ('ADMIN_DOWN', 'Sever is administrative down and does not receive traffic.') ON CONFLICT DO NOTHING;
+insert into status (name, description) values ('CCR_IGNORE', 'Server is ignored by traffic router.') ON CONFLICT DO NOTHING;
insert into status (name, description) values ('PRE_PROD', 'Pre Production. Not active in any configuration.') ON CONFLICT DO NOTHING;
-- job agents
[5/5] incubator-trafficcontrol git commit: remove traces of last
upgrade scripts from existing databases
Posted by de...@apache.org.
remove traces of last upgrade scripts from existing databases
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/d2dce5b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/d2dce5b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/d2dce5b5
Branch: refs/heads/master
Commit: d2dce5b5c276d82c2c69380a94d88a997a827654
Parents: c28b77c
Author: Derek Gelinas <mr...@gmail.com>
Authored: Wed Mar 29 15:40:17 2017 +0000
Committer: Dewayne Richardson <de...@apache.org>
Committed: Wed Mar 29 17:11:31 2017 -0600
----------------------------------------------------------------------
.../20170224163900_add_client_steering.sql | 3 +--
.../20170226190747_add_reval_pending.sql | 24 -----------------
.../20170328190847_add_reval_pending.sql | 27 ++++++++++++++++++++
3 files changed, 28 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/d2dce5b5/traffic_ops/app/db/migrations/20170224163900_add_client_steering.sql
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/migrations/20170224163900_add_client_steering.sql b/traffic_ops/app/db/migrations/20170224163900_add_client_steering.sql
index f628ba0..1617d5e 100644
--- a/traffic_ops/app/db/migrations/20170224163900_add_client_steering.sql
+++ b/traffic_ops/app/db/migrations/20170224163900_add_client_steering.sql
@@ -1,8 +1,7 @@
-- +goose Up
-- SQL in section 'Up' is executed when this migration is applied
-insert into type (name, description, use_in_table) values ('CLIENT_STEERING', 'Client-Controlled Steering Delivery Service', 'deliveryservice');
-
+insert into type (name, description, use_in_table) select 'CLIENT_STEERING', 'Client-Controlled Steering Delivery Service', 'deliveryservice' WHERE NOT EXISTS (select 1 FROM type WHERE name='CLIENT_STEERING');
-- +goose Down
-- SQL section 'Down' is executed when this migration is rolled back
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/d2dce5b5/traffic_ops/app/db/migrations/20170226190747_add_reval_pending.sql
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/migrations/20170226190747_add_reval_pending.sql b/traffic_ops/app/db/migrations/20170226190747_add_reval_pending.sql
deleted file mode 100644
index f177253..0000000
--- a/traffic_ops/app/db/migrations/20170226190747_add_reval_pending.sql
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
--- +goose Up
--- SQL in section 'Up' is executed when this migration is applied
-ALTER TABLE server ADD COLUMN reval_pending boolean NOT NULL DEFAULT false;
-
--- +goose Down
--- SQL section 'Down' is executed when this migration is rolled back
-ALTER TABLE server DROP COLUMN reval_pending;
-delete from profile_parameter where parameter = (select id from parameter where name = 'use_reval_pending');
-delete from parameter where name = 'use_reval_pending';
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/d2dce5b5/traffic_ops/app/db/migrations/20170328190847_add_reval_pending.sql
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/migrations/20170328190847_add_reval_pending.sql b/traffic_ops/app/db/migrations/20170328190847_add_reval_pending.sql
new file mode 100644
index 0000000..e73a237
--- /dev/null
+++ b/traffic_ops/app/db/migrations/20170328190847_add_reval_pending.sql
@@ -0,0 +1,27 @@
+/*
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+-- +goose Up
+-- SQL in section 'Up' is executed when this migration is applied
+ALTER TABLE server DROP COLUMN IF EXISTS reval_pendings;
+delete from profile_parameter where parameter = (select id from parameter where name = 'use_reval_pending');
+delete from parameter where name = 'use_reval_pending';
+ALTER TABLE server ADD COLUMN IF NOT EXISTS reval_pending boolean NOT NULL DEFAULT false;
+
+-- +goose Down
+-- SQL section 'Down' is executed when this migration is rolled back
+ALTER TABLE server DROP COLUMN IF EXISTS reval_pending;
+delete from profile_parameter where parameter = (select id from parameter where name = 'use_reval_pending');
+delete from parameter where name = 'use_reval_pending';
[2/5] incubator-trafficcontrol git commit: fix column name -
reval_pending
Posted by de...@apache.org.
fix column name - reval_pending
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/fbe43fb2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/fbe43fb2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/fbe43fb2
Branch: refs/heads/master
Commit: fbe43fb269e1e6864ba4d5957c540bc756daa40f
Parents: d2dce5b
Author: Derek Gelinas <mr...@gmail.com>
Authored: Wed Mar 29 15:46:38 2017 +0000
Committer: Dewayne Richardson <de...@apache.org>
Committed: Wed Mar 29 17:11:31 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/db/migrations/20170328190847_add_reval_pending.sql | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/fbe43fb2/traffic_ops/app/db/migrations/20170328190847_add_reval_pending.sql
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/migrations/20170328190847_add_reval_pending.sql b/traffic_ops/app/db/migrations/20170328190847_add_reval_pending.sql
index e73a237..6cfe524 100644
--- a/traffic_ops/app/db/migrations/20170328190847_add_reval_pending.sql
+++ b/traffic_ops/app/db/migrations/20170328190847_add_reval_pending.sql
@@ -15,7 +15,7 @@
-- +goose Up
-- SQL in section 'Up' is executed when this migration is applied
-ALTER TABLE server DROP COLUMN IF EXISTS reval_pendings;
+ALTER TABLE server DROP COLUMN IF EXISTS reval_pending;
delete from profile_parameter where parameter = (select id from parameter where name = 'use_reval_pending');
delete from parameter where name = 'use_reval_pending';
ALTER TABLE server ADD COLUMN IF NOT EXISTS reval_pending boolean NOT NULL DEFAULT false;