Merge pull request #64271 from xiaoxubeii/fix-64119

Automatic merge from submit-queue. 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>. Fix #64119 RBD volumes cannot be mapped read only to more than 1 container **What this PR does / why we need it**: RBD volumes cannot be mapped read only to more than 1 container. **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 #64119 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #64271 from xiaoxubeii/fix-64119
6e97339d · Kubernetes Submit Queue · GitHub · 936f007c · 015871bf · 6e97339d
Unverified Commit 6e97339d authored Jun 20, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 20, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

rbd_test.go pkg/volume/rbd/rbd_test.go +1 -0

rbd_util.go pkg/volume/rbd/rbd_util.go +4 -0

No files found.
--- a/pkg/volume/rbd/rbd_test.go
+++ b/pkg/volume/rbd/rbd_test.go
@@ -329,6 +329,7 @@ func TestPlugin(t *testing.T) {
 					RBDPool:      "pool1",
 					RBDImage:     "image1",
 					FSType:       "ext4",
+					ReadOnly:     true,
 				},
 			},
 		}),

--- a/pkg/volume/rbd/rbd_util.go
+++ b/pkg/volume/rbd/rbd_util.go
@@ -399,6 +399,10 @@ func (util *RBDUtil) AttachDisk(b rbdMounter) (string, error) {
 					break
 				}
 			}
+		} else {
+			// ReadOnly rbd volume should not check rbd status of being used to
+			// support mounted as read-only by multiple consumers simultaneously.
+			needValidUsed = !b.rbd.ReadOnly
 		}
 		err := wait.ExponentialBackoff(backoff, func() (bool, error) {
 			used, rbdOutput, err := util.rbdStatus(&b)