merge

kelvich · kelvich · commit 545a04472582 · 2016-07-05T17:54:29.000+03:00
diff --git a/contrib/mmts/tests2/docker-entrypoint.sh b/contrib/mmts/tests2/docker-entrypoint.sh
@@ -73,6 +73,7 @@ if [ "$1" = 'postgres' ]; then
 			max_replication_slots = 10
 			max_wal_senders = 10
 			shared_preload_libraries = 'raftable,multimaster'
+            		default_transaction_isolation = 'repeatable read'
 			log_checkpoints = on
 			log_autovacuum_min_duration = 0
 
diff --git a/contrib/mmts/tests2/lib/event_history.py b/contrib/mmts/tests2/lib/event_history.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 import time
 import datetime
 import uuid
diff --git a/contrib/raftable/raft/include/util.h b/contrib/raftable/raft/include/util.h
@@ -48,6 +48,7 @@ struct timeval ms2tv(int ms);
 
 #define shout(...) \
 	do { \
+		fprintf(stderr, "RAFT: "); \
 		fprintf(stderr, __VA_ARGS__); \
 		fflush(stderr); \
 	} while (0)
diff --git a/contrib/raftable/raft/src/raft.c b/contrib/raftable/raft/src/raft.c
@@ -649,7 +649,7 @@ void raft_tick(raft_t r, int msec) {
 	if (r->timer < 0) {
 		switch (r->role) {
 			case FOLLOWER:
-				debug(
+				shout(
 					"lost the leader,"
 					" claiming leadership\n"
 				);
@@ -659,7 +659,7 @@ void raft_tick(raft_t r, int msec) {
 				raft_claim(r);
 				break;
 			case CANDIDATE:
-				debug(
+				shout(
 					"the vote failed,"
 					" claiming leadership\n"
 				);
@@ -1055,6 +1055,7 @@ static void raft_handle_claim(raft_t r, raft_msg_claim_t *m) {
 		reply.granted = true;
 	}
 finish:
+	shout("voting %s\n", reply.granted ? "yes" : "no");
 	raft_send(r, candidate, &reply, sizeof(reply));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+from __future__ import print_function`
`1`	`2`	`import time`
`2`	`3`	`import datetime`
`3`	`4`	`import uuid`