Merge branch 'master' of https://github.com/postgrespro/postgres_cluster

knizhnik · knizhnik · commit 0cb3dee2a2b4 · 2015-12-29T20:42:51.000+03:00
diff --git a/contrib/multimaster/dtmd/Makefile b/contrib/multimaster/dtmd/Makefile
@@ -1,5 +1,5 @@
 CC=gcc
-CFLAGS=-g -O2 -Wall -Iinclude -D_LARGEFILE64_SOURCE # -DDEBUG
+CFLAGS=-g -O0 -Wall -Iinclude -D_LARGEFILE64_SOURCE # -DDEBUG
 SOCKHUB_PREFIX=../sockhub
 SOCKHUB_CFLAGS=-I"$(SOCKHUB_PREFIX)"
 SOCKHUB_LDFLAGS=-lsockhub -L"$(SOCKHUB_PREFIX)"
diff --git a/contrib/multimaster/sockhub/Makefile b/contrib/multimaster/sockhub/Makefile
@@ -1,5 +1,5 @@
 CC = gcc
-CFLAGS = -c -I. -Wall -O3 -g -fPIC
+CFLAGS = -c -I. -Wall -O0 -g -fPIC
 LD = $(CC)
 LDFLAGS = -g
 AR = ar
diff --git a/contrib/multimaster/tests/deploy_layouts/cluster.yml b/contrib/multimaster/tests/deploy_layouts/cluster.yml
@@ -1,4 +1,41 @@
 ---
+
+- hosts: nodes[0]
+
+  roles:
+  - role: postgres
+    pg_port: 15432
+    pg_repo: https://github.com/postgrespro/postgres_cluster.git
+    pg_version_tag: master
+    pg_destroy_and_init: true
+
+  tasks:
+  - name: build sockhub
+    shell: "make clean && make -j 4"
+    args:
+      chdir: "~/pg_cluster/src/contrib/multimaster/sockhub"
+
+  - name: build dtm
+    shell: "make clean && make -j 4"
+    args:
+      chdir: "~/pg_cluster/src/contrib/multimaster/dtmd"
+    # when: dtm_sources.changed
+
+  - name: kill dtmd
+    shell: kill -9 `cat ~/pg_cluster/dtm_data/arbiter.pid` || true
+
+  - name: ensure datadir for dtm exists
+    shell: "rm -rf ~/pg_cluster/dtm_data && mkdir ~/pg_cluster/dtm_data"
+
+  - name: start dtm
+    shell: >
+      nohup ~/pg_cluster/src/contrib/multimaster/dtmd/bin/dtmd
+      -d ~/pg_cluster/dtm_data -a 0.0.0.0 -p 5431 > ~/pg_cluster/dtm_data/log &
+
+  - name: wait until dtm is available
+    wait_for: port=5431 delay=1
+
+
 - hosts: nodes[1]:nodes[2]:nodes[3]
   # accelerate: true
 
@@ -52,41 +89,6 @@
     environment:
       LD_LIBRARY_PATH: "{{pg_dst}}/lib/"
 
-- hosts: nodes[0]
-
-  roles:
-  - role: postgres
-    pg_port: 15432
-    pg_repo: https://github.com/postgrespro/postgres_cluster.git
-    pg_version_tag: master
-    pg_destroy_and_init: true
-
-  tasks:
-  - name: build sockhub
-    shell: "make clean && make -j 4"
-    args:
-      chdir: "~/pg_cluster/src/contrib/multimaster/sockhub"
-
-  - name: build dtm
-    shell: "make clean && make -j 4"
-    args:
-      chdir: "~/pg_cluster/src/contrib/multimaster/dtmd"
-    # when: dtm_sources.changed
-
-  - name: kill dtmd
-    shell: kill -9 `cat ~/pg_cluster/dtm_data/arbiter.pid` || true
-
-  - name: ensure datadir for dtm exists
-    shell: "rm -rf ~/pg_cluster/dtm_data && mkdir ~/pg_cluster/dtm_data"
-
-  - name: start dtm
-    shell: >
-      nohup ~/pg_cluster/src/contrib/multimaster/dtmd/bin/dtmd
-      -d ~/pg_cluster/dtm_data -a 0.0.0.0 -p 5431 > ~/pg_cluster/dtm_data/log &
-
-  - name: wait until dtm is available
-    wait_for: port=5431 delay=1
-
 
 - hosts: clients
 
