Skip to content

Commit e82a709

Browse files
authored
fix race condition when reading large amounts of data in iroh (#488)
1 parent 2221a93 commit e82a709

File tree

4 files changed

+3
-6
lines changed

4 files changed

+3
-6
lines changed

crates/shared/src/p2p/client.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,13 +215,14 @@ impl P2PClient {
215215
// Now send the actual request
216216
let request = P2PRequest::new(message);
217217
Self::write_message(&mut send, &request).await?;
218-
send.finish()?;
219218

220219
// Read response
221220
let response: P2PResponse = Self::read_message(&mut recv).await?;
222221

223222
tokio::time::sleep(Duration::from_millis(50)).await;
224223

224+
send.finish()?;
225+
225226
Ok(response.message)
226227
}
227228

crates/worker/src/docker/docker_manager.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,6 @@ impl DockerManager {
742742
container_id: &str,
743743
tail: Option<i64>,
744744
) -> Result<String, DockerError> {
745-
debug!("Fetching logs for container: {}", container_id);
746745
let tail_value = tail.unwrap_or(Self::DEFAULT_LOG_TAIL).to_string();
747746
let options = LogsOptions::<String> {
748747
stdout: true,

crates/worker/src/docker/service.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ impl DockerService {
320320
Some(task) => {
321321
let config_hash = task.generate_config_hash();
322322
let container_id = format!("{}-{}-{:x}", TASK_PREFIX, task.id, config_hash);
323+
323324
let logs = self
324325
.docker_manager
325326
.get_container_logs(&container_id, None)

crates/worker/src/p2p/service.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -509,9 +509,6 @@ impl P2PService {
509509
Self::write_response(&mut send, response).await?;
510510
}
511511

512-
// Finish the send stream
513-
send.finish()?;
514-
515512
Ok(())
516513
}
517514

@@ -704,7 +701,6 @@ mod tests {
704701
#[serial]
705702
async fn test_ping() {
706703
let (service, client, _, worker_wallet_address) = setup_test_service(true).await;
707-
println!("worker_wallet_address: {:?}", worker_wallet_address);
708704
let node_id = service.node_id().to_string();
709705
let addresses = service.listening_addresses().to_vec();
710706
let random_nonce = rand_v8::thread_rng().gen::<u64>();

0 commit comments

Comments
 (0)