Fix photon controller plugin to construct with correct PdID

The input variable of function ConstructVolumeSpec is the volume spec name instead of persistent disk ID. Previously the function directly construct new volume spec by assigning volume spec name to persistent disk ID, which will result in mismatching of mount path. The fix will find the pdID according to mount path and construct volume spec with the correct pdID.

Fix photon controller plugin to construct with correct PdID
c2400422 · Miao Luo · 1dfd64f4 · c2400422
Commit c2400422 authored Nov 19, 2016 by Miao Luo
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 3 deletions

photon_pd.go pkg/volume/photon_pd/photon_pd.go +10 -3

No files found.
--- a/pkg/volume/photon_pd/photon_pd.go
+++ b/pkg/volume/photon_pd/photon_pd.go
@@ -119,12 +119,19 @@ func (plugin *photonPersistentDiskPlugin) newUnmounterInternal(volName string, p
 		}}, nil
 }
-func (plugin *photonPersistentDiskPlugin) ConstructVolumeSpec(volumeName, mountPath string) (*volume.Spec, error) {
+func (plugin *photonPersistentDiskPlugin) ConstructVolumeSpec(volumeSpecName, mountPath string) (*volume.Spec, error) {
+	mounter := plugin.host.GetMounter()
+	pluginDir := plugin.host.GetPluginDir(plugin.GetPluginName())
+	pdID, err := mounter.GetDeviceNameFromMount(mountPath, pluginDir)
+	if err != nil {
+		return nil, err
+	}
 	photonPersistentDisk := &v1.Volume{
-		Name: volumeName,
+		Name: volumeSpecName,
 		VolumeSource: v1.VolumeSource{
 			PhotonPersistentDisk: &v1.PhotonPersistentDiskVolumeSource{
-				PdID: volumeName,
+				PdID: pdID,
 			},
 		},
 	}