datadirs on tmpfs; forced pg kill; accyracy with libpqxx

kelvich · kelvich · commit 238617f73093 · 2015-12-21T15:26:11.000+03:00
diff --git a/contrib/multimaster/tests/deploy_layouts/cluster.yml b/contrib/multimaster/tests/deploy_layouts/cluster.yml
@@ -7,6 +7,7 @@
     pg_port: 15432
     pg_repo: https://github.com/postgrespro/postgres_cluster.git
     pg_destroy_and_init: true
+    pg_datadir: "/mnt/pgtmpfs/data_{{pg_port}}"
     pg_config_role:
     - line: "multimaster.buffer_size = 65536"
 
@@ -95,24 +96,27 @@
 
   - name: clone pqxx
     git: repo=https://github.com/Ambrosys/pqxx.git
-      dest=~/pqxx
+      dest=~/pg_cluster/pqxx
       accept_hostkey=yes
       update=no
       force=yes
     register: pqxx
 
+  # - name: ensure dirs
+  #   shell: "mkdir -p /home/{{ansible_ssh_user}}/pg_cluster/install/lib/"
+
   - name: build pqxx
-    shell: "./configure --prefix=/home/{{ansible_ssh_user}}/pg_cluster/install/ --enable-shared && make && make install"
+    shell: "./configure --prefix=/home/{{ansible_ssh_user}}/pg_cluster/install/ --enable-shared && make -j 6 && make install"
     args:
-      chdir: "~/pqxx"
+      chdir: "~/pg_cluster/pqxx"
     environment:
       PATH: "/home/{{ansible_ssh_user}}/pg_cluster/install/bin/:{{ansible_env.PATH}}"
     when: pqxx.changed
 
   - name: compile dtmbench
     shell: "g++ -g -Wall -O2 -o dtmbench dtmbench.cpp -lpqxx -lpq -pthread -L/home/{{ansible_ssh_user}}/pg_cluster/install/lib/ -I/home/{{ansible_ssh_user}}/pg_cluster/install/include/"
 
-  - name: compile dtmbench
+  - name: install dtmbench
     shell: "mv dtmbench ~/pg_cluster/install/bin/dtmbench"
 
 
diff --git a/contrib/multimaster/tests/deploy_layouts/roles/postgres/tasks/main.yml b/contrib/multimaster/tests/deploy_layouts/roles/postgres/tasks/main.yml
@@ -42,6 +42,9 @@
 
 #############################################################################
 
+- name: stop postgres if it was running
+  shell: "pkill -9 postgres || true"
+
 - name: clone postgres sources
   git: repo={{pg_repo}}
     dest={{pg_src}}
@@ -65,33 +68,13 @@
 
 #############################################################################
 
-- name: copy pg source
-  copy: src=./{{item}} dest=~/{{item}} mode=0755
-  with_items:
-    - "pg_cluster_install.tgz"
-  when: pg_copydist is defined
-
-- name: extract postgres
-  command: "tar xzf pg_cluster_install.tgz"
-  when: pg_copydist is defined
-
-#############################################################################
-
-- stat: path={{pg_datadir}}/postmaster.pid
-  register: pg_pidfile
+# - stat: path={{pg_datadir}}/postmaster.pid
+#   register: pg_pidfile
 
 # - name: stop postgres if it was running
-#   command: "{{pg_dst}}/bin/pg_ctl stop -w -D {{pg_datadir}}"
-#   environment:
-#     LD_LIBRARY_PATH: "{{pg_dst}}/lib"
+#   shell: "kill -9 `head -n 1 {{pg_datadir}}/postmaster.pid` || true"
 #   when: pg_pidfile.stat.exists
 
-- name: stop postgres if it was running
-  shell: "kill -9 `head -n 1 {{pg_datadir}}/postmaster.pid` || true"
-  environment:
-    LD_LIBRARY_PATH: "{{pg_dst}}/lib"
-  when: pg_pidfile.stat.exists
-
 - name: remove datadirs on datanodes
   command: "rm -rf {{pg_datadir}}"
   when: pg_destroy_and_init
