fix rebase err

Signed-off-by: mujunxiang <1948535941@qq.com>
This commit is contained in:
mujunxiang
2024-11-27 14:44:01 +08:00
parent 1b9ae3ccb3
commit 13b53efb2a
7 changed files with 22 additions and 15 deletions
-1
View File
@@ -61,7 +61,6 @@ matchit = "0.8.4"
shadow-rs = "0.35.2"
const-str = { version = "0.5.7", features = ["std", "proc"] }
atoi = "2.0.0"
serde.workspace = true
serde_urlencoded = "0.7.1"
[build-dependencies]
+1
View File
@@ -1,6 +1,7 @@
mod admin;
mod config;
mod grpc;
#[allow(dead_code)]
mod peer_rest_client;
mod service;
mod storage;
+4 -4
View File
@@ -531,7 +531,7 @@ impl PeerRestClient {
Ok(())
}
pub async fn signal_service(&self, sig: u64, sub_sys: &str, dry_run: bool, exec_at: SystemTime) -> Result<()> {
pub async fn signal_service(&self, sig: u64, sub_sys: &str, dry_run: bool, _exec_at: SystemTime) -> Result<()> {
let mut client = node_service_time_out_client(&self.addr)
.await
.map_err(|err| Error::msg(err.to_string()))?;
@@ -575,14 +575,14 @@ impl PeerRestClient {
}
pub async fn get_metacache_listing(&self) -> Result<()> {
let mut client = node_service_time_out_client(&self.addr)
let mut _client = node_service_time_out_client(&self.addr)
.await
.map_err(|err| Error::msg(err.to_string()))?;
todo!()
}
pub async fn update_metacache_listing(&self) -> Result<()> {
let mut client = node_service_time_out_client(&self.addr)
let mut _client = node_service_time_out_client(&self.addr)
.await
.map_err(|err| Error::msg(err.to_string()))?;
todo!()
@@ -639,7 +639,7 @@ impl PeerRestClient {
Ok(())
}
pub async fn load_transition_tier_config(&self, start_rebalance: bool) -> Result<()> {
pub async fn load_transition_tier_config(&self) -> Result<()> {
let mut client = node_service_time_out_client(&self.addr)
.await
.map_err(|err| Error::msg(err.to_string()))?;