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

rbd: Update sequence of operations on dummy mirror image

Browse Source 
The dummy mirror image needs to be disabled and then
reenabled for mirroring, to ensure a newly promoted
primary is now starting to schedule snapshots.

Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
This commit is contained in:
Shyamsundar Ranganathan 2021-11-18 12:43:10 -05:00 committed by Madhu Rajanna
parent 517ad8c644
commit d1c21eece9
1 changed files with 29 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
internal/rbd/replicationcontrollerserver.go
View File

@ -69,12 +69,11 @@ type operation string
var ( var (
// pool+"/"+key to check dummy image is created. // pool+"/"+key to check dummy image is created.
dummyImageCreated operation = "dummyImageCreated" dummyImageCreated operation = "dummyImageCreated"
// pool+"/"+key to check mirroring enabled on dummy image.
dummyImageMirroringEnabled operation = "dummyImageMirrorEnabled"
// pool+"/"+key to check mirroring disabled on dummy image.
dummyImageMirroringDisabled operation = "dummyImageMirrorDisabled"
// Read write lock to ensure that only one operation is happening at a time. // Read write lock to ensure that only one operation is happening at a time.
operationLock = sync.Map{} operationLock = sync.Map{}
// Lock to serialize operations on the dummy image to tickle RBD snapshot schedule.
dummyImageOpsLock sync.Mutex
) )
// ReplicationServer struct of rbd CSI driver with supported methods of Replication // ReplicationServer struct of rbd CSI driver with supported methods of Replication
@ -303,51 +302,32 @@ func createDummyImage(ctx context.Context, rbdVol *rbdVolume) error {
return nil return nil
} }
// enableImageMirroring enables the mirroring for the dummy image. // tickleMirroringOnDummyImage disables and reenables mirroring on the dummy image, and sets a
func enableMirroringOnDummyImage(rbdVol *rbdVolume, mirroringMode librbd.ImageMirrorMode) error { // schedule of a minute for the dummy image, to force a schedule refresh for other mirrored images
optName := getOperationName(rbdVol.Pool, dummyImageMirroringEnabled) // within a minute.
if _, ok := operationLock.Load(optName); !ok { func tickleMirroringOnDummyImage(rbdVol *rbdVolume, mirroringMode librbd.ImageMirrorMode) error {
imgName, err := getDummyImageName(rbdVol.conn) imgName, err := getDummyImageName(rbdVol.conn)
if err != nil { if err != nil {
return err return err
} }
dummyVol := rbdVol dummyVol := rbdVol
dummyVol.RbdImageName = imgName dummyVol.RbdImageName = imgName
// this is a idempotent call we dont need to worry multiple enable calls
err = dummyVol.enableImageMirroring(mirroringMode) dummyImageOpsLock.Lock()
if err != nil { defer dummyImageOpsLock.Unlock()
return err err = dummyVol.disableImageMirroring(false)
} if err != nil {
operationLock.Store(optName, true) return err
// Remove the dummyImageMirroringDisabled lock so that the mirroring can
// be disabled on the image.
optName = getOperationName(rbdVol.Pool, dummyImageMirroringDisabled)
operationLock.Delete(optName)
} }
return nil err = dummyVol.enableImageMirroring(mirroringMode)
} if err != nil {
return err
}
// disableImageMirroring disables the mirroring for the dummy image. err = dummyVol.addSnapshotScheduling(admin.Interval("1m"), admin.NoStartTime)
func disableMirroringOnDummyImage(rbdVol *rbdVolume) error { if err != nil {
optName := getOperationName(rbdVol.Pool, dummyImageMirroringDisabled) return err
if _, ok := operationLock.Load(optName); !ok {
imgName, err := getDummyImageName(rbdVol.conn)
if err != nil {
return err
}
dummyVol := rbdVol
dummyVol.RbdImageName = imgName
err = dummyVol.disableImageMirroring(false)
if err != nil {
return err
}
operationLock.Store(optName, true)
// Remove the dummyImageMirroringEnabled lock so that the mirroring can
// be re-enabled on the image.
optName = getOperationName(rbdVol.Pool, dummyImageMirroringEnabled)
operationLock.Delete(optName)
} }
return nil return nil
@ -542,7 +522,9 @@ func (rs *ReplicationServer) PromoteVolume(ctx context.Context,
if err != nil { if err != nil {
return nil, status.Errorf(codes.Internal, "failed to get mirroring mode %s", err.Error()) return nil, status.Errorf(codes.Internal, "failed to get mirroring mode %s", err.Error())
} }
err = enableMirroringOnDummyImage(rbdVol, mode)
log.DebugLog(ctx, "Attempting to tickle dummy image for restarting RBD schedules")
err = tickleMirroringOnDummyImage(rbdVol, mode)
if err != nil { if err != nil {
return nil, status.Errorf(codes.Internal, "failed to enable mirroring on dummy image %s", err.Error()) return nil, status.Errorf(codes.Internal, "failed to enable mirroring on dummy image %s", err.Error())
} }
@ -619,10 +601,6 @@ func (rs *ReplicationServer) DemoteVolume(ctx context.Context,
// demote image to secondary // demote image to secondary
if mirroringInfo.Primary { if mirroringInfo.Primary {
err = disableMirroringOnDummyImage(rbdVol)
if err != nil {
return nil, status.Errorf(codes.Internal, "failed to disable mirroring on dummy image %s", err.Error())
}
err = rbdVol.demoteImage() err = rbdVol.demoteImage()
if err != nil { if err != nil {
log.ErrorLog(ctx, err.Error()) log.ErrorLog(ctx, err.Error())