Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rbd: add context in reported errors by GetVolumeReplicationInfo #5079

Merged
merged 1 commit into from
Jan 15, 2025
+12 −4
Merged

rbd: add context in reported errors by GetVolumeReplicationInfo #5079

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions internal/csi-addons/rbd/replication.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,6 +815,8 @@ func (rs *ReplicationServer) GetVolumeReplicationInfo(ctx context.Context,
}
cr, err := util.NewUserCredentials(req.GetSecrets())
if err != nil {
log.ErrorLog(ctx, "failed to get user credentials: %v", err)

return nil, status.Error(codes.Internal, err.Error())
}
defer cr.DeleteCredentials()
Expand All @@ -830,6 +832,8 @@ func (rs *ReplicationServer) GetVolumeReplicationInfo(ctx context.Context,

rbdVol, err := mgr.GetVolumeByID(ctx, volumeID)
if err != nil {
log.ErrorLog(ctx, "failed to get volume with id %q: %v", volumeID, err)

switch {
case errors.Is(err, corerbd.ErrImageNotFound):
err = status.Error(codes.NotFound, err.Error())
Expand All @@ -843,12 +847,14 @@ func (rs *ReplicationServer) GetVolumeReplicationInfo(ctx context.Context,
}
mirror, err := rbdVol.ToMirror()
if err != nil {
log.ErrorLog(ctx, "failed to convert volume %q to mirror type: %v", rbdVol, err)

return nil, status.Error(codes.Internal, err.Error())
}

info, err := mirror.GetMirroringInfo(ctx)
if err != nil {
log.ErrorLog(ctx, err.Error())
log.ErrorLog(ctx, "failed to get info for mirror %q: %v", mirror, err)

return nil, status.Error(codes.Aborted, err.Error())
}
Expand All @@ -864,17 +870,18 @@ func (rs *ReplicationServer) GetVolumeReplicationInfo(ctx context.Context,

mirrorStatus, err := mirror.GetGlobalMirroringStatus(ctx)
if err != nil {
log.ErrorLog(ctx, "failed to get status for mirror %q: %v", mirror, err)

if errors.Is(err, corerbd.ErrImageNotFound) {
return nil, status.Error(codes.Aborted, err.Error())
}
log.ErrorLog(ctx, err.Error())

return nil, status.Error(codes.Internal, err.Error())
}

remoteStatus, err := mirrorStatus.GetRemoteSiteStatus(ctx)
if err != nil {
log.ErrorLog(ctx, err.Error())
log.ErrorLog(ctx, "failed to get remote site status for mirror %q: %v", mirror, err)

if errors.Is(err, librbd.ErrNotExist) {
return nil, status.Errorf(codes.NotFound, "failed to get remote status: %v", err)
Expand All @@ -886,10 +893,11 @@ func (rs *ReplicationServer) GetVolumeReplicationInfo(ctx context.Context,
description := remoteStatus.GetDescription()
resp, err := getLastSyncInfo(ctx, description)
if err != nil {
log.ErrorLog(ctx, "failed to parse last sync info from %q: %v", description, err)

if errors.Is(err, corerbd.ErrLastSyncTimeNotFound) {
return nil, status.Errorf(codes.NotFound, "failed to get last sync info: %v", err)
}
log.ErrorLog(ctx, err.Error())

return nil, status.Errorf(codes.Internal, "failed to get last sync info: %v", err)
}
Expand Down
Loading