Merge commit 'b0d277a049af71c6d9ada62492b547965a432b7f' into PGPROEE10_scheduler

Author: Vladimir Ershov

contrib/pgpro_scheduler/Makefile

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

contrib/pgpro_scheduler/src/scheduler_manager.c

@@ -959,14 +959,14 @@ void init_executor_shared_data(schd_executor_share_t *data, scheduler_manager_ct
 		strcpy(data->database, ctx->database);
 	else
 		elog(ERROR, "String \"%s\"\n"
-					"has %lu symbols, while it should have less than %d symbols.",
+				    "has %lu symbols, while it should have less than %d symbols.",
 					ctx->database, strlen(ctx->database), PGPRO_SCHEDULER_DBNAME_MAX);
 
 	if(strlen(job->node) < PGPRO_SCHEDULER_NODENAME_MAX)
 		strcpy(data->nodename, job->node);
 	else
 		elog(ERROR, "String \"%s\"\n"
-					"has %lu symbols, while it should have less than %d symbols.",
+				    "has %lu symbols, while it should have less than %d symbols.",
 					job->node, strlen(job->node), PGPRO_SCHEDULER_NODENAME_MAX);
 
 	data->new_job = true;
@@ -1800,14 +1800,14 @@ int start_at_worker(scheduler_manager_ctx_t *ctx, int pos)
 		strcpy(shm_data->database, ctx->database);
 	else
 		elog(ERROR, "String \"%s\"\n"
-					"has %lu symbols, while it should have less than %d symbols.",
+				    "has %lu symbols, while it should have less than %d symbols.",
 					ctx->database, strlen(ctx->database), PGPRO_SCHEDULER_DBNAME_MAX);
 
 	if(strlen(ctx->nodename) < PGPRO_SCHEDULER_NODENAME_MAX)
 		strcpy(shm_data->nodename, ctx->nodename);
 	else
 		elog(ERROR, "String \"%s\"\n"
-					"has %lu symbols, while it should have less than %d symbols.",
+				    "has %lu symbols, while it should have less than %d symbols.",
 					ctx->nodename, strlen(ctx->nodename), PGPRO_SCHEDULER_NODENAME_MAX);
 
 	shm_data->stop_worker  = false;
@@ -1970,7 +1970,7 @@ void manager_worker_main(Datum arg)
 	if(is_under_mtm())
 	{
 		check_mtm_nodes_status();
-		print_log_mtm_nodes();
+		/* print_log_mtm_nodes(); */
 		time_to_check = 3;
 	}
 #endif
@@ -2019,7 +2019,7 @@ void manager_worker_main(Datum arg)
 				if(is_under_mtm() && !time_to_check--)
 				{
 					check_mtm_nodes_status();
-					print_log_mtm_nodes();
+					/* print_log_mtm_nodes(); */
 					time_to_check = 3;
 				}
 #endif