add metrics to cinder
cd -> r fix
This commit is contained in:
		| @@ -79,6 +79,10 @@ const ( | ||||
| 	cinderVolumePluginName = "kubernetes.io/cinder" | ||||
| ) | ||||
|  | ||||
| func getPath(uid types.UID, volName string, host volume.VolumeHost) string { | ||||
| 	return host.GetPodVolumeDir(uid, kstrings.EscapeQualifiedNameForDisk(cinderVolumePluginName), volName) | ||||
| } | ||||
|  | ||||
| func (plugin *cinderPlugin) Init(host volume.VolumeHost) error { | ||||
| 	plugin.host = host | ||||
| 	plugin.volumeLocks = keymutex.NewKeyMutex() | ||||
| @@ -141,6 +145,7 @@ func (plugin *cinderPlugin) newMounterInternal(spec *volume.Spec, podUID types.U | ||||
| 			mounter:         mounter, | ||||
| 			manager:         manager, | ||||
| 			plugin:          plugin, | ||||
| 			MetricsProvider: volume.NewMetricsStatFS(getPath(podUID, spec.Name(), plugin.host)), | ||||
| 		}, | ||||
| 		fsType:             fsType, | ||||
| 		readOnly:           readOnly, | ||||
| @@ -159,6 +164,7 @@ func (plugin *cinderPlugin) newUnmounterInternal(volName string, podUID types.UI | ||||
| 			manager:         manager, | ||||
| 			mounter:         mounter, | ||||
| 			plugin:          plugin, | ||||
| 			MetricsProvider: volume.NewMetricsStatFS(getPath(podUID, volName, plugin.host)), | ||||
| 		}}, nil | ||||
| } | ||||
|  | ||||
| @@ -303,7 +309,7 @@ type cinderVolume struct { | ||||
| 	// diskMounter provides the interface that is used to mount the actual block device. | ||||
| 	blockDeviceMounter mount.Interface | ||||
| 	plugin             *cinderPlugin | ||||
| 	volume.MetricsNil | ||||
| 	volume.MetricsProvider | ||||
| } | ||||
|  | ||||
| func (b *cinderVolumeMounter) GetAttributes() volume.Attributes { | ||||
| @@ -397,8 +403,7 @@ func makeGlobalPDName(host volume.VolumeHost, devName string) string { | ||||
| } | ||||
|  | ||||
| func (cd *cinderVolume) GetPath() string { | ||||
| 	name := cinderVolumePluginName | ||||
| 	return cd.plugin.host.GetPodVolumeDir(cd.podUID, kstrings.EscapeQualifiedNameForDisk(name), cd.volName) | ||||
| 	return getPath(cd.podUID, cd.volName, cd.plugin.host) | ||||
| } | ||||
|  | ||||
| type cinderVolumeUnmounter struct { | ||||
| @@ -484,8 +489,7 @@ type cinderVolumeDeleter struct { | ||||
| var _ volume.Deleter = &cinderVolumeDeleter{} | ||||
|  | ||||
| func (r *cinderVolumeDeleter) GetPath() string { | ||||
| 	name := cinderVolumePluginName | ||||
| 	return r.plugin.host.GetPodVolumeDir(r.podUID, kstrings.EscapeQualifiedNameForDisk(name), r.volName) | ||||
| 	return getPath(r.podUID, r.volName, r.plugin.host) | ||||
| } | ||||
|  | ||||
| func (r *cinderVolumeDeleter) Delete() error { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Jesse Haka
					Jesse Haka