aboutsummaryrefslogtreecommitdiff
path: root/src/model/k2v/rpc.rs
diff options
context:
space:
mode:
authortrinity-1686a <trinity@deuxfleurs.fr>2025-02-08 16:01:11 +0100
committertrinity-1686a <trinity@deuxfleurs.fr>2025-02-08 16:01:11 +0100
commitf034e834fa70f579bfd85745aea533b4328cbce4 (patch)
tree0ec66ad7ad96ea32b8582f1c0566959c17f4b823 /src/model/k2v/rpc.rs
parentbf0f7924189444683077ce80b7d72303b2b20145 (diff)
parentd3226bfa91d4500063c5c287c6256729dcbb3f88 (diff)
downloadgarage-f034e834fa70f579bfd85745aea533b4328cbce4.tar.gz
garage-f034e834fa70f579bfd85745aea533b4328cbce4.zip
Merge branch 'main' into 1686a/s3-redirects
Diffstat (limited to 'src/model/k2v/rpc.rs')
-rw-r--r--src/model/k2v/rpc.rs6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/model/k2v/rpc.rs b/src/model/k2v/rpc.rs
index 4d7186a7..821f4549 100644
--- a/src/model/k2v/rpc.rs
+++ b/src/model/k2v/rpc.rs
@@ -10,7 +10,6 @@ use std::convert::TryInto;
use std::sync::{Arc, Mutex, MutexGuard};
use std::time::{Duration, Instant};
-use async_trait::async_trait;
use futures::stream::FuturesUnordered;
use futures::StreamExt;
use serde::{Deserialize, Serialize};
@@ -310,7 +309,7 @@ impl K2VRpcHandler {
// - we have a response to a read quorum of requests (e.g. 2/3), and an extra delay
// has passed since the quorum was achieved
// - a global RPC timeout expired
- // The extra delay after a quorum was received is usefull if the third response was to
+ // The extra delay after a quorum was received is useful if the third response was to
// arrive during this short interval: this would allow us to consider all the data seen
// by that last node in the response we produce, and would likely help reduce the
// size of the seen marker that we will return (because we would have an info of the
@@ -500,7 +499,7 @@ impl K2VRpcHandler {
} else {
// If no seen marker was specified, we do not poll for anything.
// We return immediately with the set of known items (even if
- // it is empty), which will give the client an inital view of
+ // it is empty), which will give the client an initial view of
// the dataset and an initial seen marker for further
// PollRange calls.
self.poll_range_read_range(range, &RangeSeenMarker::default())
@@ -537,7 +536,6 @@ impl K2VRpcHandler {
}
}
-#[async_trait]
impl EndpointHandler<K2VRpc> for K2VRpcHandler {
async fn handle(self: &Arc<Self>, message: &K2VRpc, _from: NodeID) -> Result<K2VRpc, Error> {
match message {