rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-31 14:23:11 +00:00
Code Issues Releases Wiki Activity

enhance preload timing issue

Browse Source
This commit is contained in:
Jason-ZW
2018-04-02 04:56:47 +00:00
parent c73954fab0
commit 80c99642b2
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/control/preload.go
View File

@@ -14,6 +14,8 @@ import (
"github.com/codegangsta/cli"
dockerClient "github.com/docker/engine-api/client"
"github.com/docker/engine-api/types"
"github.com/rancher/os/config"
"github.com/rancher/os/docker"
"github.com/rancher/os/log"
)
@@ -90,10 +92,17 @@ func PreloadImages(clientFactory func() (dockerClient.APIClient, error), imagesD
clientInitialized = true
}
log.Infof("Loading image %s", filename)
if _, err = client.ImageLoad(context.Background(), imageReader, false); err != nil {
var imageLoadResponse types.ImageLoadResponse
if imageLoadResponse, err = client.ImageLoad(context.Background(), imageReader, false); err != nil {
return err
}
cfg := config.LoadConfig()
if cfg.Rancher.PreloadWait {
if _, err := ioutil.ReadAll(imageLoadResponse.Body); err != nil {
return err
}
}
log.Infof("Finished to load image %s", filename)
log.Infof("Creating done stamp file for image %s", filename)