Photon Controller support: Address github code review comments.

docs/api-reference/apps/v1beta1/definitions.html

@@ -4444,8 +4444,8 @@ The StatefulSet guarantees that a given network identity will always map to the
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2016-11-06 03:38:42 UTC
+Last updated 2016-11-06 03:50:37 UTC
 </div>
 </div>
 </body>
-</html>
+</html>
\ No newline at end of file

docs/api-reference/v1/definitions.html

@@ -8613,7 +8613,7 @@ The resulting set of endpoints can be viewed as:<br>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2016-11-06 03:38:36 UTC
+Last updated 2016-11-06 03:50:31 UTC
 </div>
 </div>
 </body>

pkg/volume/photon_pd/BUILD

@@ -25,7 +25,6 @@ go_library(
         "//pkg/cloudprovider/providers/photon:go_default_library",
         "//pkg/types:go_default_library",
         "//pkg/util/exec:go_default_library",
-        "//pkg/util/keymutex:go_default_library",
         "//pkg/util/mount:go_default_library",
         "//pkg/util/strings:go_default_library",
         "//pkg/volume:go_default_library",

pkg/volume/photon_pd/attacher.go

@@ -28,7 +28,6 @@ import (
 	"k8s.io/kubernetes/pkg/cloudprovider/providers/photon"
 	"k8s.io/kubernetes/pkg/types"
 	"k8s.io/kubernetes/pkg/util/exec"
-	"k8s.io/kubernetes/pkg/util/keymutex"
 	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	volumeutil "k8s.io/kubernetes/pkg/volume/util"
@@ -42,9 +41,6 @@ type photonPersistentDiskAttacher struct {
 var _ volume.Attacher = &photonPersistentDiskAttacher{}
 var _ volume.AttachableVolumePlugin = &photonPersistentDiskPlugin{}
 
-// Singleton key mutex for keeping attach operations for the same host atomic
-var attachdetachMutex = keymutex.NewKeyMutex()
-
 func (plugin *photonPersistentDiskPlugin) NewAttacher() (volume.Attacher, error) {
 	photonCloud, err := getCloudProvider(plugin.host.GetCloudProvider())
 	if err != nil {
@@ -74,10 +70,6 @@ func (attacher *photonPersistentDiskAttacher) Attach(spec *volume.Spec, nodeName
 
 	glog.V(4).Infof("Photon Controller: Attach disk called for host %s", hostName)
 
-	// Keeps concurrent attach operations to same host atomic
-	attachdetachMutex.LockKey(hostName)
-	defer attachdetachMutex.UnlockKey(hostName)
-
 	// TODO: if disk is already attached?
 	err = attacher.photonDisks.AttachDisk(volumeSource.PdID, nodeName)
 	if err != nil {
@@ -260,8 +252,6 @@ func (detacher *photonPersistentDiskDetacher) Detach(deviceMountPath string, nod
 		return nil
 	}
 
-	attachdetachMutex.LockKey(hostName)
-	defer attachdetachMutex.UnlockKey(hostName)
 	if err := detacher.photonDisks.DetachDisk(pdID, nodeName); err != nil {
 		glog.Errorf("Error detaching volume %q: %v", pdID, err)
 		return err

pkg/volume/photon_pd/photon_util.go

@@ -39,16 +39,14 @@ const (
 )
 
 var ErrProbeVolume = errors.New("Error scanning attached volumes")
+
+// volNameToDeviceName is a mapping between spec.Name from detacher
+// and the device name inside scsi path. Once pvscsi controller is
+// supported, this won't be needed.
 var volNameToDeviceName = make(map[string]string)
 
 type PhotonDiskUtil struct{}
 
-func logError(msg string, err error) error {
-	s := "Photon Controller utility: " + msg + ". Error [" + err.Error() + "]"
-	glog.Errorf(s)
-	return fmt.Errorf(s)
-}
-
 func removeFromScsiSubsystem(volName string) {
 	// TODO: if using pvscsi controller, this won't be needed
 	deviceName := volNameToDeviceName[volName]
@@ -85,7 +83,8 @@ func verifyDevicePath(path string) (string, error) {
 func (util *PhotonDiskUtil) CreateVolume(p *photonPersistentDiskProvisioner) (pdID string, capacityGB int, err error) {
 	cloud, err := getCloudProvider(p.plugin.host.GetCloudProvider())
 	if err != nil {
-		return "", 0, logError("CreateVolume failed to get cloud provider", err)
+		glog.Errorf("Photon Controller Util: CreateVolume failed to get cloud provider. Error [%v]", err)
+		return "", 0, err
 	}
 
 	capacity := p.options.PVC.Spec.Resources.Requests[api.ResourceName(api.ResourceStorage)]
@@ -104,13 +103,15 @@ func (util *PhotonDiskUtil) CreateVolume(p *photonPersistentDiskProvisioner) (pd
 		case "flavor":
 			volumeOptions.Flavor = value
 		default:
-			return "", 0, logError("invalid option "+parameter+" for volume plugin "+p.plugin.GetPluginName(), err)
+			glog.Errorf("Photon Controller Util: invalid option %s for volume plugin %s.", parameter, p.plugin.GetPluginName())
+			return "", 0, fmt.Errorf("Photon Controller Util: invalid option %s for volume plugin %s.", parameter, p.plugin.GetPluginName())
 		}
 	}
 
 	pdID, err = cloud.CreateDisk(volumeOptions)
 	if err != nil {
-		return "", 0, logError("failed to CreateDisk", err)
+		glog.Errorf("Photon Controller Util: failed to CreateDisk. Error [%v]", err)
+		return "", 0, err
 	}
 
 	glog.V(4).Infof("Successfully created Photon Controller persistent disk %s", name)
@@ -121,11 +122,13 @@ func (util *PhotonDiskUtil) CreateVolume(p *photonPersistentDiskProvisioner) (pd
 func (util *PhotonDiskUtil) DeleteVolume(pd *photonPersistentDiskDeleter) error {
 	cloud, err := getCloudProvider(pd.plugin.host.GetCloudProvider())
 	if err != nil {
-		return logError("DeleteVolume failed to get cloud provider", err)
+		glog.Errorf("Photon Controller Util: DeleteVolume failed to get cloud provider. Error [%v]", err)
+		return err
 	}
 
 	if err = cloud.DeleteDisk(pd.pdID); err != nil {
-		return logError("failed to DeleteDisk for pdID "+pd.pdID, err)
+		glog.Errorf("Photon Controller Util: failed to DeleteDisk for pdID %s. Error [%v]", pd.pdID, err)
+		return err
 	}
 
 	glog.V(4).Infof("Successfully deleted PhotonController persistent disk %s", pd.pdID)
@@ -134,12 +137,14 @@ func (util *PhotonDiskUtil) DeleteVolume(pd *photonPersistentDiskDeleter) error
 
 func getCloudProvider(cloud cloudprovider.Interface) (*photon.PCCloud, error) {
 	if cloud == nil {
-		return nil, logError("Cloud provider not initialized properly", nil)
+		glog.Errorf("Photon Controller Util: Cloud provider not initialized properly")
+		return nil, fmt.Errorf("Photon Controller Util: Cloud provider not initialized properly")
 	}
 
 	pcc := cloud.(*photon.PCCloud)
 	if pcc == nil {
-		return nil, logError("Invalid cloud provider: expected Photon Controller", nil)
+		glog.Errorf("Invalid cloud provider: expected Photon Controller")
+		return nil, fmt.Errorf("Invalid cloud provider: expected Photon Controller")
 	}
 	return pcc, nil
 }