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

Merge pull request #21785 from yujuhong/rss_limit

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-01 04:57:09 -08:00
commit 84a98673cd
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
test/e2e/kubelet_perf.go
View File

@ -41,7 +41,8 @@ const (
type resourceTest struct { type resourceTest struct {
podsPerNode int podsPerNode int
limits containersCPUSummary cpuLimits containersCPUSummary
memLimits resourceUsagePerContainer
} }
func logPodsOnNodes(c *client.Client, nodeNames []string) { func logPodsOnNodes(c *client.Client, nodeNames []string) {
@ -55,7 +56,8 @@ func logPodsOnNodes(c *client.Client, nodeNames []string) {
} }
} }
func runResourceTrackingTest(framework *Framework, podsPerNode int, nodeNames sets.String, rm *resourceMonitor, expected map[string]map[float64]float64) { func runResourceTrackingTest(framework *Framework, podsPerNode int, nodeNames sets.String, rm *resourceMonitor,
expectedCPU map[string]map[float64]float64, expectedMemory resourceUsagePerContainer) {
numNodes := nodeNames.Len() numNodes := nodeNames.Len()
totalPods := podsPerNode * numNodes totalPods := podsPerNode * numNodes
By(fmt.Sprintf("Creating a RC of %d pods and wait until all pods of this RC are running", totalPods)) By(fmt.Sprintf("Creating a RC of %d pods and wait until all pods of this RC are running", totalPods))
@ -94,19 +96,14 @@ func runResourceTrackingTest(framework *Framework, podsPerNode int, nodeNames se
By("Reporting overall resource usage") By("Reporting overall resource usage")
logPodsOnNodes(framework.Client, nodeNames.List()) logPodsOnNodes(framework.Client, nodeNames.List())
rm.LogLatest()
usageSummary, err := rm.GetLatest() usageSummary, err := rm.GetLatest()
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Logf("%s", rm.FormatResourceUsage(usageSummary)) Logf("%s", rm.FormatResourceUsage(usageSummary))
// TODO(yujuhong): Set realistic values after gathering enough data. verifyMemoryLimits(expectedMemory, usageSummary)
verifyMemoryLimits(resourceUsagePerContainer{
"/kubelet": &containerResourceUsage{MemoryRSSInBytes: 500 * 1024 * 1024},
"/docker-daemon": &containerResourceUsage{MemoryRSSInBytes: 500 * 1024 * 1024},
}, usageSummary)
cpuSummary := rm.GetCPUSummary() cpuSummary := rm.GetCPUSummary()
Logf("%s", rm.FormatCPUSummary(cpuSummary)) Logf("%s", rm.FormatCPUSummary(cpuSummary))
verifyCPULimits(expected, cpuSummary) verifyCPULimits(expectedCPU, cpuSummary)
By("Deleting the RC") By("Deleting the RC")
DeleteRC(framework.Client, framework.Namespace.Name, rcName) DeleteRC(framework.Client, framework.Namespace.Name, rcName)
@ -208,16 +205,30 @@ var _ = Describe("Kubelet [Serial] [Slow]", func() {
// noise. // noise.
rTests := []resourceTest{ rTests := []resourceTest{
{podsPerNode: 0, {podsPerNode: 0,
limits: containersCPUSummary{ cpuLimits: containersCPUSummary{
"/kubelet": {0.50: 0.06, 0.95: 0.08}, "/kubelet": {0.50: 0.06, 0.95: 0.08},
"/docker-daemon": {0.50: 0.05, 0.95: 0.06}, "/docker-daemon": {0.50: 0.05, 0.95: 0.06},
}, },
// We set the memory limits generously because the distribution
// of the addon pods affect the memory usage on each node.
memLimits: resourceUsagePerContainer{
"/kubelet": &containerResourceUsage{MemoryRSSInBytes: 70 * 1024 * 1024},
"/docker-daemon": &containerResourceUsage{MemoryRSSInBytes: 85 * 1024 * 1024},
},
}, },
// TODO(yujuhong): change this test to ~100 pods per node after
// --max-pods have been changed.
{podsPerNode: 35, {podsPerNode: 35,
limits: containersCPUSummary{ cpuLimits: containersCPUSummary{
"/kubelet": {0.50: 0.12, 0.95: 0.14}, "/kubelet": {0.50: 0.12, 0.95: 0.14},
"/docker-daemon": {0.50: 0.06, 0.95: 0.08}, "/docker-daemon": {0.50: 0.06, 0.95: 0.08},
}, },
// We set the memory limits generously because the distribution
// of the addon pods affect the memory usage on each node.
memLimits: resourceUsagePerContainer{
"/kubelet": &containerResourceUsage{MemoryRSSInBytes: 75 * 1024 * 1024},
"/docker-daemon": &containerResourceUsage{MemoryRSSInBytes: 100 * 1024 * 1024},
},
}, },
} }
for _, testArg := range rTests { for _, testArg := range rTests {
@ -226,7 +237,7 @@ var _ = Describe("Kubelet [Serial] [Slow]", func() {
name := fmt.Sprintf( name := fmt.Sprintf(
"for %d pods per node over %v", podsPerNode, monitoringTime) "for %d pods per node over %v", podsPerNode, monitoringTime)
It(name, func() { It(name, func() {
runResourceTrackingTest(framework, podsPerNode, nodeNames, rm, itArg.limits) runResourceTrackingTest(framework, podsPerNode, nodeNames, rm, itArg.cpuLimits, itArg.memLimits)
}) })
} }
}) })
@ -237,7 +248,7 @@ var _ = Describe("Kubelet [Serial] [Slow]", func() {
name := fmt.Sprintf( name := fmt.Sprintf(
"for %d pods per node over %v", podsPerNode, monitoringTime) "for %d pods per node over %v", podsPerNode, monitoringTime)
It(name, func() { It(name, func() {
runResourceTrackingTest(framework, podsPerNode, nodeNames, rm, nil) runResourceTrackingTest(framework, podsPerNode, nodeNames, rm, nil, nil)
}) })
} }
}) })

2
test/e2e/kubelet_stats.go
View File

@ -586,7 +586,7 @@ func (r *resourceMonitor) LogLatest() {
if err != nil { if err != nil {
Logf("%v", err) Logf("%v", err)
} }
r.FormatResourceUsage(summary) Logf(r.FormatResourceUsage(summary))
} }
func (r *resourceMonitor) FormatResourceUsage(s resourceUsagePerNode) string { func (r *resourceMonitor) FormatResourceUsage(s resourceUsagePerNode) string {