docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix import/load return code 

Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
This commit is contained in:
Xian Chaobo 2015-09-15 10:00:49 -04:00
parent e6d81e1a43
commit 5cc6e3f30c
7 changed files with 66 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
api/handlers.go
View File

@ -459,10 +459,20 @@ func postImagesCreate(c *context, w http.ResponseWriter, r *http.Request) {
repo := r.Form.Get("repo")
tag := r.Form.Get("tag")
callback := func(what, status string) {
errorFound := false
callback := func(what, status string, err error) {
if err != nil {
errorFound = true
sendJSONMessage(wf, what, err.Error())
return
}
sendJSONMessage(wf, what, status)
}
c.cluster.Import(source, repo, tag, r.Body, callback)
if errorFound {
sendErrorJSONMessage(wf, 1, "")
}
}
}
@ -473,7 +483,14 @@ func postImagesLoad(c *context, w http.ResponseWriter, r *http.Request) {
// call cluster to load image on every node
wf := NewWriteFlusher(w)
callback := func(what, status string) {
errorFound := false
callback := func(what, status string, err error) {
if err != nil {
errorFound = true
sendJSONMessage(wf, what, fmt.Sprintf("Loading Image... : %s", err.Error()))
return
}
if status == "" {
sendJSONMessage(wf, what, "Loading Image...")
} else {
@ -481,6 +498,10 @@ func postImagesLoad(c *context, w http.ResponseWriter, r *http.Request) {
}
}
c.cluster.Load(r.Body, callback)
if errorFound {
sendErrorJSONMessage(wf, 1, "")
}
}
// GET /events

4
cluster/cluster.go
View File

@ -47,13 +47,13 @@ type Cluster interface {
// `callback` can be called multiple time
// `where` is where it is being imported
// `status` is the current status, like "", "in progress" or "imported"
Import(source string, repository string, tag string, imageReader io.Reader, callback func(where, status string))
Import(source string, repository string, tag string, imageReader io.Reader, callback func(where, status string, err error))
// Load images
// `callback` can be called multiple time
// `what` is what is being loaded
// `status` is the current status, like "", "in progress" or "loaded"
Load(imageReader io.Reader, callback func(what, status string))
Load(imageReader io.Reader, callback func(what, status string, err error))
// Return some info about the cluster, like nb or containers / images
// It is pretty open, so the implementation decides what to return.

4
cluster/mesos/cluster.go
View File

@ -275,12 +275,12 @@ func (c *Cluster) Pull(name string, authConfig *dockerclient.AuthConfig, callbac
}
// Load images
func (c *Cluster) Load(imageReader io.Reader, callback func(where, status string)) {
func (c *Cluster) Load(imageReader io.Reader, callback func(where, status string, err error)) {
}
// Import image
func (c *Cluster) Import(source string, repository string, tag string, imageReader io.Reader, callback func(what, status string)) {
func (c *Cluster) Import(source string, repository string, tag string, imageReader io.Reader, callback func(what, status string, err error)) {
}

10
cluster/swarm/cluster.go
View File

@ -325,7 +325,7 @@ func (c *Cluster) Pull(name string, authConfig *dockerclient.AuthConfig, callbac
}
// Load image
func (c *Cluster) Load(imageReader io.Reader, callback func(where, status string)) {
func (c *Cluster) Load(imageReader io.Reader, callback func(where, status string, err error)) {
var wg sync.WaitGroup
c.RLock()
@ -344,7 +344,7 @@ func (c *Cluster) Load(imageReader io.Reader, callback func(where, status string
err := engine.Load(reader)
if callback != nil {
if err != nil {
callback(engine.Name, err.Error())
callback(engine.Name, "", err)
}
}
}(pipeReader, e)
@ -373,7 +373,7 @@ func (c *Cluster) Load(imageReader io.Reader, callback func(where, status string
}
// Import image
func (c *Cluster) Import(source string, repository string, tag string, imageReader io.Reader, callback func(what, status string)) {
func (c *Cluster) Import(source string, repository string, tag string, imageReader io.Reader, callback func(what, status string, err error)) {
var wg sync.WaitGroup
c.RLock()
pipeWriters := []*io.PipeWriter{}
@ -392,9 +392,9 @@ func (c *Cluster) Import(source string, repository string, tag string, imageRead
err := engine.Import(source, repository, tag, reader)
if callback != nil {
if err != nil {
callback(engine.Name, err.Error())
callback(engine.Name, "", err)
} else {
callback(engine.Name, "Import success")
callback(engine.Name, "Import success", nil)
}
}

20
cluster/swarm/cluster_test.go
View File

@ -142,9 +142,9 @@ func TestImportImage(t *testing.T) {
readCloser := nopCloser{bytes.NewBufferString("ok")}
client.On("ImportImage", mock.Anything, mock.Anything, mock.Anything, mock.AnythingOfType("*io.PipeReader")).Return(readCloser, nil).Once()
callback := func(what, status string) {
callback := func(what, status string, err error) {
// import success
assert.Equal(t, status, "Import success")
assert.Nil(t, err)
}
c.Import("-", "testImageOK", "latest", bytes.NewReader(nil), callback)
@ -153,9 +153,9 @@ func TestImportImage(t *testing.T) {
err := fmt.Errorf("Import error")
client.On("ImportImage", mock.Anything, mock.Anything, mock.Anything, mock.AnythingOfType("*io.PipeReader")).Return(readCloser, err).Once()
callback = func(what, status string) {
callback = func(what, status string, err error) {
// import error
assert.Equal(t, status, "Import error")
assert.NotNil(t, err)
}
c.Import("-", "testImageError", "latest", bytes.NewReader(nil), callback)
}
@ -189,18 +189,18 @@ func TestLoadImage(t *testing.T) {
// load success
client.On("LoadImage", mock.AnythingOfType("*io.PipeReader")).Return(nil).Once()
callback := func(what, status string) {
//if load OK, will not come here
t.Fatalf("Load error")
callback := func(what, status string, err error) {
//if load OK, err will be nil
assert.Nil(t, err)
}
c.Load(bytes.NewReader(nil), callback)
// load error
err := fmt.Errorf("Load error")
client.On("LoadImage", mock.AnythingOfType("*io.PipeReader")).Return(err).Once()
callback = func(what, status string) {
// load error
assert.Equal(t, status, "Load error")
callback = func(what, status string, err error) {
// load error, err is not nil
assert.NotNil(t, err)
}
c.Load(bytes.NewReader(nil), callback)
}

12
test/integration/api/import.bats
View File

@ -41,3 +41,15 @@ function teardown() {
# after ok, delete exported tar file
rm -f $temp_file_name
}
@test "docker import - check error code" {
start_docker 2
swarm_manage
temp_file=$(mktemp)
run docker_swarm import - < $temp_file
[ "$status" -eq 1 ]
rm -f $temp_file
}

12
test/integration/api/load.bats
View File

@ -40,3 +40,15 @@ function teardown() {
rm -f $IMAGE_FILE
}
@test "docker load - check error code" {
start_docker 2
swarm_manage
temp_file=$(mktemp)
run docker_swarm load -i $temp_file
[ "$status" -eq 1 ]
rm -f $temp_file
}