From 65cf045a639af578958db455d5395f0b8d42c338 Mon Sep 17 00:00:00 2001 From: Jaime Casanova Date: Tue, 9 Aug 2011 02:01:00 -0500 Subject: [PATCH] Fix a few problems introduced in 020e17b0599dbc2bcdcf772dfaf994dc6b00b3e3 while adding standby_name --- dbutils.c | 4 ++-- repmgr.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dbutils.c b/dbutils.c index 9e3defd2..7458b822 100644 --- a/dbutils.c +++ b/dbutils.c @@ -318,7 +318,7 @@ getMasterConnection(PGconn *standby_conn, char *schema, int id, char *cluster, log_info(_("finding node list for cluster '%s'\n"), cluster); - sqlquery_snprintf(sqlquery, "SELECT * FROM %s.repl_nodes " + sqlquery_snprintf(sqlquery, "SELECT id, conninfo FROM %s.repl_nodes " " WHERE cluster = '%s' and id <> %d and not witness", schema_quoted, cluster, id); @@ -336,7 +336,7 @@ getMasterConnection(PGconn *standby_conn, char *schema, int id, char *cluster, { /* initialize with the values of the current node being processed */ *master_id = atoi(PQgetvalue(res1, i, 0)); - strncpy(master_conninfo, PQgetvalue(res1, i, 2), MAXCONNINFO); + strncpy(master_conninfo, PQgetvalue(res1, i, 1), MAXCONNINFO); log_info(_("checking role of cluster node '%s'\n"), master_conninfo); master_conn = establishDBConnection(master_conninfo, false); diff --git a/repmgr.c b/repmgr.c index 63960595..9fda4f2a 100644 --- a/repmgr.c +++ b/repmgr.c @@ -519,7 +519,7 @@ do_master_register(void) } sqlquery_snprintf(sqlquery, "INSERT INTO %s.repl_nodes (id, cluster, name, conninfo, priority) " - "VALUES (%d, '%s', '%s', %d)", + "VALUES (%d, '%s', '%s', '%s', %d)", repmgr_schema, options.node, options.cluster_name, options.node_name, options.conninfo, options.priority); log_debug(_("master register: %s\n"), sqlquery); @@ -662,7 +662,7 @@ do_standby_register(void) } sqlquery_snprintf(sqlquery, "INSERT INTO %s.repl_nodes(id, cluster, name, conninfo, priority) " - "VALUES (%d, '%s', '%s', %d)", + "VALUES (%d, '%s', '%s', '%s', %d)", repmgr_schema, options.node, options.cluster_name, options.node_name, options.conninfo, options.priority); log_debug(_("standby register: %s\n"), sqlquery); @@ -1516,9 +1516,9 @@ do_witness_create(void) } /* register ourselves in the master */ - sqlquery_snprintf(sqlquery, "INSERT INTO %s.repl_nodes(id, cluster, conninfo, priority, witness) " - "VALUES (%d, '%s', '%s', %d, true)", - repmgr_schema, options.node, options.cluster_name, options.conninfo); + sqlquery_snprintf(sqlquery, "INSERT INTO %s.repl_nodes(id, cluster, name, conninfo, priority, witness) " + "VALUES (%d, '%s', '%s', '%s', %d, true)", + repmgr_schema, options.node, options.cluster_name, options.node_name, options.conninfo); log_debug(_("witness create: %s"), sqlquery); if (!PQexec(masterconn, sqlquery))