GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

use a distinct error for out-of-sync replica

Browse source
This commit is contained in:
Dustin J. Mitchell 2021-10-20 21:15:05 -04:00
parent c72cae648d
commit ec35d4fa20
4 changed files with 36 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
taskchampion/src/errors.rs
View file

@ -4,6 +4,12 @@ use thiserror::Error;
#[non_exhaustive]
/// Errors returned from taskchampion operations
pub enum Error {
/// A task-database-related error
#[error("Task Database Error: {0}")]
Database(String),
/// An error specifically indicating that the local replica cannot
/// be synchronized with the sever, due to being out of date or some
/// other irrecoverable error.
#[error("Local replica is out of sync with the server")]
OutOfSync,
}

2
taskchampion/src/replica.rs
View file

@ -140,7 +140,7 @@ impl Replica {
) -> anyhow::Result<()> {
self.taskdb
.sync(server, avoid_snapshots)
.context("Failed to synchronize")?;
.context("Failed to synchronize with server")?;
self.rebuild_working_set(false)
.context("Failed to rebuild working set after sync")?;
Ok(())

3
taskchampion/src/taskdb/sync.rs
View file

@ -1,6 +1,7 @@
use super::{ops, snapshot};
use crate::server::{AddVersionResult, GetVersionResult, Server, SnapshotUrgency};
use crate::storage::{Operation, StorageTxn};
use crate::Error;
use log::{info, trace, warn};
use serde::{Deserialize, Serialize};
use std::str;
@ -97,7 +98,7 @@ pub(super) fn sync(
);
if let Some(requested) = requested_parent_version_id {
if parent_version_id == requested {
anyhow::bail!("Server's task history has diverged from this replica");
return Err(Error::OutOfSync.into());
}
}
requested_parent_version_id = Some(parent_version_id);