github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #105077 from marosset/windows-run-kubelet-in-job-object

Browse Source 
Run kubelet in a job object in windows
This commit is contained in:
Kubernetes Prow Robot 2022-03-22 10:35:59 -07:00 committed by GitHub
commit e0b334f570
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
cmd/kubelet/app/init_windows.go
View File

@ -21,7 +21,9 @@ package app
import ( import (
"fmt" "fmt"
"unsafe"
"github.com/pkg/errors"
"golang.org/x/sys/windows" "golang.org/x/sys/windows"
"k8s.io/klog/v2" "k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/windows/service" "k8s.io/kubernetes/pkg/windows/service"
@ -35,28 +37,56 @@ const (
// Ref: https://docs.microsoft.com/en-us/windows/win32/cimwin32prov/setpriority-method-in-class-win32-process // Ref: https://docs.microsoft.com/en-us/windows/win32/cimwin32prov/setpriority-method-in-class-win32-process
func getPriorityValue(priorityClassName string) uint32 { func getPriorityValue(priorityClassName string) uint32 {
var priorityClassMap = map[string]uint32{ var priorityClassMap = map[string]uint32{
"IDLE_PRIORITY_CLASS": uint32(64), "IDLE_PRIORITY_CLASS": uint32(windows.IDLE_PRIORITY_CLASS),
"BELOW_NORMAL_PRIORITY_CLASS": uint32(16384), "BELOW_NORMAL_PRIORITY_CLASS": uint32(windows.BELOW_NORMAL_PRIORITY_CLASS),
"NORMAL_PRIORITY_CLASS": uint32(32), "NORMAL_PRIORITY_CLASS": uint32(windows.NORMAL_PRIORITY_CLASS),
"ABOVE_NORMAL_PRIORITY_CLASS": uint32(32768), "ABOVE_NORMAL_PRIORITY_CLASS": uint32(windows.ABOVE_NORMAL_PRIORITY_CLASS),
"HIGH_PRIORITY_CLASS": uint32(128), "HIGH_PRIORITY_CLASS": uint32(windows.HIGH_PRIORITY_CLASS),
"REALTIME_PRIORITY_CLASS": uint32(256), "REALTIME_PRIORITY_CLASS": uint32(windows.REALTIME_PRIORITY_CLASS),
} }
return priorityClassMap[priorityClassName] return priorityClassMap[priorityClassName]
} }
// createWindowsJobObject creates a new Job Object
// (https://docs.microsoft.com/en-us/windows/win32/procthread/job-objects),
// and specifies the priority class for the job object to the specified value.
// A job object is used here so that any spawned processes such as powershell or
// wmic are created at the specified thread priority class.
// Running kubelet with above normal / high priority can help improve
// responsiveness on machines with high CPU utilization.
func createWindowsJobObject(pc uint32) (windows.Handle, error) {
job, err := windows.CreateJobObject(nil, nil)
if err != nil {
return windows.InvalidHandle, errors.Wrap(err, "windows.CreateJobObject failed")
}
limitInfo := windows.JOBOBJECT_BASIC_LIMIT_INFORMATION{
LimitFlags: windows.JOB_OBJECT_LIMIT_PRIORITY_CLASS,
PriorityClass: pc,
}
if _, err := windows.SetInformationJobObject(
job,
windows.JobObjectBasicLimitInformation,
uintptr(unsafe.Pointer(&limitInfo)),
uint32(unsafe.Sizeof(limitInfo))); err != nil {
return windows.InvalidHandle, errors.Wrap(err, "windows.SetInformationJobObject failed")
}
return job, nil
}
func initForOS(windowsService bool, windowsPriorityClass string) error { func initForOS(windowsService bool, windowsPriorityClass string) error {
priority := getPriorityValue(windowsPriorityClass) priority := getPriorityValue(windowsPriorityClass)
if priority == 0 { if priority == 0 {
return fmt.Errorf("unknown priority class %s, valid ones are available at "+ return fmt.Errorf("unknown priority class %s, valid ones are available at "+
"https://docs.microsoft.com/en-us/windows/win32/procthread/scheduling-priorities", windowsPriorityClass) "https://docs.microsoft.com/en-us/windows/win32/procthread/scheduling-priorities", windowsPriorityClass)
} }
kubeletProcessHandle := windows.CurrentProcess() klog.InfoS("Creating a Windows job object and adding kubelet process to it", "windowsPriorityClass", windowsPriorityClass)
// Set the priority of the kubelet process to given priority job, err := createWindowsJobObject(priority)
klog.InfoS("Setting the priority of kubelet process", "windowsPriorityClass", windowsPriorityClass) if err != nil {
if err := windows.SetPriorityClass(kubeletProcessHandle, priority); err != nil {
return err return err
} }
if err := windows.AssignProcessToJobObject(job, windows.CurrentProcess()); err != nil {
return errors.Wrap(err, "windows.AssignProcessToJobObject failed")
}
if windowsService { if windowsService {
return service.InitService(serviceName) return service.InitService(serviceName)