tests

kelvich · kelvich · commit 19cc584fcead · 2015-10-16T19:25:51.000+03:00
diff --git a/contrib/pg_dtm/tests/deploy_layouts/cluster.yml b/contrib/pg_dtm/tests/deploy_layouts/cluster.yml
@@ -10,5 +10,7 @@
     pg_port: 15432
     deploy_postgres: true
     pg_dtm_enable: true
+    pg_config_role:
+      - line: "dtm.buffer_size = 65536"
     pg_dtm_host: "{{ groups['dtm'][0] }}"
 
diff --git a/contrib/pg_dtm/tests/deploy_layouts/cluster_pg_shard.yml b/contrib/pg_dtm/tests/deploy_layouts/cluster_pg_shard.yml
@@ -1,15 +1,32 @@
 ---
-- hosts: master-workers
+
+- hosts: dtm
   roles:
   - role: postgrespro
     deploy_dtm: true
 
-- hosts: master-workers:workers
+- hosts: masters
   roles:
   - role: postgrespro
+    pg_src: ./postgrespro_pgshard
+    pg_version: xtm_pgshard
     pg_port: 15432
     deploy_postgres: true
+    pg_dtm_enable: true
+    pg_dtm_host: "{{ groups['dtm'][0] }}"
     deploy_pg_shard: true
+
+- hosts: workers
+  roles:
+  - role: postgrespro
+    pg_src: ./postgrespro_pgshard
+    pg_version: xtm_pgshard
+    pg_port: 15432
+    deploy_postgres: true
     pg_dtm_enable: true
-    pg_dtm_host: "{{ groups['master-workers'][0] }}"
+    pg_dtm_host: "{{ groups['dtm'][0] }}"
+
+- hosts: clients
+  roles:
+    - role: postgrespro
 
diff --git a/contrib/pg_dtm/tests/deploy_layouts/roles/postgrespro/tasks/dtm.yml b/contrib/pg_dtm/tests/deploy_layouts/roles/postgrespro/tasks/dtm.yml
@@ -1,19 +1,19 @@
 ---
 
-- name: ensure we have checked out libuv-1.7.5
-  git: repo=https://github.com/libuv/libuv.git
-    dest={{libuv.src}}
-    version={{libuv.version}}
-    update=no
+# - name: ensure we have checked out libuv-1.7.5
+#   git: repo=https://github.com/libuv/libuv.git
+#     dest={{libuv.src}}
+#     version={{libuv.version}}
+#     update=no
 
-- name: build libuv
-  shell: ./autogen.sh && ./configure --disable-shared --prefix={{libuv.dst}} && make && make install
-  args:
-    chdir: "{{libuv.src}}"
-    creates: "{{libuv.dst}}/lib/libuv.a"
+# - name: build libuv
+#   shell: ./autogen.sh && ./configure --disable-shared --prefix={{libuv.dst}} && make && make install
+#   args:
+#     chdir: "{{libuv.src}}"
+#     creates: "{{libuv.dst}}/lib/libuv.a"
 
 - name: compile dtmd
-  shell: make "LIBUV_PREFIX={{libuv.dst}}"
+  shell: "make clean && make"
   args:
     chdir: "{{pg_src}}/contrib/pg_dtm/dtmd"
     creates: "{{pg_src}}/contrib/pg_dtm/dtmd/bin/dtmd"
diff --git a/contrib/pg_dtm/tests/deploy_layouts/roles/postgrespro/tasks/main.yml b/contrib/pg_dtm/tests/deploy_layouts/roles/postgrespro/tasks/main.yml
@@ -56,6 +56,3 @@
 
 - include: dtm.yml
   when: deploy_dtm
-
-- include: pg_shard.yml
-  when: deploy_pg_shard
diff --git a/contrib/pg_dtm/tests/deploy_layouts/roles/postgrespro/tasks/pg_shard.yml b/contrib/pg_dtm/tests/deploy_layouts/roles/postgrespro/tasks/pg_shard.yml
@@ -1,41 +1,50 @@
 - name: checkout pg_shard
+  # git: repo=https://github.com/citusdata/pg_shard.git
   git: repo=git@gitlab.postgrespro.ru:s.kelvich/pg_shard.git
     dest=./pg_shard
     version=transaction_manager_integration
     force=yes
     update=yes
-    key_file=.ssh/banktest
+    key_file=.ssh/ppg-deploy
     accept_hostkey=yes
     depth=1
   register: pg_shard_source
 
 - name: build pg_shard extension
