deploy stuff

kelvich · kelvich · commit 970a1b1728f4 · 2015-10-14T16:31:22.000+03:00
diff --git a/contrib/pg_dtm/tests/deploy_layouts/cluster.yml b/contrib/pg_dtm/tests/deploy_layouts/cluster.yml
@@ -1,5 +1,5 @@
 ---
-- hosts: master-workers
+- hosts: dtm
   roles:
   - role: postgrespro
     deploy_dtm: true
@@ -10,5 +10,5 @@
     pg_port: 15432
     deploy_postgres: true
     pg_dtm_enable: true
-    pg_dtm_host: "{{groups['master-workers'][0]}}"
+    pg_dtm_host: "{{ groups['dtm'][0] }}"
 
diff --git a/contrib/pg_dtm/tests/deploy_layouts/cluster_nodtm.yml b/contrib/pg_dtm/tests/deploy_layouts/cluster_nodtm.yml
diff --git a/contrib/pg_dtm/tests/deploy_layouts/cluster_pg_shard.yml b/contrib/pg_dtm/tests/deploy_layouts/cluster_pg_shard.yml
@@ -0,0 +1,15 @@
+---
+- hosts: master-workers
+  roles:
+  - role: postgrespro
+    deploy_dtm: true
+
+- hosts: master-workers:workers
+  roles:
+  - role: postgrespro
+    pg_port: 15432
+    deploy_postgres: true
+    deploy_pg_shard: true
+    pg_dtm_enable: true
+    pg_dtm_host: "{{ groups['master-workers'][0] }}"
+
diff --git a/contrib/pg_dtm/tests/deploy_layouts/cluster_pg_shard_nodtm.yml b/contrib/pg_dtm/tests/deploy_layouts/cluster_pg_shard_nodtm.yml
diff --git a/contrib/pg_dtm/tests/farms/localhost b/contrib/pg_dtm/tests/farms/localhost
@@ -0,0 +1,2 @@
+[master-workers]
+localhost
diff --git a/contrib/pg_dtm/tests/farms/mephi b/contrib/pg_dtm/tests/farms/mephi
@@ -1,15 +1,15 @@
-[client]
+[clients]
 br.theor.mephi.ru
+blade3 ansible_ssh_host=85.143.113.31 ansible_ssh_port=4203
 
 [workers]
-blade3 ansible_ssh_host=85.143.113.31 ansible_ssh_port=4203
 blade4 ansible_ssh_host=85.143.113.31 ansible_ssh_port=4204
 blade5 ansible_ssh_host=85.143.113.31 ansible_ssh_port=4205
 blade6 ansible_ssh_host=85.143.113.31 ansible_ssh_port=4206
 blade7 ansible_ssh_host=85.143.113.31 ansible_ssh_port=4207
 blade8 ansible_ssh_host=85.143.113.31 ansible_ssh_port=4208
 
-[master-workers]
+[dtm]
 blade8 ansible_ssh_host=85.143.113.31 ansible_ssh_port=4208
 
 
diff --git a/contrib/pg_dtm/tests/farms/sai b/contrib/pg_dtm/tests/farms/sai
@@ -1,9 +1,12 @@
+[clients]
+158.250.29.4 ansible_ssh_user=s.kelvich
+158.250.29.5 ansible_ssh_user=s.kelvich
+
 [workers]
-astro4 ansible_ssh_host=158.250.29.4 ansible_ssh_user=s.kelvich
-astro5 ansible_ssh_host=158.250.29.5 ansible_ssh_user=s.kelvich
-astro6 ansible_ssh_host=158.250.29.6 ansible_ssh_user=s.kelvich
-astro8 ansible_ssh_host=158.250.29.8 ansible_ssh_user=s.kelvich
-astro9 ansible_ssh_host=158.250.29.9 ansible_ssh_user=s.kelvich
+158.250.29.6 ansible_ssh_user=s.kelvich
+158.250.29.8 ansible_ssh_user=s.kelvich
+158.250.29.9 ansible_ssh_user=s.kelvich
+158.250.29.10 ansible_ssh_user=s.kelvich
 
-[master-workers]
-astro10 ansible_ssh_host=158.250.29.10 ansible_ssh_user=s.kelvich
+[dtm]
+158.250.29.10 ansible_ssh_user=s.kelvich
diff --git a/contrib/pg_dtm/tests/transfers-remote.sh b/contrib/pg_dtm/tests/transfers-remote.sh
@@ -1,10 +1,15 @@
 #!/bin/sh
 
