Merge pull request #55203 from hzxuzhonghu/azure-bug

Automatic merge from submit-queue (batch tested with PRs 54177, 55203, 55120, 55275, 55260). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. [bug fix]invalid memory address or nil pointer dereference when mounting azure disk **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #55199 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #55203 from hzxuzhonghu/azure-bug
94a699e8 · Kubernetes Submit Queue · GitHub · 93ef57a1 · b87c16e6 · 94a699e8
Unverified Commit 94a699e8 authored Nov 08, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 08, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

azure_mounter.go pkg/volume/azure_dd/azure_mounter.go +3 -1

No files found.
--- a/pkg/volume/azure_dd/azure_mounter.go
+++ b/pkg/volume/azure_dd/azure_mounter.go
@@ -45,7 +45,9 @@ var _ volume.Mounter = &azureDiskMounter{}
 func (m *azureDiskMounter) GetAttributes() volume.Attributes {
 	readOnly := false
 	volumeSource, err := getVolumeSource(m.spec)
-	if err != nil && volumeSource.ReadOnly != nil {
+	if err != nil {
+		glog.Infof("azureDisk - mounter failed to get volume source for spec %s %v", m.spec.Name(), err)
+	} else if volumeSource.ReadOnly != nil {
 		readOnly = *volumeSource.ReadOnly
 	}
 	return volume.Attributes{