Rename StoreUnavailable error variant to ServerBlockstoreUnavailable

Scille · Feb 16, 2025 · bcc5046 · bcc5046
1 parent 9e300e6
commit bcc5046
Show file tree

Hide file tree

Showing 18 changed files with 48 additions and 40 deletions.
diff --git a/bindings/electron/src/index.d.ts b/bindings/electron/src/index.d.ts
@@ -2469,12 +2469,12 @@ export interface WorkspaceFdReadErrorOffline {
     tag: "Offline"
     error: string
 }
-export interface WorkspaceFdReadErrorStopped {
-    tag: "Stopped"
+export interface WorkspaceFdReadErrorServerBlockstoreUnavailable {
+    tag: "ServerBlockstoreUnavailable"
     error: string
 }
-export interface WorkspaceFdReadErrorStoreUnavailable {
-    tag: "StoreUnavailable"
+export interface WorkspaceFdReadErrorStopped {
+    tag: "Stopped"
     error: string
 }
 export type WorkspaceFdReadError =
@@ -2486,8 +2486,8 @@ export type WorkspaceFdReadError =
   | WorkspaceFdReadErrorNoRealmAccess
   | WorkspaceFdReadErrorNotInReadMode
   | WorkspaceFdReadErrorOffline
+  | WorkspaceFdReadErrorServerBlockstoreUnavailable
   | WorkspaceFdReadErrorStopped
-  | WorkspaceFdReadErrorStoreUnavailable
 
 
 // WorkspaceFdResizeError

diff --git a/bindings/electron/src/meths.rs b/bindings/electron/src/meths.rs
@@ -11596,13 +11596,13 @@ fn variant_workspace_fd_read_error_rs_to_js<'a>(
             let js_tag = JsString::try_new(cx, "WorkspaceFdReadErrorOffline").or_throw(cx)?;
             js_obj.set(cx, "tag", js_tag)?;
         }
-        libparsec::WorkspaceFdReadError::Stopped { .. } => {
-            let js_tag = JsString::try_new(cx, "WorkspaceFdReadErrorStopped").or_throw(cx)?;
+        libparsec::WorkspaceFdReadError::ServerBlockstoreUnavailable { .. } => {
+            let js_tag = JsString::try_new(cx, "WorkspaceFdReadErrorServerBlockstoreUnavailable")
+                .or_throw(cx)?;
             js_obj.set(cx, "tag", js_tag)?;
         }
-        libparsec::WorkspaceFdReadError::StoreUnavailable { .. } => {
-            let js_tag =
-                JsString::try_new(cx, "WorkspaceFdReadErrorStoreUnavailable").or_throw(cx)?;
+        libparsec::WorkspaceFdReadError::Stopped { .. } => {
+            let js_tag = JsString::try_new(cx, "WorkspaceFdReadErrorStopped").or_throw(cx)?;
             js_obj.set(cx, "tag", js_tag)?;
         }
     }

diff --git a/bindings/generator/api/workspace.py b/bindings/generator/api/workspace.py
@@ -593,7 +593,7 @@ class WorkspaceFdReadError(ErrorVariant):
     class Offline:
         pass
 
-    class StoreUnavailable:
+    class ServerBlockstoreUnavailable:
         pass
 
     class Stopped:

diff --git a/bindings/web/src/meths.rs b/bindings/web/src/meths.rs
@@ -12866,18 +12866,18 @@ fn variant_workspace_fd_read_error_rs_to_js(
                 &"WorkspaceFdReadErrorOffline".into(),
             )?;
         }
-        libparsec::WorkspaceFdReadError::Stopped { .. } => {
+        libparsec::WorkspaceFdReadError::ServerBlockstoreUnavailable { .. } => {
             Reflect::set(
                 &js_obj,
                 &"tag".into(),
-                &"WorkspaceFdReadErrorStopped".into(),
+                &"WorkspaceFdReadErrorServerBlockstoreUnavailable".into(),
             )?;
         }
-        libparsec::WorkspaceFdReadError::StoreUnavailable { .. } => {
+        libparsec::WorkspaceFdReadError::Stopped { .. } => {
             Reflect::set(
                 &js_obj,
                 &"tag".into(),
-                &"WorkspaceFdReadErrorStoreUnavailable".into(),
+                &"WorkspaceFdReadErrorStopped".into(),
             )?;
         }
     }

diff --git a/client/src/plugins/libparsec/definitions.ts b/client/src/plugins/libparsec/definitions.ts
@@ -2886,8 +2886,8 @@ export enum WorkspaceFdReadErrorTag {
     NoRealmAccess = 'WorkspaceFdReadErrorNoRealmAccess',
     NotInReadMode = 'WorkspaceFdReadErrorNotInReadMode',
     Offline = 'WorkspaceFdReadErrorOffline',
+    ServerBlockstoreUnavailable = 'WorkspaceFdReadErrorServerBlockstoreUnavailable',
     Stopped = 'WorkspaceFdReadErrorStopped',
-    StoreUnavailable = 'WorkspaceFdReadErrorStoreUnavailable',
 }
 
 export interface WorkspaceFdReadErrorBadFileDescriptor {
@@ -2922,12 +2922,12 @@ export interface WorkspaceFdReadErrorOffline {
     tag: WorkspaceFdReadErrorTag.Offline
     error: string
 }
-export interface WorkspaceFdReadErrorStopped {
-    tag: WorkspaceFdReadErrorTag.Stopped
+export interface WorkspaceFdReadErrorServerBlockstoreUnavailable {
+    tag: WorkspaceFdReadErrorTag.ServerBlockstoreUnavailable
     error: string
 }
-export interface WorkspaceFdReadErrorStoreUnavailable {
-    tag: WorkspaceFdReadErrorTag.StoreUnavailable
+export interface WorkspaceFdReadErrorStopped {
+    tag: WorkspaceFdReadErrorTag.Stopped
     error: string
 }
 export type WorkspaceFdReadError =
@@ -2939,8 +2939,8 @@ export type WorkspaceFdReadError =
   | WorkspaceFdReadErrorNoRealmAccess
   | WorkspaceFdReadErrorNotInReadMode
   | WorkspaceFdReadErrorOffline
+  | WorkspaceFdReadErrorServerBlockstoreUnavailable
   | WorkspaceFdReadErrorStopped
-  | WorkspaceFdReadErrorStoreUnavailable
 
 // WorkspaceFdResizeError
 export enum WorkspaceFdResizeErrorTag {

diff --git a/libparsec/crates/client/src/monitors/workspace_inbound_sync.rs b/libparsec/crates/client/src/monitors/workspace_inbound_sync.rs
@@ -210,7 +210,7 @@ async fn inbound_sync_monitor_loop(realm_id: VlobID, mut io: impl InboundSyncMan
                     match outcome {
                         Ok(()) => break,
                         Err(err) => match err {
-                            WorkspaceSyncError::Offline(_) | WorkspaceSyncError::StoreUnavailable => {
+                            WorkspaceSyncError::Offline(_) | WorkspaceSyncError::ServerBlockstoreUnavailable => {
                                 io.event_bus_wait_server_reconnect().await;
                                 continue;
                             },
@@ -290,7 +290,7 @@ async fn inbound_sync_monitor_loop(realm_id: VlobID, mut io: impl InboundSyncMan
                         break;
                     }
                     Err(err) => match err {
-                        WorkspaceSyncError::Offline(_) | WorkspaceSyncError::StoreUnavailable => {
+                        WorkspaceSyncError::Offline(_) | WorkspaceSyncError::ServerBlockstoreUnavailable => {
                             io.event_bus_wait_server_reconnect().await;
                             continue;
                         }

diff --git a/libparsec/crates/client/src/monitors/workspace_outbound_sync.rs b/libparsec/crates/client/src/monitors/workspace_outbound_sync.rs
@@ -120,7 +120,7 @@ fn task_future_factory(
                                 log::error!("Workspace {realm_id}: stopping due to unexpected error: {err:?}");
                                 return;
                             }
-                            WorkspaceSyncError::StoreUnavailable => {
+                            WorkspaceSyncError::ServerBlockstoreUnavailable => {
                                 // Re-enqueue to retry later
                                 let entry_id = $entry_id;
                                 log::info!("Workspace {realm_id}: {entry_id} sync failed due to server block store unavailable, aborting sync and waiting {}s", SERVER_STORE_UNAVAILABLE_WAIT.num_seconds());

diff --git a/libparsec/crates/client/src/server_fetch.rs b/libparsec/crates/client/src/server_fetch.rs
@@ -183,7 +183,7 @@ pub enum ServerFetchBlockError {
     #[error("Not allowed to access this realm")]
     NoRealmAccess,
     #[error("Block access is temporary unavailable on the server")]
-    StoreUnavailable,
+    ServerBlockstoreUnavailable,
     #[error(transparent)]
     InvalidBlockAccess(#[from] Box<InvalidBlockAccessError>),
     #[error(transparent)]
@@ -218,7 +218,7 @@ pub(crate) async fn server_fetch_block(
                 block,
             } => Ok((needed_realm_certificate_timestamp, key_index, block)),
             // Expected errors
-            Rep::StoreUnavailable => Err(ServerFetchBlockError::StoreUnavailable),
+            Rep::StoreUnavailable => Err(ServerFetchBlockError::ServerBlockstoreUnavailable),
             Rep::AuthorNotAllowed => Err(ServerFetchBlockError::NoRealmAccess),
             Rep::RealmNotFound => Err(ServerFetchBlockError::RealmNotFound),
             Rep::BlockNotFound => Err(ServerFetchBlockError::BlockNotFound),

diff --git a/libparsec/crates/client/src/workspace/history/fd_read.rs b/libparsec/crates/client/src/workspace/history/fd_read.rs
@@ -60,7 +60,7 @@ pub async fn fd_read(
                     WorkspaceHistoryFdReadError::Offline(e)
                 }
                 WorkspaceHistoryGetBlockError::Stopped
-                | WorkspaceHistoryGetBlockError::StoreUnavailable => {
+                | WorkspaceHistoryGetBlockError::ServerBlockstoreUnavailable => {
                     WorkspaceHistoryFdReadError::Stopped
                 }
                 WorkspaceHistoryGetBlockError::NoRealmAccess => {

diff --git a/libparsec/crates/client/src/workspace/store/mod.rs b/libparsec/crates/client/src/workspace/store/mod.rs
@@ -70,7 +70,7 @@ pub(super) enum ReadChunkOrBlockError {
     #[error("Cannot communicate with the server: {0}")]
     Offline(#[from] ConnectionError),
     #[error("Block access is temporary unavailable on the server")]
-    StoreUnavailable,
+    ServerBlockstoreUnavailable,
     #[error("Component has stopped")]
     Stopped,
     #[error("Chunk doesn't exist")]
@@ -665,7 +665,9 @@ impl WorkspaceStore {
         .map_err(|err| match err {
             ServerFetchBlockError::Stopped => ReadChunkOrBlockError::Stopped,
             ServerFetchBlockError::Offline(e) => ReadChunkOrBlockError::Offline(e),
-            ServerFetchBlockError::StoreUnavailable => ReadChunkOrBlockError::StoreUnavailable,
+            ServerFetchBlockError::ServerBlockstoreUnavailable => {
+                ReadChunkOrBlockError::ServerBlockstoreUnavailable
+            }
             ServerFetchBlockError::BlockNotFound => {
                 // This is unexpected: we got a block ID from a file manifest,
                 // but this ID points to nothing according to the server :/

diff --git a/libparsec/crates/client/src/workspace/transactions/fd_read.rs b/libparsec/crates/client/src/workspace/transactions/fd_read.rs
@@ -13,7 +13,7 @@ pub enum WorkspaceFdReadError {
     #[error("Cannot communicate with the server: {0}")]
     Offline(#[from] ConnectionError),
     #[error("Block access is temporary unavailable on the server")]
-    StoreUnavailable,
+    ServerBlockstoreUnavailable,
     #[error("Component has stopped")]
     Stopped,
     #[error("File descriptor not found")]
@@ -92,8 +92,8 @@ pub async fn fd_read(
                     .await
                     .map_err(|err| match err {
                         ReadChunkOrBlockError::Offline(e) => WorkspaceFdReadError::Offline(e),
-                        ReadChunkOrBlockError::StoreUnavailable => {
-                            WorkspaceFdReadError::StoreUnavailable
+                        ReadChunkOrBlockError::ServerBlockstoreUnavailable => {
+                            WorkspaceFdReadError::ServerBlockstoreUnavailable
                         }
                         ReadChunkOrBlockError::Stopped => WorkspaceFdReadError::Stopped,
                         ReadChunkOrBlockError::NoRealmAccess => WorkspaceFdReadError::NoRealmAccess,

diff --git a/libparsec/crates/client/src/workspace/transactions/inbound_sync.rs b/libparsec/crates/client/src/workspace/transactions/inbound_sync.rs
@@ -102,7 +102,7 @@ pub enum WorkspaceSyncError {
     #[error("Cannot communicate with the server: {0}")]
     Offline(#[from] ConnectionError),
     #[error("Block access is temporary unavailable on the server")]
-    StoreUnavailable,
+    ServerBlockstoreUnavailable,
     #[error("Client has stopped")]
     Stopped,
     #[error("Not allowed to access this realm")]

diff --git a/libparsec/crates/client/src/workspace/transactions/outbound_sync.rs b/libparsec/crates/client/src/workspace/transactions/outbound_sync.rs
@@ -653,7 +653,9 @@ async fn do_next_reshape_operation(
             Err(err) => {
                 return Err(match err {
                     ReadChunkOrBlockError::Offline(e) => WorkspaceSyncError::Offline(e),
-                    ReadChunkOrBlockError::StoreUnavailable => WorkspaceSyncError::StoreUnavailable,
+                    ReadChunkOrBlockError::ServerBlockstoreUnavailable => {
+                        WorkspaceSyncError::ServerBlockstoreUnavailable
+                    }
                     ReadChunkOrBlockError::Stopped => WorkspaceSyncError::Stopped,
                     // TODO: manifest seems to contain invalid data (or the server is lying to us)
                     ReadChunkOrBlockError::ChunkNotFound => todo!(),
@@ -799,7 +801,7 @@ async fn upload_blocks(
                 | Rep::BlockAlreadyExists => (),
                 Rep::AuthorNotAllowed => return Err(WorkspaceSyncError::NotAllowed),
                 // Nothing we can do if server is not ready to store our data, retry later
-                Rep::StoreUnavailable => return Err(WorkspaceSyncError::StoreUnavailable),
+                Rep::StoreUnavailable => return Err(WorkspaceSyncError::ServerBlockstoreUnavailable),
                     // A key rotation occurred concurrently, should poll for new certificates and retry
                     Rep::BadKeyIndex { last_realm_certificate_timestamp } => {
                         let latest_known_timestamps = PerTopicLastTimestamps::new_for_realm(ops.realm_id, last_realm_certificate_timestamp);

diff --git a/libparsec/crates/client/src/workspace_history/store/data_access.rs b/libparsec/crates/client/src/workspace_history/store/data_access.rs
@@ -39,7 +39,7 @@ pub enum DataAccessFetchBlockError {
     #[error("Not allowed to access this realm")]
     NoRealmAccess,
     #[error("Block access is temporary unavailable on the server")]
-    StoreUnavailable,
+    ServerBlockstoreUnavailable,
     #[error(transparent)]
     InvalidBlockAccess(#[from] Box<InvalidBlockAccessError>),
     #[error(transparent)]

diff --git a/libparsec/crates/client/src/workspace_history/store/data_access_server.rs b/libparsec/crates/client/src/workspace_history/store/data_access_server.rs
@@ -124,7 +124,9 @@ impl ServerDataAccess {
             ServerFetchBlockError::RealmNotFound => DataAccessFetchBlockError::BlockNotFound,
             ServerFetchBlockError::BlockNotFound => DataAccessFetchBlockError::BlockNotFound,
             ServerFetchBlockError::NoRealmAccess => DataAccessFetchBlockError::NoRealmAccess,
-            ServerFetchBlockError::StoreUnavailable => DataAccessFetchBlockError::StoreUnavailable,
+            ServerFetchBlockError::ServerBlockstoreUnavailable => {
+                DataAccessFetchBlockError::ServerBlockstoreUnavailable
+            }
             ServerFetchBlockError::InvalidBlockAccess(err) => {
                 DataAccessFetchBlockError::InvalidBlockAccess(err)
             }

diff --git a/libparsec/crates/client/src/workspace_history/transactions/fd_read.rs b/libparsec/crates/client/src/workspace_history/transactions/fd_read.rs
@@ -132,7 +132,7 @@ pub async fn fd_read(
                         WorkspaceHistoryFdReadError::Offline(e)
                     }
                     WorkspaceHistoryStoreGetBlockError::Stopped
-                    | WorkspaceHistoryStoreGetBlockError::StoreUnavailable => {
+                    | WorkspaceHistoryStoreGetBlockError::ServerBlockstoreUnavailable => {
                         WorkspaceHistoryFdReadError::Stopped
                     }
                     WorkspaceHistoryStoreGetBlockError::NoRealmAccess => {

diff --git a/libparsec/crates/platform_mountpoint/src/unix/filesystem.rs b/libparsec/crates/platform_mountpoint/src/unix/filesystem.rs
@@ -1231,7 +1231,7 @@ impl fuser::Filesystem for Filesystem {
                 }
                 Err(err) => match err {
                     WorkspaceFdReadError::Offline(_) => reply.manual().error(libc::EHOSTUNREACH),
-                    WorkspaceFdReadError::StoreUnavailable => reply.manual().error(libc::EHOSTUNREACH),
+                    WorkspaceFdReadError::ServerBlockstoreUnavailable => reply.manual().error(libc::EHOSTUNREACH),
                     WorkspaceFdReadError::NotInReadMode => reply.manual().error(libc::EBADF),
                     WorkspaceFdReadError::NoRealmAccess => reply.manual().error(libc::EPERM),
                     WorkspaceFdReadError::Stopped

diff --git a/libparsec/crates/platform_mountpoint/src/windows/filesystem.rs b/libparsec/crates/platform_mountpoint/src/windows/filesystem.rs
@@ -643,7 +643,9 @@ impl FileSystemInterface for ParsecFileSystemInterface {
                     .await
                     .map_err(|err| match err {
                         WorkspaceFdReadError::Offline(_) => STATUS_HOST_UNREACHABLE,
-                        WorkspaceFdReadError::StoreUnavailable => STATUS_HOST_UNREACHABLE,
+                        WorkspaceFdReadError::ServerBlockstoreUnavailable => {
+                            STATUS_HOST_UNREACHABLE
+                        }
                         WorkspaceFdReadError::NoRealmAccess => STATUS_ACCESS_DENIED,
                         WorkspaceFdReadError::Stopped => STATUS_NO_SUCH_DEVICE,
                         WorkspaceFdReadError::BadFileDescriptor => STATUS_INVALID_HANDLE,