diff options
| author | Pavan Deolasee | 2018-07-31 05:58:21 +0000 |
|---|---|---|
| committer | Pavan Deolasee | 2018-07-31 07:07:42 +0000 |
| commit | c8b470c1fbf442a0f9bf23d53f127adfe9a2d1cc (patch) | |
| tree | aa64e8aadfaec5e1aa91e0c54949e688bc06ebd7 | |
| parent | cc03f5d3c371920f1d545f2bf6fe5ae08a2075f4 (diff) | |
Correct select the GTM proxy for a new node being added
This fixes an oversight in array index lookup. We should have been using
0-based indexes but were instead using 1-based index.
| -rw-r--r-- | contrib/pgxc_ctl/coord_cmd.c | 4 | ||||
| -rw-r--r-- | contrib/pgxc_ctl/datanode_cmd.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/pgxc_ctl/coord_cmd.c b/contrib/pgxc_ctl/coord_cmd.c index 40612dbf5d..52715672fd 100644 --- a/contrib/pgxc_ctl/coord_cmd.c +++ b/contrib/pgxc_ctl/coord_cmd.c @@ -1109,8 +1109,8 @@ int add_coordinatorMaster(char *name, char *host, int port, int pooler, /* Now add the master */ gtmPxyIdx = getEffectiveGtmProxyIdxFromServerName(host); - gtmHost = (gtmPxyIdx > 0) ? aval(VAR_gtmProxyServers)[gtmPxyIdx] : sval(VAR_gtmMasterServer); - gtmPort = (gtmPxyIdx > 0) ? aval(VAR_gtmProxyPorts)[gtmPxyIdx] : sval(VAR_gtmMasterPort); + gtmHost = (gtmPxyIdx >= 0) ? aval(VAR_gtmProxyServers)[gtmPxyIdx] : sval(VAR_gtmMasterServer); + gtmPort = (gtmPxyIdx >= 0) ? aval(VAR_gtmProxyPorts)[gtmPxyIdx] : sval(VAR_gtmMasterPort); /* initdb */ doImmediate(host, NULL, "PGXC_CTL_SILENT=1 initdb -D %s --nodename %s", dir, name); diff --git a/contrib/pgxc_ctl/datanode_cmd.c b/contrib/pgxc_ctl/datanode_cmd.c index 4e7ecc9b72..811c7388ca 100644 --- a/contrib/pgxc_ctl/datanode_cmd.c +++ b/contrib/pgxc_ctl/datanode_cmd.c @@ -1149,8 +1149,8 @@ int add_datanodeMaster(char *name, char *host, int port, int pooler, char *dir, /* Now add the master */ gtmPxyIdx = getEffectiveGtmProxyIdxFromServerName(host); - gtmHost = (gtmPxyIdx > 0) ? aval(VAR_gtmProxyServers)[gtmPxyIdx] : sval(VAR_gtmMasterServer); - gtmPort = (gtmPxyIdx > 0) ? aval(VAR_gtmProxyPorts)[gtmPxyIdx] : sval(VAR_gtmMasterPort); + gtmHost = (gtmPxyIdx >= 0) ? aval(VAR_gtmProxyServers)[gtmPxyIdx] : sval(VAR_gtmMasterServer); + gtmPort = (gtmPxyIdx >= 0) ? aval(VAR_gtmProxyPorts)[gtmPxyIdx] : sval(VAR_gtmMasterPort); /* initdb */ doImmediate(host, NULL, "PGXC_CTL_SILENT=1 initdb -D %s %s %s --nodename %s", dir, |