reread guc in db_role

Vladimir Ershov · Vladimir Ershov · commit 6cf00c33af1c · 2016-11-15T00:37:23.000+03:00
diff --git a/src/pgpro_scheduler.c b/src/pgpro_scheduler.c
@@ -21,13 +21,15 @@
 #include "utils/snapmgr.h"
 #include "utils/datetime.h"
 #include "catalog/pg_db_role_setting.h"
+#include "commands/dbcommands.h"
 
 #include "char_array.h"
 #include "sched_manager_poll.h"
 #include "cron_string.h"
 #include "pgpro_scheduler.h"
 #include "scheduler_manager.h"
 #include "memutils.h"
+#include "scheduler_spi_utils.h"
 
 
 #ifdef PG_MODULE_MAGIC
@@ -69,16 +71,23 @@ worker_spi_sigterm(SIGNAL_ARGS)
 
 /** Some utils **/
 
-void reload_db_role_config(Oid databaseid)
+void reload_db_role_config(char *dbname)
 {
 	Relation    relsetting;
 	Snapshot    snapshot;
+	Oid databaseid;
 
+	StartTransactionCommand();
+	databaseid = get_database_oid(dbname, false);
+
+	elog(LOG, "start read");
 	relsetting = heap_open(DbRoleSettingRelationId, AccessShareLock);
 	snapshot = RegisterSnapshot(GetCatalogSnapshot(DbRoleSettingRelationId));
 	ApplySetting(snapshot, databaseid, InvalidOid, relsetting, PGC_S_DATABASE);
 	UnregisterSnapshot(snapshot);
 	heap_close(relsetting, AccessShareLock);
+	CommitTransactionCommand();
+	elog(LOG, "got read");
 }
 
 TimestampTz timestamp_add_seconds(TimestampTz to, int add)
diff --git a/src/pgpro_scheduler.h b/src/pgpro_scheduler.h
@@ -34,7 +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);
+void reload_db_role_config(char *dbname);
 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/scheduler_manager.c b/src/scheduler_manager.c
@@ -1323,8 +1323,12 @@ void manager_worker_main(Datum arg)
 			if(rc & WL_POSTMASTER_DEATH) proc_exit(1);
 			if(got_sighup)
 			{
+			elog(LOG, "manager got sighup");
 				got_sighup = false;
 				ProcessConfigFile(PGC_SIGHUP);
+				elog(LOG, "DONE CONFIG");
+				reload_db_role_config(database);
+				elog(LOG, "DONE role");
 				refresh_scheduler_manager_context(ctx);
 				set_slots_stat_report(ctx);
 			}
diff --git a/src/scheduler_spi_utils.c b/src/scheduler_spi_utils.c
@@ -240,3 +240,4 @@ int execute_spi(const char *sql, char **error)
 	return execute_spi_sql_with_args(sql, 0, NULL, NULL, NULL, error);
 }
 
+

Original file line number	Diff line number	Diff line change
`@@ -1323,8 +1323,12 @@ void manager_worker_main(Datum arg)`
`1323`	`1323`	`if(rc & WL_POSTMASTER_DEATH) proc_exit(1);`
`1324`	`1324`	`if(got_sighup)`
`1325`	`1325`	`{`
	`1326`	`+ elog(LOG, "manager got sighup");`
`1326`	`1327`	`got_sighup = false;`
`1327`	`1328`	`ProcessConfigFile(PGC_SIGHUP);`
	`1329`	`+ elog(LOG, "DONE CONFIG");`
	`1330`	`+ reload_db_role_config(database);`
	`1331`	`+ elog(LOG, "DONE role");`
`1328`	`1332`	`refresh_scheduler_manager_context(ctx);`
`1329`	`1333`	`set_slots_stat_report(ctx);`
`1330`	`1334`	`}`
Original file line number	Diff line number	Diff line change
`@@ -240,3 +240,4 @@ int execute_spi(const char sql, char *error)`
`240`	`240`	`return execute_spi_sql_with_args(sql, 0, NULL, NULL, NULL, error);`
`241`	`241`	`}`
`242`	`242`
	`243`	`+`