Fix fatal bugs in raftable.

kvap · kvap · commit 535c5a2fcbef · 2016-03-25T14:54:25.000+03:00
diff --git a/contrib/raftable/raftable.c b/contrib/raftable/raftable.c
@@ -52,10 +52,11 @@ static void *get_shared_state(void)
 	return shared.state;
 }
 
-static void try_next_peer(void)
+static void select_next_peer(void)
 {
-	while (!wcfg.peers[*shared.leader].up)
+	do {
 		*shared.leader = (*shared.leader + 1) % RAFTABLE_PEERS_MAX;
+	} while (!wcfg.peers[*shared.leader].up);
 }
 
 static void disconnect_leader(void)
@@ -64,7 +65,7 @@ static void disconnect_leader(void)
 	{
 		close(leadersock);
 	}
-	try_next_peer();
+	select_next_peer();
 	leadersock = -1;
 }
 
@@ -74,6 +75,9 @@ static bool connect_leader(void)
 	struct addrinfo hint;
 	char portstr[6];
 	struct addrinfo *a;
+	int rc;
+
+	if (*shared.leader == NOBODY) select_next_peer();
 
 	HostPort *leaderhp = wcfg.peers + *shared.leader;
 
@@ -83,10 +87,12 @@ static bool connect_leader(void)
 	snprintf(portstr, 6, "%d", leaderhp->port);
 	hint.ai_protocol = getprotobyname("tcp")->p_proto;
 
-	if (getaddrinfo(leaderhp->host, portstr, &hint, &addrs))
+	if ((rc = getaddrinfo(leaderhp->host, portstr, &hint, &addrs)))
 	{
 		disconnect_leader();
-		perror("failed to resolve address");
+		fprintf(stderr, "failed to resolve address '%s:%d': %s",
+				leaderhp->host, leaderhp->port,
+				gai_strerror(rc));
 		return false;
 	}
 
@@ -168,11 +174,14 @@ void raftable_set(char *key, char *value)
 	size += vallen;
 	ru = palloc(size);
 
+	ru->expector = wcfg.id;
+	ru->fieldnum = 1;
+
 	RaftableField *f = (RaftableField *)ru->data;
 	f->keylen = keylen;
 	f->vallen = vallen;
 	memcpy(f->data, key, keylen);
-	memcpy(f->data + keylen, key, vallen);
+	memcpy(f->data + keylen, value, vallen);
 
 	bool ok = false;
 	while (!ok)
@@ -201,6 +210,18 @@ void raftable_set(char *key, char *value)
 			}
 			sent += newbytes;
 		}
+
+		if (ok)
+		{
+			int status;
+			int recved = read(s, &status, sizeof(status));
+			if (recved != sizeof(status))
+			{
+				disconnect_leader();
+				fprintf(stderr, "failed to recv the update status from the leader\n");
+				ok = false;
+			}
+		}
 	}
 
 	pfree(ru);
@@ -358,6 +379,7 @@ _PG_init(void)
 	);
 	parse_peers(wcfg.peers, peerstr);
 
+	request_shmem();
 	worker_register(&wcfg);
 
 	PreviousShmemStartupHook = shmem_startup_hook;
diff --git a/contrib/raftable/state.c b/contrib/raftable/state.c
@@ -239,7 +239,6 @@ bool state_next(StateP state, void *scan, char **key, char **value)
 	}
 	else
 	{
-		hash_seq_term((HASH_SEQ_STATUS *)scan);
 		LWLockRelease(state->lock);
 		pfree(scan);
 		return false;
@@ -248,11 +247,13 @@ bool state_next(StateP state, void *scan, char **key, char **value)
 
 void state_shmem_request()
 {
+	int flags;
 	HASHCTL info;
 	info.keysize = sizeof(RaftableKey);
 	info.entrysize = sizeof(RaftableEntry);
 	info.dsize = info.max_dsize = hash_select_dirsize(RAFTABLE_HASH_SIZE);
-	RequestAddinShmemSpace(RAFTABLE_BLOCK_MEM + sizeof(State) + hash_get_shared_size(&info, HASH_ELEM));
+	flags = HASH_SHARED_MEM | HASH_ALLOC | HASH_DIRSIZE | HASH_ELEM;
+	RequestAddinShmemSpace(RAFTABLE_BLOCK_MEM + sizeof(State) + hash_get_shared_size(&info, flags));
 	RequestAddinLWLocks(1);
 }
 
diff --git a/contrib/raftable/worker.c b/contrib/raftable/worker.c
@@ -442,9 +442,9 @@ static void worker_main(Datum arg)
 
 void worker_register(WorkerConfig *cfg)
 {
-	BackgroundWorker worker;
+	BackgroundWorker worker = {};
 	strcpy(worker.bgw_name, "raftable worker");
-	worker.bgw_flags = 0;
+	worker.bgw_flags = BGWORKER_SHMEM_ACCESS;
 	worker.bgw_start_time = BgWorkerStart_PostmasterStart;
 	worker.bgw_restart_time = 1;
 	worker.bgw_main = worker_main;

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,6 @@ bool state_next(StateP state, void scan, char key, char *value)`
`239`	`239`	`}`
`240`	`240`	`else`
`241`	`241`	`{`
`242`		`- hash_seq_term((HASH_SEQ_STATUS *)scan);`
`243`	`242`	`LWLockRelease(state->lock);`
`244`	`243`	`pfree(scan);`
`245`	`244`	`return false;`
`@@ -248,11 +247,13 @@ bool state_next(StateP state, void scan, char key, char *value)`
`248`	`247`
`249`	`248`	`void state_shmem_request()`
`250`	`249`	`{`
	`250`	`+ int flags;`
`251`	`251`	`HASHCTL info;`
`252`	`252`	`info.keysize = sizeof(RaftableKey);`
`253`	`253`	`info.entrysize = sizeof(RaftableEntry);`
`254`	`254`	`info.dsize = info.max_dsize = hash_select_dirsize(RAFTABLE_HASH_SIZE);`
`255`		`- RequestAddinShmemSpace(RAFTABLE_BLOCK_MEM + sizeof(State) + hash_get_shared_size(&info, HASH_ELEM));`
	`255`	`+ flags = HASH_SHARED_MEM \| HASH_ALLOC \| HASH_DIRSIZE \| HASH_ELEM;`
	`256`	`+ RequestAddinShmemSpace(RAFTABLE_BLOCK_MEM + sizeof(State) + hash_get_shared_size(&info, flags));`
`256`	`257`	`RequestAddinLWLocks(1);`
`257`	`258`	`}`
`258`	`259`