tests && fixes

Author: Vladimir Ershov

pgpro_scheduler--2.1--2.2.sql

@@ -4,3 +4,8 @@ CREATE TABLE mtm_nodes(
 	status_set timestamp with time zone
 );
 
+CREATE FUNCTION pgpro_scheduler_version()
+	RETURNS text
+	AS 'MODULE_PATHNAME', 'pgpro_scheduler_version'
+	LANGUAGE C IMMUTABLE;
+

pgpro_scheduler--2.2.sql

@@ -302,10 +302,15 @@ CREATE VIEW all_job_status AS
 -- -- AT EXECUTOR FUNCTIONS --
 ------------------------------
 
-CREATE FUNCTION set_state(state bool)
-  RETURNS bool 
-  AS 'MODULE_PATHNAME', 'set_state'
-  LANGUAGE C IMMUTABLE;
+CREATE FUNCTION pgpro_scheduler_version()
+   RETURNS text 
+   AS 'MODULE_PATHNAME', 'pgpro_scheduler_version'
+   LANGUAGE C IMMUTABLE;
+
+-- CREATE FUNCTION set_state(state bool)
+--   RETURNS bool 
+--   AS 'MODULE_PATHNAME', 'set_state'
+--   LANGUAGE C IMMUTABLE;
 
 CREATE FUNCTION get_self_id()
   RETURNS bigint 
@@ -391,6 +396,7 @@ BEGIN
 			EXCEPTION
 				WHEN NO_DATA_FOUND THEN
 			RAISE EXCEPTION 'there is no such user %', executor;
+    		PERFORM onlySuperUser();
 -- TODO CHECK PERMISSION --
 --			SET SESSION AUTHORIZATION executor; 
 --			RESET SESSION AUTHORIZATION;
@@ -684,8 +690,9 @@ BEGIN
          EXCEPTION
             WHEN NO_DATA_FOUND THEN
 	       RAISE EXCEPTION 'there is no such user %', executor;
-         SET SESSION AUTHORIZATION executor; 
-         RESET SESSION AUTHORIZATION;
+    	 PERFORM onlySuperUser();
+--         SET SESSION AUTHORIZATION executor; 
+--         RESET SESSION AUTHORIZATION;
       END;
    ELSE
       executor := session_user;

src/pgpro_scheduler.c

@@ -827,6 +827,20 @@ void _PG_init(void)
 	pg_scheduler_startup();
 }
 
+PG_FUNCTION_INFO_V1(pgpro_scheduler_version);
+Datum
+pgpro_scheduler_version(PG_FUNCTION_ARGS)
+{
+	text *text_p;
+	int len;
+
+	len = strlen(PGPRO_SCHEDULER_VERSION);
+	text_p = (text *) palloc(sizeof(char)*len + VARHDRSZ);
+	memcpy((void *)VARDATA(text_p), PGPRO_SCHEDULER_VERSION, len);
+	SET_VARSIZE(text_p, sizeof(char)*len + VARHDRSZ);
+	PG_RETURN_TEXT_P(text_p);
+}
+
 PG_FUNCTION_INFO_V1(nodename);
 Datum
 nodename(PG_FUNCTION_ARGS)

src/pgpro_scheduler.h

@@ -14,7 +14,7 @@
 #define PPGS_NODEBUG 1
 
 #ifdef _WITH_MTM
-#define PGPRO_SCHEDULER_VERSION "2.2.mtm"
+#define PGPRO_SCHEDULER_VERSION "2.2-mtm"
 #else
 #define PGPRO_SCHEDULER_VERSION "2.2"
 #endif
@@ -43,8 +43,11 @@ bool is_guc_in_default_state(const char *name);
 
 void pg_scheduler_startup(void);
 char_array_t *readBasesToCheck(void);
+
+extern Datum pgpro_scheduler_version(PG_FUNCTION_ARGS);
 extern Datum nodename(PG_FUNCTION_ARGS);
 extern Datum cron_string_to_json_text(PG_FUNCTION_ARGS);
