Page MenuHomePhorge
Files F33023746

D5340.1768391547.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D5340.1768391547.diff
View Options

diff --git a/services/backup/blob_client/src/get_client.rs b/services/backup/blob_client/src/get_client.rs
--- a/services/backup/blob_client/src/get_client.rs
+++ b/services/backup/blob_client/src/get_client.rs
@@ -6,7 +6,7 @@
use proto::GetRequest;
use crate::constants::{BLOB_ADDRESS, MPSC_CHANNEL_BUFFER_CAPACITY};
-use anyhow::bail;
+use anyhow::{bail, ensure};
use crate::RUNTIME;
use lazy_static::lazy_static;
use std::collections::HashMap;
@@ -130,8 +130,6 @@
bail!("couldn't access client");
}
- if is_initialized(&holder)? {
- bail!("client transmitter handler released properly");
- }
+ ensure!(!is_initialized(&holder)?, "client transmitter handler released properly");
Ok(())
}
diff --git a/services/backup/blob_client/src/put_client.rs b/services/backup/blob_client/src/put_client.rs
--- a/services/backup/blob_client/src/put_client.rs
+++ b/services/backup/blob_client/src/put_client.rs
@@ -8,7 +8,7 @@
use proto::PutRequest;
use crate::constants::{BLOB_ADDRESS, MPSC_CHANNEL_BUFFER_CAPACITY};
-use anyhow::bail;
+use anyhow::{bail, ensure};
use crate::RUNTIME;
use lazy_static::lazy_static;
use libc;
@@ -54,9 +54,8 @@
if is_initialized(&holder)? {
put_client_terminate_cxx(&holder.to_string())?;
}
- if is_initialized(&holder)? {
- bail!("client cannot be initialized twice");
- }
+ ensure!(!is_initialized(&holder)?, "client cannot be initialized twice");
+
// grpc
if let Ok(mut grpc_client) =
RUNTIME.block_on(async { BlobServiceClient::connect(BLOB_ADDRESS).await })
@@ -145,12 +144,11 @@
Ok(())
});
- if is_initialized(&holder)? {
- bail!(format!(
- "client initialization overlapped for holder {}",
- holder
- ));
- }
+ ensure!(!is_initialized(&holder)?, format!(
+ "client initialization overlapped for holder {}",
+ holder
+ ));
+
if let Ok(mut clients) = CLIENTS.lock() {
let client = BidiClient {
tx: request_thread_tx,
@@ -243,8 +241,6 @@
bail!("couldn't access client");
}
- if is_initialized(&holder)? {
- bail!("client transmitter handler released properly");
- }
+ ensure!(!is_initialized(&holder)?, "client transmitter handler released properly");
Ok(())
}

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 14, 11:52 AM (4 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5930768
Default Alt Text
D5340.1768391547.diff (2 KB)

Event Timeline