-  shell: "PATH={{ppg.dst}}/bin:$PATH make clean && PATH={{ppg.dst}}/bin:$PATH make && PATH={{ppg.dst}}/bin:$PATH make install"
+  shell: "PATH={{pg_dst}}/bin:$PATH make clean && PATH={{pg_dst}}/bin:$PATH make && PATH={{pg_dst}}/bin:$PATH make install"
   args:
     chdir: "~/pg_shard"
-    creates: "{{ppg.dst}}/lib/pg_shard.so"
+    creates: "{{pg_dst}}/lib/pg_shard.so"
 
 - name: enable pg_shard extension in postgresql.conf with dtm
   lineinfile:
-    dest: "{{ppg.datadir}}/postgresql.conf"
+    dest: "{{pg_datadir}}/postgresql.conf"
     regexp: "{{item.regexp}}"
     line: "{{item.line}}"
     state: present
   with_items:
   - line: "shared_preload_libraries = 'pg_dtm, pg_shard'"
     regexp: "^shared_preload_libraries "
-  when: ppg.usedtm
+  - line: "pg_shard.all_modifications_commutative = 1"
+    regexp: "^pg_shard.all_modifications_commutative "
+  - line: "pg_shard.use_dtm_transactions = 1"
+    regexp: "^pg_shard.use_dtm_transactions "
+  when: pg_dtm_enable
 
 - name: enable pg_shard extension in postgresql.conf without dtm
   lineinfile:
-    dest: "{{ppg.datadir}}/postgresql.conf"
+    dest: "{{pg_datadir}}/postgresql.conf"
     regexp: "{{item.regexp}}"
     line: "{{item.line}}"
     state: present
   with_items:
   - line: "shared_preload_libraries = 'pg_shard'"
     regexp: "^shared_preload_libraries "
-  when: not ppg.usedtm
-
+  - line: "pg_shard.all_modifications_commutative = 1"
+    regexp: "^pg_shard.all_modifications_commutative "
+  when: not pg_dtm_enable
 
+- name: create pg_worker_list.conf
+  shell: echo "{{item}} 15432" >> {{pg_datadir}}/pg_worker_list.conf
+  with_items: groups['workers']
 
diff --git a/contrib/pg_dtm/tests/deploy_layouts/roles/postgrespro/tasks/postgres.yml b/contrib/pg_dtm/tests/deploy_layouts/roles/postgrespro/tasks/postgres.yml
@@ -32,6 +32,13 @@
     state: present
   with_items: "{{pg_config}}"
 
+- name: configure2 postgres on datanodes
+  lineinfile:
+    dest: "{{pg_datadir}}/postgresql.conf"
+    line: "{{item.line}}"
+    state: present
+  with_items: "{{pg_config_role}}"
+
 - name: enable dtm extension on datanodes
   lineinfile:
     dest: "{{pg_datadir}}/postgresql.conf"
@@ -56,7 +63,6 @@
 - name: start postgrespro
   command: "{{pg_dst}}/bin/pg_ctl start -w -D {{pg_datadir}} -l {{pg_datadir}}/pg.log"
 
-
-
-
+- name: create pg_dtm extension
+  command: "{{pg_dst}}/bin/psql -p {{pg_port}} postgres -c 'create extension pg_dtm;'"
 
diff --git a/contrib/pg_dtm/tests/deploy_layouts/roles/postgrespro/vars/main.yml b/contrib/pg_dtm/tests/deploy_layouts/roles/postgrespro/vars/main.yml
@@ -18,6 +18,8 @@ pg_config:
   - line: "listen_addresses = '*'"
   - line: "max_connections = 512"
   - line: "port = {{pg_port}}"
+pg_config_role:
+  - line: "#pg_config_role"
 pg_src: ./postgrespro
 pg_dst: /tmp/postgrespro-build
 pg_datadir: ./postgrespro-data
diff --git a/contrib/pg_dtm/tests/farms/mephi b/contrib/pg_dtm/tests/farms/mephi
@@ -12,4 +12,5 @@ blade8 ansible_ssh_host=85.143.113.31 ansible_ssh_port=4208
 [dtm]
 blade8 ansible_ssh_host=85.143.113.31 ansible_ssh_port=4208
 
-
+[master]
+blade7 ansible_ssh_host=85.143.113.31 ansible_ssh_port=4207
diff --git a/contrib/pg_dtm/tests/farms/sai b/contrib/pg_dtm/tests/farms/sai
@@ -1,12 +1,15 @@
 [clients]
-158.250.29.4 ansible_ssh_user=s.kelvich
 158.250.29.5 ansible_ssh_user=s.kelvich
 
 [workers]
