read guc vars for db online

Vladimir Ershov · Vladimir Ershov · commit ca2dc0fdeaee · 2016-11-14T19:00:44.000+03:00
diff --git a/pgpro_scheduler--1.0.sql b/pgpro_scheduler--1.0.sql
@@ -1037,6 +1037,42 @@ $BODY$
 LANGUAGE plpgsql
    SECURITY DEFINER;
 
+-- CREATE FUNCTION schedule.enable() RETURNS boolean AS 
+-- $BODY$
+-- DECLARE
+-- 	value text;
+-- BEGIN
+-- 	EXECUTE 'show schedule.enabled' INTO value; 
+-- 	IF value = 'on' THEN
+-- 		RAISE NOTICE 'Scheduler already enabled';
+-- 		RETURN false;
+-- 	ELSE 
+-- 		ALTER SYSTEM SET schedule.enabled = true;
+-- 		SELECT pg_reload_conf();
+-- 	END IF;
+-- 	RETURN true;
+-- END
+-- $BODY$
+-- LANGUAGE plpgsql;
+-- 
+-- CREATE FUNCTION schedule.disable() RETURNS boolean AS 
+-- $BODY$
+-- DECLARE
+-- 	value text;
+-- BEGIN
+-- 	EXECUTE 'show schedule.enabled' INTO value; 
+-- 	IF value = 'off' THEN
+-- 		RAISE NOTICE 'Scheduler already disabled';
+-- 		RETURN false;
+-- 	ELSE 
+-- 		ALTER SYSTEM SET schedule.enabled = false;
+-- 		SELECT pg_reload_conf();
+-- 	END IF;
+-- 	RETURN true;
+-- END
+-- $BODY$
+-- LANGUAGE plpgsql;
+
 CREATE FUNCTION schedule.cron2jsontext(CSTRING)
   RETURNS text 
   AS 'MODULE_PATHNAME', 'cron_string_to_json_text'
diff --git a/src/pgpro_scheduler.c b/src/pgpro_scheduler.c
@@ -20,6 +20,7 @@
 #include "access/xact.h"
 #include "utils/snapmgr.h"
 #include "utils/datetime.h"
+#include "catalog/pg_db_role_setting.h"
 
 #include "char_array.h"
 #include "sched_manager_poll.h"
@@ -68,6 +69,18 @@ worker_spi_sigterm(SIGNAL_ARGS)
 
 /** Some utils **/
 
+void reload_db_role_config(Oid databaseid)
+{
+	Relation    relsetting;
+	Snapshot    snapshot;
+
+	relsetting = heap_open(DbRoleSettingRelationId, AccessShareLock);
+	snapshot = RegisterSnapshot(GetCatalogSnapshot(DbRoleSettingRelationId));
+	ApplySetting(snapshot, databaseid, InvalidOid, relsetting, PGC_S_DATABASE);
+	UnregisterSnapshot(snapshot);
+	heap_close(relsetting, AccessShareLock);
+}
+
 TimestampTz timestamp_add_seconds(TimestampTz to, int add)
 {
 	if(to == 0) to = GetCurrentTimestamp();
@@ -227,7 +240,6 @@ char_array_t *readBasesToCheck(void)
 		SPI_finish();
 		PopActiveSnapshot();
 		CommitTransactionCommand();
-		elog(FATAL, "Cannot get databases list: error code %d", ret);
 	}
 	destroyCharArray(names);
 	processed  = SPI_processed;
@@ -299,7 +311,7 @@ void parent_scheduler_main(Datum arg)
 					names = readBasesToCheck();
 				}
 			}
