sandbox: rename the task_service to service

rename the task_service to service, in order to
incopperate with the following added sandbox
services.

Signed-off-by: Fupan Li <fupan.lfp@antgroup.com>
This commit is contained in:
Fupan Li
2024-09-11 18:20:34 +08:00
parent 20b4be0225
commit 52397ca2c1

View File

@@ -25,7 +25,7 @@ const MESSAGE_BUFFER_SIZE: usize = 8;
pub struct ServiceManager {
receiver: Option<Receiver<Message>>,
handler: Arc<RuntimeHandlerManager>,
task_server: Option<Server>,
server: Option<Server>,
binary: String,
address: String,
namespace: String,
@@ -37,7 +37,7 @@ impl std::fmt::Debug for ServiceManager {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.debug_struct("ServiceManager")
.field("receiver", &self.receiver)
.field("task_server.is_some()", &self.task_server.is_some())
.field("server.is_some()", &self.server.is_some())
.field("binary", &self.binary)
.field("address", &self.address)
.field("namespace", &self.namespace)
@@ -60,8 +60,8 @@ impl ServiceManager {
let (sender, receiver) = channel::<Message>(MESSAGE_BUFFER_SIZE);
let rt_mgr = RuntimeHandlerManager::new(id, sender).context("new runtime handler")?;
let handler = Arc::new(rt_mgr);
let mut task_server = unsafe { Server::from_raw_fd(task_server_fd) };
task_server = task_server.set_domain_unix();
let mut server = unsafe { Server::from_raw_fd(task_server_fd) };
server = server.set_domain_unix();
let event_publisher = new_event_publisher(namespace)
.await
.context("new event publisher")?;
@@ -69,7 +69,7 @@ impl ServiceManager {
Ok(Self {
receiver: Some(receiver),
handler,
task_server: Some(task_server),
server: Some(server),
binary: containerd_binary.to_string(),
address: address.to_string(),
namespace: namespace.to_string(),
@@ -136,24 +136,24 @@ impl ServiceManager {
}
fn registry_service(&mut self) -> Result<()> {
if let Some(t) = self.task_server.take() {
if let Some(t) = self.server.take() {
let task_service = Arc::new(Box::new(TaskService::new(self.handler.clone()))
as Box<dyn shim_async::Task + Send + Sync>);
let t = t.register_service(shim_async::create_task(task_service));
self.task_server = Some(t);
self.server = Some(t);
}
Ok(())
}
async fn start_service(&mut self) -> Result<()> {
if let Some(t) = self.task_server.as_mut() {
if let Some(t) = self.server.as_mut() {
t.start().await.context("task server start")?;
}
Ok(())
}
async fn stop_service(&mut self) -> Result<()> {
if let Some(t) = self.task_server.as_mut() {
if let Some(t) = self.server.as_mut() {
t.stop_listen().await;
}
Ok(())