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

knizhnik · knizhnik · commit 635fa251a4d1 · 2015-11-12T19:44:13.000+03:00
diff --git a/Makefile b/Makefile
@@ -4,13 +4,9 @@ OBJS = pg_dtm.o libdtm.o sockhub/sockhub.o
 EXTENSION = pg_dtm
 DATA = pg_dtm--1.0.sql
 
-ifndef USE_PGXS
+ifndef PG_CONFIG
 PG_CONFIG = pg_config
+endif
+
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
-else
-subdir = contrib/pg_dtm
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-include $(top_srcdir)/contrib/contrib-global.mk
-endif
diff --git a/tests/deploy_layouts/cluster.yml b/tests/deploy_layouts/cluster.yml
@@ -1,17 +1,64 @@
 ---
-- hosts: nodes[1]
-  roles:
-  - role: postgrespro
-    deploy_dtm: true
-
 - hosts: nodes
+
   roles:
-  - role: postgrespro
+  - role: postgres
     pg_port: 15432
-    deploy_postgres: true
-    pg_dtm_enable: true
-    pg_dtm_enable: false
-    # pg_config_role:
-    #   - line: "dtm.buffer_size = 65536"
-    pg_dtm_host: "{{ groups['nodes'][0] }}"
+    pg_repo: https://github.com/kelvich/postgresql.git
+    pg_version_tag: xtm_patched
+    pg_destroy_and_init: true
+    pg_config_role:
+    - line: "dtm.buffer_size = 65536"
+
+  tasks:
+  - name: clone dtm sources
+    git: repo=https://github.com/postgrespro/pg_dtm.git
+      dest={{pg_prefix}}/pg_dtm
+      accept_hostkey=yes
+      update=yes
+      force=yes
+    register: dtm_sources
+
+  - name: build dtm
+    shell: "make clean && make -j {{makejobs}} install"
+    args:
+      chdir: "{{pg_prefix}}/pg_dtm"
+    environment:
+      PG_CONFIG: "{{pg_dst}}/bin/pg_config"
+    # when: dtm_sources.changed
+
+  - name: enable dtm extension on datanodes
+    lineinfile:
+      dest: "{{pg_datadir}}/postgresql.conf"
+      regexp: "^shared_preload_libraries"
+      line: "shared_preload_libraries = 'pg_dtm'"
+      state: present
+
+  - name: restart postgrespro
+    command: "{{pg_dst}}/bin/pg_ctl restart -w -D {{pg_datadir}} -l {{pg_datadir}}/pg.log"
+    environment:
+      LD_LIBRARY_PATH: "{{pg_dst}}/lib/"
+
+- hosts: nodes[0]
+  tasks:
+  - name: build dtmd
+    shell: "make clean && make -j 4"
+    args:
+      chdir: "~/pg_cluster/pg_dtm/dtmd"
+    environment:
+      PG_CONFIG: "~/pg_cluster/install/bin/pg_config"
+
+  - 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/pg_dtm/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
 