-158.250.29.6 ansible_ssh_user=s.kelvich
+158.250.29.4 ansible_ssh_user=s.kelvich
 158.250.29.8 ansible_ssh_user=s.kelvich
 158.250.29.9 ansible_ssh_user=s.kelvich
+
+[masters]
 158.250.29.10 ansible_ssh_user=s.kelvich
 
 [dtm]
-158.250.29.10 ansible_ssh_user=s.kelvich
+158.250.29.6 ansible_ssh_user=s.kelvich
+
+
diff --git a/contrib/pg_dtm/tests/transfers b/contrib/pg_dtm/tests/transfers
diff --git a/contrib/pg_dtm/tests/transfers.linux b/contrib/pg_dtm/tests/transfers.linux
diff --git a/contrib/pg_dtm/tests/transfers.yml b/contrib/pg_dtm/tests/transfers.yml
@@ -1,23 +1,81 @@
 ---
 
-- hosts: clients
-  gather_facts: no
-  tasks:
-  - name: copy transfers binary
-    copy: src=transfers.linux dest=~/transfers mode=a+x
+# - hosts: 158.250.29.4
+#   gather_facts: no
+#   tasks:
+#   # # - shell: echo "host={{item}} user=s.kelvich port=15432 dbname=postgres"
+  # #   register: source
+  # #   with_items: groups['workers']
+
+  # # - debug: var=source
+
+  # - set_fact: 
+  #     connstr: "{{ groups['workers'] | ~'=' }}"
+
+  # - debug: var=connstr
+
+#   - name: copy transfers binary
+#     copy: src=transfers.linux dest=~/transfers mode=a+x
+
+# - hosts: blade3
+#   gather_facts: no
+#   tasks:
+#   - name: setup the databases
+#     shell: "./transfers -d 'host=158.250.29.10 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.9 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.8 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.6 user=s.kelvich port=15432 dbname=postgres' -f -g -m -w 140 -r 0"
+#     register: transfers_result
+#   - debug: var=transfers_result
+
+# - hosts: blade3
+#   gather_facts: no
+#   tasks:
+#   - name: run transfers
+#     shell: "./transfers -d 'host=158.250.29.10 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.9 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.8 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.6 user=s.kelvich port=15432 dbname=postgres' -s -g -m -w 140 -u 14000 -r 0"
+#     register: transfers_result
+#   - debug: var=transfers_result
+
+
+# - hosts: blade3
+#   gather_facts: no
+#   tasks:
+#   - name: setup the databases
+#     shell: "./transfers -d 'host=blade8 user=stas port=15432 dbname=postgres' -d 'host=blade7 user=stas port=15432 dbname=postgres' -d 'host=blade6 user=stas port=15432 dbname=postgres' -d 'host=blade5 user=stas port=15432 dbname=postgres' -d 'host=blade4 user=stas port=15432 dbname=postgres'  -f -g -w 200 -r 0"
+#     register: transfers_result
+#   - debug: var=transfers_result
+
+# - hosts: blade3
+#   gather_facts: no
+#   tasks:
+#   - name: run transfers
+#     shell: "./transfers -d 'host=blade8 user=stas port=15432 dbname=postgres' -d 'host=blade7 user=stas port=15432 dbname=postgres' -d 'host=blade6 user=stas port=15432 dbname=postgres' -d 'host=blade5 user=stas port=15432 dbname=postgres' -d 'host=blade4 user=stas port=15432 dbname=postgres' -s -g -w 200 -u 2500 -r 0"
+#     register: transfers_result
+#   - debug: var=transfers_result
+
 
 - hosts: 158.250.29.4
   gather_facts: no
   tasks:
   - name: setup the databases
-    shell: "./transfers -d 'host=158.250.29.10 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.9 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.8 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.6 user=s.kelvich port=15432 dbname=postgres' -f -g -m -w 128 -r 0"
+    shell: "./transfers -d 'host=158.250.29.10 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.8 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.9 user=s.kelvich port=15432 dbname=postgres' -f -g -m -w 105 -r 0"
     register: transfers_result
   - debug: var=transfers_result
 
 - hosts: clients
   gather_facts: no
   tasks:
   - name: run transfers
-    shell: "./transfers -d 'host=158.250.29.10 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.9 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.8 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.6 user=s.kelvich port=15432 dbname=postgres' -s -g -m -w 128 -u 5000"
+    shell: "./transfers -d 'host=158.250.29.10 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.8 user=s.kelvich port=15432 dbname=postgres' -d 'host=158.250.29.9 user=s.kelvich port=15432 dbname=postgres' -s -g -m -w 105 -u 4000 -r 0"
     register: transfers_result
   - debug: var=transfers_result
+
+
+
+
+
+
+
+
+
+
+
+
+
