Merge branch 'master' of gitlab.postgrespro.ru:s.kelvich/pg_tsdtm

kelvich · kelvich · commit d482117fcd75 · 2015-11-06T15:25:19.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,3 @@
-**/*.o
-**/*.so
 tests/perf/pref
 tests/perf/pref.linux
 
diff --git a/tests/deploy/roles/postgres/vars/main.yml b/tests/deploy/roles/postgres/vars/main.yml
@@ -22,7 +22,7 @@ pg_config:
   - line: "fsync = off"
   - line: "autovacuum = off"
   - line: "listen_addresses = '*'"
-  - line: "max_connections = 2048"
+  - line: "max_connections = 512"
   - line: "max_prepared_transactions = 400"
   - line: "port = {{pg_port}}"
 pg_config_role:
diff --git a/tests/deploy/tsdm.yml b/tests/deploy/tsdm.yml
@@ -29,44 +29,44 @@
 
   - name: clone dtm sources
     git: repo=https://github.com/kelvich/pg_tsdtm.git
-      dest=./pg_tsdtm
+      dest=./pg_tsdtm_test
       accept_hostkey=yes
       update=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"
     args:
-      chdir: ./pg_tsdtm
+      chdir: ./pg_tsdtm_test
     when: dtm_sources.changed
 
   - name: enable dtm extension on datanodes
     lineinfile:
-      dest: "postgrespro-data/postgresql.conf"
+      dest: "~/postgrespro-data/postgresql.conf"
       regexp: "^shared_preload_libraries "
       line: "shared_preload_libraries = 'pg_dtm'"
       state: present
 
   - name: enable dtm extension on datanodes
     lineinfile:
-      dest: "postgrespro-data2/postgresql.conf"
+      dest: "~/postgrespro-data2/postgresql.conf"
       regexp: "^shared_preload_libraries "
       line: "shared_preload_libraries = 'pg_dtm'"
       state: present
 
   - name: enable dtm extension on datanodes
     lineinfile:
-      dest: "postgrespro-data3/postgresql.conf"
+      dest: "~/postgrespro-data3/postgresql.conf"
       regexp: "^shared_preload_libraries "
       line: "shared_preload_libraries = 'pg_dtm'"
       state: present
 
   - name: restart postgrespro1
-    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 ~/postgrespro-data -l ~/postgrespro-data/pg.log"
 
   - name: restart postgrespro2
-    command: "{{pg_dst}}/bin/pg_ctl restart -w -D ./postgrespro-data2 -l ./postgrespro-data/pg.log"
+    command: "{{pg_dst}}/bin/pg_ctl restart -w -D ~/postgrespro-data2 -l ~/postgrespro-data/pg.log"
 
   - name: restart postgrespro3
-    command: "{{pg_dst}}/bin/pg_ctl restart -w -D ./postgrespro-data3 -l ./postgrespro-data/pg.log"
+    command: "{{pg_dst}}/bin/pg_ctl restart -w -D ~/postgrespro-data3 -l ~/postgrespro-data/pg.log"
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-*/.o`
`2`		`-*/.so`
`3`	`1`	`tests/perf/pref`
`4`	`2`	`tests/perf/pref.linux`
`5`	`3`