retry finalize if we get a "needs" on a blob we did not create (#461)

2 files changed, 5 insertions, 2 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05228dddf..5e7569476 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Improvement: When formatting log output for malformed attachments in a package message, allow the string buffer to grow instead of throwing exception
 - Improvement: Refactored build store cache to use existing CidStore implementation instead of implementation specific blob storage
   - **CAUTION** This will clear any existing cache when updating as the manifest version and storage strategy has changed
+- Improvement: If cloud-ddc requests upload of a blob it earlier reported as good to reuse we treat it as a transient error and attempt to retry
 - Bugfix: Parents were not notified when successfully attaching to an existing server instance
 - Bugfix: BuildStorage cache return "true" for metadata existance for all blobs that had payloads regardless of actual existance for metadata
 
diff --git a/src/zen/cmds/builds_cmd.cpp b/src/zen/cmds/builds_cmd.cpp
index cd27daa9e..fc3580d75 100644
--- a/src/zen/cmds/builds_cmd.cpp
+++ b/src/zen/cmds/builds_cmd.cpp
@@ -2904,8 +2904,10 @@ namespace {
 				}
 				else
 				{
-					throw std::runtime_error(
-						fmt::format("Can not upload requested build blob {} as it was not generated by this upload", RawHash));
+					ZEN_CONSOLE(
+						"Warning: Build blob {} was reported as needed for upload but it was reported as existing at the start of the "
+						"operation. Treating it as a transient inconsistent issue and will attempt to retry finalization",
+						RawHash);
 				}
 			}
 			uint64_t TotalRawSize = TotalLooseChunksSize + TotalBlocksSize;