From 40a016bcd4a0f91977ee048f9a751534cb03a602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B3=B0=E5=8F=8B?= <cuichengxu.ccx@antgroup.com>
Date: Thu, 2 Jun 2022 13:10:49 +0800
Subject: [PATCH] fix: fscache and virtio fail to start
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

State machine is turned on arriving 'RUNNING' via 'READY', instead from
'INIT' to 'RUNNING' directly. The virtio and fscache miss the trigger
from 'INIT' to 'READY', still trying to transfer from 'INIT' to
'RUNNING' which is old fashion. So this patch add additional
transformation.

Signed-off-by: 泰友 <cuichengxu.ccx@antgroup.com>
---
 src/bin/nydusd/service_controller.rs | 3 +++
 src/bin/nydusd/virtiofs.rs           | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/bin/nydusd/service_controller.rs b/src/bin/nydusd/service_controller.rs
index 98799915bcb..05ff949357b 100644
--- a/src/bin/nydusd/service_controller.rs
+++ b/src/bin/nydusd/service_controller.rs
@@ -241,6 +241,9 @@ pub fn create_daemon(subargs: &SubCmdArgs, bti: BuildTimeInfo) -> Result<Arc<dyn
     let daemon = Arc::new(service_controller);
     let machine = DaemonStateMachineContext::new(daemon.clone(), from_client, to_client);
     machine.kick_state_machine()?;
+    daemon
+        .on_event(DaemonStateMachineInput::Mount)
+        .map_err(|e| eother!(e))?;
     daemon
         .on_event(DaemonStateMachineInput::Start)
         .map_err(|e| eother!(e))?;
diff --git a/src/bin/nydusd/virtiofs.rs b/src/bin/nydusd/virtiofs.rs
index f9cdd9b0f2b..5e05b9f98d5 100644
--- a/src/bin/nydusd/virtiofs.rs
+++ b/src/bin/nydusd/virtiofs.rs
@@ -399,6 +399,9 @@ pub fn create_virtiofs_daemon(
     if let Some(cmd) = mount_cmd {
         daemon.service.mount(cmd)?;
     }
+    daemon
+        .on_event(DaemonStateMachineInput::Mount)
+        .map_err(|e| eother!(e))?;
     daemon
         .on_event(DaemonStateMachineInput::Start)
         .map_err(|e| eother!(e))?;