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

util: remove unused context.Context from GetPoolName()

Browse Source 
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2020-05-14 15:28:14 +02:00 committed by mergify[bot]
parent ec61f0746b
commit 3fea4fa827
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/journal/voljournal.go
View File

@ -285,7 +285,7 @@ func (conn *Connection) CheckReservation(ctx context.Context,
} }
savedImagePoolID = int64(binary.BigEndian.Uint64(buf64)) savedImagePoolID = int64(binary.BigEndian.Uint64(buf64))
savedImagePool, err = util.GetPoolName(ctx, conn.monitors, conn.cr, savedImagePoolID) savedImagePool, err = util.GetPoolName(conn.monitors, conn.cr, savedImagePoolID)
if err != nil { if err != nil {
if _, ok := err.(util.ErrPoolNotFound); ok { if _, ok := err.(util.ErrPoolNotFound); ok {
err = conn.UndoReservation(ctx, journalPool, "", "", reqName) err = conn.UndoReservation(ctx, journalPool, "", "", reqName)

8
internal/rbd/rbd_util.go
View File

@ -385,7 +385,7 @@ func genSnapFromSnapID(ctx context.Context, rbdSnap *rbdSnapshot, snapshotID str
return err return err
} }
rbdSnap.Pool, err = util.GetPoolName(ctx, rbdSnap.Monitors, cr, vi.LocationID) rbdSnap.Pool, err = util.GetPoolName(rbdSnap.Monitors, cr, vi.LocationID)
if err != nil { if err != nil {
return err return err
} }
@ -408,7 +408,7 @@ func genSnapFromSnapID(ctx context.Context, rbdSnap *rbdSnapshot, snapshotID str
// convert the journal pool ID to name, for use in DeleteSnapshot cases // convert the journal pool ID to name, for use in DeleteSnapshot cases
if imageAttributes.JournalPoolID != util.InvalidPoolID { if imageAttributes.JournalPoolID != util.InvalidPoolID {
rbdSnap.JournalPool, err = util.GetPoolName(ctx, rbdSnap.Monitors, cr, imageAttributes.JournalPoolID) rbdSnap.JournalPool, err = util.GetPoolName(rbdSnap.Monitors, cr, imageAttributes.JournalPoolID)
if err != nil { if err != nil {
// TODO: If pool is not found we may leak the image (as DeleteSnapshot will return success) // TODO: If pool is not found we may leak the image (as DeleteSnapshot will return success)
return err return err
@ -448,7 +448,7 @@ func genVolFromVolID(ctx context.Context, volumeID string, cr *util.Credentials,
return nil, err return nil, err
} }
rbdVol.Pool, err = util.GetPoolName(ctx, rbdVol.Monitors, cr, vi.LocationID) rbdVol.Pool, err = util.GetPoolName(rbdVol.Monitors, cr, vi.LocationID)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -483,7 +483,7 @@ func genVolFromVolID(ctx context.Context, volumeID string, cr *util.Credentials,
// convert the journal pool ID to name, for use in DeleteVolume cases // convert the journal pool ID to name, for use in DeleteVolume cases
if imageAttributes.JournalPoolID >= 0 { if imageAttributes.JournalPoolID >= 0 {
rbdVol.JournalPool, err = util.GetPoolName(ctx, rbdVol.Monitors, cr, imageAttributes.JournalPoolID) rbdVol.JournalPool, err = util.GetPoolName(rbdVol.Monitors, cr, imageAttributes.JournalPoolID)
if err != nil { if err != nil {
// TODO: If pool is not found we may leak the image (as DeleteVolume will return success) // TODO: If pool is not found we may leak the image (as DeleteVolume will return success)
return nil, err return nil, err

2
internal/util/cephcmds.go
View File

@ -108,7 +108,7 @@ func GetPoolID(monitors string, cr *Credentials, poolName string) (int64, error)
// GetPoolName fetches the pool whose pool ID is equal to the requested poolID // GetPoolName fetches the pool whose pool ID is equal to the requested poolID
// parameter // parameter
func GetPoolName(ctx context.Context, monitors string, cr *Credentials, poolID int64) (string, error) { func GetPoolName(monitors string, cr *Credentials, poolID int64) (string, error) {
conn, err := connPool.Get(monitors, cr.ID, cr.KeyFile) conn, err := connPool.Get(monitors, cr.ID, cr.KeyFile)
if err != nil { if err != nil {
return "", err return "", err