feedc0de/my-rook-config
1
0
Fork 0
forked from rook/rook
Code Pull Requests Activity

osd: remove redundant err check

Browse Source 
remove redundant nested `if err != nil` checks

Signed-off-by: Kyori Sakao <system.222.down@gmail.com>
This commit is contained in:
Kyori Sakao
2025-06-19 10:08:33 +09:00
parent 1599042236
commit 015e4f4ecf
2 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/daemon/ceph/osd/remove.go
+6 -12
View File
@@ -125,10 +125,8 @@ func removeOSD(clusterdContext *clusterd.Context, clusterInfo *client.ClusterInf
} else {
logger.Infof("removing the OSD deployment %q", deploymentName)
if err := k8sutil.DeleteDeployment(clusterInfo.Context, clusterdContext.Clientset, clusterInfo.Namespace, deploymentName); err != nil {
if err != nil {
// Continue purging the OSD even if the deployment fails to be deleted
logger.Errorf("failed to delete deployment for OSD %d. %v", osdID, err)
}
// Continue purging the OSD even if the deployment fails to be deleted
logger.Errorf("failed to delete deployment for OSD %d. %v", osdID, err)
}
if pvcName, ok := deployment.GetLabels()[oposd.OSDOverPVCLabelKey]; ok {
removeOSDPrepareJob(clusterdContext, clusterInfo, pvcName)
@@ -172,10 +170,8 @@ func removeOSDPrepareJob(clusterdContext *clusterd.Context, clusterInfo *client.
for _, prepareJob := range prepareJobList.Items {
logger.Infof("removing the osd prepare job %q", prepareJob.GetName())
if err := k8sutil.DeleteBatchJob(clusterInfo.Context, clusterdContext.Clientset, clusterInfo.Namespace, prepareJob.GetName(), false); err != nil {
if err != nil {
// Continue with the cleanup even if the job fails to be deleted
logger.Errorf("failed to delete prepare job for osd %q. %v", prepareJob.GetName(), err)
}
// Continue with the cleanup even if the job fails to be deleted
logger.Errorf("failed to delete prepare job for osd %q. %v", prepareJob.GetName(), err)
}
}
}
@@ -212,10 +208,8 @@ func removePVCs(clusterdContext *clusterd.Context, clusterInfo *client.ClusterIn
// Remove the OSD PVC
logger.Infof("removing the OSD PVC %q", pvc.Name)
if err := clusterdContext.Clientset.CoreV1().PersistentVolumeClaims(clusterInfo.Namespace).Delete(clusterInfo.Context, pvc.Name, metav1.DeleteOptions{}); err != nil {
if err != nil {
// Continue deleting the OSD PVC even if PVC deletion fails
logger.Errorf("failed to delete pvc %q for OSD. %v", pvc.Name, err)
}
// Continue deleting the OSD PVC even if PVC deletion fails
logger.Errorf("failed to delete pvc %q for OSD. %v", pvc.Name, err)
}
}
}
pkg/operator/ceph/cluster/osd/osd.go
+3 -7
View File
@@ -941,15 +941,11 @@ func (c *Cluster) deleteOSDDeployment(osdID int) error {
deploymentName := fmt.Sprintf("rook-ceph-osd-%d", osdID)
logger.Infof("removing the OSD deployment %q", deploymentName)
if err := k8sutil.DeleteDeployment(c.clusterInfo.Context, c.context.Clientset, c.clusterInfo.Namespace, deploymentName); err != nil {
if err != nil {
if kerrors.IsNotFound(err) {
logger.Debugf("osd deployment %q not found. Ignoring since object must be deleted.", deploymentName)
} else {
return errors.Wrapf(err, "failed to delete OSD deployment %q.", deploymentName)
}
if !kerrors.IsNotFound(err) {
return errors.Wrapf(err, "failed to delete OSD deployment %q.", deploymentName)
}
logger.Debugf("osd deployment %q not found. Ignoring since object must be deleted.", deploymentName)
}
return nil
}