github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 14:14:39 +00:00
Code Issues Projects Releases Wiki Activity

Make priority score info more clear

Browse Source
This commit is contained in:
xiangpengzhao
2016-06-10 13:51:53 -04:00
parent 60c1ec8eac
commit f1d98ba961
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugin/pkg/scheduler/algorithm/priorities/priorities.go
View File

@@ -61,10 +61,10 @@ func calculateResourceOccupancy(pod *api.Pod, node api.Node, nodeInfo *scheduler
cpuScore := calculateScore(totalMilliCPU, capacityMilliCPU, node.Name) cpuScore := calculateScore(totalMilliCPU, capacityMilliCPU, node.Name)
memoryScore := calculateScore(totalMemory, capacityMemory, node.Name) memoryScore := calculateScore(totalMemory, capacityMemory, node.Name)
glog.V(10).Infof( glog.V(10).Infof(
"%v -> %v: Least Requested Priority, Absolute/Requested: (%d, %d) / (%d, %d) Score: (%d, %d)", "%v -> %v: Least Requested Priority, capacity %d millicores %d memory bytes, total request %d millicores %d memory bytes, score %d CPU %d memory",
pod.Name, node.Name, pod.Name, node.Name,
totalMilliCPU, totalMemory,
capacityMilliCPU, capacityMemory, capacityMilliCPU, capacityMemory,
totalMilliCPU, totalMemory,
cpuScore, memoryScore, cpuScore, memoryScore,
) )
@@ -254,10 +254,10 @@ func calculateBalancedResourceAllocation(pod *api.Pod, node api.Node, nodeInfo *
score = int(10 - diff*10) score = int(10 - diff*10)
} }
glog.V(10).Infof( glog.V(10).Infof(
"%v -> %v: Balanced Resource Allocation, Absolute/Requested: (%d, %d) / (%d, %d) Score: (%d)", "%v -> %v: Balanced Resource Allocation, capacity %d millicores %d memory bytes, total request %d millicores %d memory bytes, score %d",
pod.Name, node.Name, pod.Name, node.Name,
totalMilliCPU, totalMemory,
capacityMilliCPU, capacityMemory, capacityMilliCPU, capacityMemory,
totalMilliCPU, totalMemory,
score, score,
) )

3
plugin/pkg/scheduler/algorithm/priorities/taint_toleration.go
View File

@@ -17,6 +17,7 @@ limitations under the License.
package priorities package priorities
import ( import (
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
@@ -104,6 +105,8 @@ func (s *TaintToleration) ComputeTaintTolerationPriority(pod *api.Pod, nodeNameT
if maxCount > 0 { if maxCount > 0 {
fScore = (1.0 - float64(counts[node.Name])/float64(maxCount)) * 10 fScore = (1.0 - float64(counts[node.Name])/float64(maxCount)) * 10
} }
glog.V(10).Infof("%v -> %v: Taint Toleration Priority, Score: (%d)", pod.Name, node.Name, int(fScore))
result = append(result, schedulerapi.HostPriority{Host: node.Name, Score: int(fScore)}) result = append(result, schedulerapi.HostPriority{Host: node.Name, Score: int(fScore)})
} }
return result, nil return result, nil