Emit mount metric on errors and successes

Author: hajiler

pkg/gce-pd-csi-driver/node.go

@@ -448,9 +448,6 @@ func (ns *GCENodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStage
 			}
 		}
 
-		if ns.metricsManager != nil {
-			ns.metricsManager.RecordMountErrorMetric(fstype, err)
-		}
 		return nil, status.Error(codes.Internal,
 			fmt.Sprintf("Failed to format and mount device from (%q) to (%q) with fstype (%q) and options (%q): %v",
 				devicePath, stagingTargetPath, fstype, options, err.Error()))

pkg/gce-pd-csi-driver/utils_linux.go

@@ -75,7 +75,12 @@ func (ns *GCENodeServer) formatAndMount(source, target, fstype string, options [
 			}
 		}()
 	}
-	return m.FormatAndMount(source, target, fstype, options)
+
+	err := m.FormatAndMount(source, target, fstype, options)
+	if ns.metricsManager != nil {
+		ns.metricsManager.RecordMountErrorMetric(fstype, err)
+	}
+	return err
 }
 
 func preparePublishPath(path string, m *mount.SafeFormatAndMount) error {

pkg/metrics/metrics.go

@@ -116,10 +116,12 @@ func (mm *MetricsManager) RecordOperationErrorMetrics(
 }
 
 func (mm *MetricsManager) RecordMountErrorMetric(fs_format string, err error) {
+	errType := "OK"
 	mntErr := &mount.MountError{}
 	if errors.As(err, mntErr) {
-		mountErrorMetric.WithLabelValues(pdcsiDriverName, fs_format, string(mntErr.Type)).Inc()
+		errType = string(mntErr.Type)
 	}
+	mountErrorMetric.WithLabelValues(pdcsiDriverName, fs_format, errType).Inc()
 
 	klog.Infof("Recorded mount error type: %q", mntErr.Type)
 }