diff --git a/internal/journal/voljournal.go b/internal/journal/voljournal.go index 0c9b93435..0e5ba9bf2 100644 --- a/internal/journal/voljournal.go +++ b/internal/journal/voljournal.go @@ -665,7 +665,7 @@ func (conn *Connection) GetImageAttributes(ctx context.Context, pool, objectUUID } // StoreImageID stores the image ID in omap. -func (conn *Connection) StoreImageID(ctx context.Context, pool, reservedUUID, imageID string, cr *util.Credentials) error { +func (conn *Connection) StoreImageID(ctx context.Context, pool, reservedUUID, imageID string) error { err := setOMapKeys(ctx, conn, pool, conn.config.namespace, conn.config.cephUUIDDirectoryPrefix+reservedUUID, map[string]string{conn.config.csiImageIDKey: imageID}) if err != nil { diff --git a/internal/rbd/clone.go b/internal/rbd/clone.go index 73a7d924a..202fd2e40 100644 --- a/internal/rbd/clone.go +++ b/internal/rbd/clone.go @@ -214,7 +214,7 @@ func (rv *rbdVolume) createCloneFromImage(ctx context.Context, parentVol *rbdVol return err } - err = j.StoreImageID(ctx, rv.JournalPool, rv.ReservedID, rv.ImageID, rv.conn.Creds) + err = j.StoreImageID(ctx, rv.JournalPool, rv.ReservedID, rv.ImageID) if err != nil { util.ErrorLog(ctx, "failed to store volume %s: %v", rv, err) return err diff --git a/internal/rbd/controllerserver.go b/internal/rbd/controllerserver.go index 8140d9285..5ef5bb617 100644 --- a/internal/rbd/controllerserver.go +++ b/internal/rbd/controllerserver.go @@ -479,7 +479,7 @@ func (cs *ControllerServer) createBackingImage(ctx context.Context, cr *util.Cre return status.Error(codes.Internal, err.Error()) } - err = j.StoreImageID(ctx, rbdVol.JournalPool, rbdVol.ReservedID, rbdVol.ImageID, cr) + err = j.StoreImageID(ctx, rbdVol.JournalPool, rbdVol.ReservedID, rbdVol.ImageID) if err != nil { util.ErrorLog(ctx, "failed to reserve volume %s: %v", rbdVol, err) return status.Error(codes.Internal, err.Error()) @@ -932,7 +932,7 @@ func (cs *ControllerServer) doSnapshotClone(ctx context.Context, parentVol *rbdV } defer j.Destroy() - err = j.StoreImageID(ctx, rbdSnap.JournalPool, rbdSnap.ReservedID, cloneRbd.ImageID, cr) + err = j.StoreImageID(ctx, rbdSnap.JournalPool, rbdSnap.ReservedID, cloneRbd.ImageID) if err != nil { util.ErrorLog(ctx, "failed to reserve volume id: %v", err) return ready, cloneRbd, err diff --git a/internal/rbd/rbd_journal.go b/internal/rbd/rbd_journal.go index 775a7987f..785f920f2 100644 --- a/internal/rbd/rbd_journal.go +++ b/internal/rbd/rbd_journal.go @@ -198,7 +198,7 @@ func checkSnapCloneExists(ctx context.Context, parentVol *rbdVolume, rbdSnap *rb err = undoSnapshotCloning(ctx, vol, rbdSnap, vol, cr) return false, err } - sErr = j.StoreImageID(ctx, vol.JournalPool, vol.ReservedID, vol.ImageID, cr) + sErr = j.StoreImageID(ctx, vol.JournalPool, vol.ReservedID, vol.ImageID) if sErr != nil { util.ErrorLog(ctx, "failed to store volume id %s: %v", vol, sErr) err = undoSnapshotCloning(ctx, vol, rbdSnap, vol, cr) @@ -296,7 +296,7 @@ func (rv *rbdVolume) Exists(ctx context.Context, parentVol *rbdVolume) (bool, er util.ErrorLog(ctx, "failed to get image id %s: %v", rv, err) return false, err } - err = j.StoreImageID(ctx, rv.JournalPool, rv.ReservedID, rv.ImageID, rv.conn.Creds) + err = j.StoreImageID(ctx, rv.JournalPool, rv.ReservedID, rv.ImageID) if err != nil { util.ErrorLog(ctx, "failed to store volume id %s: %v", rv, err) return false, err diff --git a/internal/rbd/rbd_util.go b/internal/rbd/rbd_util.go index 75565b513..f94951ee4 100644 --- a/internal/rbd/rbd_util.go +++ b/internal/rbd/rbd_util.go @@ -732,7 +732,7 @@ func genVolFromVolID(ctx context.Context, volumeID string, cr *util.Credentials, util.ErrorLog(ctx, "failed to get image id %s: %v", rbdVol, err) return rbdVol, err } - err = j.StoreImageID(ctx, rbdVol.JournalPool, rbdVol.ReservedID, rbdVol.ImageID, cr) + err = j.StoreImageID(ctx, rbdVol.JournalPool, rbdVol.ReservedID, rbdVol.ImageID) if err != nil { util.ErrorLog(ctx, "failed to store volume id %s: %v", rbdVol, err) return rbdVol, err