*/
/*
- Copyright (C) 2000-2004 Kern Sibbald and John Walker
+ Copyright (C) 2003-2004 Kern Sibbald and John Walker
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
* never have errors, or it is really fatal.
*/
B_DB *
-db_init_database(JCR *jcr, char *db_name, char *db_user, char *db_password,
- char *db_address, int db_port, char *db_socket)
+db_init_database(JCR *jcr, const char *db_name, const char *db_user, const char *db_password,
+ const char *db_address, int db_port, const char *db_socket,
+ int mult_db_connections)
{
B_DB *mdb;
- if (!db_user) {
+ if (!db_user) {
Jmsg(jcr, M_FATAL, 0, _("A user name for PostgreSQL must be supplied.\n"));
return NULL;
}
P(mutex); /* lock DB queue */
- /* Look to see if DB already open */
- for (mdb=NULL; (mdb=(B_DB *)qnext(&db_list, &mdb->bq)); ) {
- if (strcmp(mdb->db_name, db_name) == 0) {
- Dmsg2(100, "DB REopen %d %s\n", mdb->ref_count, db_name);
- mdb->ref_count++;
- V(mutex);
- return mdb; /* already open */
+ if (!mult_db_connections) {
+ /* Look to see if DB already open */
+ for (mdb=NULL; (mdb=(B_DB *)qnext(&db_list, &mdb->bq)); ) {
+ if (strcmp(mdb->db_name, db_name) == 0) {
+ Dmsg2(100, "DB REopen %d %s\n", mdb->ref_count, db_name);
+ mdb->ref_count++;
+ V(mutex);
+ return mdb; /* already open */
+ }
}
}
Dmsg0(100, "db_open first time\n");
- mdb = (B_DB *) malloc(sizeof(B_DB));
+ mdb = (B_DB *)malloc(sizeof(B_DB));
memset(mdb, 0, sizeof(B_DB));
mdb->db_name = bstrdup(db_name);
mdb->db_user = bstrdup(db_user);
mdb->have_insert_id = TRUE;
mdb->errmsg = get_pool_memory(PM_EMSG); /* get error message buffer */
*mdb->errmsg = 0;
- mdb->cmd = get_pool_memory(PM_EMSG); /* get command buffer */
+ mdb->cmd = get_pool_memory(PM_EMSG); /* get command buffer */
mdb->cached_path = get_pool_memory(PM_FNAME);
mdb->cached_path_id = 0;
mdb->ref_count = 1;
mdb->fname = get_pool_memory(PM_FNAME);
mdb->path = get_pool_memory(PM_FNAME);
mdb->esc_name = get_pool_memory(PM_FNAME);
+ mdb->allow_transactions = mult_db_connections;
qinsert(&db_list, &mdb->bq); /* put db in list */
V(mutex);
return mdb;
db_open_database(JCR *jcr, B_DB *mdb)
{
int errstat;
- char port[10];
+ char buf[10], *port;
P(mutex);
if (mdb->connected) {
V(mutex);
return 1;
}
- mdb->connected = FALSE;
+ mdb->connected = false;
if ((errstat=rwl_init(&mdb->lock)) != 0) {
- Mmsg1(&mdb->errmsg, _("Unable to initialize DB lock. ERR=%s\n"),
+ Mmsg1(&mdb->errmsg, _("Unable to initialize DB lock. ERR=%s\n"),
strerror(errstat));
V(mutex);
return 0;
}
- if (mdb->db_port && mdb->db_port[0]) {
- bsnprintf(port, sizeof(port), "%d", mdb->db_port);
+ if (mdb->db_port) {
+ bsnprintf(buf, sizeof(buf), "%d", mdb->db_port);
+ port = buf;
} else {
- port[0] = 0;
+ port = NULL;
}
- /* connect to the database */
- mdb->db = PQsetdbLogin(
- mdb->db_address, /* default = localhost */
- port, /* default port */
- NULL, /* pg options */
- NULL, /* tty, ignored */
- mdb->db_name, /* database name */
- mdb->db_user, /* login name */
- mdb->db_password); /* password */
-
- /* If no connect, try once more in case it is a timing problem */
- if (PQstatus(mdb->db) != CONNECTION_OK) {
- mdb->db = PQsetdbLogin(
- mdb->db_address, /* default = localhost */
- port, /* default port */
- NULL, /* pg options */
- NULL, /* tty, ignored */
- mdb->db_name, /* database name */
- mdb->db_user, /* login name */
- mdb->db_password); /* password */
+
+ /* If connection fails, try at 5 sec intervals for 30 seconds. */
+ for (int retry=0; retry < 6; retry++) {
+ /* connect to the database */
+ mdb->db = PQsetdbLogin(
+ mdb->db_address, /* default = localhost */
+ port, /* default port */
+ NULL, /* pg options */
+ NULL, /* tty, ignored */
+ mdb->db_name, /* database name */
+ mdb->db_user, /* login name */
+ mdb->db_password); /* password */
+
+ /* If no connect, try once more in case it is a timing problem */
+ if (PQstatus(mdb->db) == CONNECTION_OK) {
+ break;
+ }
+ bmicrosleep(5, 0);
}
-
+
Dmsg0(50, "pg_real_connect done\n");
- Dmsg3(50, "db_user=%s db_name=%s db_password=%s\n", mdb->db_user, mdb->db_name,
- mdb->db_password==NULL?"(NULL)":mdb->db_password);
-
+ Dmsg3(50, "db_user=%s db_name=%s db_password=%s\n", mdb->db_user, mdb->db_name,
+ mdb->db_password==NULL?"(NULL)":mdb->db_password);
+
if (PQstatus(mdb->db) != CONNECTION_OK) {
Mmsg2(&mdb->errmsg, _("Unable to connect to PostgreSQL server.\n"
- "Database=%s User=%s\n"
- "It is probably not running or your password is incorrect.\n"),
+ "Database=%s User=%s\n"
+ "It is probably not running or your password is incorrect.\n"),
mdb->db_name, mdb->db_user);
V(mutex);
return 0;
return 0;
}
- mdb->connected = TRUE;
+ mdb->connected = true;
V(mutex);
return 1;
}
if (mdb->connected && mdb->db) {
sql_close(mdb);
}
- rwl_destroy(&mdb->lock);
+ rwl_destroy(&mdb->lock);
free_pool_memory(mdb->errmsg);
free_pool_memory(mdb->cmd);
free_pool_memory(mdb->cached_path);
if (mdb->db_socket) {
free(mdb->db_socket);
}
+ my_postgresql_free_result(mdb);
free(mdb);
}
V(mutex);
/*
* Return the next unique index (auto-increment) for
* the given table. Return NULL on error.
- *
+ *
* For PostgreSQL, NULL causes the auto-increment value
* to be updated.
*/
{
strcpy(index, "NULL");
return 1;
-}
+}
/*
* Submit a general SQL command (cmd), and for each row returned,
* the sqlite_handler is called with the ctx.
*/
-int db_sql_query(B_DB *mdb, char *query, DB_RESULT_HANDLER *result_handler, void *ctx)
+int db_sql_query(B_DB *mdb, const char *query, DB_RESULT_HANDLER *result_handler, void *ctx)
{
SQL_ROW row;
- Dmsg0(50, "db_sql_query started\n");
-
+ Dmsg0(500, "db_sql_query started\n");
+
db_lock(mdb);
if (sql_query(mdb, query) != 0) {
- Mmsg(&mdb->errmsg, _("Query failed: %s: ERR=%s\n"), query, sql_strerror(mdb));
+ Mmsg(mdb->errmsg, _("Query failed: %s: ERR=%s\n"), query, sql_strerror(mdb));
db_unlock(mdb);
- Dmsg0(50, "db_sql_query failed\n");
+ Dmsg0(500, "db_sql_query failed\n");
return 0;
}
- Dmsg0(50, "db_sql_query succeeded. checking handler\n");
+ Dmsg0(500, "db_sql_query succeeded. checking handler\n");
if (result_handler != NULL) {
- Dmsg0(50, "db_sql_query invoking handler\n");
+ Dmsg0(500, "db_sql_query invoking handler\n");
if ((mdb->result = sql_store_result(mdb)) != NULL) {
int num_fields = sql_num_fields(mdb);
- Dmsg0(50, "db_sql_query sql_store_result suceeded\n");
+ Dmsg0(500, "db_sql_query sql_store_result suceeded\n");
while ((row = sql_fetch_row(mdb)) != NULL) {
- Dmsg0(50, "db_sql_query sql_fetch_row worked\n");
+ Dmsg0(500, "db_sql_query sql_fetch_row worked\n");
if (result_handler(ctx, num_fields, row))
break;
}
}
db_unlock(mdb);
- Dmsg0(50, "db_sql_query finished\n");
+ Dmsg0(500, "db_sql_query finished\n");
return 1;
}
-POSTGRESQL_ROW my_postgresql_fetch_row(B_DB *mdb)
+POSTGRESQL_ROW my_postgresql_fetch_row(B_DB *mdb)
{
- int j;
+ int j;
POSTGRESQL_ROW row = NULL; // by default, return NULL
- Dmsg0(50, "my_postgresql_fetch_row start\n");
+ Dmsg0(500, "my_postgresql_fetch_row start\n");
if (mdb->row_number == -1 || mdb->row == NULL) {
- Dmsg1(50, "we have need space of %d bytes\n", sizeof(char *) * mdb->num_fields);
+ Dmsg1(500, "we have need space of %d bytes\n", sizeof(char *) * mdb->num_fields);
if (mdb->row != NULL) {
- Dmsg0(50, "my_postgresql_fetch_row freeing space\n");
- free(mdb->row);
- mdb->row = NULL;
+ Dmsg0(500, "my_postgresql_fetch_row freeing space\n");
+ free(mdb->row);
+ mdb->row = NULL;
}
mdb->row = (POSTGRESQL_ROW) malloc(sizeof(char *) * mdb->num_fields);
// if still within the result set
if (mdb->row_number < mdb->num_rows) {
- Dmsg2(50, "my_postgresql_fetch_row row number '%d' is acceptable (0..%d)\n", mdb->row_number, mdb->num_rows);
+ Dmsg2(500, "my_postgresql_fetch_row row number '%d' is acceptable (0..%d)\n", mdb->row_number, mdb->num_rows);
// get each value from this row
for (j = 0; j < mdb->num_fields; j++) {
- mdb->row[j] = PQgetvalue(mdb->result, mdb->row_number, j);
- Dmsg2(50, "my_postgresql_fetch_row field '%d' has value '%s'\n", j, mdb->row[j]);
+ mdb->row[j] = PQgetvalue(mdb->result, mdb->row_number, j);
+ Dmsg2(500, "my_postgresql_fetch_row field '%d' has value '%s'\n", j, mdb->row[j]);
}
// increment the row number for the next call
mdb->row_number++;
row = mdb->row;
} else {
- Dmsg2(50, "my_postgresql_fetch_row row number '%d' is NOT acceptable (0..%d)\n", mdb->row_number, mdb->num_rows);
+ Dmsg2(500, "my_postgresql_fetch_row row number '%d' is NOT acceptable (0..%d)\n", mdb->row_number, mdb->num_rows);
}
- Dmsg1(50, "my_postgresql_fetch_row finishes returning %x\n", row);
+ Dmsg1(500, "my_postgresql_fetch_row finishes returning %x\n", row);
return row;
}
//
// for a given column, find the max length
//
- int max_length;
+ int max_length;
int i;
- int this_length;
+ int this_length;
max_length = 0;
for (i = 0; i < mdb->num_rows; i++) {
if (PQgetisnull(mdb->result, i, field_num)) {
- this_length = 4; // "NULL"
+ this_length = 4; // "NULL"
} else {
this_length = strlen(PQgetvalue(mdb->result, i, field_num));
}
-
+
if (max_length < this_length) {
max_length = this_length;
}
return max_length;
}
-POSTGRESQL_FIELD * my_postgresql_fetch_field(B_DB *mdb)
+POSTGRESQL_FIELD * my_postgresql_fetch_field(B_DB *mdb)
{
int i;
- Dmsg0(50, "my_postgresql_fetch_field starts\n");
+ Dmsg0(500, "my_postgresql_fetch_field starts\n");
if (mdb->fields == NULL) {
- Dmsg1(50, "allocating space for %d fields\n", mdb->num_fields);
+ Dmsg1(500, "allocating space for %d fields\n", mdb->num_fields);
mdb->fields = (POSTGRESQL_FIELD *)malloc(sizeof(POSTGRESQL_FIELD) * mdb->num_fields);
for (i = 0; i < mdb->num_fields; i++) {
- Dmsg1(50, "filling field %d\n", i);
+ Dmsg1(500, "filling field %d\n", i);
mdb->fields[i].name = PQfname(mdb->result, i);
mdb->fields[i].max_length = my_postgresql_max_length(mdb, i);
mdb->fields[i].type = PQftype(mdb->result, i);
mdb->fields[i].flags = 0;
- Dmsg4(50, "my_postgresql_fetch_field finds field '%s' has length='%d' type='%d' and IsNull=%d\n",
+ Dmsg4(500, "my_postgresql_fetch_field finds field '%s' has length='%d' type='%d' and IsNull=%d\n",
mdb->fields[i].name, mdb->fields[i].max_length, mdb->fields[i].type,
mdb->fields[i].flags);
} // end for
// increment field number for the next time around
- Dmsg0(50, "my_postgresql_fetch_field finishes\n");
+ Dmsg0(500, "my_postgresql_fetch_field finishes\n");
return &mdb->fields[mdb->field_number++];
}
-void my_postgresql_data_seek(B_DB *mdb, int row)
+void my_postgresql_data_seek(B_DB *mdb, int row)
{
// set the row number to be returned on the next call
// to my_postgresql_fetch_row
mdb->field_number = field;
}
-int my_postgresql_query(B_DB *mdb, char *query) {
- Dmsg0(50, "my_postgresql_query started\n");
+/*
+ * Note, if this routine returns 1 (failure), Bacula expects
+ * that no result has been stored.
+ */
+int my_postgresql_query(B_DB *mdb, const char *query) {
+ Dmsg0(500, "my_postgresql_query started\n");
// We are starting a new query. reset everything.
mdb->num_rows = -1;
mdb->row_number = -1;
mdb->field_number = -1;
+ if (mdb->result != NULL) {
+ PQclear(mdb->result); /* hmm, someone forgot to free?? */
+ }
- Dmsg1(50, "my_postgresql_query starts with '%s'\n", query);
+ Dmsg1(500, "my_postgresql_query starts with '%s'\n", query);
mdb->result = PQexec(mdb->db, query);
mdb->status = PQresultStatus(mdb->result);
if (mdb->status == PGRES_TUPLES_OK || mdb->status == PGRES_COMMAND_OK) {
- Dmsg1(50, "we have a result\n", query);
+ Dmsg1(500, "we have a result\n", query);
// how many fields in the set?
mdb->num_fields = (int) PQnfields(mdb->result);
- Dmsg1(50, "we have %d fields\n", mdb->num_fields);
+ Dmsg1(500, "we have %d fields\n", mdb->num_fields);
mdb->num_rows = PQntuples(mdb->result);
- Dmsg1(50, "we have %d rows\n", mdb->num_rows);
+ Dmsg1(500, "we have %d rows\n", mdb->num_rows);
mdb->status = 0;
} else {
- Dmsg1(50, "we failed\n", query);
+ Dmsg1(500, "we failed\n", query);
mdb->status = 1;
}
- Dmsg0(50, "my_postgresql_query finishing\n");
+ Dmsg0(500, "my_postgresql_query finishing\n");
return mdb->status;
}
-void my_postgresql_free_result (B_DB *mdb)
+void my_postgresql_free_result (B_DB *mdb)
{
if (mdb->result) {
PQclear(mdb->result);
+ mdb->result = NULL;
}
if (mdb->row) {
}
}
-int my_postgresql_currval(B_DB *mdb, char *table_name)
+int my_postgresql_currval(B_DB *mdb, char *table_name)
{
// Obtain the current value of the sequence that
// provides the serial value for primary key of the table.
bstrncat(sequence, "_seq", sizeof(sequence));
bsnprintf(query, sizeof(query), "SELECT currval('%s')", sequence);
-// Mmsg(&query, "SELECT currval('%s')", sequence);
- Dmsg1(50, "my_postgresql_currval invoked with '%s'\n", query);
+// Mmsg(query, "SELECT currval('%s')", sequence);
+ Dmsg1(500, "my_postgresql_currval invoked with '%s'\n", query);
result = PQexec(mdb->db, query);
- Dmsg0(50, "exec done");
+ Dmsg0(500, "exec done");
if (PQresultStatus(result) == PGRES_TUPLES_OK) {
- Dmsg0(50, "getting value");
+ Dmsg0(500, "getting value");
id = atoi(PQgetvalue(result, 0, 0));
- Dmsg2(50, "got value '%s' which became %d\n", PQgetvalue(result, 0, 0), id);
+ Dmsg2(500, "got value '%s' which became %d\n", PQgetvalue(result, 0, 0), id);
} else {
Mmsg1(&mdb->errmsg, _("error fetching currval: %s\n"), PQerrorMessage(mdb->db));
}
projects / bacula / bacula / blobdiff