mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-01-17 18:29:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd: add context in reported errors by GetVolumeReplicationInfo

Browse Source 
Logged errors are much more helpful when there is some context around
the message about what went wrong.

Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
Niels de Vos 2025-01-14 16:41:53 +01:00 committed by mergify[bot]
parent 4101b63e02
commit e89fe5ad1f
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/csi-addons/rbd/replication.go
View File

@ -815,6 +815,8 @@ func (rs *ReplicationServer) GetVolumeReplicationInfo(ctx context.Context,
} }
cr, err := util.NewUserCredentials(req.GetSecrets()) cr, err := util.NewUserCredentials(req.GetSecrets())
if err != nil { if err != nil {
log.ErrorLog(ctx, "failed to get user credentials: %v", err)
return nil, status.Error(codes.Internal, err.Error()) return nil, status.Error(codes.Internal, err.Error())
} }
defer cr.DeleteCredentials() defer cr.DeleteCredentials()
@ -830,6 +832,8 @@ func (rs *ReplicationServer) GetVolumeReplicationInfo(ctx context.Context,
rbdVol, err := mgr.GetVolumeByID(ctx, volumeID) rbdVol, err := mgr.GetVolumeByID(ctx, volumeID)
if err != nil { if err != nil {
log.ErrorLog(ctx, "failed to get volume with id %q: %v", volumeID, err)
switch { switch {
case errors.Is(err, corerbd.ErrImageNotFound): case errors.Is(err, corerbd.ErrImageNotFound):
err = status.Error(codes.NotFound, err.Error()) err = status.Error(codes.NotFound, err.Error())
@ -843,12 +847,14 @@ func (rs *ReplicationServer) GetVolumeReplicationInfo(ctx context.Context,
} }
mirror, err := rbdVol.ToMirror() mirror, err := rbdVol.ToMirror()
if err != nil { 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()) return nil, status.Error(codes.Internal, err.Error())
} }
info, err := mirror.GetMirroringInfo(ctx) info, err := mirror.GetMirroringInfo(ctx)
if err != nil { 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()) return nil, status.Error(codes.Aborted, err.Error())
} }
@ -864,17 +870,18 @@ func (rs *ReplicationServer) GetVolumeReplicationInfo(ctx context.Context,
mirrorStatus, err := mirror.GetGlobalMirroringStatus(ctx) mirrorStatus, err := mirror.GetGlobalMirroringStatus(ctx)
if err != nil { if err != nil {
log.ErrorLog(ctx, "failed to get status for mirror %q: %v", mirror, err)
if errors.Is(err, corerbd.ErrImageNotFound) { if errors.Is(err, corerbd.ErrImageNotFound) {
return nil, status.Error(codes.Aborted, err.Error()) return nil, status.Error(codes.Aborted, err.Error())
} }
log.ErrorLog(ctx, err.Error())
return nil, status.Error(codes.Internal, err.Error()) return nil, status.Error(codes.Internal, err.Error())
} }
remoteStatus, err := mirrorStatus.GetRemoteSiteStatus(ctx) remoteStatus, err := mirrorStatus.GetRemoteSiteStatus(ctx)
if err != nil { 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) { if errors.Is(err, librbd.ErrNotExist) {
return nil, status.Errorf(codes.NotFound, "failed to get remote status: %v", err) return nil, status.Errorf(codes.NotFound, "failed to get remote status: %v", err)
@ -886,10 +893,11 @@ func (rs *ReplicationServer) GetVolumeReplicationInfo(ctx context.Context,
description := remoteStatus.GetDescription() description := remoteStatus.GetDescription()
resp, err := getLastSyncInfo(ctx, description) resp, err := getLastSyncInfo(ctx, description)
if err != nil { if err != nil {
log.ErrorLog(ctx, "failed to parse last sync info from %q: %v", description, err)
if errors.Is(err, corerbd.ErrLastSyncTimeNotFound) { if errors.Is(err, corerbd.ErrLastSyncTimeNotFound) {
return nil, status.Errorf(codes.NotFound, "failed to get last sync info: %v", err) 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) return nil, status.Errorf(codes.Internal, "failed to get last sync info: %v", err)
} }