github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #28448 from thockin/gce-pd-discard

Browse Source 
Automatic merge from submit-queue

Mount r/w GCE PD disks with -o discard

As per https://cloud.google.com/compute/docs/disks/add-persistent-disk#formatting.

Fixes #23258
This commit is contained in:
k8s-merge-robot
2016-07-07 11:01:43 -07:00
committed by GitHub
parent 3895cede49 8efefab9a3
commit 939b98481e
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/volume/gce_pd/attacher.go
View File

@@ -165,6 +165,9 @@ func (attacher *gcePersistentDiskAttacher) MountDevice(spec *volume.Spec, device
options := []string{} options := []string{}
if readOnly { if readOnly {
options = append(options, "ro") options = append(options, "ro")
} else {
// as per https://cloud.google.com/compute/docs/disks/add-persistent-disk#formatting
options = append(options, "discard")
} }
if notMnt { if notMnt {
diskMounter := &mount.SafeFormatAndMount{Interface: mounter, Runner: exec.New()} diskMounter := &mount.SafeFormatAndMount{Interface: mounter, Runner: exec.New()}