kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refresh cache if there was error

pull/8959/head
Medya Gh 2020-08-10 15:46:55 -07:00
parent 5cb47d75af
commit 84d198d8b5
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/minikube/cmd/start_flags.go
View File

@ -220,14 +220,14 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
cc = updateExistingConfigFromFlags(cmd, existing) cc = updateExistingConfigFromFlags(cmd, existing)
} else { } else {
glog.Info("no existing cluster config was found, will generate one from the flags ") glog.Info("no existing cluster config was found, will generate one from the flags ")
sysLimit, containerLimit, err := memoryLimits(drvName) sysLimit, containerLimit, errs := memoryLimits(drvName)
if err != nil { if errs != nil {
glog.Warningf("Unable to query memory limits: %v", err) glog.Warningf("Unable to query memory limits: %+v", errs)
} }
mem := suggestMemoryAllocation(sysLimit, containerLimit, viper.GetInt(nodes)) mem := suggestMemoryAllocation(sysLimit, containerLimit, viper.GetInt(nodes))
if cmd.Flags().Changed(memory) { if cmd.Flags().Changed(memory) {
mem, err = pkgutil.CalculateSizeInMB(viper.GetString(memory)) mem, err := pkgutil.CalculateSizeInMB(viper.GetString(memory))
if err != nil { if err != nil {
exit.WithCodeT(exit.Config, "Generate unable to parse memory '{{.memory}}': {{.error}}", out.V{"memory": viper.GetString(memory), "error": err}) exit.WithCodeT(exit.Config, "Generate unable to parse memory '{{.memory}}': {{.error}}", out.V{"memory": viper.GetString(memory), "error": err})
} }

6
pkg/minikube/machine/info.go
View File

@ -110,7 +110,7 @@ var cachedSystemMemoryErr *error
// cachedSysMemLimit will return a cached limit for the system's virtual memory. // cachedSysMemLimit will return a cached limit for the system's virtual memory.
func cachedSysMemLimit() (*mem.VirtualMemoryStat, error) { func cachedSysMemLimit() (*mem.VirtualMemoryStat, error) {
if cachedSystemMemoryLimit == nil { if cachedSystemMemoryLimit == nil || cachedSystemMemoryErr != nil {
v, err := mem.VirtualMemory() v, err := mem.VirtualMemory()
cachedSystemMemoryLimit = v cachedSystemMemoryLimit = v
cachedSystemMemoryErr = &err cachedSystemMemoryErr = &err
@ -123,7 +123,7 @@ var cachedDiskInfoeErr *error
// cachedDiskInfo will return a cached disk usage info // cachedDiskInfo will return a cached disk usage info
func cachedDiskInfo() (disk.UsageStat, error) { func cachedDiskInfo() (disk.UsageStat, error) {
if cachedDisk == nil { if cachedDisk == nil || cachedDiskInfoeErr != nil {
d, err := disk.Usage("/") d, err := disk.Usage("/")
cachedDisk = d cachedDisk = d
cachedDiskInfoeErr = &err cachedDiskInfoeErr = &err
@ -136,7 +136,7 @@ var cachedCPUErr *error
// cachedCPUInfo will return a cached cpu info // cachedCPUInfo will return a cached cpu info
func cachedCPUInfo() ([]cpu.InfoStat, error) { func cachedCPUInfo() ([]cpu.InfoStat, error) {
if cachedCPU == nil { if cachedCPU == nil || cachedCPUErr != nil {
i, err := cpu.Info() i, err := cpu.Info()
cachedCPU = &i cachedCPU = &i
cachedCPUErr = &err cachedCPUErr = &err