You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2017/01/10 03:38:16 UTC
[04/50] incubator-trafficcontrol git commit: add another step to
convert bools
add another step to convert bools
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/ce61680f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/ce61680f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/ce61680f
Branch: refs/heads/master
Commit: ce61680f795ed836da61fe703112b3e236dceb57
Parents: 731ecd7
Author: Dan Kirkwood <da...@gmail.com>
Authored: Sun Dec 4 01:44:03 2016 +0000
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Sun Jan 8 21:04:59 2017 -0700
----------------------------------------------------------------------
traffic_ops/app/db/pg-migration/Dockerfile-convert | 4 +++-
traffic_ops/app/db/pg-migration/docker-compose.yml | 16 +++++++++++++++-
.../mysql/initdb.d/AAA-wait-for-data.sh | 6 ------
traffic_ops/app/db/pg-migration/mysql/run.sh | 8 --------
traffic_ops/app/db/pg-migration/runconvert.sh | 17 +++++++++++++++++
traffic_ops/app/db/pg-migration/runpgloader.sh | 8 ++++++++
6 files changed, 43 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ce61680f/traffic_ops/app/db/pg-migration/Dockerfile-convert
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/pg-migration/Dockerfile-convert b/traffic_ops/app/db/pg-migration/Dockerfile-convert
index 7f96523..b1a7dd5 100644
--- a/traffic_ops/app/db/pg-migration/Dockerfile-convert
+++ b/traffic_ops/app/db/pg-migration/Dockerfile-convert
@@ -2,6 +2,8 @@ FROM postgres:9.6
MAINTAINER Dan Kirkwood
+RUN apt-get update && apt-get -y install netcat
+ADD pg-migration/runconvert.sh .
ADD convert_bools.sql .
-CMD psql postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST/$POSTGRES_DB < ./convert_bools.sql
+CMD ./runconvert.sh
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ce61680f/traffic_ops/app/db/pg-migration/docker-compose.yml
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/pg-migration/docker-compose.yml b/traffic_ops/app/db/pg-migration/docker-compose.yml
index fc327fa..74b5bd8 100644
--- a/traffic_ops/app/db/pg-migration/docker-compose.yml
+++ b/traffic_ops/app/db/pg-migration/docker-compose.yml
@@ -1,5 +1,8 @@
version: '2'
+volumes:
+ sync:
+
services:
# dataimport reads data from an existing traffic_ops server running mysql thru the API
dataimport:
@@ -41,7 +44,7 @@ services:
- POSTGRES_PASSWORD=twelve
- POSTGRES_USER=traffic_ops
volumes:
- - /var/lib/postgresql/data:/var/lib/postgresql/data
+ - /opt/traffic_ops-db:/var/lib/postgresql/data
ports:
- 5432
@@ -63,6 +66,8 @@ services:
- POSTGRES_DB=traffic_ops
- POSTGRES_PASSWORD=twelve
- POSTGRES_USER=traffic_ops
+ volumes:
+ - sync:/sync
# convert runs necessary post-import conversion(s) in postgres
convert:
@@ -70,3 +75,12 @@ services:
context: ..
dockerfile: pg-migration/Dockerfile-convert
restart: "no"
+ depends_on:
+ - postgres_host
+ environment:
+ - POSTGRES_HOST=postgres_host
+ - POSTGRES_DB=traffic_ops
+ - POSTGRES_PASSWORD=twelve
+ - POSTGRES_USER=traffic_ops
+ volumes:
+ - sync:/sync
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ce61680f/traffic_ops/app/db/pg-migration/mysql/initdb.d/AAA-wait-for-data.sh
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/pg-migration/mysql/initdb.d/AAA-wait-for-data.sh b/traffic_ops/app/db/pg-migration/mysql/initdb.d/AAA-wait-for-data.sh
deleted file mode 100755
index 69681ab..0000000
--- a/traffic_ops/app/db/pg-migration/mysql/initdb.d/AAA-wait-for-data.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash -x
-
-# wait for traffic_ops.sql file to appear
-while [[ ! -f /docker-entrypoint-initdb.d/traffic_ops.sql ]]; do
- sleep 1
-done
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ce61680f/traffic_ops/app/db/pg-migration/mysql/run.sh
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/pg-migration/mysql/run.sh b/traffic_ops/app/db/pg-migration/mysql/run.sh
deleted file mode 100644
index 50c149d..0000000
--- a/traffic_ops/app/db/pg-migration/mysql/run.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-docker run \
- --name mysql \
- -p 3306:3306 \
- -v $(pwd)/mysql/conf.d:/etc/mysql/conf.d \
- -v $(pwd)/mysql/initdb.d:/docker-entrypoint-initdb.d \
- -d mysql
-
-
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ce61680f/traffic_ops/app/db/pg-migration/runconvert.sh
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/pg-migration/runconvert.sh b/traffic_ops/app/db/pg-migration/runconvert.sh
new file mode 100755
index 0000000..6b27f97
--- /dev/null
+++ b/traffic_ops/app/db/pg-migration/runconvert.sh
@@ -0,0 +1,17 @@
+#!/bin/bash -x
+
+set -x
+
+waiting=/sync/waiting-for-pgloader
+touch $waiting
+
+# Wait for pgloader to finish
+while [[ -f $waiting ]]; do
+ ls -l $waiting
+ sleep 3
+done
+
+echo "Looks like pgloader is finished.. Converting.."
+
+# Load required conversion of booleans
+psql postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST/$POSTGRES_DB < ./convert_bools.sql
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ce61680f/traffic_ops/app/db/pg-migration/runpgloader.sh
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/pg-migration/runpgloader.sh b/traffic_ops/app/db/pg-migration/runpgloader.sh
index 9f698f3..cbbf8e3 100755
--- a/traffic_ops/app/db/pg-migration/runpgloader.sh
+++ b/traffic_ops/app/db/pg-migration/runpgloader.sh
@@ -16,3 +16,11 @@ pgloader -v \
--cast 'type double to numeric drop typemod' \
mysql://$MYSQL_USER:$MYSQL_PASSWORD@$MYSQL_HOST/traffic_ops_db \
postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST/$POSTGRES_DB
+
+waiting=/sync/waiting-for-pgloader
+while [[ ! -f $waiting ]]; do
+ echo "Nothing waiting for pgloader?"
+ sleep 3
+done
+
+rm $waiting