Merge commit 'fd0f452b8a1f96dd42aa1ca99ec06fbc65891058' into PGPROEE10_scheduler

Author: Vladimir Ershov

contrib/pgpro_scheduler/Makefile

@@ -24,10 +24,10 @@ else
 	subdir = contrib/pgpro_scheduler
 	top_builddir = ../..
 	include $(top_builddir)/src/Makefile.global
-	include $(top_srcdir)/contrib/contrib-global.mk
 	ifneq ($(MAJORVERSION),10)
 		PG_CPPFLAGS = -D_WITH_MTM -I$(top_srcdir)/contrib/mmts -I$(libpq_srcdir)
 	endif
+	include $(top_srcdir)/contrib/contrib-global.mk
 endif
 
 #check: temp-install

contrib/pgpro_scheduler/src/scheduler_mtm.c

@@ -111,7 +111,15 @@ Oid get_mtm_node_status_pkey_oid(void)
 
 bool check_mtm_compatibility(void)
 {
-	if(pg_dlsym(RTLD_DEFAULT, "MtmGetDisabledNodeMask")) return true;
+	void *handler;
+
+	handler = pg_dlopen(NULL);
+	if(pg_dlsym(handler, "MtmGetDisabledNodeMask"))
+	{
+		pg_dlclose(handler);
+		return true;
+	}
+	pg_dlclose(handler);
 	elog(WARNING, "The version of multimaster extension found is not compatiable with pgpro_scheduler. Pgpro_scheduler is functional but with some issues. Consider to upgrade multimaster.");
 	return false;
 }
@@ -179,9 +187,12 @@ set_state(PG_FUNCTION_ARGS)
 nodemask_t call_MtmGetDisabledNodeMask(void)
 {
 	void *ptr;
+	void *handler;
 
 	if(fptr_MtmGetDisabledNodeMask) (*fptr_MtmGetDisabledNodeMask)();
-	ptr = pg_dlsym(RTLD_DEFAULT, "MtmGetDisabledNodeMask");
+	handler = pg_dlopen(NULL);
+	ptr = pg_dlsym(handler, "MtmGetDisabledNodeMask");
+	pg_dlclose(handler);
 	if(ptr)
 	{
 		fptr_MtmGetDisabledNodeMask = (nodemask_t (*)(void))ptr;
@@ -196,9 +207,12 @@ nodemask_t call_MtmGetDisabledNodeMask(void)
 MtmNodeStatus call_MtmGetCurrentStatus(void)
 {
 	void *ptr;
+	void *handler;
 
 	if(fptr_MtmGetCurrentStatus) (*fptr_MtmGetCurrentStatus)();
-	ptr = pg_dlsym(RTLD_DEFAULT, "MtmGetCurrentStatus");
+	handler = pg_dlopen(NULL);
+	ptr = pg_dlsym(handler, "MtmGetCurrentStatus");
+	pg_dlclose(handler);
 	if(ptr)
 	{
 		fptr_MtmGetCurrentStatus = (MtmNodeStatus (*)(void))ptr;
@@ -215,9 +229,14 @@ MtmNodeStatus call_MtmGetCurrentStatus(void)
 void call_MtmToggleDML(void)
 {
 	void *ptr;
+	void *handler;
 
 	if(fptr_MtmToggleDML) (*fptr_MtmToggleDML)();
-	ptr = pg_dlsym(RTLD_DEFAULT, "MtmToggleDML");
+
+	handler = pg_dlopen(NULL);
+	ptr = pg_dlsym(handler, "MtmToggleDML");
+	pg_dlclose(handler);
+
 	if(ptr)
 	{
 		fptr_MtmToggleDML = (void (*)(void))ptr;