+FARM="sai"
+WORKERS=3
+TRANS_SRV="s.kelvich@158.250.29.10"
+
+
 if [ ! -f ./transfers.linux ]; then
-    GOOS=linux GOARCH=amd64 go build -o ./transfers ./transfers.go
+    GOOS=linux GOARCH=amd64 go build -o ./transfers.linux ./transfers.go
 fi
 
-ansible master-workers -i farms/mephi -m copy -a "src=transfers dest=~/transfers mode=a+x"
+ansible master-workers -i farms/$FARM -m copy -a "src=transfers.linux dest=~/transfers mode=a+x"
 
 
 
@@ -18,3 +23,17 @@ ssh -p4207 br.theor.mephi.ru "./transfers -d 'host=blade8 dbname=postgres user=s
 
 
 
+ssh s.kelvich@158.250.29.10 "./transfers -d 'host=158.250.29.9 port=15432 dbname=postgres' -d 'host=158.250.29.8 port=15432 dbname=postgres'  -d 'host=158.250.29.4 port=15432 dbname=postgres'  -d 'host=158.250.29.5 port=15432 dbname=postgres'  -d 'host=158.250.29.6 port=15432 dbname=postgres'  -g -w 64"
+
+
+ssh s.kelvich@158.250.29.10 "./transfers -d 'host=158.250.29.9 user=s.kelvich port=15432 dbname=postgres'  -g -w 128"
+
+ssh s.kelvich@158.250.29.10 "./transfers -d 'host=158.250.29.9 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.8 user=s.kelvich port=15432 dbname=postgres'  -g -w 128"
+
+ssh s.kelvich@158.250.29.10 "./transfers -d 'host=158.250.29.9 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.8 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.6 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.5 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.4 user=s.kelvich port=15432 dbname=postgres'    -g -w 128"
+
+
+
+
+./transfers -d 'host=127.0.0.1 port=5432 dbname=postgres' -d 'host=127.0.0.1 port=5433 dbname=postgres' -g -w 128
+
diff --git a/contrib/pg_dtm/tests/transfers.go b/contrib/pg_dtm/tests/transfers.go
@@ -32,6 +32,9 @@ var cfg struct {
 
     Verbose bool
     UseDtm bool
+    InitOnly bool
+    SkipInit bool
+
     Isolation string // "repeatable read" or "read committed"
 
     Accounts struct {
@@ -108,6 +111,8 @@ func init() {
     flag.BoolVar(&cfg.Writers.AllowLocal, "l", false, "Allow local updates")
     flag.BoolVar(&cfg.Writers.PrivateRows, "p", false, "Private rows (avoid waits/aborts caused by concurrent updates of the same rows)")
     flag.BoolVar(&cfg.Writers.UseCursors, "c", false, "Use cursors for updates")
+    flag.BoolVar(&cfg.InitOnly, "f", false, "Only feed databses with data")
+    flag.BoolVar(&cfg.SkipInit, "s", false, "Skip init phase")
     flag.Parse()
 
     if len(cfg.ConnStrs) == 0 {
@@ -141,8 +146,15 @@ func init() {
 
 func main() {
     start := time.Now()
-    prepare(cfg.ConnStrs)
-    fmt.Printf("database prepared in %0.2f seconds\n", time.Since(start).Seconds())
+
+    if (!cfg.SkipInit){
+        prepare(cfg.ConnStrs)
+        fmt.Printf("database prepared in %0.2f seconds\n", time.Since(start).Seconds())
+    }
+
+    if (cfg.InitOnly) {
+        return
+    }
 
     var writerWg sync.WaitGroup
     var readerWg sync.WaitGroup
diff --git a/contrib/pg_dtm/tests/transfers.yml b/contrib/pg_dtm/tests/transfers.yml
@@ -0,0 +1,23 @@
+---
+
+- hosts: masters
+  gather_facts: no
+  tasks:
+  - name: copy transfers binary
+    copy: src=transfers.linux dest=~/transfers mode=a+x
+
+- hosts: 158.250.29.4
+  gather_facts: no
+  tasks:
+  - name: setup the databases
+    shell: "./transfers -d 'host=158.250.29.10 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.9 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.8 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.5 user=s.kelvich port=15432 dbname=postgres' -f -g -w 200 -r 0"
+    register: transfers_result
+  - debug: var=transfers_result
+
+- hosts: masters
+  gather_facts: no
+  tasks:
+  - name: run transfers
+    shell: "./transfers -d 'host=158.250.29.10 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.9 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.8 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.5 user=s.kelvich port=15432 dbname=postgres' -s -g -w 200 -r 0"
+    register: transfers_result
+  - debug: var=transfers_result
