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

replace variable manifest to podSpec to make names unconfusing; update NoDiskConflicts comments

Browse Source 
Signed-off-by: Huamin Chen <hchen@redhat.com>
This commit is contained in:
Huamin Chen 2015-10-22 09:28:30 -04:00
parent bd10664851
commit 1ec9829ddf
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
plugin/pkg/scheduler/algorithm/predicates/predicates.go
View File

@ -56,11 +56,11 @@ func isVolumeConflict(volume api.Volume, pod *api.Pod) bool {
if volume.GCEPersistentDisk != nil { if volume.GCEPersistentDisk != nil {
disk := volume.GCEPersistentDisk disk := volume.GCEPersistentDisk
manifest := &(pod.Spec) existingPods := &(pod.Spec)
for ix := range manifest.Volumes { for ix := range existingPods.Volumes {
if manifest.Volumes[ix].GCEPersistentDisk != nil && if existingPods.Volumes[ix].GCEPersistentDisk != nil &&
manifest.Volumes[ix].GCEPersistentDisk.PDName == disk.PDName && existingPods.Volumes[ix].GCEPersistentDisk.PDName == disk.PDName &&
!(manifest.Volumes[ix].GCEPersistentDisk.ReadOnly && disk.ReadOnly) { !(existingPods.Volumes[ix].GCEPersistentDisk.ReadOnly && disk.ReadOnly) {
return true return true
} }
} }
@ -68,10 +68,10 @@ func isVolumeConflict(volume api.Volume, pod *api.Pod) bool {
if volume.AWSElasticBlockStore != nil { if volume.AWSElasticBlockStore != nil {
volumeID := volume.AWSElasticBlockStore.VolumeID volumeID := volume.AWSElasticBlockStore.VolumeID
manifest := &(pod.Spec) existingPods := &(pod.Spec)
for ix := range manifest.Volumes { for ix := range existingPods.Volumes {
if manifest.Volumes[ix].AWSElasticBlockStore != nil && if existingPods.Volumes[ix].AWSElasticBlockStore != nil &&
manifest.Volumes[ix].AWSElasticBlockStore.VolumeID == volumeID { existingPods.Volumes[ix].AWSElasticBlockStore.VolumeID == volumeID {
return true return true
} }
} }
@ -81,12 +81,12 @@ func isVolumeConflict(volume api.Volume, pod *api.Pod) bool {
pool := volume.RBD.RBDPool pool := volume.RBD.RBDPool
image := volume.RBD.RBDImage image := volume.RBD.RBDImage
manifest := &(pod.Spec) existingPods := &(pod.Spec)
for ix := range manifest.Volumes { for ix := range existingPods.Volumes {
if manifest.Volumes[ix].RBD != nil { if existingPods.Volumes[ix].RBD != nil {
mon_m := manifest.Volumes[ix].RBD.CephMonitors mon_m := existingPods.Volumes[ix].RBD.CephMonitors
pool_m := manifest.Volumes[ix].RBD.RBDPool pool_m := existingPods.Volumes[ix].RBD.RBDPool
image_m := manifest.Volumes[ix].RBD.RBDImage image_m := existingPods.Volumes[ix].RBD.RBDImage
if haveSame(mon, mon_m) && pool_m == pool && image_m == image { if haveSame(mon, mon_m) && pool_m == pool && image_m == image {
return true return true
} }
@ -97,15 +97,14 @@ func isVolumeConflict(volume api.Volume, pod *api.Pod) bool {
} }
// NoDiskConflict evaluates if a pod can fit due to the volumes it requests, and those that // NoDiskConflict evaluates if a pod can fit due to the volumes it requests, and those that
// are already mounted. Some times of volumes are mounted onto node machines. For now, these mounts // are already mounted. If there is already a volume mounted on that node, another pod that uses the same volume
// are exclusive so if there is already a volume mounted on that node, another pod can't schedule // can't be scheduled there. This is GCE, Amazon EBS, and Ceph RBD specific for now.
// there. This is GCE, Amazon EBS, and Ceph RBD specific for now.
// TODO: migrate this into some per-volume specific code? // TODO: migrate this into some per-volume specific code?
func NoDiskConflict(pod *api.Pod, existingPods []*api.Pod, node string) (bool, error) { func NoDiskConflict(pod *api.Pod, existingPods []*api.Pod, node string) (bool, error) {
manifest := &(pod.Spec) podSpec := &(pod.Spec)
for ix := range manifest.Volumes { for ix := range podSpec.Volumes {
for podIx := range existingPods { for podIx := range existingPods {
if isVolumeConflict(manifest.Volumes[ix], existingPods[podIx]) { if isVolumeConflict(podSpec.Volumes[ix], existingPods[podIx]) {
return false, nil return false, nil
} }
} }