getMasterConnection() cannot avoid checking the same node that asks

to find the master.
This was a micro optimization based on the fact that all commands that
needed to detect the master were executed from the standby but now that
we have CLUSTER level commands that is not true anymore
This commit is contained in:
Jaime Casanova
2012-06-12 23:28:24 -05:00
parent 4db046a8ea
commit 7a76f1998c
4 changed files with 10 additions and 10 deletions

View File

@@ -491,7 +491,7 @@ do_master_register(void)
int id;
/* Ensure there isn't any other master already registered */
master_conn = getMasterConnection(conn, repmgr_schema, options.node,
master_conn = getMasterConnection(conn, repmgr_schema,
options.cluster_name, &id,NULL);
if (master_conn != NULL)
{
@@ -612,7 +612,7 @@ do_standby_register(void)
/* check if there is a master in this cluster */
log_info(_("%s connecting to master database\n"), progname);
master_conn = getMasterConnection(conn, repmgr_schema, options.node, options.cluster_name,
master_conn = getMasterConnection(conn, repmgr_schema, options.cluster_name,
&master_id, NULL);
if (!master_conn)
{
@@ -1204,7 +1204,7 @@ do_standby_promote(void)
}
/* we also need to check if there isn't any master already */
old_master_conn = getMasterConnection(conn, repmgr_schema, options.node, options.cluster_name,
old_master_conn = getMasterConnection(conn, repmgr_schema, options.cluster_name,
&old_master_id, NULL);
if (old_master_conn != NULL)
{
@@ -1309,7 +1309,7 @@ do_standby_follow(void)
/* we also need to check if there is any master in the cluster */
log_info(_("%s connecting to master database\n"), progname);
master_conn = getMasterConnection(conn, repmgr_schema, options.node,
master_conn = getMasterConnection(conn, repmgr_schema,
options.cluster_name, &master_id,(char *) &master_conninfo);
if (master_conn == NULL)
{