Node addition fixed: specifying proper shardlord connstring.

We really should verify that shardlors's connstring actually belongs to it.

Author: arssher

devops/.gitignore

@@ -1,7 +1,9 @@
 *.retry
-inventory/manual
+inventory_manual/manual
 logs/
 
 /postgresql.conf.common
 /postgresql.conf.lord
-/postgresql.conf.worker
+/postgresql.conf.worker
+
+*.log

devops/init.yml

@@ -1,4 +1,4 @@
-### initdb and send configs
+### initdb, send configs and add all workers.
 
 ---
 - hosts: nodes
@@ -68,7 +68,7 @@
   - name: add manual workers
     command: >
       psql -p {{ pg_port }} -c "select shardman.add_node(
-      'hostaddr={{ item]}} port={{ pg_port }}')"
+      'hostaddr={{ item }} port={{ pg_port }}')"
     with_items: "{{ groups.manual_workers }}"
     tags:
       - add_nodes

devops/inventory

@@ -17,6 +17,7 @@ pg_repo=git://git.postgresql.org/git/postgresql.git
 pg_version_tag=REL_10_STABLE
 pg_prefix="{{ansible_env.HOME}}/pg"
 pg_src="{{pg_prefix}}/src"
+cflags="-O0"
 pg_dst="{{pg_prefix}}/install"
 pg_datadir="{{pg_prefix}}/data_{{pg_port}}"
 pg_logfile="{{pg_datadir}}/pg.log"
@@ -31,7 +32,7 @@ shardman_repo=https://github.com/postgrespro/pg_shardman.git
 shardman_src="{{pg_prefix}}/pg_shardman"
 shardman_version_tag=master
 
-cflags="-O0"
+shardman_shardlord_connstring="host={{ shardlord_ip }} port={{ pg_port }} user={{ ansible_user }}"
 
 [nodes:children]
 ec2
@@ -55,10 +56,16 @@ manual_init_node
 
 # empty groups to be able to run without ec2/manual inventories
 [ec2]
+[ec2:vars]
+# for ec2, take private ip
+shardlord_ip="{{ hostvars[groups['shardlord'][0]]['ec2_private_ip_address'] }}"
 [ec2_shardlord]
 [ec2_workers]
 [ec2_init_node]
 [manual]
+[manual:vars]
+# for manual, use just ip specified in inventory
+shardlord_ip="{{ groups['shardlord'][0] }}"
 [manual_shardlord]
 [manual_workers]
 [manual_init_node]

devops/inventory_manual/manual

@@ -51,6 +51,8 @@ ansible-playbook -i inventory_ec2 pg_ctl.yml -e "pg_ctl_action=restart"
 
 Read cmd log on shardlord:
 ansible-playbook -i inventory_ec2/ psql.yml --limit 'shardlord' -e "cmd='\'table shardman.cmd_log\''"
+Read nodes table on workers:
+nodes': ansible-playbook -i inventory_manual/ psql.yml --limit 'workers' -e "cmd='\'table shardman.nodes\''"
 
 Gather logs to ./logs:
 ansible-playbook -i inventory_ec2/ logs.yml
@@ -67,6 +69,8 @@ Things that made me wonder during writing this:
   why projects like
   https://github.com/larsks/ansible-toolbox
   emerge. Printing cmd output via saved var is pretty horrible too.
+* They also try to reinvent all the concepts of normal languages in YML. How
+  about infinite repeat..until?
 * No way to specify multiple inventory files, only whole directory or one file.
 * No way to append file to file, except for j2 templates, which doesn't work
   with files outside the template dir, really?

devops/readme.txt

@@ -5,6 +5,8 @@
 
 {% include "postgresql.conf.lord" ignore missing %}
 
+shardman.shardlord_connstring = '{{ shardman_shardlord_connstring }}'
+
 {% include "postgresql.conf.devops.common" ignore missing %}
 
 {% include "postgresql.conf.devops.lord" ignore missing %}