If primary_conninfo is not set, don't try to establish streaming

hlinnaka · hlinnaka · commit 54cbd1757e6f · 2010-02-12T07:56:36.000Z
connection.
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.371 2010/02/12 07:36:44 heikki Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.372 2010/02/12 07:56:36 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -8796,8 +8796,9 @@ XLogPageRead(XLogRecPtr *RecPtr, int emode, bool fetching_ckpt,
 					 * that when we later jump backwards to start redo at
 					 * RedoStartLSN, we will have the logs streamed already.
 					 */
-					RequestXLogStreaming(fetching_ckpt ? RedoStartLSN : *RecPtr,
-										 PrimaryConnInfo);
+					if (PrimaryConnInfo)
+						RequestXLogStreaming(fetching_ckpt ? RedoStartLSN : *RecPtr,
+											 PrimaryConnInfo);
 				}
 
 				/*

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.371 2010/02/12 07:36:44 heikki Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.372 2010/02/12 07:56:36 heikki Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -8796,8 +8796,9 @@ XLogPageRead(XLogRecPtr *RecPtr, int emode, bool fetching_ckpt,`
`8796`	`8796`	`* that when we later jump backwards to start redo at`
`8797`	`8797`	`* RedoStartLSN, we will have the logs streamed already.`
`8798`	`8798`	`*/`
`8799`		`- RequestXLogStreaming(fetching_ckpt ? RedoStartLSN : *RecPtr,`
`8800`		`- PrimaryConnInfo);`
	`8799`	`+ if (PrimaryConnInfo)`
	`8800`	`+ RequestXLogStreaming(fetching_ckpt ? RedoStartLSN : *RecPtr,`
	`8801`	`+ PrimaryConnInfo);`
`8801`	`8802`	`}`
`8802`	`8803`
`8803`	`8804`	`/*`