From c0eeb0b0f32ed0a27cfdf9297d0e71e1b9948b73 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Wed, 27 Mar 2024 10:44:03 +0100
Subject: [next-0.10] fixes to k2v rpc + comment fixes

---
 src/model/k2v/rpc.rs | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'src/model/k2v/rpc.rs')

diff --git a/src/model/k2v/rpc.rs b/src/model/k2v/rpc.rs
index e15f2df8..95ff2d18 100644
--- a/src/model/k2v/rpc.rs
+++ b/src/model/k2v/rpc.rs
@@ -219,12 +219,11 @@ impl K2VRpcHandler {
 			},
 			sort_key,
 		};
-		// TODO figure this out with write sets, is it still appropriate???
 		let nodes = self
 			.item_table
 			.data
 			.replication
-			.read_nodes(&poll_key.partition.hash());
+			.storage_nodes(&poll_key.partition.hash());
 
 		let rpc = self.system.rpc_helper().try_call_many(
 			&self.endpoint,
@@ -239,8 +238,7 @@ impl K2VRpcHandler {
 				.send_all_at_once(true)
 				.without_timeout(),
 		);
-		let timeout_duration =
-			Duration::from_millis(timeout_msec) + self.system.rpc_helper().rpc_timeout();
+		let timeout_duration = Duration::from_millis(timeout_msec);
 		let resps = select! {
 			r = rpc => r?,
 			_ = tokio::time::sleep(timeout_duration) => return Ok(None),
@@ -282,12 +280,11 @@ impl K2VRpcHandler {
 		seen.restrict(&range);
 
 		// Prepare PollRange RPC to send to the storage nodes responsible for the parititon
-		// TODO figure this out with write sets, does it still work????
 		let nodes = self
 			.item_table
 			.data
 			.replication
-			.read_nodes(&range.partition.hash());
+			.storage_nodes(&range.partition.hash());
 		let quorum = self.item_table.data.replication.read_quorum();
 		let msg = K2VRpc::PollRange {
 			range,
@@ -320,9 +317,7 @@ impl K2VRpcHandler {
 		// kind: all items produced by that node until time ts have been returned, so we can
 		// bump the entry in the global vector clock and possibly remove some item-specific
 		// vector clocks)
-		let mut deadline = Instant::now()
-			+ Duration::from_millis(timeout_msec)
-			+ self.system.rpc_helper().rpc_timeout();
+		let mut deadline = Instant::now() + Duration::from_millis(timeout_msec);
 		let mut resps = vec![];
 		let mut errors = vec![];
 		loop {
-- 
cgit v1.2.3