Logging node id, adding and moving replicas in progress.

Author: arssher

Makefile

@@ -6,7 +6,8 @@ DATA_built = $(EXTENSION)--$(EXTVERSION).sql
 
 
 MODULE_big = pg_shardman
-OBJS = src/pg_shardman.o src/udf.o src/shard.o src/timeutils.o
+OBJS = src/pg_shardman.o src/udf.o src/shard.o src/timeutils.o \
+       src/shardman_hooks.o
 
 PG_CPPFLAGS += -Isrc/include
 
@@ -21,7 +22,6 @@ PG_CPPFLAGS += -I$(INCLUDEDIR) # add server's include directory for libpq-fe.h
 SHLIB_LINK += -lpq # add libpq
 
 EXTRA_CLEAN = $(EXTENSION)--$(EXTVERSION).sql
-$(info $$var is [${EXTRA_CLEAN}])
 
 include $(PGXS)
 

bin/common.sh

@@ -7,6 +7,7 @@ set -e
 pgpath=~/postgres/install/vanilla/
 pathmanpath=~/postgres/pg_pathman
 install_pathman=false
+logfile=$HOME/tmp/tmp/tmp.log
 
 master_datadir=~/postgres/data1
 master_port=5432
@@ -31,9 +32,9 @@ function start_nodes()
     for ((i=0; i<${#worker_datadirs[@]}; ++i)); do
 	datadir="${worker_datadirs[i]}"
 	port="${worker_ports[i]}"
-	pg_ctl -o "-p $port" -D $datadir start
+	pg_ctl -o "-p $port" -D $datadir  -l $logfile start
     done
-    pg_ctl -o "-p $master_port" -D $master_datadir start
+    pg_ctl -o "-p $master_port" -D $master_datadir -l $logfile start
 }
 
 function stop_nodes()
@@ -50,9 +51,9 @@ function restart_nodes()
     for ((i=0; i<${#worker_datadirs[@]}; ++i)); do
 	datadir="${worker_datadirs[i]}"
 	port="${worker_ports[i]}"
-	pg_ctl -o "-p $port" -D $datadir restart
+	pg_ctl -o "-p $port" -D $datadir -l $logfile restart
     done
-    pg_ctl -o "-p $master_port" -D $master_datadir restart
+    pg_ctl -o "-p $master_port" -D $master_datadir -l $logfile restart
 }
 
 function run_demo()

bin/shardman_init.sh

@@ -13,6 +13,8 @@ cd "${script_dir}/.."
 make clean
 make install
 
+> $logfile
+
 stop_nodes
 for datadir in $master_datadir "${worker_datadirs[@]}"; do
     rm -rf "$datadir"
@@ -37,4 +39,4 @@ restart_nodes
 
 run_demo
 
-psql
+# psql

bin/shardman_start.sh

@@ -6,6 +6,8 @@ source "${script_dir}/common.sh"
 cd "${script_dir}/.."
 make clean
 
+> $logfile
+
 restart_nodes # make sure nodes run
 # first workers, then master
 for port in "${worker_ports[@]}" $master_port; do
@@ -23,4 +25,4 @@ restart_nodes
 
 run_demo
 
-psql
+# psql

membership.sql

@@ -46,22 +46,30 @@ CREATE TABLE local_meta (
 	k text NOT NULL, -- key
 	v text -- value
 );
-INSERT INTO @extschema@.local_meta VALUES ('node_id', NULL);
+INSERT INTO shardman.local_meta VALUES ('node_id', NULL);
 
 -- Get local node id. NULL means node is not in the cluster yet.
 CREATE FUNCTION get_node_id() RETURNS int AS $$
-	SELECT v::int FROM @extschema@.local_meta WHERE k = 'node_id';
+	SELECT v::int FROM shardman.local_meta WHERE k = 'node_id';
 $$ LANGUAGE sql;
 
 -- Exclude node from the cluster
 CREATE FUNCTION reset_node_id() RETURNS void AS $$
-	UPDATE @extschema@.local_meta SET v = NULL WHERE k = 'node_id';
-$$ LANGUAGE sql;
+BEGIN
+	UPDATE shardman.local_meta SET v = NULL WHERE k = 'node_id';
+	PERFORM shardman.reset_node_id_c();
+END $$ LANGUAGE plpgsql STRICT;
+CREATE FUNCTION reset_node_id_c() RETURNS void
+	AS 'pg_shardman' LANGUAGE C;
 
 -- Set local node id.
 CREATE FUNCTION set_node_id(node_id int) RETURNS void AS $$
-	UPDATE @extschema@.local_meta SET v = node_id WHERE k = 'node_id';
-$$ LANGUAGE sql;
+BEGIN
+	UPDATE shardman.local_meta SET v = node_id WHERE k = 'node_id';
+	PERFORM shardman.set_node_id_c(node_id);
+END $$ LANGUAGE plpgsql STRICT;
+CREATE FUNCTION set_node_id_c(node_id int) RETURNS void
+	AS 'pg_shardman' LANGUAGE C;
 
 -- If for cmd cmd_id we haven't yet inserted new node, do that; mark it as
 -- passive for now, we still need to setup lr and set its id on the node itself.

postgresql.conf.common.template

@@ -1,5 +1,8 @@
 shared_preload_libraries = 'pg_pathman, pg_shardman'
 
+# print node ids in log messages
+log_line_prefix = '%m %z'
+
 # just to suppress logging
 autovacuum = off
 

shard.sql

@@ -65,7 +65,7 @@ CREATE TRIGGER new_table_master_side AFTER INSERT ON shardman.tables
 CREATE TABLE partitions (
 	part_name text,
 	-- Shard number. 0 means primary shard.
-	num int NOT NULL,
+	num serial,
 	nxt int,
 	prev int,
 	relation text NOT NULL REFERENCES tables(relation),

src/include/pg_shardman.h

@@ -28,6 +28,9 @@ extern char *shardman_master_connstring;
 extern int shardman_cmd_retry_naptime;
 extern int shardman_poll_interval;
 
+extern int32 shardman_my_node_id;
+#define SHMN_INVALID_NODE_ID -1
+
 typedef struct Cmd
 {
 	int64 id;

src/include/shardman_hooks.h

@@ -0,0 +1,8 @@
+#ifndef SHARDMAN_HOOKS_H
+#define SHARDMAN_HOOKS_H
+
+extern emit_log_hook_type log_hook_next;
+
+extern void shardman_log_hook(ErrorData *edata);
+
+#endif							/* SHARDMAN_HOOKS_H */

src/pg_shardman.c

@@ -29,6 +29,7 @@
 
 #include "pg_shardman.h"
 #include "shard.h"
+#include "shardman_hooks.h"
 
 
 /* ensure that extension won't load against incompatible version of Postgres */
@@ -63,6 +64,8 @@ int shardman_poll_interval;
  * cleanup after receiving SIGTERM.
  */
 static PGconn *conn = NULL;
+/* This node id. */
+int32 shardman_my_node_id = -1;
 
 /*
  * Entrypoint of the module. Define variables and register background worker.
@@ -79,6 +82,10 @@ _PG_init()
 						errhint("Add pg_shardman to shared_preload_libraries.")));
 	}
 
+	/* remember & set hooks */
+	log_hook_next = emit_log_hook;
+	emit_log_hook = shardman_log_hook;
+
 	DefineCustomBoolVariable("shardman.master",
 							 "This node is the master?",
 							 NULL,
@@ -184,10 +191,10 @@ shardmaster_main(Datum main_arg)
 		while ((cmd = next_cmd()) != NULL)
 		{
 			update_cmd_status(cmd->id, "in progress");
-			shmn_elog(LOG, "Working on command %ld, %s, opts are",
+			shmn_elog(DEBUG1, "Working on command %ld, %s, opts are",
 				 cmd->id, cmd->cmd_type);
 			for (char **opts = cmd->opts; *opts; opts++)
-				shmn_elog(LOG, "%s", *opts);
+				shmn_elog(DEBUG1, "%s", *opts);
 			if (strcmp(cmd->cmd_type, "add_node") == 0)
 				add_node(cmd);
 			else if (strcmp(cmd->cmd_type, "rm_node") == 0)
@@ -577,7 +584,7 @@ add_node(Cmd *cmd)
 		pfree(sql);
 
 		/* done */
-		elog(INFO, "Node %s successfully added, it is assigned id %d",
+		shmn_elog(INFO, "Node %s successfully added, it is assigned id %d",
 			 connstr, node_id);
 		return;