I just noticed a problem with log_statement = 'ddl' and log_line_prefix
containing '%x'. If the statement is the first in the transaction, it
will be logged before it is executed, and more importantly, before a
transaction ID is assigned. That means that %x will be 0.
If the administrator has configured postgres like this in order to ease
PITR on bad DDL, it's actually of no use whatsoever and they'll have to
use pg_waldump to try to figure things out.
PFA a simple patch that I hope addresses the issue in a clean way. It
also handles the same problem for 'mod'.
I'm undecided whether this is a bugfix or an improvement. I'm leaning
towards bugfix.
--
Vik Fearing +33 6 46 75 15 36
http://2ndQuadrant.fr PostgreSQL : Expertise, Formation et Support
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index f4133953be..27027a0fa8 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -38,6 +38,7 @@
#include "access/parallel.h"
#include "access/printtup.h"
+#include "access/transam.h"
#include "access/xact.h"
#include "catalog/pg_type.h"
#include "commands/async.h"
@@ -2098,16 +2099,31 @@ check_log_statement(List *stmt_list)
if (log_statement == LOGSTMT_NONE)
return false;
- if (log_statement == LOGSTMT_ALL)
+
+ /*
+ * If we're supposed to log mod or ddl statements, we need to make sure we
+ * have a TransactionId so it appears in log_line_prefix's %x wildcard.
+ * If the user is logging all statements, we can fast-track out if we
+ * already have a TransactionId, otherwise we need to loop through the
+ * statements.
+ */
+ if (log_statement == LOGSTMT_ALL && TransactionIdIsValid(GetTopTransactionIdIfAny()))
return true;
/* Else we have to inspect the statement(s) to see whether to log */
foreach(stmt_item, stmt_list)
{
Node *stmt = (Node *) lfirst(stmt_item);
+ LogStmtLevel level = GetCommandLogLevel(stmt);
+
+ if (level <= log_statement)
+ {
+ /* Make sure we have a TransactionId for mod and ddl statements. */
+ if (level == LOGSTMT_DDL || level == LOGSTMT_MOD)
+ (void) GetTopTransactionId();
- if (GetCommandLogLevel(stmt) <= log_statement)
return true;
+ }
}
return false;
