From c9da8469add06794835dff7b366735021dab2a4d Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Mon, 4 Feb 2019 18:34:11 +0530 Subject: [PATCH] migrate cephfs code to use klog instead of glog Signed-off-by: Humble Chirammal --- pkg/cephfs/controllerserver.go | 34 ++++++++++++++++---------------- pkg/cephfs/driver.go | 12 ++++++------ pkg/cephfs/nodeserver.go | 36 +++++++++++++++++----------------- pkg/cephfs/util.go | 4 ++-- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/pkg/cephfs/controllerserver.go b/pkg/cephfs/controllerserver.go index 20b6fe729..f52302675 100644 --- a/pkg/cephfs/controllerserver.go +++ b/pkg/cephfs/controllerserver.go @@ -17,10 +17,10 @@ limitations under the License. package cephfs import ( - "github.com/golang/glog" "golang.org/x/net/context" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + "k8s.io/klog" "github.com/container-storage-interface/spec/lib/go/csi" "github.com/kubernetes-csi/drivers/pkg/csi-common" @@ -43,21 +43,21 @@ type controllerCacheEntry struct { // CreateVolume creates the volume in backend and store the volume metadata func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest) (*csi.CreateVolumeResponse, error) { if err := cs.validateCreateVolumeRequest(req); err != nil { - glog.Errorf("CreateVolumeRequest validation failed: %v", err) + klog.Errorf("CreateVolumeRequest validation failed: %v", err) return nil, err } // Configuration secret := req.GetSecrets() volOptions, err := newVolumeOptions(req.GetParameters(), secret) if err != nil { - glog.Errorf("validation of volume options failed: %v", err) + klog.Errorf("validation of volume options failed: %v", err) return nil, status.Error(codes.InvalidArgument, err.Error()) } volID := makeVolumeID(req.GetName()) conf := cephConfigData{Monitors: volOptions.Monitors, VolumeID: volID} if err = conf.writeToFile(); err != nil { - glog.Errorf("failed to write ceph config file to %s: %v", getCephConfPath(volID), err) + klog.Errorf("failed to write ceph config file to %s: %v", getCephConfPath(volID), err) return nil, status.Error(codes.Internal, err.Error()) } @@ -71,28 +71,28 @@ func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol } if err = storeCephCredentials(volID, cr); err != nil { - glog.Errorf("failed to store admin credentials for '%s': %v", cr.id, err) + klog.Errorf("failed to store admin credentials for '%s': %v", cr.id, err) return nil, status.Error(codes.Internal, err.Error()) } if err = createVolume(volOptions, cr, volID, req.GetCapacityRange().GetRequiredBytes()); err != nil { - glog.Errorf("failed to create volume %s: %v", req.GetName(), err) + klog.Errorf("failed to create volume %s: %v", req.GetName(), err) return nil, status.Error(codes.Internal, err.Error()) } if _, err = createCephUser(volOptions, cr, volID); err != nil { - glog.Errorf("failed to create ceph user for volume %s: %v", req.GetName(), err) + klog.Errorf("failed to create ceph user for volume %s: %v", req.GetName(), err) return nil, status.Error(codes.Internal, err.Error()) } - glog.Infof("cephfs: successfully created volume %s", volID) + klog.Infof("cephfs: successfully created volume %s", volID) } else { - glog.Infof("cephfs: volume %s is provisioned statically", volID) + klog.Infof("cephfs: volume %s is provisioned statically", volID) } ce := &controllerCacheEntry{VolOptions: *volOptions, VolumeID: volID} if err := cs.MetadataStore.Create(string(volID), ce); err != nil { - glog.Errorf("failed to store a cache entry for volume %s: %v", volID, err) + klog.Errorf("failed to store a cache entry for volume %s: %v", volID, err) return nil, status.Error(codes.Internal, err.Error()) } @@ -109,7 +109,7 @@ func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol // from store func (cs *ControllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequest) (*csi.DeleteVolumeResponse, error) { if err := cs.validateDeleteVolumeRequest(); err != nil { - glog.Errorf("DeleteVolumeRequest validation failed: %v", err) + klog.Errorf("DeleteVolumeRequest validation failed: %v", err) return nil, err } @@ -126,7 +126,7 @@ func (cs *ControllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol if !ce.VolOptions.ProvisionVolume { // DeleteVolume() is forbidden for statically provisioned volumes! - glog.Warningf("volume %s is provisioned statically, aborting delete", volID) + klog.Warningf("volume %s is provisioned statically, aborting delete", volID) return &csi.DeleteVolumeResponse{}, nil } // mons may have changed since create volume, @@ -134,7 +134,7 @@ func (cs *ControllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol secret := req.GetSecrets() mon := "" if mon, err = getMonValFromSecret(secret); err == nil && len(mon) > 0 { - glog.Infof("override old mons [%q] with [%q]", ce.VolOptions.Monitors, mon) + klog.Infof("override old mons [%q] with [%q]", ce.VolOptions.Monitors, mon) ce.VolOptions.Monitors = mon } @@ -142,17 +142,17 @@ func (cs *ControllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol cr, err := getAdminCredentials(secret) if err != nil { - glog.Errorf("failed to retrieve admin credentials: %v", err) + klog.Errorf("failed to retrieve admin credentials: %v", err) return nil, status.Error(codes.InvalidArgument, err.Error()) } if err = purgeVolume(volID, cr, &ce.VolOptions); err != nil { - glog.Errorf("failed to delete volume %s: %v", volID, err) + klog.Errorf("failed to delete volume %s: %v", volID, err) return nil, status.Error(codes.Internal, err.Error()) } if err = deleteCephUser(cr, volID); err != nil { - glog.Errorf("failed to delete ceph user for volume %s: %v", volID, err) + klog.Errorf("failed to delete ceph user for volume %s: %v", volID, err) return nil, status.Error(codes.Internal, err.Error()) } @@ -160,7 +160,7 @@ func (cs *ControllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol return nil, status.Error(codes.Internal, err.Error()) } - glog.Infof("cephfs: successfully deleted volume %s", volID) + klog.Infof("cephfs: successfully deleted volume %s", volID) return &csi.DeleteVolumeResponse{}, nil } diff --git a/pkg/cephfs/driver.go b/pkg/cephfs/driver.go index 28cbaea83..a3db886ed 100644 --- a/pkg/cephfs/driver.go +++ b/pkg/cephfs/driver.go @@ -17,7 +17,7 @@ limitations under the License. package cephfs import ( - "github.com/golang/glog" + "k8s.io/klog" "github.com/container-storage-interface/spec/lib/go/csi" "github.com/kubernetes-csi/drivers/pkg/csi-common" @@ -76,17 +76,17 @@ func NewNodeServer(d *csicommon.CSIDriver) *NodeServer { // Run start a non-blocking grpc controller,node and identityserver for // ceph CSI driver which can serve multiple parallel requests func (fs *Driver) Run(driverName, nodeID, endpoint, volumeMounter string, cachePersister util.CachePersister) { - glog.Infof("Driver: %v version: %v", driverName, version) + klog.Infof("Driver: %v version: %v", driverName, version) // Configuration if err := loadAvailableMounters(); err != nil { - glog.Fatalf("cephfs: failed to load ceph mounters: %v", err) + klog.Fatalf("cephfs: failed to load ceph mounters: %v", err) } if volumeMounter != "" { if err := validateMounter(volumeMounter); err != nil { - glog.Fatalln(err) + klog.Fatalln(err) } else { DefaultVolumeMounter = volumeMounter } @@ -97,13 +97,13 @@ func (fs *Driver) Run(driverName, nodeID, endpoint, volumeMounter string, cacheP DefaultVolumeMounter = availableMounters[0] } - glog.Infof("cephfs: setting default volume mounter to %s", DefaultVolumeMounter) + klog.Infof("cephfs: setting default volume mounter to %s", DefaultVolumeMounter) // Initialize default library driver fs.cd = csicommon.NewCSIDriver(driverName, version, nodeID) if fs.cd == nil { - glog.Fatalln("Failed to initialize CSI driver") + klog.Fatalln("Failed to initialize CSI driver") } fs.cd.AddControllerServiceCapabilities([]csi.ControllerServiceCapability_RPC_Type{ diff --git a/pkg/cephfs/nodeserver.go b/pkg/cephfs/nodeserver.go index d140e4c17..cf61541f0 100644 --- a/pkg/cephfs/nodeserver.go +++ b/pkg/cephfs/nodeserver.go @@ -21,9 +21,9 @@ import ( "fmt" "os" - "github.com/golang/glog" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + "k8s.io/klog" "github.com/container-storage-interface/spec/lib/go/csi" "github.com/kubernetes-csi/drivers/pkg/csi-common" @@ -93,7 +93,7 @@ func (ns *NodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVol secret := req.GetSecrets() volOptions, err := newVolumeOptions(req.GetVolumeContext(), secret) if err != nil { - glog.Errorf("error reading volume options for volume %s: %v", volID, err) + klog.Errorf("error reading volume options for volume %s: %v", volID, err) return nil, status.Error(codes.InvalidArgument, err.Error()) } @@ -103,13 +103,13 @@ func (ns *NodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVol } if err = createMountPoint(stagingTargetPath); err != nil { - glog.Errorf("failed to create staging mount point at %s for volume %s: %v", stagingTargetPath, volID, err) + klog.Errorf("failed to create staging mount point at %s for volume %s: %v", stagingTargetPath, volID, err) return nil, status.Error(codes.Internal, err.Error()) } cephConf := cephConfigData{Monitors: volOptions.Monitors, VolumeID: volID} if err = cephConf.writeToFile(); err != nil { - glog.Errorf("failed to write ceph config file to %s for volume %s: %v", getCephConfPath(volID), volID, err) + klog.Errorf("failed to write ceph config file to %s for volume %s: %v", getCephConfPath(volID), volID, err) return nil, status.Error(codes.Internal, err.Error()) } @@ -118,12 +118,12 @@ func (ns *NodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVol isMnt, err := isMountPoint(stagingTargetPath) if err != nil { - glog.Errorf("stat failed: %v", err) + klog.Errorf("stat failed: %v", err) return nil, status.Error(codes.Internal, err.Error()) } if isMnt { - glog.Infof("cephfs: volume %s is already mounted to %s, skipping", volID, stagingTargetPath) + klog.Infof("cephfs: volume %s is already mounted to %s, skipping", volID, stagingTargetPath) return &csi.NodeStageVolumeResponse{}, nil } @@ -132,7 +132,7 @@ func (ns *NodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVol return nil, err } - glog.Infof("cephfs: successfully mounted volume %s to %s", volID, stagingTargetPath) + klog.Infof("cephfs: successfully mounted volume %s to %s", volID, stagingTargetPath) return &csi.NodeStageVolumeResponse{}, nil } @@ -143,20 +143,20 @@ func (*NodeServer) mount(volOptions *volumeOptions, req *csi.NodeStageVolumeRequ cr, err := getCredentialsForVolume(volOptions, volID, req) if err != nil { - glog.Errorf("failed to get ceph credentials for volume %s: %v", volID, err) + klog.Errorf("failed to get ceph credentials for volume %s: %v", volID, err) return status.Error(codes.Internal, err.Error()) } m, err := newMounter(volOptions) if err != nil { - glog.Errorf("failed to create mounter for volume %s: %v", volID, err) + klog.Errorf("failed to create mounter for volume %s: %v", volID, err) return status.Error(codes.Internal, err.Error()) } - glog.V(4).Infof("cephfs: mounting volume %s with %s", volID, m.name()) + klog.V(4).Infof("cephfs: mounting volume %s with %s", volID, m.name()) if err = m.mount(stagingTargetPath, cr, volOptions, volID); err != nil { - glog.Errorf("failed to mount volume %s: %v", volID, err) + klog.Errorf("failed to mount volume %s: %v", volID, err) return status.Error(codes.Internal, err.Error()) } return nil @@ -175,7 +175,7 @@ func (ns *NodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis volID := req.GetVolumeId() if err := createMountPoint(targetPath); err != nil { - glog.Errorf("failed to create mount point at %s: %v", targetPath, err) + klog.Errorf("failed to create mount point at %s: %v", targetPath, err) return nil, status.Error(codes.Internal, err.Error()) } @@ -184,23 +184,23 @@ func (ns *NodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis isMnt, err := isMountPoint(targetPath) if err != nil { - glog.Errorf("stat failed: %v", err) + klog.Errorf("stat failed: %v", err) return nil, status.Error(codes.Internal, err.Error()) } if isMnt { - glog.Infof("cephfs: volume %s is already bind-mounted to %s", volID, targetPath) + klog.Infof("cephfs: volume %s is already bind-mounted to %s", volID, targetPath) return &csi.NodePublishVolumeResponse{}, nil } // It's not, mount now if err = bindMount(req.GetStagingTargetPath(), req.GetTargetPath(), req.GetReadonly()); err != nil { - glog.Errorf("failed to bind-mount volume %s: %v", volID, err) + klog.Errorf("failed to bind-mount volume %s: %v", volID, err) return nil, status.Error(codes.Internal, err.Error()) } - glog.Infof("cephfs: successfully bind-mounted volume %s to %s", volID, targetPath) + klog.Infof("cephfs: successfully bind-mounted volume %s to %s", volID, targetPath) return &csi.NodePublishVolumeResponse{}, nil } @@ -223,7 +223,7 @@ func (ns *NodeServer) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpu return nil, status.Error(codes.Internal, err.Error()) } - glog.Infof("cephfs: successfully unbinded volume %s from %s", req.GetVolumeId(), targetPath) + klog.Infof("cephfs: successfully unbinded volume %s from %s", req.GetVolumeId(), targetPath) return &csi.NodeUnpublishVolumeResponse{}, nil } @@ -246,7 +246,7 @@ func (ns *NodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstag return nil, status.Error(codes.Internal, err.Error()) } - glog.Infof("cephfs: successfully umounted volume %s from %s", req.GetVolumeId(), stagingTargetPath) + klog.Infof("cephfs: successfully umounted volume %s from %s", req.GetVolumeId(), stagingTargetPath) return &csi.NodeUnstageVolumeResponse{}, nil } diff --git a/pkg/cephfs/util.go b/pkg/cephfs/util.go index fe5eca6fe..e9314f532 100644 --- a/pkg/cephfs/util.go +++ b/pkg/cephfs/util.go @@ -23,9 +23,9 @@ import ( "fmt" "os/exec" - "github.com/golang/glog" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + "k8s.io/klog" "github.com/container-storage-interface/spec/lib/go/csi" "k8s.io/kubernetes/pkg/util/mount" @@ -38,7 +38,7 @@ func makeVolumeID(volName string) volumeID { } func execCommand(command string, args ...string) ([]byte, error) { - glog.V(4).Infof("cephfs: EXEC %s %s", command, args) + klog.V(4).Infof("cephfs: EXEC %s %s", command, args) cmd := exec.Command(command, args...) // #nosec return cmd.CombinedOutput()