Merge pull request #713 from teawater/grpclog

serverrpc: update log to show clear work status

Author: laijs

serverrpc/container.go

@@ -12,10 +12,12 @@ func (s *ServerRPC) ContainerCreate(ctx context.Context, req *types.ContainerCre
 
 	containerID, err := s.daemon.CreateContainerInPod(req.PodID, req.ContainerSpec)
 	if err != nil {
-		glog.Errorf("CreateContainerInPod failed: %v", err)
+		glog.Errorf("ContainerCreate failed %v with request %s: %v", err, req.String())
 		return nil, err
 	}
 
+	glog.V(3).Infof("ContainerCreate done with request %s", req.String())
+
 	return &types.ContainerCreateResponse{
 		ContainerID: containerID,
 	}, nil
@@ -25,9 +27,10 @@ func (s *ServerRPC) ContainerStart(ctx context.Context, req *types.ContainerStar
 	glog.V(3).Info("ContainerStart with request %s", req.String())
 	err := s.daemon.StartContainer(req.ContainerId)
 	if err != nil {
-		glog.Errorf("ContainerStart failed: %v", err)
+		glog.Errorf("ContainerStart failed %v with request %s", err, req.String())
 		return nil, err
 	}
+	glog.V(3).Info("ContainerStart done with request %s", req.String())
 	return &types.ContainerStartResponse{}, nil
 }
 
@@ -37,10 +40,12 @@ func (s *ServerRPC) ContainerStop(c context.Context, req *types.ContainerStopReq
 
 	err := s.daemon.StopContainer(req.ContainerID, int(req.Timeout))
 	if err != nil {
-		glog.Errorf("ContainerStop error: %v", err)
+		glog.Errorf("ContainerStop failed %v with request %v", err, req.String())
 		return nil, err
 	}
 
+	glog.V(3).Infof("ContainerStop done with request %v", req.String())
+
 	return &types.ContainerStopResponse{}, nil
 }
 
@@ -50,20 +55,23 @@ func (s *ServerRPC) ContainerRename(c context.Context, req *types.ContainerRenam
 
 	err := s.daemon.ContainerRename(req.OldContainerName, req.NewContainerName)
 	if err != nil {
-		glog.Errorf("ContainerRename error: %v", err)
+		glog.Errorf("ContainerRename failed %v with request %v", err, req.String())
 		return nil, err
 	}
 
+	glog.V(3).Infof("ContainerRename done with request %v", req.String())
+
 	return &types.ContainerRenameResponse{}, nil
 }
 
 func (s *ServerRPC) ContainerRemove(ctx context.Context, req *types.ContainerRemoveRequest) (*types.ContainerRemoveResponse, error) {
 	glog.V(3).Info("ContainerRemove with request %s", req.String())
 	err := s.daemon.RemoveContainer(req.ContainerId)
 	if err != nil {
-		glog.Errorf("ContainerRemove failed: %v", err)
+		glog.Errorf("ContainerRemove failed %v with request %s", err, req.String())
 		return nil, err
 	}
+	glog.V(3).Info("ContainerRemove done with request %s", req.String())
 	return &types.ContainerRemoveResponse{}, nil
 }
 
@@ -73,9 +81,10 @@ func (s *ServerRPC) ContainerSignal(ctx context.Context, req *types.ContainerSig
 
 	err := s.daemon.KillPodContainers(req.PodID, req.ContainerID, req.Signal)
 	if err != nil {
-		glog.Errorf("Kill Container %s of Pod %s with signal %d failed: %v", req.ContainerID, req.PodID, req.Signal, err)
+		glog.Errorf("ContainerSignal failed %v done with request %s", err, req.String())
 		return nil, err
 	}
 
+	glog.V(3).Infof("ContainerSignal done with request %s", req.String())
 	return &types.ContainerSignalResponse{}, nil
 }

serverrpc/exec.go

@@ -11,7 +11,7 @@ import (
 )
 
 func (s *ServerRPC) ExecCreate(ctx context.Context, req *types.ExecCreateRequest) (*types.ExecCreateResponse, error) {
-	glog.V(3).Infof("create exec %v", req.String())
+	glog.V(3).Infof("ExecCreate with request %s", req.String())
 
 	cmd, err := json.Marshal(req.Command)
 	if err != nil {
@@ -20,10 +20,13 @@ func (s *ServerRPC) ExecCreate(ctx context.Context, req *types.ExecCreateRequest
 
 	execId, err := s.daemon.CreateExec(req.ContainerID, string(cmd), req.Tty)
 	if err != nil {
-		glog.Errorf("ExecCreate error: %v", err)
+		glog.Errorf("ExecCreate failed %v with request %s", err, req.String())
+
 		return nil, err
 	}
 
+	glog.V(3).Infof("ExecCreate done with request %s", req.String())
+
 	return &types.ExecCreateResponse{
 		ExecID: execId,
 	}, nil
@@ -92,30 +95,32 @@ func (s *ServerRPC) ExecStart(stream types.PublicAPI_ExecStartServer) error {
 
 // Wait gets exitcode by container and processId
 func (s *ServerRPC) Wait(c context.Context, req *types.WaitRequest) (*types.WaitResponse, error) {
-	glog.V(3).Infof("Wait with request %v", req.String())
+	glog.V(3).Infof("Wait with request %s", req.String())
 
 	//FIXME need update if param NoHang is enabled
 	code, err := s.daemon.ExitCode(req.Container, req.ProcessId)
 	if err != nil {
-		glog.Errorf("Wait error: %v", err)
+		glog.Errorf("Wait failed %v with request %s", err, req.String())
 		return nil, err
 	}
 
+	glog.V(3).Infof("Wait done with request %s", req.String())
 	return &types.WaitResponse{
 		ExitCode: int32(code),
 	}, nil
 }
 
 // ExecSignal sends a singal to specified exec of specified container
 func (s *ServerRPC) ExecSignal(ctx context.Context, req *types.ExecSignalRequest) (*types.ExecSignalResponse, error) {
-	glog.V(3).Infof("ExecSignal with request %v", req.String())
+	glog.V(3).Infof("ExecSignal with request %s", req.String())
 
 	err := s.daemon.KillExec(req.ContainerID, req.ExecID, req.Signal)
 	if err != nil {
-		glog.Errorf("Kill Process %s of container %s with signal %d failed: %v", req.ExecID, req.ContainerID, req.Signal, err)
+		glog.Errorf("ExecSignal failed %v with request %s", err, req.String())
 		return nil, err
 	}
 
+	glog.V(3).Infof("ExecSignal done with request %s", req.String())
 	return &types.ExecSignalResponse{}, nil
 }
 

serverrpc/images.go

@@ -17,7 +17,7 @@ func (s *ServerRPC) ImageList(ctx context.Context, req *types.ImageListRequest)
 
 	images, err := s.daemon.Daemon.Images(req.FilterArgs, req.Filter, req.All)
 	if err != nil {
-		glog.Errorf("ImageList error: %v", err)
+		glog.Errorf("ImageList failed %v with request %s", err, req.String())
 		return nil, err
 	}
 
@@ -34,6 +34,7 @@ func (s *ServerRPC) ImageList(ctx context.Context, req *types.ImageListRequest)
 		})
 	}
 
+	glog.V(3).Infof("ImageList done with request %s", req.String())
 	return &types.ImageListResponse{
 		ImageList: result,
 	}, nil
@@ -88,6 +89,7 @@ func (s *ServerRPC) ImagePull(req *types.ImagePullRequest, stream types.PublicAP
 	pullResult = s.daemon.CmdImagePull(req.Image, req.Tag, authConfig, nil, w)
 	complete = true
 
+	glog.V(3).Infof("ImagePull done with request %s", req.String())
 	return pullResult
 }
 
@@ -126,7 +128,7 @@ func (s *ServerRPC) ImagePush(req *types.ImagePushRequest, stream types.PublicAP
 		}
 
 		if err != nil {
-			glog.Errorf("Read image push stream error: %v", err)
+			glog.Errorf("ImagePush read image push stream failed %v with request %s", err, req.String())
 			return err
 		}
 
@@ -135,6 +137,7 @@ func (s *ServerRPC) ImagePush(req *types.ImagePushRequest, stream types.PublicAP
 		}
 	}
 
+	glog.V(3).Infof("ImagePush done with request %s", req.String())
 	return pushResult
 }
 
