check that module is in shared_preload_libraries

zilder · zilder · commit b9c30478facf · 2016-06-27T15:00:07.000+03:00
diff --git a/src/init.c b/src/init.c
@@ -64,15 +64,6 @@ init_shmem_config()
 			pmstate->dsm_init_lock    = LWLockAssign();
 			pmstate->edit_partitions_lock = LWLockAssign();
 		}
-#ifdef WIN32
-		else
-		{
-			elog(ERROR, "Pathman module must be initialized in postmaster. "
-						"Put the following line to configuration file: "
-						"shared_preload_libraries='pg_pathman'");
-			initialization_needed = false;
-		}
-#endif
 	}
 
 	create_relations_hashtable();
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -126,15 +126,13 @@ static Path *get_cheapest_parameterized_child_path(PlannerInfo *root, RelOptInfo
 void
 _PG_init(void)
 {
-#ifndef WIN32
-	if (IsUnderPostmaster)
+	if (!process_shared_preload_libraries_in_progress)
 	{
 		elog(ERROR, "Pathman module must be initialized in postmaster. "
 					"Put the following line to configuration file: "
 					"shared_preload_libraries='pg_pathman'");
-	        initialization_needed = false;
+		initialization_needed = false;
 	}
-#endif
 
 	/* Request additional shared resources */
 	RequestAddinShmemSpace(pathman_memsize());

Original file line number	Diff line number	Diff line change
`@@ -126,15 +126,13 @@ static Path get_cheapest_parameterized_child_path(PlannerInfo root, RelOptInfo`
`126`	`126`	`void`
`127`	`127`	`_PG_init(void)`
`128`	`128`	`{`
`129`		`-#ifndef WIN32`
`130`		`- if (IsUnderPostmaster)`
	`129`	`+ if (!process_shared_preload_libraries_in_progress)`
`131`	`130`	`{`
`132`	`131`	`elog(ERROR, "Pathman module must be initialized in postmaster. "`
`133`	`132`	`"Put the following line to configuration file: "`
`134`	`133`	`"shared_preload_libraries='pg_pathman'");`
`135`		`- initialization_needed = false;`
	`134`	`+ initialization_needed = false;`
`136`	`135`	`}`
`137`		`-#endif`
`138`	`136`
`139`	`137`	`/* Request additional shared resources */`
`140`	`138`	`RequestAddinShmemSpace(pathman_memsize());`