1. docker
  2. Commit 35df24c8e6195ebac6ea28ed4dda5b53b1021f38
Browse code

graph: change argument order of Register function

This commit is patch for following comment
FIXME: pass img as first argument

Signed-off-by: Daehyeok.Mun <daehyeok@gmail.com>

Daehyeok.Mun authored on 2014/08/28 19:57:54
Showing 6 changed files
graph/graph.go
History View file @ 35df24c
... ... 
@@ -151,15 +151,14 @@ func (graph *Graph) Create(layerData archive.ArchiveReader, containerID, contain
151 151 
 		img.ContainerConfig = *containerConfig
152 152 
 	}
153 153
154 
-	if err := graph.Register(nil, layerData, img); err != nil {
154 
+	if err := graph.Register(img, nil, layerData); err != nil {
155 155 
 		return nil, err
156 156 
 	}
157 157 
 	return img, nil
158 158 
 }
159 159
160 160 
 // Register imports a pre-existing image into the graph.
161 
-// FIXME: pass img as first argument
162 
-func (graph *Graph) Register(jsonData []byte, layerData archive.ArchiveReader, img *image.Image) (err error) {
161 
+func (graph *Graph) Register(img *image.Image, jsonData []byte, layerData archive.ArchiveReader) (err error) {
163 162 
 	defer func() {
164 163 
 		// If any error occurs, remove the new dir from the driver.
165 164 
 		// Don't check for errors since the dir might not have been created.
graph/load.go
History View file @ 35df24c
... ... 
@@ -118,7 +118,7 @@ func (s *TagStore) recursiveLoad(eng *engine.Engine, address, tmpImageDir string
118 118 
 				}
119 119 
 			}
120 120 
 		}
121 
-		if err := s.graph.Register(imageJson, layer, img); err != nil {
121 
+		if err := s.graph.Register(img, imageJson, layer); err != nil {
122 122 
 			return err
123 123 
 		}
124 124 
 	}
graph/pull.go
History View file @ 35df24c
... ... 
@@ -280,9 +280,8 @@ func (s *TagStore) pullImage(r *registry.Session, out io.Writer, imgID, endpoint
280 280 
 				}
281 281 
 				defer layer.Close()
282 282
283 
-				err = s.graph.Register(imgJSON,
284 
-					utils.ProgressReader(layer, imgSize, out, sf, false, utils.TruncateID(id), "Downloading"),
285 
-					img)
283 
+				err = s.graph.Register(img, imgJSON,
284 
+					utils.ProgressReader(layer, imgSize, out, sf, false, utils.TruncateID(id), "Downloading"))
286 285 
 				if terr, ok := err.(net.Error); ok && terr.Timeout() && j < retries {
287 286 
 					time.Sleep(time.Duration(j) * 500 * time.Millisecond)
288 287 
 					continue
graph/service.go
History View file @ 35df24c
... ... 
@@ -74,7 +74,7 @@ func (s *TagStore) CmdSet(job *engine.Job) engine.Status {
74 74 
 	if err != nil {
75 75 
 		return job.Error(err)
76 76 
 	}
77 
-	if err := s.graph.Register(imgJSON, layer, img); err != nil {
77 
+	if err := s.graph.Register(img, imgJSON, layer); err != nil {
78 78 
 		return job.Error(err)
79 79 
 	}
80 80 
 	return engine.StatusOK
graph/tags_unit_test.go
History View file @ 35df24c
... ... 
@@ -61,7 +61,7 @@ func mkTestTagStore(root string, t *testing.T) *TagStore {
61 61 
 		t.Fatal(err)
62 62 
 	}
63 63 
 	img := &image.Image{ID: testImageID}
64 
-	if err := graph.Register(nil, archive, img); err != nil {
64 
+	if err := graph.Register(img, nil, archive); err != nil {
65 65 
 		t.Fatal(err)
66 66 
 	}
67 67 
 	if err := store.Set(testImageName, "", testImageID, false); err != nil {
integration/graph_test.go
History View file @ 35df24c
... ... 
@@ -74,7 +74,7 @@ func TestInterruptedRegister(t *testing.T) {
74 74 
 		Created: time.Now(),
75 75 
 	}
76 76 
 	w.CloseWithError(errors.New("But I'm not a tarball!")) // (Nobody's perfect, darling)
77 
-	graph.Register(nil, badArchive, image)
77 
+	graph.Register(image, nil, badArchive)
78 78 
 	if _, err := graph.Get(image.ID); err == nil {
79 79 
 		t.Fatal("Image should not exist after Register is interrupted")
80 80 
 	}
... ... 
@@ -83,7 +83,7 @@ func TestInterruptedRegister(t *testing.T) {
83 83 
 	if err != nil {
84 84 
 		t.Fatal(err)
85 85 
 	}
86 
-	if err := graph.Register(nil, goodArchive, image); err != nil {
86 
+	if err := graph.Register(image, nil, goodArchive); err != nil {
87 87 
 		t.Fatal(err)
88 88 
 	}
89 89 
 }
... ... 
@@ -133,7 +133,7 @@ func TestRegister(t *testing.T) {
133 133 
 		Comment: "testing",
134 134 
 		Created: time.Now(),
135 135 
 	}
136 
-	err = graph.Register(nil, archive, image)
136 
+	err = graph.Register(image, nil, archive)
137 137 
 	if err != nil {
138 138 
 		t.Fatal(err)
139 139 
 	}
... ... 
@@ -228,7 +228,7 @@ func TestDelete(t *testing.T) {
228 228 
 		t.Fatal(err)
229 229 
 	}
230 230 
 	// Test delete twice (pull -> rm -> pull -> rm)
231 
-	if err := graph.Register(nil, archive, img1); err != nil {
231 
+	if err := graph.Register(img1, nil, archive); err != nil {
232 232 
 		t.Fatal(err)
233 233 
 	}
234 234 
 	if err := graph.Delete(img1.ID); err != nil {
... ... 
@@ -262,9 +262,9 @@ func TestByParent(t *testing.T) {
262 262 
 		Created: time.Now(),
263 263 
 		Parent:  parentImage.ID,
264 264 
 	}
265 
-	_ = graph.Register(nil, archive1, parentImage)
266 
-	_ = graph.Register(nil, archive2, childImage1)
267 
-	_ = graph.Register(nil, archive3, childImage2)
265 
+	_ = graph.Register(parentImage, nil, archive1)
266 
+	_ = graph.Register(childImage1, nil, archive2)
267 
+	_ = graph.Register(childImage2, nil, archive3)
268 268
269 269 
 	byParent, err := graph.ByParent()
270 270 
 	if err != nil {