-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve image pull handling, with better logging and timeout behaviour (
- Loading branch information
Showing
11 changed files
with
362 additions
and
83 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
121 changes: 121 additions & 0 deletions
121
core/src/main/java/org/testcontainers/images/LoggedPullImageResultCallback.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| package org.testcontainers.images; | ||
|
|
||
| import com.github.dockerjava.api.model.PullResponseItem; | ||
| import com.github.dockerjava.core.command.PullImageResultCallback; | ||
| import org.slf4j.Logger; | ||
|
|
||
| import java.io.Closeable; | ||
| import java.time.Duration; | ||
| import java.time.Instant; | ||
| import java.util.*; | ||
|
|
||
| import static java.lang.String.format; | ||
| import static org.apache.commons.io.FileUtils.byteCountToDisplaySize; | ||
|
|
||
| /** | ||
| * {@link PullImageResultCallback} with improved logging of pull progress. | ||
| */ | ||
| class LoggedPullImageResultCallback extends PullImageResultCallback { | ||
| private final Logger logger; | ||
|
|
||
| private final Set<String> allLayers = new HashSet<>(); | ||
| private final Set<String> downloadedLayers = new HashSet<>(); | ||
| private final Set<String> pulledLayers = new HashSet<>(); | ||
| private final Map<String, Long> totalSizes = new HashMap<>(); | ||
| private final Map<String, Long> currentSizes = new HashMap<>(); | ||
| private boolean completed; | ||
| private Instant start; | ||
|
|
||
| LoggedPullImageResultCallback(final Logger logger) { | ||
| this.logger = logger; | ||
| } | ||
|
|
||
| @Override | ||
| public void onStart(final Closeable stream) { | ||
| super.onStart(stream); | ||
| start = Instant.now(); | ||
|
|
||
| logger.info("Starting to pull image"); | ||
| } | ||
|
|
||
| @Override | ||
| public void onNext(final PullResponseItem item) { | ||
| super.onNext(item); | ||
|
|
||
| final String statusLowercase = item.getStatus() != null ? item.getStatus().toLowerCase() : ""; | ||
| final String id = item.getId(); | ||
|
|
||
| if (item.getProgressDetail() != null) { | ||
| allLayers.add(id); | ||
| } | ||
|
|
||
| if (statusLowercase.equalsIgnoreCase("download complete")) { | ||
| downloadedLayers.add(id); | ||
| } | ||
|
|
||
| if (statusLowercase.equalsIgnoreCase("pull complete")) { | ||
| pulledLayers.add(id); | ||
| } | ||
|
|
||
| if (item.getProgressDetail() != null) { | ||
| Long total = item.getProgressDetail().getTotal(); | ||
| Long current = item.getProgressDetail().getCurrent(); | ||
|
|
||
| if (total != null && total > totalSizes.getOrDefault(id, 0L)) { | ||
| totalSizes.put(id, total); | ||
| } | ||
| if (current != null && current > currentSizes.getOrDefault(id, 0L)) { | ||
| currentSizes.put(id, current); | ||
| } | ||
| } | ||
|
|
||
| if (statusLowercase.startsWith("pulling from" ) || statusLowercase.contains("complete" )) { | ||
|
|
||
| long totalSize = totalLayerSize(); | ||
| long currentSize = downloadedLayerSize(); | ||
|
|
||
| int pendingCount = allLayers.size() - downloadedLayers.size(); | ||
| String friendlyTotalSize; | ||
| if (pendingCount > 0) { | ||
| friendlyTotalSize = "? MB"; | ||
| } else { | ||
| friendlyTotalSize = byteCountToDisplaySize(totalSize); | ||
| } | ||
|
|
||
| logger.info("Pulling image layers: {} pending, {} downloaded, {} extracted, ({}/{})", | ||
| format("%2d", pendingCount), | ||
| format("%2d", downloadedLayers.size()), | ||
| format("%2d", pulledLayers.size()), | ||
| byteCountToDisplaySize(currentSize), | ||
| friendlyTotalSize); | ||
| } | ||
|
|
||
| if (statusLowercase.contains("complete")) { | ||
| completed = true; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onComplete() { | ||
| super.onComplete(); | ||
|
|
||
| final long downloadedLayerSize = downloadedLayerSize(); | ||
| final long duration = Duration.between(start, Instant.now()).getSeconds(); | ||
|
|
||
| if (completed) { | ||
| logger.info("Pull complete. {} layers, pulled in {}s (downloaded {} at {}/s)", | ||
| allLayers.size(), | ||
| duration, | ||
| byteCountToDisplaySize(downloadedLayerSize), | ||
| byteCountToDisplaySize(downloadedLayerSize / duration)); | ||
| } | ||
| } | ||
|
|
||
| private long downloadedLayerSize() { | ||
| return currentSizes.values().stream().filter(Objects::nonNull).mapToLong(it -> it).sum(); | ||
| } | ||
|
|
||
| private long totalLayerSize() { | ||
| return totalSizes.values().stream().filter(Objects::nonNull).mapToLong(it -> it).sum(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.