diff --git a/charts/graphscope-store/templates/configmap.yaml b/charts/graphscope-store/templates/configmap.yaml index d202ff52d74c..826a05f777b7 100644 --- a/charts/graphscope-store/templates/configmap.yaml +++ b/charts/graphscope-store/templates/configmap.yaml @@ -81,7 +81,7 @@ data: gaia.rpc.port=60000 gaia.engine.port=60001 - gaia.write.timeout.ms={{ .Values.pegasus.timeout }} + gaia.write.timeout.ms=5000 ## Secondary config secondary.instance.enabled={{ .Values.secondary.enabled }} diff --git a/interactive_engine/executor/engine/pegasus/network/src/send/mod.rs b/interactive_engine/executor/engine/pegasus/network/src/send/mod.rs index 87d0e4d7eaa8..fd7e58dad6d6 100644 --- a/interactive_engine/executor/engine/pegasus/network/src/send/mod.rs +++ b/interactive_engine/executor/engine/pegasus/network/src/send/mod.rs @@ -199,8 +199,12 @@ pub(crate) fn start_net_sender( let params = params.get_write_params(); match params.mode { BlockMode::Blocking(timeout) => { - conn.set_write_timeout(timeout).ok(); - is_block = false; + if timeout.is_none() { + is_block = false; + } else { + conn.set_write_timeout(timeout).ok(); + is_block = true; + } } _ => (), } diff --git a/interactive_engine/executor/engine/pegasus/network/src/transport/block/mod.rs b/interactive_engine/executor/engine/pegasus/network/src/transport/block/mod.rs index 936cd41080cd..0f87123ca34f 100644 --- a/interactive_engine/executor/engine/pegasus/network/src/transport/block/mod.rs +++ b/interactive_engine/executor/engine/pegasus/network/src/transport/block/mod.rs @@ -19,7 +19,6 @@ use std::sync::atomic::AtomicBool; use std::sync::Arc; use std::time::Duration; -use crate::config::BlockMode; use crate::receive::start_net_receiver; use crate::send::start_net_sender; use crate::transport::ConnectionParams; @@ -56,14 +55,6 @@ pub fn listen_on( let remote = Server { id: remote_id, addr }; if params.is_nonblocking { stream.set_nonblocking(true).ok(); - } else { - if let BlockMode::Blocking(Some(write_timelout)) = - params.get_write_params().mode - { - stream - .set_write_timeout(Some(write_timelout)) - .ok(); - } } let recv_poisoned = Arc::new(AtomicBool::new(false)); start_net_sender( @@ -136,11 +127,6 @@ pub fn connect( let remote = Server { id: remote_id, addr }; if params.is_nonblocking { conn.set_nonblocking(true).ok(); - } else { - if let BlockMode::Blocking(Some(write_timelout)) = params.get_write_params().mode { - conn.set_write_timeout(Some(write_timelout)) - .ok(); - } } let read_half = conn .try_clone()