Skip to content

Commit 82cc455

Browse files
controller: use if/else for CephFS/RBD dispatch in reconcilePV
Use if/else instead of early return to handle CephFS and RBD paths symmetrically, improving readability. Signed-off-by: Praveen M <m.praveen@ibm.com>
1 parent e7fb4f3 commit 82cc455

File tree

1 file changed

+18
-20
lines changed

1 file changed

+18
-20
lines changed

internal/controller/persistentvolume/persistentvolume.go

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -157,27 +157,25 @@ func (r *ReconcilePersistentVolume) reconcilePV(ctx context.Context, obj runtime
157157

158158
return err
159159
}
160+
} else {
161+
rbdVolID, err := rbd.RegenerateJournal(
162+
pv.Spec.CSI.VolumeAttributes,
163+
pv.Spec.ClaimRef.Name,
164+
volumeHandler,
165+
requestName,
166+
pvcNamespace,
167+
r.config.ClusterName,
168+
r.config.InstanceID,
169+
r.config.SetMetadata,
170+
cr)
171+
if err != nil {
172+
log.ErrorLogMsg("failed to regenerate journal %s", err)
160173

161-
return nil
162-
}
163-
164-
rbdVolID, err := rbd.RegenerateJournal(
165-
pv.Spec.CSI.VolumeAttributes,
166-
pv.Spec.ClaimRef.Name,
167-
volumeHandler,
168-
requestName,
169-
pvcNamespace,
170-
r.config.ClusterName,
171-
r.config.InstanceID,
172-
r.config.SetMetadata,
173-
cr)
174-
if err != nil {
175-
log.ErrorLogMsg("failed to regenerate journal %s", err)
176-
177-
return err
178-
}
179-
if rbdVolID != volumeHandler {
180-
log.DebugLog(ctx, "volumeHandler changed from %s to %s", volumeHandler, rbdVolID)
174+
return err
175+
}
176+
if rbdVolID != volumeHandler {
177+
log.DebugLog(ctx, "volumeHandler changed from %s to %s", volumeHandler, rbdVolID)
178+
}
181179
}
182180

183181
return nil

0 commit comments

Comments
 (0)