Dirty init scripts updates, resetting node id on node deletion

Author: arssher

bin/common.sh

@@ -49,3 +49,14 @@ function restart_nodes()
     done
     pg_ctl -o "-p $master_port" -D $master_datadir restart
 }
+
+function run_demo()
+{
+    psql -p 5433 -c "drop table if exists partitioned_table cascade;"
+    psql -p 5433 -c "CREATE TABLE partitioned_table(id INT NOT NULL, payload REAL);"
+    psql -p 5433 -c "INSERT INTO partitioned_table SELECT generate_series(1, 1000), random();"
+    psql -c "select shardman.add_node('port=5433');"
+    psql -c "select shardman.add_node('port=5434');"
+    sleep 5
+    psql -c "select shardman.create_hash_partitions(2, 'partitioned_table', 'id', 2);"
+}

bin/shardman_init.sh

@@ -35,12 +35,6 @@ done
 
 restart_nodes
 
-psql -p 5433 -c "drop table if exists partitioned_table cascade;"
-psql -p 5433 -c "CREATE TABLE partitioned_table(id INT NOT NULL, payload REAL);"
-psql -p 5433 -c "INSERT INTO partitioned_table SELECT generate_series(1, 1000), random();"
-psql -c "select shardman.add_node('port=5433');"
-psql -c "select shardman.add_node('port=5434');"
-
-psql -c "select shardman.create_hash_partitions(2, 'partitioned_table', 'id', 2);"
+run_demo
 
 psql

bin/shardman_start.sh

@@ -5,20 +5,21 @@ source "${script_dir}/common.sh"
 
 cd "${script_dir}/.."
 make clean
-make install
 
 restart_nodes
 for port in $master_port "${worker_ports[@]}"; do
     psql -p $port -c "drop extension if exists pg_shardman;"
+done
+
+restart_nodes
+make install
+for port in $master_port "${worker_ports[@]}"; do
     psql -p $port -c "create extension pg_shardman cascade;"
 done
+
 # to restart master bgw
 restart_nodes
 
-psql -p 5433 -c "drop table if exists partitioned_table cascade;"
-psql -p 5433 -c "CREATE TABLE partitioned_table(id INT NOT NULL, payload REAL);"
-psql -p 5433 -c "INSERT INTO partitioned_table SELECT generate_series(1, 1000), random();"
-psql -c "select shardman.add_node('port=5433');"
-psql -c "select shardman.add_node('port=5434');"
+run_demo
 
 psql

pg_shardman--0.0.1.sql

@@ -155,7 +155,6 @@ BEGIN
 		IF um_opts != '' THEN
 			um_opts := format(' OPTIONS (%s)', um_opts);
 		END IF;
-		raise log 'serv opts are %, um opts are %', server_opts, um_opts;
 		EXECUTE format('CREATE SERVER %I FOREIGN DATA WRAPPER
 					   postgres_fdw %s;', NEW.part_name, server_opts);
 		EXECUTE format('DROP USER MAPPING IF EXISTS FOR CURRENT_USER SERVER %I;',
@@ -363,6 +362,8 @@ BEGIN
 		WHERE slot_name LIKE 'shardman_%' AND slot_type = 'logical' LOOP
 		EXECUTE format('SELECT pg_drop_replication_slot(%L)', rs.slot_name);
 	END LOOP;
+
+	PERFORM shardman.reset_node_id();
 END;
 $$ LANGUAGE plpgsql;
 CREATE FUNCTION pg_shardman_cleanup_c() RETURNS event_trigger