actualise reinit shell script

kelvich · kelvich · commit 93b7e67e35ca · 2017-11-13T02:17:36.000+03:00
diff --git a/tests/reinit-mm.sh b/tests/reinit-mm.sh
@@ -2,25 +2,21 @@ n_nodes=3
 export PATH=~/code/postgres_cluster/tmp_install/bin/:$PATH
 ulimit -c unlimited
 pkill -9 postgres
-pkill -9 arbiter
 
 cd ~/code/postgres_cluster/contrib/mmts/
 make clean && make install
-cd ~/code/postgres_cluster/contrib/raftable/
-make clean && make install
+
 cd ~/code/postgres_cluster/contrib/mmts/tests
 
 
-rm -fr node? *.log dtm
+rm -fr node? *.log
 conn_str=""
 sep=""
 for ((i=1;i<=n_nodes;i++))
 do    
     port=$((5431 + i))
-	raft_port=$((6665 + i))
     arbiter_port=$((7000 + i))
     conn_str="$conn_str${sep}dbname=regression user=stas host=127.0.0.1 port=$port arbiter_port=$arbiter_port sslmode=disable"
-	raft_conn_str="$raft_conn_str${sep}${i}:localhost:$raft_port"
     sep=","
     initdb node$i
     pg_ctl -w -D node$i -l node$i.log start
@@ -50,21 +46,15 @@ do
         default_transaction_isolation = 'repeatable read'
 
         multimaster.workers = 1
-        multimaster.use_raftable = false
-        multimaster.queue_size=52857600
-        multimaster.ignore_tables_without_pk = 1
         multimaster.heartbeat_recv_timeout = 2000
         multimaster.heartbeat_send_timeout = 250
-        multimaster.twopc_min_timeout = 40000000
-        multimaster.min_2pc_timeout = 40000000
         multimaster.volkswagen_mode = 1
 
         multimaster.conn_strings = '$conn_str'
         multimaster.node_id = $i
-        multimaster.max_nodes = 3
+        multimaster.max_nodes = 4
         multimaster.arbiter_port = $arbiter_port
-        raftable.id = $i
-        raftable.peers = '$raft_conn_str'
+        multimaster.min_2pc_timeout = 100000
 SQL
     cp pg_hba.conf node$i
     pg_ctl -w -D node$i -l node$i.log start
