According to the cfbot this patch needs a rebase
Indeed. v4 attached.
--
Fabien.
diff --git a/doc/src/sgml/ref/pgbench.sgml b/doc/src/sgml/ref/pgbench.sgml
index ebdb4b3f46..d96d2d291d 100644
--- a/doc/src/sgml/ref/pgbench.sgml
+++ b/doc/src/sgml/ref/pgbench.sgml
@@ -29,7 +29,7 @@ PostgreSQL documentation
<cmdsynopsis>
<command>pgbench</command>
<arg rep="repeat"><replaceable>option</replaceable></arg>
- <arg choice="opt"><replaceable>dbname</replaceable></arg>
+ <arg rep="repeat"><replaceable>dbname or conninfo</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -169,6 +169,9 @@ pgbench <optional> <replaceable>options</replaceable> </optional> <replaceable>d
not specified, the environment variable
<envar>PGDATABASE</envar> is used. If that is not set, the
user name specified for the connection is used.
+ Alternatively, the <replaceable>dbname</replaceable> can be
+ a standard connection information string.
+ Several connections can be provided.
</para>
</listitem>
</varlistentry>
@@ -918,6 +921,21 @@ pgbench <optional> <replaceable>options</replaceable> </optional> <replaceable>d
<variablelist>
+ <varlistentry>
+ <term><option>--connection-policy=</option><replaceable>policy</replaceable></term>
+ <listitem>
+ <para>
+ Set the connection policy when multiple connections are available.
+ Default is <literal>round-robin</literal> provided (<literal>ro</literal>).
+ Possible values are:
+ <literal>first</literal> (<literal>f</literal>),
+ <literal>random</literal> (<literal>ra</literal>),
+ <literal>round-robin</literal> (<literal>ro</literal>),
+ <literal>working</literal> (<literal>w</literal>).
+ </para>
+ </listitem>
+ </varlistentry>
+
<varlistentry>
<term><option>-h</option> <replaceable>hostname</replaceable></term>
<term><option>--host=</option><replaceable>hostname</replaceable></term>
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index acf3e56413..d99d40fbb9 100644
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -305,13 +305,39 @@ uint32 max_tries = 1;
bool failures_detailed = false; /* whether to group failures in reports
* or logs by basic types */
+char *logfile_prefix = NULL;
+
+/* main connection definition */
const char *pghost = NULL;
const char *pgport = NULL;
const char *username = NULL;
-const char *dbName = NULL;
-char *logfile_prefix = NULL;
const char *progname;
+/* multi connections */
+typedef enum mc_policy_t
+{
+ MC_UNKNOWN = 0,
+ MC_FIRST,
+ MC_RANDOM,
+ MC_ROUND_ROBIN,
+ MC_WORKING
+} mc_policy_t;
+
+/* connection info list */
+typedef struct connection_t
+{
+ const char *connection; /* conninfo or dbname */
+ int errors; /* number of connection errors */
+} connection_t;
+
+static int n_connections = 0;
+static connection_t *connections = NULL;
+static mc_policy_t mc_policy = MC_ROUND_ROBIN;
+
+/* last used connection */
+// FIXME per thread?
+static int current_connection = 0;
+
#define WSEP '@' /* weight separator */
volatile bool timer_exceeded = false; /* flag from signal handler */
@@ -873,7 +899,7 @@ usage(void)
{
printf("%s is a benchmarking tool for PostgreSQL.\n\n"
"Usage:\n"
- " %s [OPTION]... [DBNAME]\n"
+ " %s [OPTION]... [DBNAME or CONNINFO ...]\n"
"\nInitialization options:\n"
" -i, --initialize invokes initialization mode\n"
" -I, --init-steps=[" ALL_INIT_STEPS "]+ (default \"" DEFAULT_INIT_STEPS "\")\n"
@@ -931,6 +957,7 @@ usage(void)
" -h, --host=HOSTNAME database server host or socket directory\n"
" -p, --port=PORT database server port number\n"
" -U, --username=USERNAME connect as specified database user\n"
+ " --connection-policy=S set multiple connection policy (\"first\", \"rand\", \"round-robin\", \"working\")\n"
" -V, --version output version information, then exit\n"
" -?, --help show this help, then exit\n"
"\n"
@@ -1538,13 +1565,89 @@ tryExecuteStatement(PGconn *con, const char *sql)
PQclear(res);
}
+/* store a new connection information string */
+static void
+push_connection(const char *c)
+{
+ connections = pg_realloc(connections, sizeof(connection_t) * (n_connections+1));
+ connections[n_connections].connection = pg_strdup(c);
+ connections[n_connections].errors = 0;
+ n_connections++;
+}
+
+/* switch connection */
+static int
+next_connection(int *pci)
+{
+ int ci;
+
+ ci = ((*pci) + 1) % n_connections;
+ *pci = ci;
+
+ return ci;
+}
+
+/* return the connection index to use for next attempt */
+static int
+choose_connection(int *pci)
+{
+ int ci;
+
+ switch (mc_policy)
+ {
+ case MC_FIRST:
+ ci = 0;
+ break;
+ case MC_RANDOM:
+ // FIXME should use a prng state ; not thread safe ;
+ ci = (int) getrand(&base_random_sequence, 0, n_connections-1);
+ *pci = ci;
+ break;
+ case MC_ROUND_ROBIN:
+ ci = next_connection(pci);
+ break;
+ case MC_WORKING:
+ ci = *pci;
+ break;
+ default:
+ pg_log_fatal("unexpected multi connection policy: %d", mc_policy);
+ exit(1);
+ }
+
+ return ci;
+}
+
+/* return multi-connection policy based on its name or shortest prefix */
+static mc_policy_t
+get_connection_policy(const char *s)
+{
+ if (s == NULL || *s == '\0' || strcmp(s, "first") == 0 || strcmp(s, "f") == 0)
+ return MC_FIRST;
+ else if (strcmp(s, "random") == 0 || strcmp(s, "ra") == 0)
+ return MC_RANDOM;
+ else if (strcmp(s, "round-robin") == 0 || strcmp(s, "ro") == 0)
+ return MC_ROUND_ROBIN;
+ else if (strcmp(s, "working") == 0 || strcmp(s, "w") == 0)
+ return MC_WORKING;
+ else
+ return MC_UNKNOWN;
+}
+
+/* get backend connection info */
+static connection_t *
+getConnection(void)
+{
+ return &connections[choose_connection(¤t_connection)];
+}
+
/* set up a connection to the backend */
static PGconn *
doConnect(void)
{
- PGconn *conn;
- bool new_pass;
- static char *password = NULL;
+ PGconn *conn;
+ bool new_pass;
+ static char *password = NULL;
+ connection_t *ci = getConnection();
/*
* Start the connection. Loop until we have a password if requested by
@@ -1565,8 +1668,9 @@ doConnect(void)
values[2] = username;
keywords[3] = "password";
values[3] = password;
+ /* dbname can include a full conninfo */
keywords[4] = "dbname";
- values[4] = dbName;
+ values[4] = ci->connection;
keywords[5] = "fallback_application_name";
values[5] = progname;
keywords[6] = NULL;
@@ -1574,11 +1678,12 @@ doConnect(void)
new_pass = false;
+ pg_log_debug("connecting to %s", ci->connection);
conn = PQconnectdbParams(keywords, values, true);
if (!conn)
{
- pg_log_error("connection to database \"%s\" failed", dbName);
+ pg_log_error("connection to database \"%s\" failed", ci->connection);
return NULL;
}
@@ -1597,6 +1702,9 @@ doConnect(void)
{
pg_log_error("%s", PQerrorMessage(conn));
PQfinish(conn);
+ ci->errors += 1;
+ if (mc_policy == MC_WORKING)
+ (void) next_connection(¤t_connection);
return NULL;
}
@@ -6570,6 +6678,7 @@ main(int argc, char **argv)
{"failures-detailed", no_argument, NULL, 13},
{"max-tries", required_argument, NULL, 14},
{"verbose-errors", no_argument, NULL, 15},
+ {"connection-policy", required_argument, NULL, 16},
{NULL, 0, NULL, 0}
};
@@ -6945,6 +7054,14 @@ main(int argc, char **argv)
benchmarking_option_set = true;
verbose_errors = true;
break;
+ case 16:
+ mc_policy = get_connection_policy(optarg);
+ if (mc_policy == MC_UNKNOWN)
+ {
+ pg_log_fatal("unexpected connection policy: %s", optarg);
+ exit(1);
+ }
+ break;
default:
fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
@@ -6999,23 +7116,18 @@ main(int argc, char **argv)
throttle_delay *= nthreads;
if (argc > optind)
- dbName = argv[optind++];
+ {
+ while (optind < argc)
+ push_connection(argv[optind++]);
+ }
else
{
if ((env = getenv("PGDATABASE")) != NULL && *env != '\0')
- dbName = env;
+ push_connection(env);
else if ((env = getenv("PGUSER")) != NULL && *env != '\0')
- dbName = env;
+ push_connection(env);
else
- dbName = get_user_name_or_exit(progname);
- }
-
- if (optind < argc)
- {
- pg_log_fatal("too many command-line arguments (first is \"%s\")",
- argv[optind]);
- fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
- exit(1);
+ push_connection(get_user_name_or_exit(progname));
}
if (is_init_mode)
