increase open files; save intermediate bench results; force postgres stop

kelvich · kelvich · commit 88ea1e19cebd · 2015-11-11T20:16:25.000+03:00
diff --git a/tests/deploy/cluster.yml b/tests/deploy/cluster.yml
@@ -49,6 +49,12 @@
 
 - hosts: clients
   tasks:
+  - name: increase open files
+    shell: "echo '{{ansible_ssh_user}}  soft  nofile  65535' > /etc/security/limits.d/cluster.conf"
+    args:
+      creates: "/etc/security/limits.d/cluster.conf"
+    sudo: yes
+
   - name: copy pg source
     copy: src=./{{item}} dest=~/{{item}} mode=0755
     with_items:
diff --git a/tests/deploy/hosts.sample b/tests/deploy/hosts.sample
@@ -1,8 +1,16 @@
 [clients]
-client1 ansible_ssh_user=cluster offset=6001
+158.250.29.4 ansible_ssh_user=cluster offset=1
+158.250.29.7 ansible_ssh_user=cluster ansible_ssh_port=2299 offset=100001
 
 [nodes]
-nodes1 ansible_ssh_user=cluster offset=2001
+158.250.29.5  ansible_ssh_user=cluster
+158.250.29.6  ansible_ssh_user=cluster
+158.250.29.8  ansible_ssh_user=cluster
+158.250.29.9  ansible_ssh_user=cluster
+158.250.29.10 ansible_ssh_user=cluster
 
 [master]
-master1 ansible_ssh_user=cluster offset=1
+158.250.29.10 ansible_ssh_user=cluster
+
+[local]
+localhost
diff --git a/tests/deploy/roles/postgres/tasks/main.yml b/tests/deploy/roles/postgres/tasks/main.yml
@@ -34,6 +34,12 @@
   shell: sysctl kernel.sem='1000 128000 128 512'
   sudo: yes
 
+- name: increase open files
+  shell: "echo '{{ansible_ssh_user}}  soft  nofile  65535' > /etc/security/limits.d/cluster.conf"
+  args:
+    creates: "/etc/security/limits.d/cluster.conf"
+  sudo: yes
+
 #############################################################################
 
 - name: clone postgres sources
@@ -73,8 +79,14 @@
 - 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"
+#   when: pg_pidfile.stat.exists
+
 - name: stop postgres if it was running
-  command: "{{pg_dst}}/bin/pg_ctl stop -w -D {{pg_datadir}}"
+  shell: "kill -9 `head -n 1 {{pg_datadir}}/postmaster.pid`"
   environment:
     LD_LIBRARY_PATH: "{{pg_dst}}/lib"
   when: pg_pidfile.stat.exists
diff --git a/tests/perf.yml b/tests/perf.yml
@@ -37,8 +37,9 @@
 - hosts: clients
   gather_facts: no
   tasks:
+
   - name: run transfers
-    shell: '~/pg_cluster/install/bin/dtmbench {{connections}} -w {{item}} -s {{offset}} -d 100000 -r 1 -n 1000 -a 2000000 | sed "s/^/`hostname`:/"'
+    shell: '~/pg_cluster/install/bin/dtmbench {{connections}} -w {{item}} -s {{offset}} -d 100000 -r 1 -n 1000 -a 2000000 | tee -a perf.results | sed "s/^/`hostname`:/"'
     register: transfers_result
     environment:
       LD_LIBRARY_PATH: "/home/{{ansible_ssh_user}}/pg_cluster/install/lib"
