fix kvm containerd

Author: ComradeProgrammer

pkg/minikube/cruntime/docker.go

@@ -167,6 +167,7 @@ func (r *Docker) Enable(disOthers bool, cgroupDriver string, inUserNamespace boo
 		return err
 	}
 
+	_ = r.Init.ResetFailed("docker")
 	if err := r.Init.Restart("docker"); err != nil {
 		return err
 	}
@@ -197,11 +198,12 @@ func (r *Docker) Enable(disOthers bool, cgroupDriver string, inUserNamespace boo
 			return err
 		}
 
+		_ = r.Init.ResetFailed(service)
 		_ = r.Init.Restart(service)
 		// try to restart service if stopped, restart until it works
 		for !r.Init.Active(service) {
-			fmt.Println("stuck")
 			time.Sleep(5 * time.Second)
+			_ = r.Init.ResetFailed(service)
 			_ = r.Init.Restart(service)
 			time.Sleep(5 * time.Second)
 
@@ -213,6 +215,7 @@ func (r *Docker) Enable(disOthers bool, cgroupDriver string, inUserNamespace boo
 
 // Restart restarts Docker on a host
 func (r *Docker) Restart() error {
+	_ = r.Init.ResetFailed("docker")
 	return r.Init.Restart("docker")
 }
 

pkg/minikube/sysinit/openrc.go

@@ -120,6 +120,10 @@ func (s *OpenRC) Disable(_ string) error {
 	return nil
 }
 
+func (s *OpenRC) ResetFailed(_ string) error {
+	return nil
+}
+
 // DisableNow does Disable + Stop
 func (s *OpenRC) DisableNow(svc string) error {
 	// supposed to do disable + stop

pkg/minikube/sysinit/sysinit.go

@@ -65,6 +65,9 @@ type Manager interface {
 	// Reload restarts a service
 	Reload(string) error
 
+	// ResetFailed reset the fail counter of a service
+	ResetFailed(string) error
+
 	// Stop stops a service
 	Stop(string) error
 

pkg/minikube/sysinit/systemd.go

@@ -110,14 +110,16 @@ func (s *Systemd) Restart(svc string) error {
 	if err := s.daemonReload(); err != nil {
 		return err
 	}
-	// some services declare a realitive small restart-limit in their .service configuration
-	// so we reset reset-failed counter to override the limit
-	// and always force restart the service
+
+	_, err := s.r.RunCmd(exec.Command("sudo", "systemctl", "restart", svc))
+	return s.appendJournalctlLogsOnFailure(svc, err)
+}
+
+// run systemctl reset-failed for a service
+// some services declare a realitive small restart-limit in their .service configuration
+// so we reset reset-failed counter to override the limit
+func (s *Systemd) ResetFailed(svc string) error {
 	_, err := s.r.RunCmd(exec.Command("sudo", "systemctl", "reset-failed", svc))
-	if err != nil {
-		return err
-	}
-	_, err = s.r.RunCmd(exec.Command("sudo", "systemctl", "restart", svc))
 	return s.appendJournalctlLogsOnFailure(svc, err)
 }