Skip to content

fix(storage): consume server responses before finishing stream in AsyncWriter Close/Finalize #16270

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
kalragauri wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix(storage): consume server responses before finishing stream in AsyncWriter Close/Finalize #16270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
235b7c9
fix(storage): consume server responses before finishing stream in Asy…
kalragauri Jul 21, 2026
28689f7
Address feedback from Gemini code assistant
kalragauri Jul 21, 2026
fe1675f
Merge branch 'main' into feat/close-hangs
kalragauri Jul 22, 2026
a721d96
Merge branch 'main' into feat/close-hangs
kalragauri Jul 23, 2026
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
42 changes: 30 additions & 12 deletions google/cloud/storage/internal/async/connection_impl_appendable_upload_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,12 @@ std::unique_ptr<MockAsyncBidiWriteObjectStream> MakeCommonAppendStream(
response.mutable_resource()->set_size(persisted_size + 1024);
return std::make_optional(std::move(response));
});
})
// The third `Read()` call returns EOF.
.WillOnce([&] {
return sequencer.PushBack("Read(EOF)").then([](auto) {
return std::optional<google::storage::v2::BidiWriteObjectResponse>();
});
});

EXPECT_CALL(*stream, Cancel).Times(1);
Expand Down Expand Up @@ -304,6 +310,12 @@ TEST_F(AsyncConnectionImplAppendableTest, StartAppendableObjectUploadSuccess) {
next = sequencer.PopFrontWithName();
EXPECT_EQ(next.second, "Read(FinalObject)");
next.first.set_value(true);
next = sequencer.PopFrontWithName();
EXPECT_EQ(next.second, "Read(EOF)");
next.first.set_value(true);
next = sequencer.PopFrontWithName();
EXPECT_EQ(next.second, "Finish");
next.first.set_value(true);

auto response = w2.get();
ASSERT_STATUS_OK(response);
Expand All @@ -312,9 +324,6 @@ TEST_F(AsyncConnectionImplAppendableTest, StartAppendableObjectUploadSuccess) {
EXPECT_EQ(response->size(), 1024);

writer.reset();
next = sequencer.PopFrontWithName();
EXPECT_EQ(next.second, "Finish");
next.first.set_value(true);
}

TEST_F(AsyncConnectionImplAppendableTest, ResumeAppendableObjectUploadSuccess) {
Expand Down Expand Up @@ -370,15 +379,18 @@ TEST_F(AsyncConnectionImplAppendableTest, ResumeAppendableObjectUploadSuccess) {
next = sequencer.PopFrontWithName();
EXPECT_EQ(next.second, "Read(FinalObject)");
next.first.set_value(true);
next = sequencer.PopFrontWithName();
EXPECT_EQ(next.second, "Read(EOF)");
next.first.set_value(true);
next = sequencer.PopFrontWithName();
EXPECT_EQ(next.second, "Finish");
next.first.set_value(true);

auto response = w2.get();
ASSERT_STATUS_OK(response);
EXPECT_EQ(response->size(), kPersistedSize + 1024);

writer.reset();
next = sequencer.PopFrontWithName();
EXPECT_EQ(next.second, "Finish");
next.first.set_value(true);
}

TEST_F(AsyncConnectionImplAppendableTest, AppendableUploadTooManyTransients) {
Expand Down Expand Up @@ -517,6 +529,12 @@ TEST_F(AsyncConnectionImplAppendableTest, AppendableUploadRedirect) {
next = sequencer.PopFrontWithName();
EXPECT_EQ(next.second, "Read(FinalObject)");
next.first.set_value(true);
next = sequencer.PopFrontWithName();
EXPECT_EQ(next.second, "Read(EOF)");
next.first.set_value(true);
next = sequencer.PopFrontWithName();
EXPECT_EQ(next.second, "Finish");
next.first.set_value(true);

auto response = w2.get();
ASSERT_STATUS_OK(response);
Expand All @@ -525,9 +543,6 @@ TEST_F(AsyncConnectionImplAppendableTest, AppendableUploadRedirect) {
EXPECT_EQ(response->size(), 1024 + 1024);

writer.reset();
next = sequencer.PopFrontWithName();
EXPECT_EQ(next.second, "Finish");
next.first.set_value(true);
}

TEST_F(AsyncConnectionImplAppendableTest, AppendableUploadRedirectNoHandle) {
Expand Down Expand Up @@ -614,6 +629,12 @@ TEST_F(AsyncConnectionImplAppendableTest, AppendableUploadRedirectNoHandle) {
next = sequencer.PopFrontWithName();
EXPECT_EQ(next.second, "Read(FinalObject)");
next.first.set_value(true);
next = sequencer.PopFrontWithName();
EXPECT_EQ(next.second, "Read(EOF)");
next.first.set_value(true);
next = sequencer.PopFrontWithName();
EXPECT_EQ(next.second, "Finish");
next.first.set_value(true);

auto response = w2.get();
ASSERT_STATUS_OK(response);
Expand All @@ -622,9 +643,6 @@ TEST_F(AsyncConnectionImplAppendableTest, AppendableUploadRedirectNoHandle) {
EXPECT_EQ(response->size(), 1024 + 1024);

writer.reset();
next = sequencer.PopFrontWithName();
EXPECT_EQ(next.second, "Finish");
next.first.set_value(true);
}
} // namespace
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
Expand Down
Loading
Loading