Paquier review part#1

kelvich · kelvich · commit 2c7c4654f445 · 2016-03-28T19:38:45.000+03:00
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
@@ -1241,9 +1241,9 @@ ReadTwoPhaseFile(TransactionId xid, bool give_warnings)
  * Reads 2PC data from xlog. During checkpoint this data will be moved to
  * twophase files and ReadTwoPhaseFile should be used instead.
  *
- * Note clearly that this function accesses WAL during normal operation, similarly
- * to the way WALSender or Logical Decoding would do. It does not run during
- * crash recovery or standby processing.
+ * Note clearly that this function access WAL not only during recovery/replay
+ * but also during normal operation, similarly to the way WALSender or
+ * Logical Decoding would do.
  */
 static void
 XlogReadTwoPhaseData(XLogRecPtr lsn, char **buf, int *len)
@@ -1616,7 +1616,6 @@ XlogRedoFinishPrepared(TransactionId xid, bool isCommit)
 	PGPROC	   *proc;
 	PGXACT	   *pgxact;
 
-	/* During replay that lock isn't really necessary, but let's take it anyway */
 	LWLockAcquire(TwoPhaseStateLock, LW_EXCLUSIVE);
 	for (i = 0; i < TwoPhaseState->numPrepXacts; i++)
 	{
diff --git a/src/test/recovery/t/006_twophase.pl b/src/test/recovery/t/006_twophase.pl
@@ -1,4 +1,3 @@
-# Checks for recovery_min_apply_delay
 use strict;
 use warnings;
 use PostgresNode;
@@ -24,7 +23,7 @@
 $node_master->append_conf('postgresql.conf', qq(
 synchronous_standby_names = '*'
 ));
-$node_master->restart;
+$node_master->psql('postgres', "select pg_reload_conf()");
 
 my $psql_out = '';
 my $psql_rc = '';
