Merge pull request #49598 from sbezverk/local_vol_metrics

Automatic merge from submit-queue (batch tested with PRs 49619, 49598, 47267, 49597, 49638) Adding metrics support to local volume Adding metrics support to local volume plugin. Fixes #49601

Merge pull request #49598 from sbezverk/local_vol_metrics
ee632be5 · Kubernetes Submit Queue · GitHub · 07d7ac78 · fb67f118 · ee632be5
Commit ee632be5 authored Jul 28, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

local.go pkg/volume/local/local.go +7 -7

No files found.
--- a/pkg/volume/local/local.go
+++ b/pkg/volume/local/local.go
@@ -102,11 +102,12 @@ func (plugin *localVolumePlugin) NewMounter(spec *volume.Spec, pod *v1.Pod, _ vo

 	return &localVolumeMounter{
 		localVolume: &localVolume{
-			podUID:     pod.UID,
-			volName:    spec.Name(),
-			mounter:    plugin.host.GetMounter(),
-			plugin:     plugin,
-			globalPath: volumeSource.Path,
+			podUID:          pod.UID,
+			volName:         spec.Name(),
+			mounter:         plugin.host.GetMounter(),
+			plugin:          plugin,
+			globalPath:      volumeSource.Path,
+			MetricsProvider: volume.NewMetricsStatFS(volumeSource.Path),
 		},
 		readOnly: readOnly,
 	}, nil
@@ -151,8 +152,7 @@ type localVolume struct {
 	// Mounter interface that provides system calls to mount the global path to the pod local path.
 	mounter mount.Interface
 	plugin  *localVolumePlugin
-	// TODO: add metrics
-	volume.MetricsNil
+	volume.MetricsProvider
 }

 func (l *localVolume) GetPath() string {