Reduce CPU usage when --timeout=0

* Add second go routine for when a Timer is not needed.
* goimports updated some project files

Fixes #5531

Signed-off-by: Jhon Honce <jhonce@redhat.com>

pkg/api/server/server.go

@@ -83,10 +83,6 @@ func newServer(runtime *libpod.Runtime, duration time.Duration, listener *net.Li
 		ConnectionCh: make(chan int),
 	}
 
-	server.Timer = time.AfterFunc(server.Duration, func() {
-		server.ConnectionCh <- NOOPHandler
-	})
-
 	router.NotFoundHandler = http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
 			// We can track user errors...
@@ -139,8 +135,41 @@ func newServer(runtime *libpod.Runtime, duration time.Duration, listener *net.Li
 
 // Serve starts responding to HTTP requests
 func (s *APIServer) Serve() error {
-	// stalker to count the connections.  Should the timer expire it will shutdown the service.
+	// This is initialized here as Timer is not needed until Serve'ing
+	if s.Duration > 0 {
+		s.Timer = time.AfterFunc(s.Duration, func() {
+			s.ConnectionCh <- NOOPHandler
+		})
+		go s.ReadChannelWithTimeout()
+	} else {
+		go s.ReadChannelNoTimeout()
+	}
+
+	sigChan := make(chan os.Signal, 1)
+	signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)
+	errChan := make(chan error, 1)
+
 	go func() {
+		err := s.Server.Serve(s.Listener)
+		if err != nil && err != http.ErrServerClosed {
+			errChan <- errors.Wrap(err, "Failed to start APIServer")
+			return
+		}
+		errChan <- nil
+	}()
+
+	select {
+	case err := <-errChan:
+		return err
+	case sig := <-sigChan:
+		logrus.Infof("APIServer terminated by signal %v", sig)
+	}
+
+	return nil
+}
+
+func (s *APIServer) ReadChannelWithTimeout() {
+	// stalker to count the connections.  Should the timer expire it will shutdown the service.
 	for delta := range s.ConnectionCh {
 		switch delta {
 		case EnterHandler:
@@ -165,32 +194,25 @@ func (s *APIServer) Serve() error {
 			// push the check out another duration...
 			s.Timer.Reset(s.Duration)
 		default:
-				logrus.Errorf("ConnectionCh received unsupported input %d", delta)
+			logrus.Warnf("ConnectionCh received unsupported input %d", delta)
 		}
 	}
-	}()
+}
 
-	sigChan := make(chan os.Signal, 1)
-	signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)
-	errChan := make(chan error, 1)
-
-	go func() {
-		err := s.Server.Serve(s.Listener)
-		if err != nil && err != http.ErrServerClosed {
-			errChan <- errors.Wrap(err, "Failed to start APIServer")
-			return
+func (s *APIServer) ReadChannelNoTimeout() {
+	// stalker to count the connections.
+	for delta := range s.ConnectionCh {
+		switch delta {
+		case EnterHandler:
+			s.ActiveConnections += 1
+			s.TotalConnections += 1
+		case ExitHandler:
+			s.ActiveConnections -= 1
+		case NOOPHandler:
+		default:
+			logrus.Warnf("ConnectionCh received unsupported input %d", delta)
 		}
-		errChan <- nil
-	}()
-
-	select {
-	case err := <-errChan:
-		return err
-	case sig := <-sigChan:
-		logrus.Infof("APIServer terminated by signal %v", sig)
 	}
-
-	return nil
 }
 
 // Shutdown is a clean shutdown waiting on existing clients

pkg/bindings/test/common_test.go

@@ -152,7 +152,7 @@ func (b *bindingTest) startAPIService() *gexec.Session {
 	var (
 		cmd []string
 	)
-	cmd = append(cmd, "--log-level=debug", "system", "service", "--timeout=999999", b.sock)
+	cmd = append(cmd, "--log-level=debug", "system", "service", "--timeout=0", b.sock)
 	return b.runPodman(cmd)
 }
 

pkg/bindings/test/volumes_test.go

@@ -3,11 +3,12 @@ package test_bindings
 import (
 	"context"
 	"fmt"
+	"net/http"
+	"time"
+
 	"github.com/containers/libpod/pkg/api/handlers"
 	"github.com/containers/libpod/pkg/bindings/containers"
 	"github.com/containers/libpod/pkg/bindings/volumes"
-	"net/http"
-	"time"
 
 	"github.com/containers/libpod/pkg/bindings"
 	. "github.com/onsi/ginkgo"

pkg/varlinkapi/system.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/containers/image/v5/pkg/sysregistriesv2"
-	"github.com/containers/libpod/cmd/podman/varlink"
+	iopodman "github.com/containers/libpod/cmd/podman/varlink"
 	"github.com/containers/libpod/libpod/define"
 	"github.com/sirupsen/logrus"
 )

test/e2e/search_test.go

@@ -5,13 +5,14 @@ package integration
 import (
 	"bytes"
 	"fmt"
-	. "github.com/containers/libpod/test/utils"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
 	"io/ioutil"
 	"os"
 	"strconv"
 	"text/template"
+
+	. "github.com/containers/libpod/test/utils"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
 )
 
 type endpoint struct {