Skip to content

Commit

Permalink
rbd: remove checkHealthyPrimary check
Browse files Browse the repository at this point in the history
After Failover of workloads to the secondary
cluster when the primary cluster is down,
RBD Image is not marked healthy, and VR
resources are not promoted to the Primary,
In VolumeReplication, the `CURRENT STATE`
remains Unknown and doesn't change to Primary.

This happens because the primary cluster went down,
and we have force promoted the image on the
secondary cluster. and the image stays in
up+stopping_replay or could be any other states.
Currently assumption was that the image will
always be `up+stopped`. But the image will be in
`up+stopped` only for planned failover and it
could be in any other state if its a forced
failover. For this reason, removing
checkHealthyPrimary from the PromoteVolume RPC call.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
  • Loading branch information
Madhu-1 authored and openshift-cherrypick-robot committed Jul 27, 2022
1 parent 664f8bb commit e6fd843
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 109 deletions.
2 changes: 0 additions & 2 deletions internal/rbd/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,4 @@ var (
ErrMissingImageNameInVolID = errors.New("rbd image name information can not be empty in volID")
// ErrDecodeClusterIDFromMonsInVolID is returned when mons hash decoding on migration volID.
ErrDecodeClusterIDFromMonsInVolID = errors.New("failed to get clusterID from monitors hash in volID")
// ErrUnHealthyMirroredImage is returned when mirrored image is not healthy.
ErrUnHealthyMirroredImage = errors.New("mirrored image is not healthy")
)
35 changes: 0 additions & 35 deletions internal/rbd/replicationcontrollerserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -581,16 +581,6 @@ func (rs *ReplicationServer) PromoteVolume(ctx context.Context,
}
}

mirrorStatus, err := rbdVol.getImageMirroringStatus()
if err != nil {
return nil, status.Error(codes.Internal, err.Error())
}

err = checkHealthyPrimary(ctx, rbdVol, mirrorStatus)
if err != nil {
return nil, status.Error(codes.Internal, err.Error())
}

var mode librbd.ImageMirrorMode
mode, err = getMirroringMode(ctx, req.GetParameters())
if err != nil {
Expand Down Expand Up @@ -620,31 +610,6 @@ func (rs *ReplicationServer) PromoteVolume(ctx context.Context,
return &replication.PromoteVolumeResponse{}, nil
}

// checkHealthyPrimary checks if the image is a healhty primary or not.
// healthy primary image will be in up+stopped state, for states other
// than this it returns an error message.
func checkHealthyPrimary(ctx context.Context, rbdVol *rbdVolume, mirrorStatus *librbd.GlobalMirrorImageStatus) error {
localStatus, err := mirrorStatus.LocalStatus()
if err != nil {
// LocalStatus can fail if the local site status is not found in
// mirroring status. Log complete sites status to debug why getting
// local status failed
log.ErrorLog(ctx, "mirroring status is %+v", mirrorStatus)

return fmt.Errorf("failed to get local status: %w", err)
}

if !localStatus.Up || localStatus.State != librbd.MirrorImageStatusStateStopped {
return fmt.Errorf("%s %w. State is up=%t, state=%q",
rbdVol,
ErrUnHealthyMirroredImage,
localStatus.Up,
localStatus.State)
}

return nil
}

// DemoteVolume extracts the RBD volume information from the
// volumeID, If the image is present, mirroring is enabled and the
// image is in promoted state it will demote the volume as secondary.
Expand Down
72 changes: 0 additions & 72 deletions internal/rbd/replicationcontrollerserver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -279,75 +279,3 @@ func TestCheckVolumeResyncStatus(t *testing.T) {
})
}
}

func Test_checkHealthyPrimary(t *testing.T) {
t.Parallel()
rbdVol := &rbdVolume{
rbdImage: rbdImage{
RbdImageName: "test",
Pool: "test-pool",
},
}
tests := []struct {
name string
ctx context.Context
rbdVol *rbdVolume
mirrorStatus *librbd.GlobalMirrorImageStatus
wantErr bool
}{
{
name: "when image is in up+stopped state",
ctx: context.TODO(),
rbdVol: rbdVol,
mirrorStatus: &librbd.GlobalMirrorImageStatus{
SiteStatuses: []librbd.SiteMirrorImageStatus{
{
MirrorUUID: "",
State: librbd.MirrorImageStatusStateStopped,
Up: true,
},
},
},
wantErr: false,
},
{
name: "when image is in up+error state",
ctx: context.TODO(),
rbdVol: rbdVol,
mirrorStatus: &librbd.GlobalMirrorImageStatus{
SiteStatuses: []librbd.SiteMirrorImageStatus{
{
MirrorUUID: "",
State: librbd.MirrorImageStatusStateError,
Up: false,
},
},
},
wantErr: true,
},
{
name: "when image is in up+replaying state",
ctx: context.TODO(),
rbdVol: rbdVol,
mirrorStatus: &librbd.GlobalMirrorImageStatus{
SiteStatuses: []librbd.SiteMirrorImageStatus{
{
MirrorUUID: "",
State: librbd.MirrorImageStatusStateReplaying,
Up: true,
},
},
},
wantErr: true,
},
}
for _, tt := range tests {
ts := tt
t.Run(ts.name, func(t *testing.T) {
t.Parallel()
if err := checkHealthyPrimary(ts.ctx, ts.rbdVol, ts.mirrorStatus); (err != nil) != ts.wantErr {
t.Errorf("checkHealthyPrimary() error = %v, wantErr %v", err, ts.wantErr)
}
})
}
}

0 comments on commit e6fd843

Please sign in to comment.