diff options
| author | Dan Engelbrecht <[email protected]> | 2025-04-24 15:45:34 +0200 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2025-04-24 15:45:34 +0200 |
| commit | 0a3d04458199a1bfe2c60fc7ce174dbea20713a6 (patch) | |
| tree | e70d917f335cd8382235005b3b76831df1b29a6f /src | |
| parent | use state file if available when doing builds diff command (#369) (diff) | |
| download | zen-0a3d04458199a1bfe2c60fc7ce174dbea20713a6.tar.xz zen-0a3d04458199a1bfe2c60fc7ce174dbea20713a6.zip | |
limit retries on buildpart finalize (#374)
* limit retries on buildpart finalize
Diffstat (limited to 'src')
| -rw-r--r-- | src/zen/cmds/builds_cmd.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/zen/cmds/builds_cmd.cpp b/src/zen/cmds/builds_cmd.cpp index 855d7012f..f50f6205b 100644 --- a/src/zen/cmds/builds_cmd.cpp +++ b/src/zen/cmds/builds_cmd.cpp @@ -2475,7 +2475,7 @@ namespace { BlockIndexes.push_back(It->second); TotalBlocksSize += NewBlocks.BlockSizes[It->second]; } - if (auto ChunkIndexIt = Lookup.ChunkHashToChunkIndex.find(RawHash); ChunkIndexIt != Lookup.ChunkHashToChunkIndex.end()) + else if (auto ChunkIndexIt = Lookup.ChunkHashToChunkIndex.find(RawHash); ChunkIndexIt != Lookup.ChunkHashToChunkIndex.end()) { const uint32_t ChunkIndex = ChunkIndexIt->second; if (auto LooseOrderIndexIt = ChunkIndexToLooseChunkOrderIndex.find(ChunkIndex); @@ -2485,6 +2485,11 @@ namespace { TotalLooseChunksSize += Content.ChunkedContent.ChunkRawSizes[ChunkIndex]; } } + else + { + throw std::runtime_error( + fmt::format("Can not upload requested build blob {} as it was not generated by this upload", RawHash)); + } } uint64_t TotalRawSize = TotalLooseChunksSize + TotalBlocksSize; @@ -3644,7 +3649,8 @@ namespace { UploadAttachments(PutBuildPartResult.second); } - while (!AbortFlag) + uint32_t FinalizeBuildPartRetryCount = 5; + while (!AbortFlag && (FinalizeBuildPartRetryCount--) > 0) { Stopwatch FinalizeBuildPartTimer; std::vector<IoHash> Needs = Storage.BuildStorage->FinalizeBuildPart(BuildId, BuildPartId, PartHash); |