github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-25 16:16:29 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge branch 'gabriele-2010-12' of https://github.com/gbartolini/repmgr into gbartolini-gabriele-2010-12

Browse Source
This commit is contained in:
Greg Smith
2010-12-22 18:43:14 -05:00
parent e5d886d651 d88783a4d9
commit 47349b01e0
6 changed files with 74 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
config.c
View File

@@ -7,38 +7,41 @@
#include "repmgr.h" #include "repmgr.h"
#define MAXLINELENGTH 4096
void void
parse_config(const char *config_file, char *cluster_name, int *node, char *conninfo) parse_config(const char *config_file, char *cluster_name, int *node, char *conninfo)
{ {
char *s, buff[256]; char *s, buff[MAXLINELENGTH];
char name[MAXLEN];
char value[MAXLEN];
FILE *fp = fopen (config_file, "r"); FILE *fp = fopen (config_file, "r");
if (fp == NULL) if (fp == NULL)
return; return;
/* Read next line */ /* Read next line */
while ((s = fgets (buff, sizeof buff, fp)) != NULL) while ((s = fgets (buff, sizeof buff, fp)) != NULL)
{ {
char name[MAXLEN]; /* Skip blank lines and comments */
char value[MAXLEN]; if (buff[0] == '\n' || buff[0] == '#')
continue;
/* Skip blank lines and comments */ /* Parse name/value pair from line */
if (buff[0] == '\n' || buff[0] == '#')
continue;
/* Parse name/value pair from line */
parse_line(buff, name, value); parse_line(buff, name, value);
/* Copy into correct entry in parameters struct */ /* Copy into correct entry in parameters struct */
if (strcmp(name, "cluster") == 0) if (strcmp(name, "cluster") == 0)
strncpy (cluster_name, value, MAXLEN); strncpy (cluster_name, value, MAXLEN);
else if (strcmp(name, "node") == 0) else if (strcmp(name, "node") == 0)
*node = atoi(value); *node = atoi(value);
else if (strcmp(name, "conninfo") == 0) else if (strcmp(name, "conninfo") == 0)
strncpy (conninfo, value, MAXLEN); strncpy (conninfo, value, MAXLEN);
else else
printf ("WARNING: %s/%s: Unknown name/value pair!\n", name, value); printf ("WARNING: %s/%s: Unknown name/value pair!\n", name, value);
} }
/* Close file */ /* Close file */
fclose (fp); fclose (fp);
@@ -52,12 +55,12 @@ trim (char *s)
/* Trim and delimit right side */ /* Trim and delimit right side */
while ( (isspace (*s2)) && (s2 >= s1) ) while ( (isspace (*s2)) && (s2 >= s1) )
s2--; --s2;
*(s2+1) = '\0'; *(s2+1) = '\0';
/* Trim left side */ /* Trim left side */
while ( (isspace (*s1)) && (s1 < s2) ) while ( (isspace (*s1)) && (s1 < s2) )
s1++; ++s1;
/* Copy finished string */ /* Copy finished string */
strcpy (s, s1); strcpy (s, s1);
@@ -67,14 +70,13 @@ trim (char *s)
void void
parse_line(char *buff, char *name, char *value) parse_line(char *buff, char *name, char *value)
{ {
int i; int i = 0;
int j; int j = 0;
/* /*
* first we find the name of the parameter * first we find the name of the parameter
*/ */
j = 0; for ( ; i < MAXLEN; ++i)
for (i = 0; i < MAXLEN; i++)
{ {
if (buff[i] != '=') if (buff[i] != '=')
name[j++] = buff[i]; name[j++] = buff[i];
@@ -83,12 +85,11 @@ parse_line(char *buff, char *name, char *value)
} }
name[j] = '\0'; name[j] = '\0';
i++;
/* /*
* Now the value * Now the value
*/ */
j = 0; j = 0;
for ( ; i < MAXLEN; i++) for ( ++i ; i < MAXLEN; ++i)
if (buff[i] == '\'') if (buff[i] == '\'')
continue; continue;
else if (buff[i] != '\n') else if (buff[i] != '\n')
@@ -96,5 +97,5 @@ parse_line(char *buff, char *name, char *value)
else else
break; break;
value[j] = '\0'; value[j] = '\0';
trim(value); trim(value);
} }

53
dbutils.c
View File

@@ -8,23 +8,26 @@
#include "repmgr.h" #include "repmgr.h"
#define MAXQUERY 8192
#define MAXCONNINFO 1024
PGconn * PGconn *
establishDBConnection(const char *conninfo, const bool exit_on_error) establishDBConnection(const char *conninfo, const bool exit_on_error)
{ {
PGconn *conn; /* Make a connection to the database */
/* Make a connection to the database */ PGconn *conn = PQconnectdb(conninfo);
conn = PQconnectdb(conninfo);
/* Check to see that the backend connection was successfully made */ /* Check to see that the backend connection was successfully made */
if ((PQstatus(conn) != CONNECTION_OK)) if ((PQstatus(conn) != CONNECTION_OK))
{ {
fprintf(stderr, "Connection to database failed: %s", fprintf(stderr, "Connection to database failed: %s",
PQerrorMessage(conn)); PQerrorMessage(conn));
if (exit_on_error) if (exit_on_error)
{ {
PQfinish(conn); PQfinish(conn);
exit(1); exit(1);
} }
} }
return conn; return conn;
} }
@@ -34,17 +37,17 @@ establishDBConnection(const char *conninfo, const bool exit_on_error)
bool bool
is_standby(PGconn *conn) is_standby(PGconn *conn)
{ {
PGresult *res; PGresult *res;
bool result; bool result;
res = PQexec(conn, "SELECT pg_is_in_recovery()"); res = PQexec(conn, "SELECT pg_is_in_recovery()");
if (PQresultStatus(res) != PGRES_TUPLES_OK) if (PQresultStatus(res) != PGRES_TUPLES_OK)
{ {
fprintf(stderr, "Can't query server mode: %s", PQerrorMessage(conn)); fprintf(stderr, "Can't query server mode: %s", PQerrorMessage(conn));
PQclear(res); PQclear(res);
PQfinish(conn); PQfinish(conn);
exit(1); exit(1);
} }
if (strcmp(PQgetvalue(res, 0, 0), "f") == 0) if (strcmp(PQgetvalue(res, 0, 0), "f") == 0)
result = false; result = false;
@@ -61,10 +64,9 @@ is_standby(PGconn *conn)
* if 8 or inferior returns an empty string * if 8 or inferior returns an empty string
*/ */
char * char *
pg_version(PGconn *conn) pg_version(PGconn *conn, char* major_version)
{ {
PGresult *res; PGresult *res;
char *major_version;
int major_version1; int major_version1;
char *major_version2; char *major_version2;
@@ -82,11 +84,10 @@ pg_version(PGconn *conn)
major_version2 = PQgetvalue(res, 0, 1); major_version2 = PQgetvalue(res, 0, 1);
PQclear(res); PQclear(res);
major_version = malloc(10);
if (major_version1 >= 9) if (major_version1 >= 9)
{ {
/* form a major version string */ /* form a major version string */
sprintf(major_version, "%d.%s", major_version1, major_version2); snprintf(major_version, MAXVERSIONSTR, "%d.%s", major_version1, major_version2);
} }
else else
strcpy(major_version, ""); strcpy(major_version, "");
@@ -99,7 +100,7 @@ bool
guc_setted(PGconn *conn, const char *parameter, const char *op, const char *value) guc_setted(PGconn *conn, const char *parameter, const char *op, const char *value)
{ {
PGresult *res; PGresult *res;
char sqlquery[8192]; char sqlquery[MAXQUERY];
sprintf(sqlquery, "SELECT true FROM pg_settings " sprintf(sqlquery, "SELECT true FROM pg_settings "
" WHERE name = '%s' AND setting %s '%s'", " WHERE name = '%s' AND setting %s '%s'",
@@ -129,7 +130,7 @@ get_cluster_size(PGconn *conn)
{ {
PGresult *res; PGresult *res;
const char *size; const char *size;
char sqlquery[8192]; char sqlquery[MAXQUERY];
sprintf(sqlquery, "SELECT pg_size_pretty(SUM(pg_database_size(oid))::bigint) " sprintf(sqlquery, "SELECT pg_size_pretty(SUM(pg_database_size(oid))::bigint) "
" FROM pg_database "); " FROM pg_database ");
@@ -157,8 +158,8 @@ getMasterConnection(PGconn *standby_conn, int id, char *cluster, int *master_id)
PGconn *master_conn = NULL; PGconn *master_conn = NULL;
PGresult *res1; PGresult *res1;
PGresult *res2; PGresult *res2;
char sqlquery[8192]; char sqlquery[MAXQUERY];
char master_conninfo[8192]; char master_conninfo[MAXCONNINFO];
int i; int i;
/* find all nodes belonging to this cluster */ /* find all nodes belonging to this cluster */
@@ -179,7 +180,7 @@ getMasterConnection(PGconn *standby_conn, int id, char *cluster, int *master_id)
{ {
/* initialize with the values of the current node being processed */ /* initialize with the values of the current node being processed */
*master_id = atoi(PQgetvalue(res1, i, 0)); *master_id = atoi(PQgetvalue(res1, i, 0));
strcpy(master_conninfo, PQgetvalue(res1, i, 2)); strncpy(master_conninfo, PQgetvalue(res1, i, 2), MAXCONNINFO);
master_conn = establishDBConnection(master_conninfo, false); master_conn = establishDBConnection(master_conninfo, false);
if (PQstatus(master_conn) != CONNECTION_OK) if (PQstatus(master_conn) != CONNECTION_OK)
continue; continue;

2
dbutils.h
View File

@@ -6,7 +6,7 @@
PGconn *establishDBConnection(const char *conninfo, const bool exit_on_error); PGconn *establishDBConnection(const char *conninfo, const bool exit_on_error);
bool is_standby(PGconn *conn); bool is_standby(PGconn *conn);
char *pg_version(PGconn *conn); char *pg_version(PGconn *conn, char* major_version);
bool guc_setted(PGconn *conn, const char *parameter, const char *op, const char *value); bool guc_setted(PGconn *conn, const char *parameter, const char *op, const char *value);
const char *get_cluster_size(PGconn *conn); const char *get_cluster_size(PGconn *conn);
PGconn * getMasterConnection(PGconn *standby_conn, int id, char *cluster, int *master_id); PGconn * getMasterConnection(PGconn *standby_conn, int id, char *cluster, int *master_id);

28
repmgr.c
View File

@@ -287,7 +287,7 @@ do_master_register(void)
char conninfo[MAXLEN]; char conninfo[MAXLEN];
bool schema_exists = false; bool schema_exists = false;
const char *master_version = NULL; char master_version[MAXVERSIONSTR];
/* /*
* Read the configuration file: repmgr.conf * Read the configuration file: repmgr.conf
@@ -303,7 +303,7 @@ do_master_register(void)
conn = establishDBConnection(conninfo, true); conn = establishDBConnection(conninfo, true);
/* master should be v9 or better */ /* master should be v9 or better */
master_version = pg_version(conn); pg_version(conn, master_version);
if (strcmp(master_version, "") == 0) if (strcmp(master_version, "") == 0)
{ {
PQfinish(conn); PQfinish(conn);
@@ -464,8 +464,8 @@ do_standby_register(void)
int myLocalId = -1; int myLocalId = -1;
char conninfo[MAXLEN]; char conninfo[MAXLEN];
const char *master_version = NULL; char master_version[MAXVERSIONSTR];
const char *standby_version = NULL; char standby_version[MAXVERSIONSTR];
/* /*
* Read the configuration file: repmgr.conf * Read the configuration file: repmgr.conf
@@ -481,7 +481,7 @@ do_standby_register(void)
conn = establishDBConnection(conninfo, true); conn = establishDBConnection(conninfo, true);
/* should be v9 or better */ /* should be v9 or better */
standby_version = pg_version(conn); pg_version(conn, standby_version);
if (strcmp(standby_version, "") == 0) if (strcmp(standby_version, "") == 0)
{ {
PQfinish(conn); PQfinish(conn);
@@ -523,7 +523,7 @@ do_standby_register(void)
return; return;
/* master should be v9 or better */ /* master should be v9 or better */
master_version = pg_version(master_conn); pg_version(master_conn, master_version);
if (strcmp(master_version, "") == 0) if (strcmp(master_version, "") == 0)
{ {
PQfinish(conn); PQfinish(conn);
@@ -600,7 +600,7 @@ do_standby_clone(void)
const char *first_wal_segment = NULL; const char *first_wal_segment = NULL;
const char *last_wal_segment = NULL; const char *last_wal_segment = NULL;
const char *master_version = NULL; char master_version[MAXVERSIONSTR];
/* if dest_dir hasn't been provided, initialize to current directory */ /* if dest_dir hasn't been provided, initialize to current directory */
if (dest_dir == NULL) if (dest_dir == NULL)
@@ -683,7 +683,7 @@ do_standby_clone(void)
} }
/* primary should be v9 or better */ /* primary should be v9 or better */
master_version = pg_version(conn); pg_version(conn, master_version);
if (strcmp(master_version, "") == 0) if (strcmp(master_version, "") == 0)
{ {
PQfinish(conn); PQfinish(conn);
@@ -968,7 +968,7 @@ do_standby_promote(void)
char recovery_file_path[MAXLEN]; char recovery_file_path[MAXLEN];
char recovery_done_path[MAXLEN]; char recovery_done_path[MAXLEN];
const char *standby_version = NULL; char standby_version[MAXVERSIONSTR];
/* /*
* Read the configuration file: repmgr.conf * Read the configuration file: repmgr.conf
@@ -985,7 +985,7 @@ do_standby_promote(void)
conn = establishDBConnection(conninfo, true); conn = establishDBConnection(conninfo, true);
/* we need v9 or better */ /* we need v9 or better */
standby_version = pg_version(conn); pg_version(conn, standby_version);
if (strcmp(standby_version, "") == 0) if (strcmp(standby_version, "") == 0)
{ {
PQfinish(conn); PQfinish(conn);
@@ -1074,8 +1074,8 @@ do_standby_follow(void)
int r; int r;
char data_dir[MAXLEN]; char data_dir[MAXLEN];
const char *master_version = NULL; char master_version[MAXVERSIONSTR];
const char *standby_version = NULL; char standby_version[MAXVERSIONSTR];
/* /*
* Read the configuration file: repmgr.conf * Read the configuration file: repmgr.conf
@@ -1099,7 +1099,7 @@ do_standby_follow(void)
} }
/* should be v9 or better */ /* should be v9 or better */
standby_version = pg_version(conn); pg_version(conn, standby_version);
if (strcmp(standby_version, "") == 0) if (strcmp(standby_version, "") == 0)
{ {
PQfinish(conn); PQfinish(conn);
@@ -1125,7 +1125,7 @@ do_standby_follow(void)
} }
/* should be v9 or better */ /* should be v9 or better */
master_version = pg_version(master_conn); pg_version(master_conn, master_version);
if (strcmp(master_version, "") == 0) if (strcmp(master_version, "") == 0)
{ {
PQfinish(conn); PQfinish(conn);

1
repmgr.h
View File

@@ -20,5 +20,6 @@
#define MAXLEN 80 #define MAXLEN 80
#define CONFIG_FILE "repmgr.conf" #define CONFIG_FILE "repmgr.conf"
#define MAXVERSIONSTR 16
#endif #endif

4
repmgrd.c
View File

@@ -81,7 +81,7 @@ main(int argc, char **argv)
int c; int c;
char conninfo[MAXLEN]; char conninfo[MAXLEN];
const char *standby_version = NULL; char standby_version[MAXVERSIONSTR];
progname = get_progname(argv[0]); progname = get_progname(argv[0]);
@@ -138,7 +138,7 @@ main(int argc, char **argv)
myLocalConn = establishDBConnection(conninfo, true); myLocalConn = establishDBConnection(conninfo, true);
/* should be v9 or better */ /* should be v9 or better */
standby_version = pg_version(myLocalConn); pg_version(myLocalConn, standby_version);
if (strcmp(standby_version, "") == 0) if (strcmp(standby_version, "") == 0)
{ {
PQfinish(myLocalConn); PQfinish(myLocalConn);