@@ -144,10 +147,11 @@ func (s *ServerRPC) ImageRemove(ctx context.Context, req *types.ImageRemoveReque
 
 	resp, err := s.daemon.CmdImageDelete(req.Image, req.Force, req.Prune)
 	if err != nil {
-		glog.Errorf("DeleteImage failed: %v", err)
+		glog.Errorf("ImageDelete failed %v with request %s", err, req.String())
 		return nil, err
 	}
 
+	glog.V(3).Infof("ImageDelete done with request %s", req.String())
 	return &types.ImageRemoveResponse{
 		Images: resp,
 	}, nil

serverrpc/info.go

@@ -13,42 +13,47 @@ const (
 
 // PodInfo gets PodInfo by podID
 func (s *ServerRPC) PodInfo(c context.Context, req *types.PodInfoRequest) (*types.PodInfoResponse, error) {
-	glog.V(3).Infof("PodInfo with request %v", req.String())
+	glog.V(3).Infof("PodInfo with request %s", req.String())
 
 	info, err := s.daemon.GetPodInfo(req.PodID)
 	if err != nil {
-		glog.Errorf("GetPodInfo error: %v", err)
+		glog.Errorf("PodInfo failed %v with request %s", err, req.String())
 		return nil, err
 	}
 
+	glog.V(3).Infof("PodInfo done with request %s", req.String())
 	return &types.PodInfoResponse{
 		PodInfo: info,
 	}, nil
 }
 
 // ContainerInfo gets ContainerInfo by ID or name of container
 func (s *ServerRPC) ContainerInfo(c context.Context, req *types.ContainerInfoRequest) (*types.ContainerInfoResponse, error) {
-	glog.V(3).Infof("ContainerInfo with request %v", req.String())
+	glog.V(3).Infof("ContainerInfo with request %s", req.String())
 
 	info, err := s.daemon.GetContainerInfo(req.Container)
 	if err != nil {
-		glog.Errorf("GetContainerInfo error: %v", err)
+		glog.Errorf("ContainerInfo failed %v with request %s", err, req.String())
 		return nil, err
 	}
 
+	glog.V(3).Infof("ContainerInfo done with request %s", req.String())
 	return &types.ContainerInfoResponse{
 		ContainerInfo: info,
 	}, nil
 }
 
 // Info gets CmdSystemInfo
 func (s *ServerRPC) Info(c context.Context, req *types.InfoRequest) (*types.InfoResponse, error) {
+	glog.V(3).Infof("Info with request %s", req.String())
+
 	info, err := s.daemon.CmdSystemInfo()
 	if err != nil {
-		glog.Errorf("CmdSystemInfo error: %v", err)
+		glog.Errorf("Info failed %v with request %s", err, req.String())
 		return nil, err
 	}
 
+	glog.V(3).Infof("Info done with request %s", req.String())
 	return info, nil
 }
 

serverrpc/list.go

@@ -12,10 +12,11 @@ func (s *ServerRPC) ContainerList(ctx context.Context, req *types.ContainerListR
 
 	containerList, err := s.daemon.ListContainers(req.PodID, req.VmID)
 	if err != nil {
-		glog.Errorf("ContainerList error: %v", err)
+		glog.Errorf("ContainerList failed %v with request %s", err, req.String())
 		return nil, err
 	}
 
+	glog.V(3).Infof("ContainerList done with request %s", req.String())
 	return &types.ContainerListResponse{
 		ContainerList: containerList,
 	}, nil
@@ -27,10 +28,11 @@ func (s *ServerRPC) PodList(ctx context.Context, req *types.PodListRequest) (*ty
 
 	podList, err := s.daemon.ListPods(req.PodID, req.VmID)
 	if err != nil {
-		glog.Errorf("PodList error: %v", err)
+		glog.Errorf("PodList failed %v with request %s", err, req.String())
 		return nil, err
 	}
 
+	glog.V(3).Infof("PodList done with request %s", req.String())
 	return &types.PodListResponse{
 		PodList: podList,
 	}, nil
@@ -42,10 +44,11 @@ func (s *ServerRPC) VMList(ctx context.Context, req *types.VMListRequest) (*type
 
 	vmList, err := s.daemon.ListVMs(req.PodID, req.VmID)
 	if err != nil {
-		glog.Errorf("VmList error: %v", err)
+		glog.Errorf("VmList failed %v with request %s", err, req.String())
 		return nil, err
 	}
 
+	glog.V(3).Infof("VMList done with request %s", req.String())
 	return &types.VMListResponse{
 		VmList: vmList,
 	}, nil

serverrpc/logs.go

@@ -18,6 +18,7 @@ func (s *ServerRPC) ContainerLogs(req *types.ContainerLogsRequest, stream types.
 	if req.Since != "" {
 		s, n, err := timetypes.ParseTimestamps(req.Since, 0)
 		if err != nil {
+			glog.Errorf("ContainerLogs failed %v with request %s", err, req.String())
 			return err
 		}
 		since = time.Unix(s, n)
@@ -43,7 +44,7 @@ func (s *ServerRPC) ContainerLogs(req *types.ContainerLogsRequest, stream types.
 	} else {
 		err := s.daemon.GetContainerLogs(req.Container, logsConfig)
 		if err != nil {
-			glog.Errorf("ContainerLogs error: %v", err)
+			glog.Errorf("ContainerLogs failed %v with request %s", err, req.String())
 			return err
 		}
 	}
@@ -56,7 +57,7 @@ func (s *ServerRPC) ContainerLogs(req *types.ContainerLogsRequest, stream types.
 				eof = true
 			}
 		} else if err != nil {
-			glog.Errorf("Read log stream error: %v", err)
+			glog.Errorf("ContainerLogs failed %v with request %s", err, req.String())
 			return err
 		}
 
@@ -70,5 +71,6 @@ func (s *ServerRPC) ContainerLogs(req *types.ContainerLogsRequest, stream types.
 		}
 	}
 
+	glog.V(3).Infof("ContainerLogs done with request %s", req.String())
 	return nil
 }