diff options
author | trinity-1686a <trinity@deuxfleurs.fr> | 2025-02-08 16:01:11 +0100 |
---|---|---|
committer | trinity-1686a <trinity@deuxfleurs.fr> | 2025-02-08 16:01:11 +0100 |
commit | f034e834fa70f579bfd85745aea533b4328cbce4 (patch) | |
tree | 0ec66ad7ad96ea32b8582f1c0566959c17f4b823 /src/table/gc.rs | |
parent | bf0f7924189444683077ce80b7d72303b2b20145 (diff) | |
parent | d3226bfa91d4500063c5c287c6256729dcbb3f88 (diff) | |
download | garage-f034e834fa70f579bfd85745aea533b4328cbce4.tar.gz garage-f034e834fa70f579bfd85745aea533b4328cbce4.zip |
Merge branch 'main' into 1686a/s3-redirects
Diffstat (limited to 'src/table/gc.rs')
-rw-r--r-- | src/table/gc.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/table/gc.rs b/src/table/gc.rs index d30a1849..28ea119d 100644 --- a/src/table/gc.rs +++ b/src/table/gc.rs @@ -4,6 +4,7 @@ use std::sync::Arc; use std::time::Duration; use async_trait::async_trait; + use serde::{Deserialize, Serialize}; use serde_bytes::ByteBuf; @@ -258,21 +259,20 @@ impl<F: TableSchema, R: TableReplication> TableGc<F, R> { .await .err_context("GC: remote delete tombstones")?; - // GC has been successfull for all of these entries. + // GC has been successful for all of these entries. // We now remove them all from our local table and from the GC todo list. for item in items { self.data .delete_if_equal_hash(&item.key[..], item.value_hash) .err_context("GC: local delete tombstones")?; item.remove_if_equal(&self.data.gc_todo) - .err_context("GC: remove from todo list after successfull GC")?; + .err_context("GC: remove from todo list after successful GC")?; } Ok(()) } } -#[async_trait] impl<F: TableSchema, R: TableReplication> EndpointHandler<GcRpc> for TableGc<F, R> { async fn handle(self: &Arc<Self>, message: &GcRpc, _from: NodeID) -> Result<GcRpc, Error> { match message { @@ -383,7 +383,7 @@ impl GcTodoEntry { /// Removes the GcTodoEntry from the gc_todo tree if the /// hash of the serialized value is the same here as in the tree. - /// This is usefull to remove a todo entry only under the condition + /// This is useful to remove a todo entry only under the condition /// that it has not changed since the time it was read, i.e. /// what we have to do is still the same pub(crate) fn remove_if_equal(&self, gc_todo_tree: &db::Tree) -> Result<(), Error> { |