Merge branch 'master' of https://github.com/postgrespro/postgres_cluster

knizhnik · knizhnik · commit f7c6b098ed0c · 2016-08-23T16:09:16.000+03:00
diff --git a/contrib/raftable/worker.c b/contrib/raftable/worker.c
@@ -497,9 +497,12 @@ void raftable_worker_main(Datum arg)
 		if (tick(cfg->raft_config.heartbeat_ms))
 		{
 			m = raft_recv_message(raft);
-			Assert(m != NULL);
-			raft_handle_message(raft, m);
-			notify();
+			if (m) {
+				raft_handle_message(raft, m);
+				notify();
+			} else {
+				elog(WARNING, "got an empty or corrupt message on raftable port");
+			}
 		}
 		CHECK_FOR_INTERRUPTS();
 	}

Original file line number	Diff line number	Diff line change
`@@ -497,9 +497,12 @@ void raftable_worker_main(Datum arg)`
`497`	`497`	`if (tick(cfg->raft_config.heartbeat_ms))`
`498`	`498`	`{`
`499`	`499`	`m = raft_recv_message(raft);`
`500`		`- Assert(m != NULL);`
`501`		`- raft_handle_message(raft, m);`
`502`		`- notify();`
	`500`	`+ if (m) {`
	`501`	`+ raft_handle_message(raft, m);`
	`502`	`+ notify();`
	`503`	`+ } else {`
	`504`	`+ elog(WARNING, "got an empty or corrupt message on raftable port");`
	`505`	`+ }`
`503`	`506`	`}`
`504`	`507`	`CHECK_FOR_INTERRUPTS();`
`505`	`508`	`}`