Merge pull request #1579 from Phala-Network/connect-sidevm-rcu

pruntime: Allow HTTP proxy to sidevm when syncing chain state
Phala-Network · May 11, 2024 · 3bf0a5e · 3bf0a5e
2 parents 9a91c53 + eed14f3
commit 3bf0a5e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/phactory/src/prpc_service.rs b/crates/phactory/src/prpc_service.rs
@@ -1315,6 +1315,7 @@ impl<Platform: pal::Platform> RpcService<Platform> {
         let guard = self.phactory.lock().unwrap();
         debug!(target: "phactory::lock", "Locked phactory");
         if !allow_rcu && guard.rcu_dispatching {
+            warn!(target: "phactory::lock", "RCU in progress, returning error");
             return Err(from_display(
                 "RCU in progress, please try the request again later",
             ));

diff --git a/standalone/pruntime/src/runtime.rs b/standalone/pruntime/src/runtime.rs
@@ -91,7 +91,7 @@ pub(crate) async fn ecall_connect_sidevm(
     let contract_id = hex::decode(id.trim_start_matches("0x"))
         .map_err(|err| (Status::BadRequest, err.to_string()))?;
     let Some(command_tx) = APPLICATION
-        .lock_phactory(false, false)
+        .lock_phactory(true, false)
         .map_err(|err| (Status::InternalServerError, err.to_string()))?
         .sidevm_command_sender(&contract_id)
     else {