-			else
+			else if(poll->enabled)
 			{
 				names = readBasesToCheck();
 				if(isBaseListChanged(names, poll)) refresh = true;
@@ -321,7 +333,7 @@ void parent_scheduler_main(Datum arg)
 
 				if(shared->setbychild)
 				{
-				elog(LOG, "got status change from: %s", poll->workers[i]->dbname);
+				/* elog(LOG, "got status change from: %s", poll->workers[i]->dbname); */
 					shared->setbychild = false;
 					if(shared->status == SchdManagerConnected)
 					{
@@ -340,7 +352,6 @@ void parent_scheduler_main(Datum arg)
 					else
 					{
 						elog(WARNING, "manager: %s set strange status: %d", poll->workers[i]->dbname, shared->status);
-						/* MAYBE kill the creep */
 					}
 				}
 			}
@@ -361,7 +372,7 @@ pg_scheduler_startup(void)
 {
 	BackgroundWorker worker;
 
-	elog(LOG, "start up");
+	elog(LOG, "Start PostgresPro scheduler");
 
 	worker.bgw_flags = BGWORKER_SHMEM_ACCESS |
 		BGWORKER_BACKEND_DATABASE_CONNECTION;
@@ -425,7 +436,7 @@ void _PG_init(void)
 		2,
 		1,
 		100,
-		PGC_SIGHUP,
+		PGC_SUSET,
 		0,
 		NULL,
 		NULL,
@@ -470,10 +481,10 @@ temp_now(PG_FUNCTION_ARGS)
 	timestamp2tm(ts, &tz, &info, &fsec, &tzn, session_timezone );
 	info.tm_wday = j2day(date2j(info.tm_year, info.tm_mon, info.tm_mday));
 
-	elog(NOTICE, "WDAY: %d, MON: %d, MDAY: %d, HOUR: %d, MIN: %d, YEAR: %d (%ld)", 
+/*	elog(NOTICE, "WDAY: %d, MON: %d, MDAY: %d, HOUR: %d, MIN: %d, YEAR: %d (%ld)", 
 		info.tm_wday, info.tm_mon, info.tm_mday, info.tm_hour, info.tm_min,
 		info.tm_year, info.tm_gmtoff);
-	elog(NOTICE, "TZP: %d, ZONE: %s", tz, tzn);
+	elog(NOTICE, "TZP: %d, ZONE: %s", tz, tzn); */
 
 	cp.tm_mon = info.tm_mon;
 	cp.tm_mday = info.tm_mday;
@@ -483,7 +494,7 @@ temp_now(PG_FUNCTION_ARGS)
 	cp.tm_sec = info.tm_sec;
 
 	toff = DetermineTimeZoneOffset(&cp, session_timezone);
-	elog(NOTICE, "Detect: offset = %ld", toff);
+/*	elog(NOTICE, "Detect: offset = %ld", toff); */
 
 	cp.tm_gmtoff = -toff;
 	tm2timestamp(&cp, 0, &tz, &ts);
diff --git a/src/pgpro_scheduler.h b/src/pgpro_scheduler.h
@@ -10,7 +10,7 @@
 #define PGPRO_SCHEDULER_DBNAME_MAX 128
 #define PGPRO_SCHEDULER_NODENAME_MAX 128
 #define PGPRO_SCHEDULER_EXECUTOR_MESSAGE_MAX 1024
-#define PPGS_DEBUG 1
+#define PPGS_NODEBUG 1
 
 #ifdef PPGS_DEBUG 
 #ifdef HAVE__VA_ARGS
@@ -34,6 +34,7 @@ int checkSchedulerNamespace(void);
 void manager_worker_main(Datum arg);
 pid_t registerManagerWorker(schd_manager_t *man);
 
+void reload_db_role_config(Oid databaseid);
 TimestampTz timestamp_add_seconds(TimestampTz to, int add);
 char *make_date_from_timestamp(TimestampTz ts);
 int get_integer_from_string(char *s, int start, int len);
diff --git a/src/sched_manager_poll.c b/src/sched_manager_poll.c
@@ -100,11 +100,11 @@ void changeChildBgwState(schd_manager_share_t *s, schd_manager_status_t status)
 	if(parent)
 	{
 		SetLatch(&parent->procLatch);
-		elog(LOG, "set LATCH to %d - status = %d" , MyBgworkerEntry->bgw_notify_pid, status);
+		/* elog(LOG, "set LATCH to %d - status = %d" , MyBgworkerEntry->bgw_notify_pid, status); */
 	}
 	else
 	{
-		elog(LOG, "unable to set LATCH to %d", MyBgworkerEntry->bgw_notify_pid);
+		/* elog(LOG, "unable to set LATCH to %d", MyBgworkerEntry->bgw_notify_pid); */
 	}
 }
 
@@ -114,7 +114,7 @@ int stopAllManagers(schd_managers_poll_t *poll)
 	PGPROC *child;
 	schd_manager_share_t *shared;
 
-	elog(LOG, "Stop all managers");
+	elog(LOG, "Scheduler stops all managers");
 
 	for(i=0; i < poll->n; i++)
 	{
@@ -124,16 +124,14 @@ int stopAllManagers(schd_managers_poll_t *poll)
 		child = BackendPidGetProc(poll->workers[i]->pid);
 		if(!child)
 		{
-			elog(LOG, "cannot get PGRPOC of %s scheduler", poll->workers[i]->dbname);
+			/* elog(LOG, "cannot get PGRPOC of %s scheduler", poll->workers[i]->dbname); */
 		}
 		else
 		{
 			SetLatch(&child->procLatch);
 		}
 	}
 
-	/* MAYBE:  WAIT? */
-
 	for(i=0; i < poll->n; i++)
 	{
 		destroyManagerRecord(poll->workers[i]);
@@ -382,7 +380,7 @@ int refreshManagers(char_array_t *names, schd_managers_poll_t *poll)
 			if(found == 0) pushCharArray(delete, poll->workers[i]->dbname);
 		}
 	}
-	elog(LOG, "WORK RESULT: same: %d, new: %d, delete: %d", same->n, new->n, delete->n);
+	/* elog(LOG, "WORK RESULT: same: %d, new: %d, delete: %d", same->n, new->n, delete->n); */
 	if(delete->n)
 	{
 		for(i = 0; i < delete->n; i++)
diff --git a/src/scheduler_manager.c b/src/scheduler_manager.c
@@ -68,23 +68,23 @@ int checkSchedulerNamespace(void)
 		}
 		else if(isnull)
 		{
-			elog(LOG, "%s: cannot check namespace: count return null",
+			elog(LOG, "Scheduler manager: %s: cannot check namespace: count return null",
 				MyBgworkerEntry->bgw_name);
 		}
 		else if(ntup > 1)
 		{
-			elog(LOG, "%s: cannot check namespace: found %d namespaces",
+			elog(LOG, "Scheduler manager: %s: cannot check namespace: found %d namespaces",
 				MyBgworkerEntry->bgw_name, ntup);
 		}
 	}
 	else if(ret != SPI_OK_SELECT)
 	{
-		elog(LOG, "%s: cannot check namespace: error code %d",
+		elog(LOG, "Scheduler manager: %s: cannot check namespace: error code %d",
 				MyBgworkerEntry->bgw_name, ret);
 	}
 	else if(SPI_processed != 1)
 	{
-		elog(LOG, "%s: cannot check namespace: count return %ud tups",
+		elog(LOG, "Scheduler manager: %s: cannot check namespace: count return %ud tups",
 				MyBgworkerEntry->bgw_name,
 				(unsigned)SPI_processed);
 	}
@@ -100,7 +100,7 @@ int get_scheduler_maxworkers(void)
 	const char *opt;
 	int var;
 
-	opt = GetConfigOption("schedule.max_workers", true, false);
+	opt = GetConfigOption("schedule.max_workers", false, false);
 	/* opt = GetConfigOptionByName("schedule.max_workers", NULL); */
 	if(opt == NULL)
 	{
@@ -152,10 +152,11 @@ int refresh_scheduler_manager_context(scheduler_manager_ctx_t *ctx)
 	scheduler_manager_slot_t **old;
 
 	N = get_scheduler_maxworkers();
+	elog(LOG, "max-workers: %d", N);
 	if(N != ctx->slots_len)
 	{
 		elog(LOG, "Change available workers number %d => %d", ctx->slots_len, N);
-	}
+	} 
 
 	if(N > ctx->slots_len)
 	{
@@ -314,7 +315,7 @@ scheduler_task_t *scheduler_get_active_tasks(scheduler_manager_ctx_t *ctx, int *
 	}
 	else if(ret != SPI_OK_SELECT)
 	{
-		elog(LOG, "%s: cannot get \"at\" tasks: error code %d",
+		elog(LOG, "Scheduler manager: %s: cannot get \"at\" tasks: error code %d",
 				MyBgworkerEntry->bgw_name, ret);
 
         scheduler_manager_stop(ctx);
@@ -1047,7 +1048,8 @@ int scheduler_vanish_expired_jobs(scheduler_manager_ctx_t *ctx)
 			move_ret  = move_job_to_log(&expired[i], 0);
 			if(move_ret < 0)
 			{
-				elog(LOG, "cannot move job %d@%s:00 to log", expired[i].cron_id, ts);
+				elog(LOG, "Scheduler manager: cannot move job %d@%s:00 to log",
+								expired[i].cron_id, ts);
 				ret--;
 			}
 			pfree(ts);
@@ -1233,7 +1235,7 @@ bool check_parent_stop_signal(scheduler_manager_ctx_t *ctx)
 		shared->setbyparent = false;
 		if(shared->status == SchdManagerStop)
 		{
-			elog(LOG, "Recieve stop signal from parent");
+			elog(LOG, "Scheduler manager: receive stop signal from supervisor");
 			return true;
 		}
 	}
diff --git a/src/scheduler_spi_utils.c b/src/scheduler_spi_utils.c
@@ -153,7 +153,6 @@ Datum select_onedatumvalue_sql(const char *sql, bool *is_null)
 	int ret;
 	Datum datum = 0;
 
-	elog(LOG, "do one val: %s", sql);
 	ret = SPI_execute(sql, true, 0);
 	if(ret == SPI_OK_SELECT)
 	{

Original file line number	Diff line number	Diff line change
`@@ -100,11 +100,11 @@ void changeChildBgwState(schd_manager_share_t *s, schd_manager_status_t status)`
`100`	`100`	`if(parent)`
`101`	`101`	`{`
`102`	`102`	`SetLatch(&parent->procLatch);`
`103`		`- elog(LOG, "set LATCH to %d - status = %d" , MyBgworkerEntry->bgw_notify_pid, status);`
	`103`	`+ /* elog(LOG, "set LATCH to %d - status = %d" , MyBgworkerEntry->bgw_notify_pid, status); */`
`104`	`104`	`}`
`105`	`105`	`else`
`106`	`106`	`{`
`107`		`- elog(LOG, "unable to set LATCH to %d", MyBgworkerEntry->bgw_notify_pid);`
	`107`	`+ /* elog(LOG, "unable to set LATCH to %d", MyBgworkerEntry->bgw_notify_pid); */`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
`@@ -114,7 +114,7 @@ int stopAllManagers(schd_managers_poll_t *poll)`
`114`	`114`	`PGPROC *child;`
`115`	`115`	`schd_manager_share_t *shared;`
`116`	`116`
`117`		`- elog(LOG, "Stop all managers");`
	`117`	`+ elog(LOG, "Scheduler stops all managers");`
`118`	`118`
`119`	`119`	`for(i=0; i < poll->n; i++)`
`120`	`120`	`{`
`@@ -124,16 +124,14 @@ int stopAllManagers(schd_managers_poll_t *poll)`
`124`	`124`	`child = BackendPidGetProc(poll->workers[i]->pid);`
`125`	`125`	`if(!child)`
`126`	`126`	`{`
`127`		`- elog(LOG, "cannot get PGRPOC of %s scheduler", poll->workers[i]->dbname);`
	`127`	`+ /* elog(LOG, "cannot get PGRPOC of %s scheduler", poll->workers[i]->dbname); */`
`128`	`128`	`}`
`129`	`129`	`else`
`130`	`130`	`{`
`131`	`131`	`SetLatch(&child->procLatch);`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`
`135`		`- /* MAYBE: WAIT? */`
`136`		`-`
`137`	`135`	`for(i=0; i < poll->n; i++)`
`138`	`136`	`{`
`139`	`137`	`destroyManagerRecord(poll->workers[i]);`
`@@ -382,7 +380,7 @@ int refreshManagers(char_array_t names, schd_managers_poll_t poll)`
`382`	`380`	`if(found == 0) pushCharArray(delete, poll->workers[i]->dbname);`
`383`	`381`	`}`
`384`	`382`	`}`
`385`		`- elog(LOG, "WORK RESULT: same: %d, new: %d, delete: %d", same->n, new->n, delete->n);`
	`383`	`+ /* elog(LOG, "WORK RESULT: same: %d, new: %d, delete: %d", same->n, new->n, delete->n); */`
`386`	`384`	`if(delete->n)`
`387`	`385`	`{`
`388`	`386`	`for(i = 0; i < delete->n; i++)`
Original file line number	Diff line number	Diff line change
`@@ -68,23 +68,23 @@ int checkSchedulerNamespace(void)`
`68`	`68`	`}`
`69`	`69`	`else if(isnull)`
`70`	`70`	`{`
`71`		`- elog(LOG, "%s: cannot check namespace: count return null",`
	`71`	`+ elog(LOG, "Scheduler manager: %s: cannot check namespace: count return null",`
`72`	`72`	`MyBgworkerEntry->bgw_name);`
`73`	`73`	`}`
`74`	`74`	`else if(ntup > 1)`
`75`	`75`	`{`
`76`		`- elog(LOG, "%s: cannot check namespace: found %d namespaces",`
	`76`	`+ elog(LOG, "Scheduler manager: %s: cannot check namespace: found %d namespaces",`
`77`	`77`	`MyBgworkerEntry->bgw_name, ntup);`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`	`else if(ret != SPI_OK_SELECT)`
`81`	`81`	`{`
`82`		`- elog(LOG, "%s: cannot check namespace: error code %d",`
	`82`	`+ elog(LOG, "Scheduler manager: %s: cannot check namespace: error code %d",`
`83`	`83`	`MyBgworkerEntry->bgw_name, ret);`
`84`	`84`	`}`
`85`	`85`	`else if(SPI_processed != 1)`
`86`	`86`	`{`
`87`		`- elog(LOG, "%s: cannot check namespace: count return %ud tups",`
	`87`	`+ elog(LOG, "Scheduler manager: %s: cannot check namespace: count return %ud tups",`
`88`	`88`	`MyBgworkerEntry->bgw_name,`
`89`	`89`	`(unsigned)SPI_processed);`
`90`	`90`	`}`
`@@ -100,7 +100,7 @@ int get_scheduler_maxworkers(void)`
`100`	`100`	`const char *opt;`
`101`	`101`	`int var;`
`102`	`102`
`103`		`- opt = GetConfigOption("schedule.max_workers", true, false);`
	`103`	`+ opt = GetConfigOption("schedule.max_workers", false, false);`
`104`	`104`	`/* opt = GetConfigOptionByName("schedule.max_workers", NULL); */`
`105`	`105`	`if(opt == NULL)`
`106`	`106`	`{`
`@@ -152,10 +152,11 @@ int refresh_scheduler_manager_context(scheduler_manager_ctx_t *ctx)`
`152`	`152`	`scheduler_manager_slot_t **old;`
`153`	`153`
`154`	`154`	`N = get_scheduler_maxworkers();`
	`155`	`+ elog(LOG, "max-workers: %d", N);`
`155`	`156`	`if(N != ctx->slots_len)`
`156`	`157`	`{`
`157`	`158`	`elog(LOG, "Change available workers number %d => %d", ctx->slots_len, N);`
`158`		`- }`
	`159`	`+ }`
`159`	`160`
`160`	`161`	`if(N > ctx->slots_len)`
`161`	`162`	`{`
`@@ -314,7 +315,7 @@ scheduler_task_t scheduler_get_active_tasks(scheduler_manager_ctx_t ctx, int *`
`314`	`315`	`}`
`315`	`316`	`else if(ret != SPI_OK_SELECT)`
`316`	`317`	`{`
`317`		`- elog(LOG, "%s: cannot get \"at\" tasks: error code %d",`
	`318`	`+ elog(LOG, "Scheduler manager: %s: cannot get \"at\" tasks: error code %d",`
`318`	`319`	`MyBgworkerEntry->bgw_name, ret);`
`319`	`320`
`320`	`321`	`scheduler_manager_stop(ctx);`
`@@ -1047,7 +1048,8 @@ int scheduler_vanish_expired_jobs(scheduler_manager_ctx_t *ctx)`
`1047`	`1048`	`move_ret = move_job_to_log(&expired[i], 0);`
`1048`	`1049`	`if(move_ret < 0)`
`1049`	`1050`	`{`
`1050`		`- elog(LOG, "cannot move job %d@%s:00 to log", expired[i].cron_id, ts);`
	`1051`	`+ elog(LOG, "Scheduler manager: cannot move job %d@%s:00 to log",`
	`1052`	`+ expired[i].cron_id, ts);`
`1051`	`1053`	`ret--;`
`1052`	`1054`	`}`
`1053`	`1055`	`pfree(ts);`
`@@ -1233,7 +1235,7 @@ bool check_parent_stop_signal(scheduler_manager_ctx_t *ctx)`
`1233`	`1235`	`shared->setbyparent = false;`
`1234`	`1236`	`if(shared->status == SchdManagerStop)`
`1235`	`1237`	`{`
`1236`		`- elog(LOG, "Recieve stop signal from parent");`
	`1238`	`+ elog(LOG, "Scheduler manager: receive stop signal from supervisor");`
`1237`	`1239`	`return true;`
`1238`	`1240`	`}`
`1239`	`1241`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,6 @@ Datum select_onedatumvalue_sql(const char sql, bool is_null)`
`153`	`153`	`int ret;`
`154`	`154`	`Datum datum = 0;`
`155`	`155`
`156`		`- elog(LOG, "do one val: %s", sql);`
`157`	`156`	`ret = SPI_execute(sql, true, 0);`
`158`	`157`	`if(ret == SPI_OK_SELECT)`
`159`	`158`	`{`