Merge pull request operator-framework#370 from Jobava/timeout

Add timeout to opm registry serve

Author: openshift-merge-robot

Makefile

@@ -36,6 +36,18 @@ static: build
 unit:
 	$(GO) test $(SPECIFIC_UNIT_TEST) $(TAGS) $(TEST_RACE) -count=1 -v ./pkg/...
 
+.PHONY: sanity-check
+sanity-check:
+	# Build a container with the most recent binaries for this project.
+	# Does not include the database, which needs to be added separately.
+	docker build -f upstream-builder.Dockerfile -t sanity-container .
+
+	# TODO: add more invocations of the opm binary here
+
+	# serve the container for a second, using the bundles.db in testdata
+	docker run --rm -it -v "$(shell pwd)"/pkg/lib/indexer/testdata/:/database sanity-container \
+		./bin/opm registry serve --database /database/bundles.db --timeout-seconds 1
+
 .PHONY: image
 image:
 	docker build .

cmd/opm/registry/serve.go

@@ -6,6 +6,8 @@ import (
 	"fmt"
 	"net"
 	"os"
+	"strconv"
+	"time"
 
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -42,8 +44,9 @@ func newRegistryServeCmd() *cobra.Command {
 	rootCmd.Flags().StringP("port", "p", "50051", "port number to serve on")
 	rootCmd.Flags().StringP("termination-log", "t", "/dev/termination-log", "path to a container termination log file")
 	rootCmd.Flags().Bool("skip-migrate", false, "do  not attempt to migrate to the latest db revision when starting")
-	return rootCmd
+	rootCmd.Flags().String("timeout-seconds", "infinite", "Timeout in seconds. This flag will be removed later.")
 
+	return rootCmd
 }
 
 func serveFunc(cmd *cobra.Command, args []string) error {
@@ -106,7 +109,27 @@ func serveFunc(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		logger.Fatalf("failed to listen: %s", err)
 	}
+
+	timeout, err := cmd.Flags().GetString("timeout-seconds")
+	if err != nil {
+		return err
+	}
+
 	s := grpc.NewServer()
+	logger.Printf("Keeping server open for %s seconds", timeout)
+	if timeout != "infinite" {
+		timeoutSeconds, err := strconv.ParseUint(timeout, 10, 16)
+		if err != nil {
+			return err
+		}
+
+		timeoutDuration := time.Duration(timeoutSeconds) * time.Second
+		timer := time.AfterFunc(timeoutDuration, func() {
+			logger.Info("Timeout expired. Gracefully stopping.")
+			s.GracefulStop()
+		})
+		defer timer.Stop()
+	}
 
 	api.RegisterRegistryServer(s, server.NewRegistryServer(store))
 	health.RegisterHealthServer(s, server.NewHealthServer())