change deploy directory structure;

kelvich · kelvich · commit baa904606b3f · 2015-11-10T20:32:18.000+03:00
change dtmbench output format to json;
diff --git a/tests/deploy/cluster.yml b/tests/deploy/cluster.yml
@@ -9,32 +9,33 @@
     pg_repo: https://github.com/kelvich/postgresql.git
     pg_version_tag: xtm_patched
     pg_destroy_and_init: true
-    pg_datadir: ./postgrespro-data
     pg_config_role: 
     - line: "dtm.vacuum_delay=60"
 
   tasks:
 
   - name: clone dtm sources
     git: repo=https://github.com/postgrespro/pg_tsdtm.git
-      dest=./pg_tsdtm
+      dest={{pg_prefix}}/pg_tsdtm
       accept_hostkey=yes
       update=yes
       force=yes
     register: dtm_sources
 
   - name: build dtm
-    shell: "PG_CONFIG={{pg_dst}}/bin/pg_config make clean && PG_CONFIG={{pg_dst}}/bin/pg_config make -j {{makejobs}} install"
+    shell: "make clean && make -j {{makejobs}} install"
     args:
-      chdir: ./pg_tsdtm
+      chdir: "{{pg_prefix}}/pg_tsdtm"
+    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 "
+      regexp: "^shared_preload_libraries"
       line: "shared_preload_libraries = 'pg_dtm'"
       state: present
 
   - name: restart postgrespro
-    command: "{{pg_dst}}/bin/pg_ctl restart -w -D ./postgrespro-data -l ./postgrespro-data/pg.log"
+    command: "{{pg_dst}}/bin/pg_ctl restart -w -D {{pg_datadir}} -l {{pg_datadir}}/pg.log"
diff --git a/tests/deploy/roles/postgres/tasks/main.yml b/tests/deploy/roles/postgres/tasks/main.yml
@@ -30,6 +30,10 @@
   when: ansible_os_family == "RedHat"
   sudo: yes
 
+- name: increase semaphores
+  shell: sysctl kernel.sem='1000 128000 128 512'
+  sudo: yes
+
 - name: clone postgres sources
   git: repo={{pg_repo}}
     dest={{pg_src}}
diff --git a/tests/deploy/roles/postgres/vars/main.yml b/tests/deploy/roles/postgres/vars/main.yml
@@ -2,17 +2,11 @@
 ---
 makejobs: 4
 
-deploy_postgres: false
-deploy_dtm: false
-deploy_pg_shard: false
-
 pg_repo: git://git.postgresql.org/git/postgresql.git
 pg_version_tag: master
 
-
 pg_destroy_and_init: false
 
-
 pg_port: 5432
 pg_dtm_enable: false
 pg_dtm_host: "127.0.0.1"
@@ -27,18 +21,9 @@ pg_config:
   - line: "port = {{pg_port}}"
 pg_config_role:
   - line: "#pg_config_role"
-pg_src: ~/postgrespro
-pg_dst: /tmp/postgrespro-build
-pg_datadir: ~/postgrespro-data
-
-libuv:
-  version: v1.7.5
-  src: ./libuv
-  dst: /tmp/libuv-build
 
-dtmd:
-  port: 5431
-  dst: ./dtmd
-  datadir: ./dtmd-data
-  log: ./dtmd.log
+pg_prefix: "{{ansible_env.HOME}}/pg_cluster"
+pg_src: "{{pg_prefix}}/src"
+pg_dst: "{{pg_prefix}}/install"
+pg_datadir: "{{pg_prefix}}/data_{{pg_port}}"
 
diff --git a/tests/dtmbench.cpp b/tests/dtmbench.cpp
@@ -271,6 +271,19 @@ int main (int argc, char* argv[])
     }
  
     time_t elapsed = getCurrentTime() - start;
-    printf("TPS(updates)=%f, TPS(selects)=%f\n", (double)(nWrites*USEC)/elapsed, (double)(nReads*USEC)/elapsed);
+
+
+
+    printf(
+        "{\"update_tps\":%f, \"read_tps\":%f, \"readers\":%d, \"writers\":%d, \"accounts\":%d, \"iterations\":%d, \"hosts\":%d}\n", 
+        (double)(nWrites*USEC)/elapsed,
+        (double)(nReads*USEC)/elapsed,
+        cfg.nReaders,
+        cfg.nWriters,
+        cfg.nAccounts,
+        cfg.nIterations,
+        cfg.connections.size()
+        );
+
     return 0;
 }
diff --git a/tests/perf.yml b/tests/perf.yml
@@ -1,6 +1,6 @@
 ---
 
-- hosts: clients[0]
+- hosts: clients
   gather_facts: no
   tasks:
 
@@ -15,21 +15,25 @@
     set_fact:
       connections: "{{ connstrs.results | map(attribute='ansible_facts.connstr') | join }}"
 
-  - name: copy transfers binary
+  # - name: copy transfers binary
+  #   copy: src=./{{item}} dest=~/{{item}} mode=0755
+  #   with_items:
+  #     - "dtmbench"
+  #     - "libpqxx-4.0.so"
+
+  - name: copy transfers source
     copy: src=./{{item}} dest=~/{{item}} mode=0755
     with_items:
       - "dtmbench.cpp"
 
   - name: compile dtmbench
-    shell: "g++ -g -Wall -O2 -o dtmbench dtmbench.cpp -lpqxx -pthread "
+    shell: "g++ -g -Wall -O2 -o dtmbench dtmbench.cpp -lpqxx -pthread"
 
-- hosts: clients[0]
-  gather_facts: no
-  tasks:
   - name: run transfers
-    shell: "./dtmbench {{connections}} -w {{item}} -r 1 -n 1000 -a 100000 -i "
+    shell: "./dtmbench {{connections}} -w {{item}} -r 1 -n 100 -a 100000 -i "
     register: transfers_result
-    with_sequence: start=20 end=400 stride=20
+    with_sequence: start=100 end=200 stride=100
 
-  - debug: msg={{transfers_result.results | map(attribute='stdout_lines') | join }}
+  - local_action: shell echo "{{transfers_result.results | map(attribute='stdout') | join('\n')}}" >> x.out
 
+  - debug: msg="{{ transfers_result.results | map(attribute='stdout') | join('\n') }}"
