github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rebased and updated

pull/6/head
markturansky 2015-07-27 16:33:22 -04:00
parent 920cb34b1e
commit 8639f24374
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/volume/gce_pd/gce_pd.go
View File

@ -229,8 +229,8 @@ func (b *gcePersistentDiskBuilder) SetUpAt(dir string) error {
return nil
}
func (pd *gcePersistentDisk) IsReadOnly() bool {
return pd.readOnly
func (b *gcePersistentDiskBuilder) IsReadOnly() bool {
return b.readOnly
}
func makeGlobalPDName(host volume.VolumeHost, devName string) string {

6
pkg/volume/rbd/disk_manager.go
View File

@ -62,11 +62,7 @@ func diskSetUp(manager diskManager, b rbdBuilder, volPath string, mounter mount.
}
// Perform a bind mount to the full path to allow duplicate mounts of the same disk.
options := []string{"bind"}
<<<<<<< HEAD
if b.ReadOnly {
=======
if disk.readOnly {
>>>>>>> rebased and updated to latest
if b.IsReadOnly() {
options = append(options, "ro")
}
err = mounter.Mount(globalPDPath, volPath, "", options)

10
pkg/volume/rbd/rbd_util.go
View File

@ -161,11 +161,7 @@ func (util *RBDUtil) loadRBD(rbd *rbd, mnt string) error {
func (util *RBDUtil) fencing(b rbdBuilder) error {
// no need to fence readOnly
<<<<<<< HEAD
if b.ReadOnly {
=======
if rbd.readOnly {
>>>>>>> rebased and updated to latest
if b.IsReadOnly() {
return nil
}
return util.rbdLock(b, true)
@ -173,11 +169,7 @@ func (util *RBDUtil) fencing(b rbdBuilder) error {
func (util *RBDUtil) defencing(c rbdCleaner) error {
// no need to fence readOnly
<<<<<<< HEAD
if c.ReadOnly {
=======
if rbd.readOnly {
>>>>>>> rebased and updated to latest
return nil
}