-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9503 from priyawadhwa/schedule-stop-unix
Implement schedule stop for unix
- Loading branch information
Showing
10 changed files
with
334 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| // +build !windows | ||
|
|
||
| /* | ||
| Copyright 2020 The Kubernetes Authors All rights reserved. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package schedule | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "io/ioutil" | ||
| "os" | ||
| "strconv" | ||
| "time" | ||
|
|
||
| "github.com/VividCortex/godaemon" | ||
| "github.com/pkg/errors" | ||
| "k8s.io/klog/v2" | ||
| "k8s.io/minikube/pkg/minikube/localpath" | ||
| ) | ||
|
|
||
| // KillExisting kills existing scheduled stops by looking up the PID | ||
| // of the scheduled stop from the PID file saved for the profile and killing the process | ||
| func KillExisting(profiles []string) { | ||
| for _, profile := range profiles { | ||
| if err := killPIDForProfile(profile); err != nil { | ||
| klog.Errorf("error killng PID for profile %s: %v", profile, err) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func killPIDForProfile(profile string) error { | ||
| file := localpath.PID(profile) | ||
| f, err := ioutil.ReadFile(file) | ||
| if os.IsNotExist(err) { | ||
| return nil | ||
| } | ||
| defer func() { | ||
| if err := os.Remove(file); err != nil { | ||
| klog.Errorf("error deleting %s: %v, you may have to delete in manually", file, err) | ||
| } | ||
| }() | ||
| if err != nil { | ||
| return errors.Wrapf(err, "reading %s", file) | ||
| } | ||
| pid, err := strconv.Atoi(string(f)) | ||
| if err != nil { | ||
| return errors.Wrapf(err, "converting %s to int", f) | ||
| } | ||
| p, err := os.FindProcess(pid) | ||
| if err != nil { | ||
| return errors.Wrap(err, "finding process") | ||
| } | ||
| klog.Infof("killing process %v as it is an old scheduled stop", pid) | ||
| if err := p.Kill(); err != nil { | ||
| return errors.Wrapf(err, "killing %v", pid) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func daemonize(profiles []string, duration time.Duration) error { | ||
| _, _, err := godaemon.MakeDaemon(&godaemon.DaemonAttr{}) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| // now that this process has daemonized, it has a new PID | ||
| pid := os.Getpid() | ||
| return savePIDs(pid, profiles) | ||
| } | ||
|
|
||
| func savePIDs(pid int, profiles []string) error { | ||
| for _, p := range profiles { | ||
| file := localpath.PID(p) | ||
| if err := ioutil.WriteFile(file, []byte(fmt.Sprintf("%v", pid)), 0600); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| // +build windows | ||
|
|
||
| /* | ||
| Copyright 2020 The Kubernetes Authors All rights reserved. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package schedule | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "time" | ||
|
|
||
| "k8s.io/klog/v2" | ||
| ) | ||
|
|
||
| // KillExisting will kill existing scheduled stops | ||
| func KillExisting(profiles []string) { | ||
| klog.Errorf("not yet implemented for windows") | ||
| } | ||
|
|
||
| func daemonize(profiles []string, duration time.Duration) error { | ||
| return fmt.Errorf("not yet implemented for windows") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* | ||
| Copyright 2020 The Kubernetes Authors All rights reserved. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package schedule | ||
|
|
||
| import ( | ||
| "time" | ||
|
|
||
| "github.com/pkg/errors" | ||
| "k8s.io/minikube/pkg/minikube/config" | ||
| "k8s.io/minikube/pkg/minikube/driver" | ||
| "k8s.io/minikube/pkg/minikube/mustload" | ||
| "k8s.io/minikube/pkg/minikube/out" | ||
| ) | ||
|
|
||
| // Daemonize daemonizes minikube so that scheduled stop happens as expected | ||
| func Daemonize(profiles []string, duration time.Duration) error { | ||
| // save current time and expected duration in config | ||
| scheduledStop := &config.ScheduledStopConfig{ | ||
| InitiationTime: time.Now().Unix(), | ||
| Duration: duration, | ||
| } | ||
| var daemonizeProfiles []string | ||
| for _, p := range profiles { | ||
| _, cc := mustload.Partial(p) | ||
| if driver.BareMetal(cc.Driver) { | ||
| out.WarningT("scheduled stop is not supported on the none driver, skipping scheduling") | ||
| continue | ||
| } | ||
| daemonizeProfiles = append(daemonizeProfiles, p) | ||
| cc.ScheduledStop = scheduledStop | ||
| if err := config.SaveProfile(p, cc); err != nil { | ||
| return errors.Wrap(err, "saving profile") | ||
| } | ||
| } | ||
|
|
||
| return daemonize(daemonizeProfiles, duration) | ||
| } |
Oops, something went wrong.