Update daemons.go

kvap · kvap · commit 6b8b21bdc6d0 · 2016-08-15T14:10:52.000+03:00
diff --git a/contrib/mmts/tests/daemons.go b/contrib/mmts/tests/daemons.go
@@ -60,34 +60,10 @@ func cmd_to_channel(argv []string, name string, out chan string) {
 }
 
 const (
-	DtmHost = "127.0.0.1"
-	DtmPort = 5431
 	PgPort = 5432
+	RaftPort = 6543
 )
 
-func arbiter(bin string, datadir string, servers []string, id int, wg *sync.WaitGroup) {
-	argv := []string{
-		bin,
-		"-d", datadir,
-		"-i", strconv.Itoa(id),
-	}
-	for _, server := range servers {
-		argv = append(argv, "-r", server)
-	}
-	log.Println(argv)
-
-	name := "arbiter " + datadir
-	c := make(chan string)
-
-	go cmd_to_channel(argv, name, c)
-
-	for s := range c {
-		log.Printf("[%s] %s\n", name, s)
-	}
-
-	wg.Done()
-}
-
 func appendfile(filename string, lines ...string) {
 	f, err := os.OpenFile(filename, os.O_APPEND | os.O_WRONLY, 0600)
 	if err != nil {
@@ -126,36 +102,33 @@ func initdb(bin string, datadir string) {
 	)
 }
 
-func initarbiter(arbiterdir string) {
-	if err := os.RemoveAll(arbiterdir); err != nil {
-		log.Fatal(err)
-	}
-	if err := os.MkdirAll(arbiterdir, os.ModeDir | 0777); err != nil {
-		log.Fatal(err)
-	}
-}
-
-func postgres(bin string, datadir string, postgresi []string, arbiters []string, port int, nodeid int, wg *sync.WaitGroup) {
+func postgres(bin string, datadir string, postgresi []string, port int, nodeid int, wg *sync.WaitGroup) {
 	argv := []string{
 		bin,
 		"-D", datadir,
 		"-p", strconv.Itoa(port),
-		"-c", "multimaster.buffer_size=65536",
+		"-c", "autovacuum=off",
+		"-c", "fsync=off",
+		"-c", "max_connections=200",
+		"-c", "max_replication_slots=10",
+		"-c", "max_wal_senders=10",
+		"-c", "max_worker_processes=100",
+		"-c", "default_transaction_isolation=repeatable read",
 		"-c", "multimaster.conn_strings=" + strings.Join(postgresi, ","),
 		"-c", "multimaster.node_id=" + strconv.Itoa(nodeid + 1),
-		"-c", "multimaster.arbiters=" + strings.Join(arbiters, ","),
-		"-c", "multimaster.workers=8",
-		"-c", "multimaster.queue_size=1073741824",
+		"-c", "multimaster.queue_size=52857600",
+		"-c", "multimaster.workers=4",
+		"-c", "multimaster.use_raftable=true",
+		"-c", "multimaster.ignore_tables_without_pk=1",
+		"-c", "multimaster.heartbeat_recv_timeout=1000",
+		"-c", "multimaster.heartbeat_send_timeout=250",
+		"-c", "multimaster.twopc_min_timeout=40000",
+		"-c", "shared_preload_libraries=raftable,multimaster",
+		"-c", "synchronous_commit=on",
 		"-c", "wal_level=logical",
 		"-c", "wal_sender_timeout=0",
-		"-c", "max_wal_senders=10",
-		"-c", "max_worker_processes=100",
-		"-c", "max_replication_slots=10",
-		"-c", "autovacuum=off",
-		"-c", "fsync=off",
-		"-c", "synchronous_commit=on",
-		"-c", "max_connections=200",
-		"-c", "shared_preload_libraries=multimaster",
+		"-c", "log_checkpoints=on",
+		"-c", "log_autovacuum_min_duration=0",
 	}
 	name := "postgres " + datadir
 	c := make(chan string)
@@ -207,49 +180,34 @@ func main() {
 	prefix := get_prefix(srcroot)
 
 	bin := map[string]string{
-		"arbiter": srcroot + "/contrib/arbiter/bin/arbiter",
 		"initdb": prefix + "/bin/initdb",
 		"postgres": prefix + "/bin/postgres",
 	}
 
 	datadirs := []string{"/tmp/data0", "/tmp/data1", "/tmp/data2"}
-	//arbiterdirs := []string{"/tmp/arbiter0", "/tmp/arbiter1", "/tmp/arbiter2"}
-	arbiterdirs := []string{"/tmp/arbiter0"}
 
 	check_bin(&bin);
 
 	if doInitDb {
 		for _, datadir := range datadirs {
 			initdb(bin["initdb"], datadir)
 		}
-		for _, arbiterdir := range arbiterdirs {
-			initarbiter(arbiterdir)
-		}
 	}
 
 	var wg sync.WaitGroup
 
-	var arbiters []string
-	for i := range arbiterdirs {
-		arbiters = append(arbiters, DtmHost + ":" + strconv.Itoa(DtmPort - i))
-	}
-	for i, dir := range arbiterdirs {
-		wg.Add(1)
-		go arbiter(bin["arbiter"], dir, arbiters, i, &wg)
-	}
-
 	time.Sleep(3 * time.Second)
 
 	var postgresi []string
 	for i := range datadirs {
 		postgresi = append(
 			postgresi,
-			fmt.Sprintf("dbname=postgres host=127.0.0.1 port=%d sslmode=disable", PgPort + i),
+			fmt.Sprintf("dbname=postgres host=127.0.0.1 port=%d raftport=%d sslmode=disable", PgPort + i, RaftPort + i),
 		)
 	}
 	for i, dir := range datadirs {
 		wg.Add(1)
-		go postgres(bin["postgres"], dir, postgresi, arbiters, PgPort + i, i, &wg)
+		go postgres(bin["postgres"], dir, postgresi, PgPort + i, i, &wg)
 	}
 
 	wg.Wait()
