Merge branch 'PGPROEE9_6_CFS_385' into PGPROEE9_6

vbwagner · vbwagner · commit c3036a6d0108 · 2017-06-29T16:33:52.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -424,8 +424,9 @@ void cfs_initialize()
 		if (cfs_encryption)
 			cfs_crypto_init();
 
-		elog(LOG, "Start CFS version %s compression algorithm %s encryption %s GC %s",
-			 CFS_VERSION, cfs_algorithm(), cfs_encryption ? "enabled" : "disabled", cfs_gc_enabled ? "enabled" : "disabled");
+		if (IsPostmasterEnvironment)
+			elog(LOG, "Start CFS version %s compression algorithm %s encryption %s GC %s",
+				 CFS_VERSION, cfs_algorithm(), cfs_encryption ? "enabled" : "disabled", cfs_gc_enabled ? "enabled" : "disabled");
 	}
 }
 int cfs_msync(FileMap* map)

Original file line number	Diff line number	Diff line change
`@@ -424,8 +424,9 @@ void cfs_initialize()`
`424`	`424`	`if (cfs_encryption)`
`425`	`425`	`cfs_crypto_init();`
`426`	`426`
`427`		`- elog(LOG, "Start CFS version %s compression algorithm %s encryption %s GC %s",`
`428`		`- CFS_VERSION, cfs_algorithm(), cfs_encryption ? "enabled" : "disabled", cfs_gc_enabled ? "enabled" : "disabled");`
	`427`	`+ if (IsPostmasterEnvironment)`
	`428`	`+ elog(LOG, "Start CFS version %s compression algorithm %s encryption %s GC %s",`
	`429`	`+ CFS_VERSION, cfs_algorithm(), cfs_encryption ? "enabled" : "disabled", cfs_gc_enabled ? "enabled" : "disabled");`
`429`	`430`	`}`
`430`	`431`	`}`
`431`	`432`	`int cfs_msync(FileMap* map)`