[FAB-5861] Fix mis-usage in container/image

yeasy · ryjones · commit b63ee5603c91 · 2018-04-05T22:00:23.000Z
This patchset fixes the following issues related to Docker:

* Name and ID are different in Docker, now we mixed the usage;
* Docker image does not support start/stop. The start/stop req is
  actually for Docker containers.

Change-Id: I4150c0b273acd0c8e6c13c2f5929301836fd5277
Signed-off-by: Baohua Yang &lt;yangbaohua@gmail.com&gt;
diff --git a/core/chaincode/chaincode_support.go b/core/chaincode/chaincode_support.go
@@ -411,7 +411,7 @@ func (ccl *ccLauncherImpl) launch(ctxt context.Context, notify chan bool) (conta
 	}
 
 	ipcCtxt := context.WithValue(ctxt, ccintf.GetCCHandlerKey(), ccl.support)
-	sir := container.StartImageReq{
+	sir := container.StartContainerReq{
 		CCID: ccintf.CCID{
 			ChaincodeSpec: ccl.cds.ChaincodeSpec,
 			NetworkID:     ccl.support.peerNetworkID,
@@ -547,10 +547,10 @@ func (chaincodeSupport *ChaincodeSupport) Stop(context context.Context, cccid *c
 	}
 
 	//stop the chaincode
-	sir := container.StopImageReq{CCID: ccintf.CCID{ChaincodeSpec: cds.ChaincodeSpec, NetworkID: chaincodeSupport.peerNetworkID, PeerID: chaincodeSupport.peerID, Version: cccid.Version}, Timeout: 0}
+	sir := container.StopContainerReq{CCID: ccintf.CCID{ChaincodeSpec: cds.ChaincodeSpec, NetworkID: chaincodeSupport.peerNetworkID, PeerID: chaincodeSupport.peerID, Version: cccid.Version}, Timeout: 0}
 	// The line below is left for debugging. It replaces the line above to keep
 	// the chaincode container around to give you a chance to get data
-	//sir := container.StopImageReq{CCID: ccintf.CCID{ChaincodeSpec: cds.ChaincodeSpec, NetworkID: chaincodeSupport.peerNetworkID, PeerID: chaincodeSupport.peerID, ChainID: cccid.ChainID, Version: cccid.Version}, Timeout: 0, Dontremove: true}
+	//sir := container.StopContainerReq{CCID: ccintf.CCID{ChaincodeSpec: cds.ChaincodeSpec, NetworkID: chaincodeSupport.peerNetworkID, PeerID: chaincodeSupport.peerID, ChainID: cccid.ChainID, Version: cccid.Version}, Timeout: 0, Dontremove: true}
 
 	vmtype, _ := chaincodeSupport.getVMType(cds)
 
diff --git a/core/container/controller.go b/core/container/controller.go
@@ -148,8 +148,8 @@ func (bp CreateImageReq) getCCID() ccintf.CCID {
 	return bp.CCID
 }
 
-//StartImageReq - properties for starting a container.
-type StartImageReq struct {
+//StartContainerReq - properties for starting a container.
+type StartContainerReq struct {
 	ccintf.CCID
 	Builder       api.BuildSpecFactory
 	Args          []string
@@ -158,7 +158,7 @@ type StartImageReq struct {
 	PrelaunchFunc api.PrelaunchFunc
 }
 
-func (si StartImageReq) do(ctxt context.Context, v api.VM) VMCResp {
+func (si StartContainerReq) do(ctxt context.Context, v api.VM) VMCResp {
 	var resp VMCResp
 
 	if err := v.Start(ctxt, si.CCID, si.Args, si.Env, si.FilesToUpload, si.Builder, si.PrelaunchFunc); err != nil {
@@ -170,12 +170,12 @@ func (si StartImageReq) do(ctxt context.Context, v api.VM) VMCResp {
 	return resp
 }
 
-func (si StartImageReq) getCCID() ccintf.CCID {
+func (si StartContainerReq) getCCID() ccintf.CCID {
 	return si.CCID
 }
 
-//StopImageReq - properties for stopping a container.
-type StopImageReq struct {
+//StopContainerReq - properties for stopping a container.
+type StopContainerReq struct {
 	ccintf.CCID
 	Timeout uint
 	//by default we will kill the container after stopping
@@ -184,7 +184,7 @@ type StopImageReq struct {
 	Dontremove bool
 }
 
-func (si StopImageReq) do(ctxt context.Context, v api.VM) VMCResp {
+func (si StopContainerReq) do(ctxt context.Context, v api.VM) VMCResp {
 	var resp VMCResp
 
 	if err := v.Stop(ctxt, si.CCID, si.Timeout, si.Dontkill, si.Dontremove); err != nil {
@@ -196,7 +196,7 @@ func (si StopImageReq) do(ctxt context.Context, v api.VM) VMCResp {
 	return resp
 }
 
-func (si StopImageReq) getCCID() ccintf.CCID {
+func (si StopContainerReq) getCCID() ccintf.CCID {
 	return si.CCID
 }
 
diff --git a/core/container/controller_test.go b/core/container/controller_test.go
@@ -176,7 +176,7 @@ func TestVMCStartContainer(t *testing.T) {
 	//create a StartImageReq obj and send it to VMCProcess
 	go func() {
 		defer close(c)
-		sir := StartImageReq{CCID: ccintf.CCID{ChaincodeSpec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "simple"}}}}
+		sir := StartContainerReq{CCID: ccintf.CCID{ChaincodeSpec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "simple"}}}}
 		_, err := VMCProcess(ctxt, "Docker", sir)
 		if err != nil {
 			t.Fail()
@@ -188,7 +188,7 @@ func TestVMCStartContainer(t *testing.T) {
 	//wait for VMController to complete.
 	fmt.Println("VMCStartContainer-waiting for response")
 	<-c
-	stopr := StopImageReq{CCID: ccintf.CCID{ChaincodeSpec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "simple"}}}, Timeout: 0, Dontremove: true}
+	stopr := StopContainerReq{CCID: ccintf.CCID{ChaincodeSpec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "simple"}}}, Timeout: 0, Dontremove: true}
 	VMCProcess(ctxt, "Docker", stopr)
 }
 
@@ -204,10 +204,10 @@ func TestVMCCreateAndStartContainer(t *testing.T) {
 		defer close(c)
 
 		//stop and delete the container first (if it exists)
-		stopir := StopImageReq{CCID: ccintf.CCID{ChaincodeSpec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "simple"}}}, Timeout: 0}
+		stopir := StopContainerReq{CCID: ccintf.CCID{ChaincodeSpec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "simple"}}}, Timeout: 0}
 		VMCProcess(ctxt, "Docker", stopir)
 
-		startir := StartImageReq{CCID: ccintf.CCID{ChaincodeSpec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "simple"}}}}
+		startir := StartContainerReq{CCID: ccintf.CCID{ChaincodeSpec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "simple"}}}}
 		r, err := VMCProcess(ctxt, "Docker", startir)
 		if err != nil {
 			t.Fail()
@@ -224,7 +224,7 @@ func TestVMCCreateAndStartContainer(t *testing.T) {
 	//wait for VMController to complete.
 	fmt.Println("VMCStartContainer-waiting for response")
 	<-c
-	//stopr := StopImageReq{ID: "simple", Timeout: 0, Dontremove: true}
+	//stopr := StopContainerReq{ID: "simple", Timeout: 0, Dontremove: true}
 	//VMCProcess(ctxt, "Docker", stopr)
 }
 
@@ -234,14 +234,14 @@ func TestVMCSyncStartContainer(t *testing.T) {
 	var ctxt = context.Background()
 
 	//creat a StartImageReq obj and send it to VMCProcess
-	sir := StartImageReq{CCID: ccintf.CCID{ChaincodeSpec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "simple"}}}}
+	sir := StartContainerReq{CCID: ccintf.CCID{ChaincodeSpec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "simple"}}}}
 	_, err := VMCProcess(ctxt, "Docker", sir)
 	if err != nil {
 		t.Fail()
 		t.Logf("Error starting container: %s", err)
 		return
 	}
-	stopr := StopImageReq{CCID: ccintf.CCID{ChaincodeSpec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "simple"}}}, Timeout: 0, Dontremove: true}
+	stopr := StopContainerReq{CCID: ccintf.CCID{ChaincodeSpec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "simple"}}}, Timeout: 0, Dontremove: true}
 	VMCProcess(ctxt, "Docker", stopr)
 }
 
