diff options
| author | Pavan Deolasee | 2014-07-18 10:12:53 +0000 |
|---|---|---|
| committer | Pavan Deolasee | 2014-09-01 14:20:29 +0000 |
| commit | 1f425e6dcc83a1e54182dc8dceae05cad08a91d9 (patch) | |
| tree | 102e1c674f58ad7495e183919dbb466d04a851cb | |
| parent | 5263d3ae66490ecec61c195bafe48f0c9d31f59e (diff) | |
Handle datanodePoolerPorts properly. Earlier this was directly checked in the
pgxc_ctl_bash.c file which gets auto generated during build process and hence
could get overwritten
| -rwxr-xr-x | contrib/pgxc_ctl/make_signature | 4 | ||||
| -rwxr-xr-x | contrib/pgxc_ctl/pgxc_ctl_bash_2 | 3 | ||||
| -rwxr-xr-x | contrib/pgxc_ctl/pgxc_ctl_conf_part | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/contrib/pgxc_ctl/make_signature b/contrib/pgxc_ctl/make_signature index aef05b83cc..04020f3a0c 100755 --- a/contrib/pgxc_ctl/make_signature +++ b/contrib/pgxc_ctl/make_signature @@ -57,6 +57,8 @@ ex pgxc_ctl_bash.c.wk <<EOF %s/"/\\\"/g w %s/^\(.*\)$/"\1",/ +%s/^"#ifdef XCP",$/#ifdef XCP/ +%s/^"#endif",$/#endif/ wq EOF @@ -112,6 +114,8 @@ ex pgxc_ctl_conf_part.wk <<EOF %s/"/\\\"/g w %s/^\(.*\)$/"\1",/ +%s/^"#ifdef XCP",$/#ifdef XCP/ +%s/^"#endif",$/#endif/ wq EOF diff --git a/contrib/pgxc_ctl/pgxc_ctl_bash_2 b/contrib/pgxc_ctl/pgxc_ctl_bash_2 index 4c47568f08..c83adda40b 100755 --- a/contrib/pgxc_ctl/pgxc_ctl_bash_2 +++ b/contrib/pgxc_ctl/pgxc_ctl_bash_2 @@ -109,6 +109,9 @@ function print_values echo primaryDatanode $primaryDatanode print_array datanodeNames print_array datanodePorts +#ifdef XCP + print_array datanodePoolerPorts +#endif print_array datanodePgHbaEntries # Datanodes masters diff --git a/contrib/pgxc_ctl/pgxc_ctl_conf_part b/contrib/pgxc_ctl/pgxc_ctl_conf_part index 11431ae2da..7f2ae47fb5 100755 --- a/contrib/pgxc_ctl/pgxc_ctl_conf_part +++ b/contrib/pgxc_ctl/pgxc_ctl_conf_part @@ -231,7 +231,9 @@ datanodeArchLogDir=$HOME/pgxc/nodes/datanode_archlog primaryDatanode=datanode1 # Primary Node. datanodeNames=(datanode1 datanode2 datanode3 datanode4) datanodePorts=(20008 20009 20008 20009) # Master and slave use the same port! +#ifdef XCP datanodePoolerPorts=(20012 20013 20012 20013) # Master and slave use the same port! +#endif datanodePgHbaEntries=(192.168.1.0/24) # Assumes that all the coordinator (master/slave) accepts # the same connection # This list sets up pg_hba.conf for $pgxcOwner user. |