From f3f27293df83986ba29fb03f8af26a2177518e20 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Wed, 4 Jan 2023 13:07:13 +0100
Subject: Uniform framework for bg variable management

---
 src/garage/admin.rs | 47 +++++++++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

(limited to 'src/garage/admin.rs')

diff --git a/src/garage/admin.rs b/src/garage/admin.rs
index c669b5e6..13536c80 100644
--- a/src/garage/admin.rs
+++ b/src/garage/admin.rs
@@ -18,7 +18,6 @@ use garage_table::*;
 use garage_rpc::*;
 
 use garage_block::manager::BlockResyncErrorInfo;
-use garage_block::repair::ScrubWorkerCommand;
 
 use garage_model::bucket_alias_table::*;
 use garage_model::bucket_table::*;
@@ -60,6 +59,7 @@ pub enum AdminRpc {
 		HashMap<usize, garage_util::background::WorkerInfo>,
 		WorkerListOpt,
 	),
+	WorkerVars(Vec<(String, String)>),
 	WorkerInfo(usize, garage_util::background::WorkerInfo),
 	BlockErrorList(Vec<BlockResyncErrorInfo>),
 	BlockInfo {
@@ -943,32 +943,27 @@ impl AdminRpcHandler {
 					.clone();
 				Ok(AdminRpc::WorkerInfo(*tid, info))
 			}
-			WorkerOperation::Set { opt } => match opt {
-				WorkerSetCmd::ScrubTranquility { tranquility } => {
-					let scrub_command = ScrubWorkerCommand::SetTranquility(*tranquility);
-					self.garage
-						.block_manager
-						.send_scrub_command(scrub_command)
-						.await?;
-					Ok(AdminRpc::Ok("Scrub tranquility updated".into()))
-				}
-				WorkerSetCmd::ResyncWorkerCount { worker_count } => {
-					self.garage
-						.block_manager
-						.resync
-						.set_n_workers(*worker_count)
-						.await?;
-					Ok(AdminRpc::Ok("Number of resync workers updated".into()))
-				}
-				WorkerSetCmd::ResyncTranquility { tranquility } => {
-					self.garage
-						.block_manager
-						.resync
-						.set_tranquility(*tranquility)
-						.await?;
-					Ok(AdminRpc::Ok("Resync tranquility updated".into()))
+			WorkerOperation::Get { variable } => {
+				if let Some(v) = variable {
+					Ok(AdminRpc::WorkerVars(vec![(
+						v.clone(),
+						self.garage.bg_vars.get(&v)?,
+					)]))
+				} else {
+					Ok(AdminRpc::WorkerVars(
+						self.garage
+							.bg_vars
+							.get_all()
+							.into_iter()
+							.map(|(k, v)| (k.to_string(), v))
+							.collect(),
+					))
 				}
-			},
+			}
+			WorkerOperation::Set { variable, value } => {
+				self.garage.bg_vars.set(&variable, &value)?;
+				Ok(AdminRpc::Ok(format!("{} was set to {}", variable, value)))
+			}
 		}
 	}
 
-- 
cgit v1.2.3