@@ -252,10 +252,10 @@ func TestVMCStopContainer(t *testing.T) {
 
 	c := make(chan struct{})
 
-	//creat a StopImageReq obj and send it to VMCProcess
+	//creat a StopContainerReq obj and send it to VMCProcess
 	go func() {
 		defer close(c)
-		sir := StopImageReq{CCID: ccintf.CCID{ChaincodeSpec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "simple"}}}, Timeout: 0}
+		sir := StopContainerReq{CCID: ccintf.CCID{ChaincodeSpec: &pb.ChaincodeSpec{ChaincodeId: &pb.ChaincodeID{Name: "simple"}}}, Timeout: 0}
 		_, err := VMCProcess(ctxt, "Docker", sir)
 		if err != nil {
 			t.Fail()
diff --git a/core/container/dockercontroller/dockercontroller.go b/core/container/dockercontroller/dockercontroller.go
@@ -217,7 +217,7 @@ func (vm *DockerVM) Deploy(ctxt context.Context, ccid ccintf.CCID,
 //Start starts a container using a previously created docker image
 func (vm *DockerVM) Start(ctxt context.Context, ccid ccintf.CCID,
 	args []string, env []string, filesToUpload map[string][]byte, builder container.BuildSpecFactory, prelaunchFunc container.PrelaunchFunc) error {
-	imageID, err := vm.GetVMName(ccid, formatImageName)
+	imageName, err := vm.GetVMName(ccid, formatImageName)
 	if err != nil {
 		return err
 	}
@@ -228,47 +228,47 @@ func (vm *DockerVM) Start(ctxt context.Context, ccid ccintf.CCID,
 		return err
 	}
 
-	containerID, err := vm.GetVMName(ccid, nil)
+	containerName, err := vm.GetVMName(ccid, nil)
 	if err != nil {
 		return err
 	}
 
 	attachStdout := viper.GetBool("vm.docker.attachStdout")
 
 	//stop,force remove if necessary
-	dockerLogger.Debugf("Cleanup container %s", containerID)
-	vm.stopInternal(ctxt, client, containerID, 0, false, false)
+	dockerLogger.Debugf("Cleanup container %s", containerName)
+	vm.stopInternal(ctxt, client, containerName, 0, false, false)
 
-	dockerLogger.Debugf("Start container %s", containerID)
-	err = vm.createContainer(ctxt, client, imageID, containerID, args, env, attachStdout)
+	dockerLogger.Debugf("Start container %s", containerName)
+	err = vm.createContainer(ctxt, client, imageName, containerName, args, env, attachStdout)
 	if err != nil {
 		//if image not found try to create image and retry
 		if err == docker.ErrNoSuchImage {
 			if builder != nil {
 				dockerLogger.Debugf("start-could not find image <%s> (container id <%s>), because of <%s>..."+
-					"attempt to recreate image", imageID, containerID, err)
+					"attempt to recreate image", imageName, containerName, err)
 
 				reader, err1 := builder()
 				if err1 != nil {
 					dockerLogger.Errorf("Error creating image builder for image <%s> (container id <%s>), "+
-						"because of <%s>", imageID, containerID, err1)
+						"because of <%s>", imageName, containerName, err1)
 				}
 
 				if err1 = vm.deployImage(client, ccid, args, env, reader); err1 != nil {
 					return err1
 				}
 
 				dockerLogger.Debug("start-recreated image successfully")
-				if err1 = vm.createContainer(ctxt, client, imageID, containerID, args, env, attachStdout); err1 != nil {
+				if err1 = vm.createContainer(ctxt, client, imageName, containerName, args, env, attachStdout); err1 != nil {
 					dockerLogger.Errorf("start-could not recreate container post recreate image: %s", err1)
 					return err1
 				}
 			} else {
-				dockerLogger.Errorf("start-could not find image <%s>, because of %s", imageID, err)
+				dockerLogger.Errorf("start-could not find image <%s>, because of %s", imageName, err)
 				return err
 			}
 		} else {
-			dockerLogger.Errorf("start-could not recreate container <%s>, because of %s", containerID, err)
+			dockerLogger.Errorf("start-could not recreate container <%s>, because of %s", containerName, err)
 			return err
 		}
 	}
@@ -285,7 +285,7 @@ func (vm *DockerVM) Start(ctxt context.Context, ccid ccintf.CCID,
 			// The returned error is not used outside the scope of this function. Assign the
 			// error to a local variable to prevent clobbering the function variable 'err'.
 			err := client.AttachToContainer(docker.AttachToContainerOptions{
-				Container:    containerID,
+				Container:    containerName,
 				OutputStream: w,
 				ErrorStream:  w,
 				Logs:         true,
@@ -306,7 +306,7 @@ func (vm *DockerVM) Start(ctxt context.Context, ccid ccintf.CCID,
 			case <-attached:
 				// successful attach
 			case <-time.After(10 * time.Second):
-				dockerLogger.Errorf("Timeout while attaching to IO channel in container %s", containerID)
+				dockerLogger.Errorf("Timeout while attaching to IO channel in container %s", containerName)
 				return
 			}
 
@@ -320,8 +320,8 @@ func (vm *DockerVM) Start(ctxt context.Context, ccid ccintf.CCID,
 			is := bufio.NewReader(r)
 
 			// Acquire a custom logger for our chaincode, inheriting the level from the peer
-			containerLogger := flogging.MustGetLogger(containerID)
-			logging.SetLevel(logging.GetLevel("peer"), containerID)
+			containerLogger := flogging.MustGetLogger(containerName)
+			logging.SetLevel(logging.GetLevel("peer"), containerName)
 
 			for {
 				// Loop forever dumping lines of text into the containerLogger
@@ -330,7 +330,7 @@ func (vm *DockerVM) Start(ctxt context.Context, ccid ccintf.CCID,
 				if err2 != nil {
 					switch err2 {
 					case io.EOF:
-						dockerLogger.Infof("Container %s has closed its IO channel", containerID)
+						dockerLogger.Infof("Container %s has closed its IO channel", containerName)
 					default:
 						dockerLogger.Errorf("Error reading container output: %s", err2)
 					}
@@ -363,14 +363,14 @@ func (vm *DockerVM) Start(ctxt context.Context, ccid ccintf.CCID,
 
 		gw.Close()
 
-		err = client.UploadToContainer(containerID, docker.UploadToContainerOptions{
+		err = client.UploadToContainer(containerName, docker.UploadToContainerOptions{
 			InputStream:          bytes.NewReader(payload.Bytes()),
 			Path:                 "/",
 			NoOverwriteDirNonDir: false,
 		})
 
 		if err != nil {
-			return fmt.Errorf("Error uploading files to the container instance %s: %s", containerID, err)
+			return fmt.Errorf("Error uploading files to the container instance %s: %s", containerName, err)
 		}
 	}
 
@@ -381,13 +381,13 @@ func (vm *DockerVM) Start(ctxt context.Context, ccid ccintf.CCID,
 	}
 
 	// start container with HostConfig was deprecated since v1.10 and removed in v1.2
-	err = client.StartContainer(containerID, nil)
+	err = client.StartContainer(containerName, nil)
 	if err != nil {
 		dockerLogger.Errorf("start-could not start container: %s", err)
 		return err
 	}
 
-	dockerLogger.Debugf("Started container %s", containerID)
+	dockerLogger.Debugf("Started container %s", containerName)
 	return nil
 }
 
