mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-27 16:50:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd: replace klog with util logger in driver.go

Browse Source 
replace klog with util logger in driver.go

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
(cherry picked from commit 883485b082)
This commit is contained in:
Madhu Rajanna 2020-08-19 16:11:13 +05:30 committed by mergify[bot]
parent ab53834757
commit 4b5952d15a
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/rbd/driver.go
View File

@ -22,7 +22,6 @@ import (
"github.com/ceph/ceph-csi/internal/util" "github.com/ceph/ceph-csi/internal/util"
"github.com/container-storage-interface/spec/lib/go/csi" "github.com/container-storage-interface/spec/lib/go/csi"
klog "k8s.io/klog/v2"
"k8s.io/utils/mount" "k8s.io/utils/mount"
) )
@ -99,7 +98,7 @@ func (r *Driver) Run(conf *util.Config) {
// Create ceph.conf for use with CLI commands // Create ceph.conf for use with CLI commands
if err = util.WriteCephConfig(); err != nil { if err = util.WriteCephConfig(); err != nil {
klog.Fatalf("failed to write ceph configuration file (%v)", err) util.FatalLogMsg("failed to write ceph configuration file (%v)", err)
} }
// Use passed in instance ID, if provided for omap suffix naming // Use passed in instance ID, if provided for omap suffix naming
@ -119,7 +118,7 @@ func (r *Driver) Run(conf *util.Config) {
// Initialize default library driver // Initialize default library driver
r.cd = csicommon.NewCSIDriver(conf.DriverName, util.DriverVersion, conf.NodeID) r.cd = csicommon.NewCSIDriver(conf.DriverName, util.DriverVersion, conf.NodeID)
if r.cd == nil { if r.cd == nil {
klog.Fatalln("Failed to initialize CSI Driver.") util.FatalLogMsg("Failed to initialize CSI Driver.")
} }
if conf.IsControllerServer || !conf.IsNodeServer { if conf.IsControllerServer || !conf.IsNodeServer {
r.cd.AddControllerServiceCapabilities([]csi.ControllerServiceCapability_RPC_Type{ r.cd.AddControllerServiceCapabilities([]csi.ControllerServiceCapability_RPC_Type{
@ -143,11 +142,11 @@ func (r *Driver) Run(conf *util.Config) {
if conf.IsNodeServer { if conf.IsNodeServer {
topology, err = util.GetTopologyFromDomainLabels(conf.DomainLabels, conf.NodeID, conf.DriverName) topology, err = util.GetTopologyFromDomainLabels(conf.DomainLabels, conf.NodeID, conf.DriverName)
if err != nil { if err != nil {
klog.Fatalln(err) util.FatalLogMsg(err.Error())
} }
r.ns, err = NewNodeServer(r.cd, conf.Vtype, topology) r.ns, err = NewNodeServer(r.cd, conf.Vtype, topology)
if err != nil { if err != nil {
klog.Fatalf("failed to start node server, err %v\n", err) util.FatalLogMsg("failed to start node server, err %v\n", err)
} }
} }
@ -157,11 +156,11 @@ func (r *Driver) Run(conf *util.Config) {
if !conf.IsControllerServer && !conf.IsNodeServer { if !conf.IsControllerServer && !conf.IsNodeServer {
topology, err = util.GetTopologyFromDomainLabels(conf.DomainLabels, conf.NodeID, conf.DriverName) topology, err = util.GetTopologyFromDomainLabels(conf.DomainLabels, conf.NodeID, conf.DriverName)
if err != nil { if err != nil {
klog.Fatalln(err) util.FatalLogMsg(err.Error())
} }
r.ns, err = NewNodeServer(r.cd, conf.Vtype, topology) r.ns, err = NewNodeServer(r.cd, conf.Vtype, topology)
if err != nil { if err != nil {
klog.Fatalf("failed to start node server, err %v\n", err) util.FatalLogMsg("failed to start node server, err %v\n", err)
} }
r.cs = NewControllerServer(r.cd) r.cs = NewControllerServer(r.cd)
} }
@ -169,7 +168,7 @@ func (r *Driver) Run(conf *util.Config) {
s := csicommon.NewNonBlockingGRPCServer() s := csicommon.NewNonBlockingGRPCServer()
s.Start(conf.Endpoint, conf.HistogramOption, r.ids, r.cs, r.ns, conf.EnableGRPCMetrics) s.Start(conf.Endpoint, conf.HistogramOption, r.ids, r.cs, r.ns, conf.EnableGRPCMetrics)
if conf.EnableGRPCMetrics { if conf.EnableGRPCMetrics {
klog.Warning("EnableGRPCMetrics is deprecated") util.WarningLogMsg("EnableGRPCMetrics is deprecated")
go util.StartMetricsServer(conf) go util.StartMetricsServer(conf)
} }
s.Wait() s.Wait()