+
 void _PG_init(void);
 extern PGDLLEXPORT void parent_scheduler_main(Datum) pg_attribute_noreturn();
 int checkSchedulerNamespace(void);

src/scheduler_manager.c

@@ -1809,7 +1809,7 @@ void manager_worker_main(Datum arg)
 {
 	char database[NAMEDATALEN];
 	char buffer[1024];
-	int rc = 0, i;
+	int rc = 0;
 	schd_manager_share_t *shared;
 	dsm_segment *seg;
 	scheduler_manager_ctx_t *ctx;
@@ -1819,7 +1819,9 @@ void manager_worker_main(Datum arg)
 	MemoryContext longTerm;
 	Oid reloid;
 	int stop_by_parent = 0;
-	int time_to_check = 3;
+#ifdef _WITH_MTM
+	int time_to_check = 3, i;
+#endif
 
 
 	CurrentResourceOwner = ResourceOwnerCreate(NULL, "pgpro_scheduler");

src/scheduler_mtm.c

@@ -40,11 +40,12 @@
 Oid scheduler_mtm_node_status_OID = InvalidOid;
 Oid scheduler_mtm_node_status_pkey_OID = InvalidOid;
 int is_mtm_present = -1;
+int smtm_max_nodes = -1;  /* copy of MtmMaxNodes */
+int smtm_node_id = -1;    /* copy of MtmNodeId */
 
 MtmState *mtmState = NULL;
 extern volatile sig_atomic_t got_sigterm;
 
-Oid scheduler_mtm_node_status_func_oid = InvalidOid;
 sched_mtm_node_list_t *MTM_nodes = NULL;
 
 /* Returns Oid of "mtm_nodes" table
@@ -183,7 +184,7 @@ void set_mtm_node_status(bool status)
 	}
 
 	indexScan = index_beginscan(nodes_heap, nodes_idx, SnapshotSelf, 1, 0);
-	ScanKeyInit(&key, 1, BTEqualStrategyNumber, F_INT4EQ, Int32GetDatum(MtmNodeId));
+	ScanKeyInit(&key, 1, BTEqualStrategyNumber, F_INT4EQ, Int32GetDatum(getMtmNodeId()));
 	index_rescan(indexScan, &key, 1, NULL, 0);
 	if(index_getnext_tid(indexScan, ForwardScanDirection))
 	{
@@ -207,7 +208,7 @@ void set_mtm_node_status(bool status)
 		}
 		else
 		{
-			values[0] = Int32GetDatum(MtmNodeId);
+			values[0] = Int32GetDatum(getMtmNodeId());
 			values[1] = CStringGetTextDatum(node_name);
 			values[2] = TimestampTzGetDatum(GetCurrentTimestamp());
 
@@ -287,25 +288,46 @@ const char *check_multimaster_database(void)
 	return NULL;
 }
 
+/* Get Multimaster nodeId  */
+
+int getMtmNodeId(void)
+{
+	const char *val;
+
+	if(smtm_node_id != -1) return smtm_node_id;
+
+	val = GetConfigOption("multimaster.node_id", true, false);
+	if(!val)
+	{
+		elog(ERROR, "Cannot get multimaster.node_id value");
+	}
+	if(!parse_int(val, &smtm_node_id, 0 , NULL))
+	{
+		elog(ERROR, "Cannot parse multimaster.node_id value");
+	}
+
+	return smtm_node_id; 
+}
+
 /* Get Multimaster max nodes  */
 
 int getMtmMaxNodes(void)
 {
-	return MtmMaxNodes;
-/*	int max_nodes = -1;
 	const char *val;
 
+	if(smtm_max_nodes != -1) return smtm_max_nodes;
+
 	val = GetConfigOption("multimaster.max_nodes", true, false);
 	if(!val)
 	{
 		elog(ERROR, "Cannot get multimaster.max_nodes value");
 	}
-	if(!parse_int(val, &max_nodes, 0 , NULL))
+	if(!parse_int(val, &smtm_max_nodes, 0 , NULL))
 	{
 		elog(ERROR, "Cannot parse multimaster.max_nodes value");
 	}
 
-	return max_nodes; */
+	return smtm_max_nodes; 
 }
 
 void initializeMtmState(void)
@@ -449,7 +471,7 @@ void check_mtm_nodes_status(void)
 		MTM_nodes->set = true;
 		MTM_nodes->nodes[node_id-1].has_scheduler = true;
 		MTM_nodes->set = true;
-		if(min_avail == MtmNodeId && !MTM_nodes->nodes[node_id-1].avail)
+		if(min_avail == getMtmNodeId() && !MTM_nodes->nodes[node_id-1].avail)
 		{
 			MTM_nodes->nodes[node_id-1].need_help = true;
 			MTM_nodes->need_help++;
@@ -500,38 +522,6 @@ void print_log_mtm_nodes(void)
 	LWLockRelease((LWLockId)&MTM_nodes->locks[0]);
 }
 
-Oid get_mtm_node_func_oid(void)
-{
-	Oid ns_oid, func_oid;
-	CatCList   *catlist;
-	int i;
-
-	if(OidIsValid(scheduler_mtm_node_status_func_oid))
-				return scheduler_mtm_node_status_func_oid;
-
-	ns_oid = LookupExplicitNamespace(MULTIMASTER_SCHEMA_NAME, true);
-	if (!OidIsValid(ns_oid))
-		elog(ERROR, "SCHEDULER: cannot get multimaster namespace");
-	catlist = SearchSysCacheList1(PROCNAMEARGSNSP, CStringGetDatum("get_nodes_state"));
-	for(i = 0; i < catlist->n_members; i++)
-	{
-		HeapTuple   proctup = &catlist->members[i]->tuple;
-		Form_pg_proc procform = (Form_pg_proc) GETSTRUCT(proctup);
-		if(procform->pronargs == 0 && procform->pronamespace == ns_oid)
-		{
-			func_oid = HeapTupleGetOid(proctup);	
-			break;
-		}
-	}
-	ReleaseSysCacheList(catlist);
-
-	if(!OidIsValid(func_oid))
-		elog(ERROR, "SCHEDULER: cannot get multimaster function get_nodes_state");
-	scheduler_mtm_node_status_func_oid = func_oid;
-
-	return func_oid;
-}
-
 bool mtm_check_help_byNodeId(int node_id)
 {
 	bool st = true;

src/scheduler_mtm.h

@@ -32,9 +32,9 @@ const char *check_multimaster_database(void);
 void initializeMtmState(void);
 void mtm_scheduler_StartTransactionCommand(void);
 void check_mtm_nodes_status(void);
+int getMtmNodeId(void);
 int getMtmMaxNodes(void);
 sched_mtm_node_list_t *init_scheduler_mtm_nodes(void);
-Oid get_mtm_node_func_oid(void);
 void print_log_mtm_nodes(void);
 bool mtm_check_if_node_need_help(char *nodename);
 bool is_mtm_node_available(int node_id);

src/scheduler_mtm.o

@@ -10,17 +10,20 @@
 my $password;
 my $host;
 my $port;
+my $multimaster;
+
 GetOptions (
 			"--host=s" => \$host,
 			"--port=s" => \$port,
             "--dbname=s" => \$dbname,
             "--username=s" => \$username,
-            "--password=s" => \$password);
+            "--password=s" => \$password,
+            "--multimaster" => \$multimaster);
 
 $dbname ||= '_pgpro_scheduler_test';
 $username ||= 'postgres';
 
-my $adm_dsn = 'dbi:Pg:dbname=postgres';
+my $adm_dsn = $multimaster ? "dbi:Pg:dbname=$dbname": 'dbi:Pg:dbname=postgres';
 my $dsn = "dbi:Pg:dbname=$dbname";
 
 
@@ -37,7 +40,7 @@
 
 print "Prepare test enviroment\n";
 my $dbh = DBI->connect($adm_dsn, $username, $password, {PrintError => 1});
-if($dbh->err != 0){
+if(!$dbh || $dbh->err != 0){
     print $DBI::errstr . "\n";
     exit(-1);
 }
@@ -68,15 +71,23 @@
 my @sqls = ( 
 	"ALTER SYSTEM SET schedule.enabled=off",
 	"SELECT pg_reload_conf()",
-	"DROP DATABASE IF EXISTS $dbname",
-	"CREATE DATABASE $dbname",
 );
+if(!$multimaster)
+{
+	push @sqls, "DROP DATABASE IF EXISTS $dbname";
+	push @sqls, "CREATE DATABASE $dbname";
+}
+else
+{
+	push @sqls, "DROP TABLE IF EXISTS test_results";
+	push @sqls, "DROP TABLE IF EXISTS task_info";
+}
 
 map { __do_sql($dbh, $_) } @sqls;
 $dbh->disconnect();
 
 $dbh = DBI->connect($dsn, $username, $password, {PrintError => 1});
-if($dbh->err != 0){
+if(!$dbh || $dbh->err != 0){
     print $DBI::errstr . "\n";
     exit(-1);
 }
@@ -99,7 +110,7 @@
 
 print "Run tests\n";
 
-my @db_param = ["--dbname=$dbname"];
+my @db_param = ( "--dbname=$dbname" );
 push @db_param, "--host=$host" if $host;
 push @db_param, "--port=$port" if $port;
 push @db_param, "--username=$username" if $username;

test/perl/runtest.pl

@@ -13,14 +13,14 @@ my $query = "DELETE FROM test_results;";
 $dbh->do($query);
 ok($dbh->err == 0) or (print $DBI::errstr and $dbh->disconnect() and BAIL_OUT);
 
-$query = "SELECT schedule.create_job(NULL, '');";
+$query = "SELECT * from schedule.create_job(NULL, '');";
 my $sth = $dbh->prepare($query);
 $sth->execute();
 ok($dbh->err == 0) or (print $DBI::errstr and $dbh->disconnect() and BAIL_OUT);
 my $job_id = $sth->fetchrow_array() and $sth->finish();
 $sth->finish();
 
-$query = "SELECT schedule.deactivate_job(?)";
+$query = "SELECT * from schedule.deactivate_job(?)";
 $sth = $dbh->prepare($query);
 $sth->bind_param(1, $job_id);
 ok($sth->execute()) or (print $DBI::errstr and $dbh->disconnect() and BAIL_OUT);
@@ -37,13 +37,13 @@ my %data = (
 	use_same_transaction =>  "true"
 );
 
-$query = "SELECT schedule.set_job_attributes(?, '". t::json(\%data) ."')";
+$query = "SELECT * from schedule.set_job_attributes(?, '". t::json(\%data) ."')";
 $sth = $dbh->prepare($query);
 $sth->bind_param(1, $job_id);
 ok($sth->execute()) or (print $DBI::errstr and $dbh->disconnect() and BAIL_OUT);
 $sth->finish();
 
-$query = "SELECT schedule.activate_job(?)";
+$query = "SELECT * from schedule.activate_job(?)";
 $sth = $dbh->prepare($query);
 $sth->bind_param(1, $job_id);
 ok($sth->execute()) or (print $DBI::errstr and $dbh->disconnect() and BAIL_OUT);
@@ -57,7 +57,7 @@ ok($sth->execute()) or (print $DBI::errstr and $dbh->disconnect() and BAIL_OUT);
 my $result = $sth->fetchrow_array() and $sth->finish();
 ok ($result > 1) or print "Count == 0\n";
 
-$query = "SELECT schedule.deactivate_job(?)";
+$query = "SELECT * from schedule.deactivate_job(?)";
 $sth = $dbh->prepare($query);
 $sth->bind_param(1, $job_id);
 ok($sth->execute()) or print $DBI::errstr ;
@@ -67,7 +67,7 @@ $query = "DELETE FROM test_results;";
 $dbh->do($query);
 ok($dbh->err == 0) or print $DBI::errstr;
 
-$query = "SELECT schedule.drop_job(?)";
+$query = "SELECT * from schedule.drop_job(?)";
 $sth = $dbh->prepare($query);
 $sth->bind_param(1, $job_id);
 ok($sth->execute()) or print $DBI::errstr;