fix LD_LIBRARY_PATH

Dmitry Vasilyev · Dmitry Vasilyev · commit 0510958cf248 · 2015-11-11T22:43:15.000+03:00
diff --git a/tests/.gitignore b/tests/.gitignore
@@ -0,0 +1,3 @@
+/deploy/hosts
+/deploy/pg_cluster_install.tgz
+/perf.results
diff --git a/tests/deploy/cluster.yml b/tests/deploy/cluster.yml
@@ -44,7 +44,7 @@
   - name: restart postgrespro
     command: "{{pg_dst}}/bin/pg_ctl restart -w -D {{pg_datadir}} -l {{pg_datadir}}/pg.log"
     environment:
-      LD_LIBRARY_PATH: "{{pg_dst}}/lib/"
+      LD_LIBRARY_PATH: "$LD_LIBRARY_PATH:{{pg_dst}}/lib/"
 
 - hosts: clients
   tasks:
diff --git a/tests/deploy/roles/postgres/tasks/main.yml b/tests/deploy/roles/postgres/tasks/main.yml
@@ -93,7 +93,7 @@
 - name: stop postgres if it was running
   shell: "kill -9 `head -n 1 {{pg_datadir}}/postmaster.pid`"
   environment:
-    LD_LIBRARY_PATH: "{{pg_dst}}/lib"
+    LD_LIBRARY_PATH: "$LD_LIBRARY_PATH:{{pg_dst}}/lib"
   when: pg_pidfile.stat.exists
 
 - name: remove datadirs on datanodes
@@ -103,7 +103,7 @@
 - name: create datadirs on datanodes
   command: "{{pg_dst}}/bin/initdb {{pg_datadir}}"
   environment:
-    LD_LIBRARY_PATH: "{{pg_dst}}/lib/"
+    LD_LIBRARY_PATH: "$LD_LIBRARY_PATH:{{pg_dst}}/lib/"
   args:
     creates: "{{pg_datadir}}"
 
@@ -129,5 +129,5 @@
 - name: start postgrespro
   shell: "{{pg_dst}}/bin/pg_ctl start -w -D {{pg_datadir}} -l {{pg_datadir}}/pg.log"
   environment:
-    LD_LIBRARY_PATH: "{{pg_dst}}/lib/"
+    LD_LIBRARY_PATH: "$LD_LIBRARY_PATH:{{pg_dst}}/lib"
 
diff --git a/tests/perf.yml b/tests/perf.yml
@@ -30,6 +30,8 @@
   gather_facts: no
   tasks:
   - name: init database
+    environment:
+      LD_LIBRARY_PATH: "$LD_LIBRARY_PATH:/home/{{ansible_ssh_user}}/pg_cluster/install/lib"
     shell: "~/pg_cluster/install/bin/dtmbench {{connections}} -a 2000000 -i"
     register: init_result
   - debug: var=init_result
@@ -49,7 +51,7 @@
       sed "s/^/`hostname`:/"
     register: transfers_result
     environment:
-      LD_LIBRARY_PATH: "/home/{{ansible_ssh_user}}/pg_cluster/install/lib"
+      LD_LIBRARY_PATH: "$LD_LIBRARY_PATH:/home/{{ansible_ssh_user}}/pg_cluster/install/lib"
 
   - debug: var=transfers_result
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+/deploy/hosts`
	`2`	`+/deploy/pg_cluster_install.tgz`
	`3`	`+/perf.results`