From b386851dc69cb297ce8dd481a55c6c2aff681d92 Mon Sep 17 00:00:00 2001 From: Alex Castillo Date: Sun, 15 Nov 2026 04:57:02 -0400 Subject: [PATCH] fix: recognize completed large files after finish errors --- .../client/B2StorageClientWebifierImpl.java | 25 ++++++++-- .../B2StorageClientWebifierImplTest.java | 50 +++++++++++++++++++ 2 files changed, 70 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/backblaze/b2/client/B2StorageClientWebifierImpl.java b/core/src/main/java/com/backblaze/b2/client/B2StorageClientWebifierImpl.java index d10d43110..1d78cf775 100644 --- a/core/src/main/java/com/backblaze/b2/client/B2StorageClientWebifierImpl.java +++ b/core/src/main/java/com/backblaze/b2/client/B2StorageClientWebifierImpl.java @@ -455,11 +455,26 @@ public B2FileVersion startLargeFile(B2AccountAuthorization accountAuth, @Override public B2FileVersion finishLargeFile(B2AccountAuthorization accountAuth, B2FinishLargeFileRequest request) throws B2Exception { - return webApiClient.postJsonReturnJson( - makeUrl(accountAuth, "b2_finish_large_file"), - makeHeaders(accountAuth), - request, - B2FileVersion.class); + try { + return webApiClient.postJsonReturnJson( + makeUrl(accountAuth, "b2_finish_large_file"), + makeHeaders(accountAuth), + request, + B2FileVersion.class); + } catch (B2BadRequestException original) { + // The service waits for an in-progress finish before returning 400 (#41). + // File info can therefore confirm success after a lost finish response. + try { + final B2FileVersion version = getFileInfo(accountAuth, + B2GetFileInfoRequest.builder(request.getFileId()).build()); + if (version.isUpload()) { + return version; + } + } catch (B2Exception ignored) { + // Preserve the finish error if the file's state cannot be checked. + } + throw original; + } } @Override diff --git a/core/src/test/java/com/backblaze/b2/client/B2StorageClientWebifierImplTest.java b/core/src/test/java/com/backblaze/b2/client/B2StorageClientWebifierImplTest.java index 4475de8bf..9741a592d 100644 --- a/core/src/test/java/com/backblaze/b2/client/B2StorageClientWebifierImplTest.java +++ b/core/src/test/java/com/backblaze/b2/client/B2StorageClientWebifierImplTest.java @@ -845,6 +845,56 @@ public void testFinishLargeFile() throws B2Exception { checkRequestCategory(OTHER, w -> w.finishLargeFile(ACCOUNT_AUTH, request)); } + @Test + public void testFinishLargeFileAlreadyFinished() throws B2Exception { + checkFinishLargeFileAfterBadRequest(true, false); + } + + @Test + public void testFinishLargeFileStillUnfinished() throws B2Exception { + checkFinishLargeFileAfterBadRequest(false, false); + } + + @Test + public void testFinishLargeFileInfoFails() throws B2Exception { + checkFinishLargeFileAfterBadRequest(false, true); + } + + private void checkFinishLargeFileAfterBadRequest(boolean uploaded, boolean infoFails) throws B2Exception { + final B2BadRequestException original = new B2BadRequestException("bad_request", null, "finish failed"); + final B2FileVersion version = mock(B2FileVersion.class); + org.mockito.Mockito.when(version.isUpload()).thenReturn(uploaded); + final B2WebApiClient client = new AlwaysThrowsUnauthorizedWebClientApi() { + @Override + public ResponseType postJsonReturnJson(String url, + B2Headers headersOrNull, + Object request, + Class responseClass) throws B2Exception { + if (url.endsWith("/b2_finish_large_file")) { + throw original; + } + assertEquals("apiUrl1/b2api/v2/b2_get_file_info", url); + assertEquals(B2GetFileInfoRequest.builder(fileId(1)).build(), request); + if (infoFails) { + throw new B2UnauthorizedException("unauthorized", null, "info failed"); + } + return responseClass.cast(version); + } + }; + final B2StorageClientWebifierImpl localWebifier = new B2StorageClientWebifierImpl( + client, USER_AGENT, MASTER_URL, null); + final B2FinishLargeFileRequest request = B2FinishLargeFileRequest + .builder(fileId(1), B2Collections.listOf("sha1_1")).build(); + try { + final B2FileVersion result = localWebifier.finishLargeFile(ACCOUNT_AUTH, request); + assertTrue(uploaded && !infoFails); + org.junit.Assert.assertSame(version, result); + } catch (B2BadRequestException e) { + assertFalse(uploaded && !infoFails); + org.junit.Assert.assertSame(original, e); + } + } + @Test public void testCancelLargeFile() throws B2Exception { final B2CancelLargeFileRequest request = B2CancelLargeFileRequest