Skip to content

fix(aws_s3 source): sqs recieve_messages hangs #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AvihaiSam wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(aws_s3 source): sqs recieve_messages hangs #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions src/sources/aws_s3/sqs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use std::collections::HashMap;
use std::{future::ready, num::NonZeroUsize, panic, sync::Arc};
use std::{future::ready, num::NonZeroUsize, panic, sync::Arc, time::Duration};

use aws_sdk_s3::operation::get_object::GetObjectError;
use aws_sdk_s3::Client as S3Client;
Expand All @@ -20,7 +20,7 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer};
use serde_with::serde_as;
use smallvec::SmallVec;
use snafu::{ResultExt, Snafu};
use tokio::{pin, select};
use tokio::{pin, select, time};
use tokio_util::codec::FramedRead;
use tracing::Instrument;
use vector_lib::codecs::decoding::FramingError;
Expand Down Expand Up @@ -329,13 +329,20 @@ impl IngestorProcess {
}

async fn run_once(&mut self) {
let messages = self.receive_messages().await;
let timeout_duration = Duration::from_secs(self.state.poll_secs as u64 + 5);
let messages = time::timeout(timeout_duration, self.receive_messages()).await;
let messages = messages
.map(|messages| {
emit!(SqsMessageReceiveSucceeded {
count: messages.len(),
});
messages
.map(|result| match result {
Ok(messages) => {
emit!(SqsMessageReceiveSucceeded {
count: messages.len(),
});
messages
}
Err(err) => {
emit!(SqsMessageReceiveError { error: &err });
Vec::new() // or handle the error case appropriately
}
})
.map_err(|err| {
emit!(SqsMessageReceiveError { error: &err });
Expand Down