Merge pull request ceph#55643 from afreen23/fix-62089

mgr/dashboard: Handle errors for /api/osd/settings

Reviewed-by: Pedro Gonzalez Gomez <[email protected]>
Reviewed-by: Nizamudeen A <[email protected]>

Author: nizamial09

src/pybind/mgr/dashboard/controllers/osd.py

@@ -168,11 +168,18 @@ def gauge_stats(osd, osd_spec):
     @RESTController.Collection('GET', version=APIVersion.EXPERIMENTAL)
     @ReadPermission
     def settings(self):
-        result = CephService.send_command('mon', 'osd dump')
-        return {
-            'nearfull_ratio': result['nearfull_ratio'],
-            'full_ratio': result['full_ratio']
+        data = {
+            'nearfull_ratio': -1,
+            'full_ratio': -1
         }
+        try:
+            result = CephService.send_command('mon', 'osd dump')
+            data['nearfull_ratio'] = result['nearfull_ratio']
+            data['full_ratio'] = result['full_ratio']
+        except TypeError:
+            logger.error(
+                'Error setting nearfull_ratio and full_ratio:', exc_info=True)
+        return data
 
     def _get_operational_status(self, osd_id: int, removing_osd_ids: Optional[List[int]]):
         if removing_osd_ids is None:

src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/dashboard-pie/dashboard-pie.component.ts

@@ -59,7 +59,7 @@ export class DashboardPieComponent implements OnChanges, OnInit {
   constructor(private cssHelper: CssHelper, private dimlessBinary: DimlessBinaryPipe) {
     this.chartConfig = {
       chartType: 'doughnut',
-      labels: ['', '', ''],
+      labels: [],
       dataset: [
         {
           label: null,
@@ -97,19 +97,20 @@ export class DashboardPieComponent implements OnChanges, OnInit {
                   fillStyle: chart.data.datasets[1].backgroundColor[0],
                   strokeStyle: chart.data.datasets[1].backgroundColor[0]
                 };
-                labels[1] = {
-                  text: $localize`Warning: ${chart.data.datasets[0].data[0]}%`,
-                  fillStyle: chart.data.datasets[0].backgroundColor[1],
-                  strokeStyle: chart.data.datasets[0].backgroundColor[1]
-                };
-                labels[2] = {
-                  text: $localize`Danger: ${
-                    chart.data.datasets[0].data[0] + chart.data.datasets[0].data[1]
-                  }%`,
-                  fillStyle: chart.data.datasets[0].backgroundColor[2],
-                  strokeStyle: chart.data.datasets[0].backgroundColor[2]
-                };
-
+                if (chart.data.datasets[0].data?.length) {
+                  labels[1] = {
+                    text: $localize`Warning: ${chart.data.datasets[0].data[0]}%`,
+                    fillStyle: chart.data.datasets[0].backgroundColor[1],
+                    strokeStyle: chart.data.datasets[0].backgroundColor[1]
+                  };
+                  labels[2] = {
+                    text: $localize`Danger: ${
+                      chart.data.datasets[0].data[0] + chart.data.datasets[0].data[1]
+                    }%`,
+                    fillStyle: chart.data.datasets[0].backgroundColor[2],
+                    strokeStyle: chart.data.datasets[0].backgroundColor[2]
+                  };
+                }
                 return labels;
               }
             }
@@ -158,27 +159,31 @@ export class DashboardPieComponent implements OnChanges, OnInit {
     const fullRatioPercent = this.highThreshold * 100;
     const percentAvailable = this.calcPercentage(data.max - data.current, data.max);
     const percentUsed = this.calcPercentage(data.current, data.max);
-    if (percentUsed >= fullRatioPercent) {
+
+    if (fullRatioPercent >= 0 && percentUsed >= fullRatioPercent) {
       this.color = 'chart-color-red';
-    } else if (percentUsed >= nearFullRatioPercent) {
+    } else if (nearFullRatioPercent >= 0 && percentUsed >= nearFullRatioPercent) {
       this.color = 'chart-color-yellow';
     } else {
       this.color = 'chart-color-blue';
     }
 
-    chart.dataset[0].data = [
-      Math.round(nearFullRatioPercent),
-      Math.round(Math.abs(nearFullRatioPercent - fullRatioPercent)),
-      Math.round(100 - fullRatioPercent)
-    ];
+    if (fullRatioPercent >= 0 && nearFullRatioPercent >= 0) {
+      chart.dataset[0].data = [
+        Math.round(nearFullRatioPercent),
+        Math.round(Math.abs(nearFullRatioPercent - fullRatioPercent)),
+        Math.round(100 - fullRatioPercent)
+      ];
+    } else {
+      chart.dataset[1].backgroundColor[1] = this.cssHelper.propertyValue('chart-color-light-gray');
+    }
 
     chart.dataset[1].data = [
       percentUsed,
       percentAvailable,
       this.dimlessBinary.transform(data.current)
     ];
     chart.dataset[1].backgroundColor[0] = this.cssHelper.propertyValue(this.color);
-
     chart.dataset[0].label = [`${percentUsed}%\nof ${this.dimlessBinary.transform(data.max)}`];
   }
 

src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.ts

@@ -164,9 +164,12 @@ export class HealthComponent implements OnInit, OnDestroy {
       data.df.stats.total_bytes
     );
 
-    if (percentUsed / 100 >= this.osdSettings.nearfull_ratio) {
+    const nearfullRatio = this.osdSettings.nearfull_ratio;
+    const fullRatio = this.osdSettings.nearfull_ratio;
+
+    if (nearfullRatio >= 0 && percentUsed / 100 >= nearfullRatio) {
       this.color = 'chart-color-red';
-    } else if (percentUsed / 100 >= this.osdSettings.full_ratio) {
+    } else if (fullRatio >= 0 && percentUsed / 100 >= fullRatio) {
       this.color = 'chart-color-yellow';
     } else {
       this.color = 'chart-color-blue';

src/pybind/mgr/dashboard/frontend/src/app/shared/components/usage-bar/usage-bar.component.html

@@ -29,7 +29,7 @@
      data-placement="left"
      [ngbTooltip]="usageTooltipTpl">
   <div class="progress-bar bg-info"
-       [ngClass]="{'bg-warning': usedPercentage/100 >= warningThreshold, 'bg-danger': usedPercentage/100 >= errorThreshold}"
+       [ngClass]="{'bg-warning': (warningThreshold >= 0) && (usedPercentage/100 >= warningThreshold), 'bg-danger': (errorThreshold >= 0) && (usedPercentage/100 >= errorThreshold)}"
        role="progressbar"
        [attr.aria-label]="{ title }"
        i18n-aria-label="The title of this usage bar is { title }"