github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

fix typo about volumes

Browse Source
This commit is contained in:
jianglingxia 2017-08-29 18:57:57 +08:00
parent 80ea31fcbf
commit 437f4640ca
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/cloudprovider/providers/openstack/openstack_volumes.go
View File

@ -209,7 +209,7 @@ func (os *OpenStack) OperationPending(diskName string) (bool, string, error) {
return true, volumeStatus, nil return true, volumeStatus, nil
} }
// Attaches given cinder volume to the compute running kubelet // AttachDisk attaches given cinder volume to the compute running kubelet
func (os *OpenStack) AttachDisk(instanceID, volumeID string) (string, error) { func (os *OpenStack) AttachDisk(instanceID, volumeID string) (string, error) {
volume, err := os.getVolume(volumeID) volume, err := os.getVolume(volumeID)
if err != nil { if err != nil {
@ -288,7 +288,7 @@ func (os *OpenStack) DetachDisk(instanceID, volumeID string) error {
return nil return nil
} }
// Retrieves Volume by its ID. // getVolume retrieves Volume by its ID.
func (os *OpenStack) getVolume(volumeID string) (Volume, error) { func (os *OpenStack) getVolume(volumeID string) (Volume, error) {
volumes, err := os.volumeService("") volumes, err := os.volumeService("")
if err != nil || volumes == nil { if err != nil || volumes == nil {
@ -298,7 +298,7 @@ func (os *OpenStack) getVolume(volumeID string) (Volume, error) {
return volumes.getVolume(volumeID) return volumes.getVolume(volumeID)
} }
// Create a volume of given size (in GiB) // CreateVolume creates a volume of given size (in GiB)
func (os *OpenStack) CreateVolume(name string, size int, vtype, availability string, tags *map[string]string) (string, string, error) { func (os *OpenStack) CreateVolume(name string, size int, vtype, availability string, tags *map[string]string) (string, string, error) {
volumes, err := os.volumeService("") volumes, err := os.volumeService("")
if err != nil || volumes == nil { if err != nil || volumes == nil {
@ -378,7 +378,7 @@ func (os *OpenStack) DeleteVolume(volumeID string) error {
} }
// Get device path of attached volume to the compute running kubelet, as known by cinder // GetAttachmentDiskPath gets device path of attached volume to the compute running kubelet, as known by cinder
func (os *OpenStack) GetAttachmentDiskPath(instanceID, volumeID string) (string, error) { func (os *OpenStack) GetAttachmentDiskPath(instanceID, volumeID string) (string, error) {
// See issue #33128 - Cinder does not always tell you the right device path, as such // See issue #33128 - Cinder does not always tell you the right device path, as such
// we must only use this value as a last resort. // we must only use this value as a last resort.
@ -405,7 +405,7 @@ func (os *OpenStack) GetAttachmentDiskPath(instanceID, volumeID string) (string,
return "", fmt.Errorf("volume %s has no ServerId.", volumeID) return "", fmt.Errorf("volume %s has no ServerId.", volumeID)
} }
// query if a volume is attached to a compute instance // DiskIsAttached queries if a volume is attached to a compute instance
func (os *OpenStack) DiskIsAttached(instanceID, volumeID string) (bool, error) { func (os *OpenStack) DiskIsAttached(instanceID, volumeID string) (bool, error) {
volume, err := os.getVolume(volumeID) volume, err := os.getVolume(volumeID)
if err != nil { if err != nil {
@ -415,7 +415,7 @@ func (os *OpenStack) DiskIsAttached(instanceID, volumeID string) (bool, error) {
return instanceID == volume.AttachedServerId, nil return instanceID == volume.AttachedServerId, nil
} }
// query if a list of volumes are attached to a compute instance // DisksAreAttached queries if a list of volumes are attached to a compute instance
func (os *OpenStack) DisksAreAttached(instanceID string, volumeIDs []string) (map[string]bool, error) { func (os *OpenStack) DisksAreAttached(instanceID string, volumeIDs []string) (map[string]bool, error) {
attached := make(map[string]bool) attached := make(map[string]bool)
for _, volumeID := range volumeIDs { for _, volumeID := range volumeIDs {
@ -434,7 +434,7 @@ func (os *OpenStack) diskIsUsed(volumeID string) (bool, error) {
return volume.AttachedServerId != "", nil return volume.AttachedServerId != "", nil
} }
// query if we should trust the cinder provide deviceName, See issue #33128 // ShouldTrustDevicePath queries if we should trust the cinder provide deviceName, See issue #33128
func (os *OpenStack) ShouldTrustDevicePath() bool { func (os *OpenStack) ShouldTrustDevicePath() bool {
return os.bsOpts.TrustDevicePath return os.bsOpts.TrustDevicePath
} }

2
pkg/kubelet/kubelet_volumes.go
View File

@ -126,7 +126,7 @@ func (kl *Kubelet) cleanupOrphanedPodDirs(pods []*v1.Pod, runningPods []*kubecon
logSpew := func(errs []error) { logSpew := func(errs []error) {
if len(errs) > 0 { if len(errs) > 0 {
glog.Errorf("%v : There were a total of %v errors similar to this. Turn up verbosity to see them.", errs[0], len(errs)) glog.Errorf("%v : There were a total of %v errors similar to this. Turn up verbosity to see them.", errs[0], len(errs))
for _, err := range errs { for _, err := range errs {
glog.V(5).Infof("Orphan pod: %v", err) glog.V(5).Infof("Orphan pod: %v", err)
} }