Merge pull request #1069 from kart2bc/locket-timeout

ameowlia · web-flow · commit 3ea792d9c671 · 2025-11-03T11:21:01.000-05:00
Locket timeout and metron config settings for inigo tests
diff --git a/src/code.cloudfoundry.org/inigo/cell/converger_test.go b/src/code.cloudfoundry.org/inigo/cell/converger_test.go
@@ -114,7 +114,7 @@ var _ = Describe("Convergence to desired state", func() {
 				Eventually(runningLRPsPresencePoller(models.ActualLRP_Suspect)).Should(HaveLen(2))
 
 				By("bringing back the original rep")
-				rep = ginkgomon.Invoke(componentMaker.Rep())
+				rep = ginkgomon.Invoke(componentMaker.Rep(modifyFunRepLoggregatorConfig))
 
 				Eventually(runningLRPsPoller).Should(HaveLen(2))
 				Eventually(helloWorldInstancePoller).Should(Equal([]string{"0", "1"}))
@@ -133,7 +133,7 @@ var _ = Describe("Convergence to desired state", func() {
 
 				BeforeEach(func() {
 					firstActualLRPs = runningLRPsPoller()
-					rep2 = ginkgomon.Invoke(componentMaker.RepN(1))
+					rep2 = ginkgomon.Invoke(componentMaker.RepN(1, modifyFunRepLoggregatorConfig))
 				})
 
 				AfterEach(func() {
diff --git a/src/code.cloudfoundry.org/inigo/cell/evacuation_test.go b/src/code.cloudfoundry.org/inigo/cell/evacuation_test.go
@@ -104,15 +104,17 @@ var _ = Describe("Evacuation", func() {
 				config.ListenAddr = cellARepAddr
 				config.ListenAddrSecurable = cellARepSecureAddr
 				config.EvacuationTimeout = durationjson.Duration(30 * time.Second)
-			}, modifyFunRepLoggregatorConfig)
+				config.LoggregatorConfig = setupMetronConfig(config.LoggregatorConfig)
+			})
 
 		cellBRepRunner = componentMaker.RepN(1,
 			func(config *repconfig.RepConfig) {
 				config.CellID = cellBID
 				config.ListenAddr = cellBRepAddr
 				config.ListenAddrSecurable = cellBRepSecureAddr
 				config.EvacuationTimeout = durationjson.Duration(30 * time.Second)
-			}, modifyFunRepLoggregatorConfig)
+				config.LoggregatorConfig = setupMetronConfig(config.LoggregatorConfig)
+			})
 
 		test_helper.CreateZipArchive(
 			filepath.Join(fileServerStaticDir, "lrp.zip"),
@@ -187,6 +189,7 @@ var _ = Describe("Evacuation", func() {
 					config.ListenAddr = cellARepAddr
 					config.ListenAddrSecurable = cellARepSecureAddr
 					config.GracefulShutdownInterval = 1 // 1 nanosecond otherwise a 0 is treated as omitted value
+					config.LoggregatorConfig = setupMetronConfig(config.LoggregatorConfig)
 				},
 			)
 		})
diff --git a/src/code.cloudfoundry.org/inigo/cell/task_lifecycle_test.go b/src/code.cloudfoundry.org/inigo/cell/task_lifecycle_test.go
@@ -306,7 +306,7 @@ exit 0
 			))
 
 			cellProcess = ginkgomon.Invoke(grouper.NewParallel(os.Interrupt, grouper.Members{
-				{Name: "rep", Runner: componentMaker.Rep()},
+				{Name: "rep", Runner: componentMaker.Rep(modifyFunRepLoggregatorConfig)},
 			}))
 		})
 
@@ -330,7 +330,7 @@ exit 0
 
 			Context("and then an auctioneer come up", func() {
 				BeforeEach(func() {
-					auctioneerProcess = ginkgomon.Invoke(componentMaker.Auctioneer())
+					auctioneerProcess = ginkgomon.Invoke(componentMaker.Auctioneer(modifyFunAuctioneerLoggregatorConfig))
 				})
 
 				AfterEach(func() {
diff --git a/src/code.cloudfoundry.org/inigo/executor/executor_garden_test.go b/src/code.cloudfoundry.org/inigo/executor/executor_garden_test.go
@@ -7,11 +7,13 @@ import (
 	"io"
 	"net"
 	"os"
+	"path/filepath"
 	"time"
 
 	"code.cloudfoundry.org/bbs/models"
 	"code.cloudfoundry.org/clock"
-	loggingclient "code.cloudfoundry.org/diego-logging-client"
+	diego_logging_client "code.cloudfoundry.org/diego-logging-client"
+	"code.cloudfoundry.org/diego-logging-client/testhelpers"
 	"code.cloudfoundry.org/durationjson"
 	"code.cloudfoundry.org/executor"
 	"code.cloudfoundry.org/executor/gardenhealth"
@@ -43,12 +45,30 @@ var _ = Describe("Executor/Garden", func() {
 		ownerName               string
 		gardenHealthcheckRootFS string
 
-		expectedDiskCapacityMB int
+		expectedDiskCapacityMB                                  int
+		signalMetricsChan                                       chan struct{}
+		testIngressServer                                       *testhelpers.TestIngressServer
+		metronCAFile, metronServerCertFile, metronServerKeyFile string
+		metricsPort                                             int
 	)
 
 	BeforeEach(func() {
 		gardenHealthcheckRootFS = ""
 
+		fixturesPath := "../fixtures/certs"
+
+		var err error
+		metronCAFile = filepath.Join(fixturesPath, "metron", "CA.crt")
+		metronServerCertFile = filepath.Join(fixturesPath, "metron", "metron.crt")
+		metronServerKeyFile = filepath.Join(fixturesPath, "metron", "metron.key")
+		testIngressServer, err = testhelpers.NewTestIngressServer(metronServerCertFile, metronServerKeyFile, metronCAFile)
+		Expect(err).NotTo(HaveOccurred())
+		receiversChan := testIngressServer.Receivers()
+		testIngressServer.Start()
+		metricsPort, _ = testIngressServer.Port()
+
+		_, signalMetricsChan = testhelpers.TestMetricChan(receiversChan)
+
 		randomName, err := uuid.NewV4()
 		Expect(err).NotTo(HaveOccurred())
 
@@ -111,7 +131,12 @@ var _ = Describe("Executor/Garden", func() {
 
 		logger = lagertest.NewTestLogger("test")
 		var executorMembers grouper.Members
-		metronClient, err := loggingclient.NewIngressClient(loggingclient.Config{})
+		metronClient, err := diego_logging_client.NewIngressClient(diego_logging_client.Config{
+			APIPort:    metricsPort,
+			CACertPath: metronCAFile,
+			CertPath:   metronServerCertFile,
+			KeyPath:    metronServerKeyFile,
+		})
 		Expect(err).NotTo(HaveOccurred())
 
 		rootFSes := map[string]string{"somestack": gardenHealthcheckRootFS}
@@ -135,6 +160,9 @@ var _ = Describe("Executor/Garden", func() {
 			executorClient.Cleanup(logger)
 		}
 
+		testIngressServer.Stop()
+		close(signalMetricsChan)
+
 		os.RemoveAll(cachePath)
 	})
 
diff --git a/src/code.cloudfoundry.org/inigo/volman/volman_bbs_lrp_test.go b/src/code.cloudfoundry.org/inigo/volman/volman_bbs_lrp_test.go
@@ -41,8 +41,8 @@ var _ = Describe("LRPs with volume mounts", func() {
 				{Name: "sql", Runner: componentMaker.SQL()},
 				{Name: "nats", Runner: componentMaker.NATS()},
 			})},
-			{Name: "locket", Runner: componentMaker.Locket()},
-			{Name: "bbs", Runner: componentMaker.BBS()},
+			{Name: "locket", Runner: componentMaker.Locket(modifyFuncLocketLoggregatorConfig)},
+			{Name: "bbs", Runner: componentMaker.BBS(modifyFuncBBSLoggregatorConfig)},
 		}))
 
 		logger = lager.NewLogger("test")
diff --git a/src/code.cloudfoundry.org/inigo/volman/volman_bbs_task_test.go b/src/code.cloudfoundry.org/inigo/volman/volman_bbs_task_test.go
@@ -36,13 +36,16 @@ var _ = Describe("Tasks", func() {
 			{Name: "initial-services", Runner: grouper.NewParallel(os.Kill, grouper.Members{
 				{Name: "sql", Runner: componentMaker.SQL()},
 			})},
-			{Name: "locket", Runner: componentMaker.Locket()},
-			{Name: "bbs", Runner: componentMaker.BBS()},
+			{Name: "locket", Runner: componentMaker.Locket(modifyFuncLocketLoggregatorConfig)},
+			{Name: "bbs", Runner: componentMaker.BBS(modifyFuncBBSLoggregatorConfig)},
 		}))
 
 		cellProcess = ginkgomon.Invoke(grouper.NewParallel(os.Interrupt, grouper.Members{
 			{Name: "file-server", Runner: fileServerRunner},
-			{Name: "rep", Runner: componentMaker.Rep(func(config *repconfig.RepConfig) { config.MemoryMB = "1024" })},
+			{Name: "rep", Runner: componentMaker.Rep(func(config *repconfig.RepConfig) {
+				config.MemoryMB = "1024"
+				config.LoggregatorConfig = setupMetronConfig(config.LoggregatorConfig)
+			})},
 			{Name: "auctioneer", Runner: componentMaker.Auctioneer(modifyFunAuctioneerLoggregatorConfig)},
 		}))
 
diff --git a/src/code.cloudfoundry.org/inigo/volman/volman_executor_test.go b/src/code.cloudfoundry.org/inigo/volman/volman_executor_test.go
@@ -12,7 +12,7 @@ import (
 
 	"code.cloudfoundry.org/bbs/models"
 	"code.cloudfoundry.org/clock"
-	loggingclient "code.cloudfoundry.org/diego-logging-client"
+	diego_logging_client "code.cloudfoundry.org/diego-logging-client"
 	"code.cloudfoundry.org/dockerdriver"
 	"code.cloudfoundry.org/dockerdriver/driverhttp"
 	dockerdriverutils "code.cloudfoundry.org/dockerdriver/utils"
@@ -376,7 +376,12 @@ func initializeExecutor(logger lager.Logger, config executorinit.ExecutorConfig)
 	var err error
 	var executorClient executor.Client
 	defaultRootFS := ""
-	metronClient, err := loggingclient.NewIngressClient(loggingclient.Config{})
+	metronClient, err := diego_logging_client.NewIngressClient(diego_logging_client.Config{
+		APIPort:    metricsPort,
+		CACertPath: metronCAFile,
+		CertPath:   metronServerCertFile,
+		KeyPath:    metronServerKeyFile,
+	})
 	Expect(err).NotTo(HaveOccurred())
 	rootFSes := map[string]string{
 		"somestack": defaultRootFS,
diff --git a/src/code.cloudfoundry.org/inigo/volman/volman_suite_test.go b/src/code.cloudfoundry.org/inigo/volman/volman_suite_test.go
@@ -14,6 +14,7 @@ import (
 	auctioneerconfig "code.cloudfoundry.org/auctioneer/cmd/auctioneer/config"
 	bbsconfig "code.cloudfoundry.org/bbs/cmd/bbs/config"
 	fileserverconfig "code.cloudfoundry.org/fileserver/cmd/file-server/config"
+	locketconfig "code.cloudfoundry.org/locket/cmd/locket/config"
 	repconfig "code.cloudfoundry.org/rep/cmd/rep/config"
 	routeemitterconfig "code.cloudfoundry.org/route-emitter/cmd/route-emitter/config"
 
@@ -65,7 +66,9 @@ var (
 	modifyFunRepLoggregatorConfig                           func(cfg *repconfig.RepConfig)
 	modifyFunFileServerLoggregatorConfig                    func(cfg *fileserverconfig.FileServerConfig)
 	modifyFuncBBSLoggregatorConfig                          func(cfg *bbsconfig.BBSConfig)
+	modifyFuncLocketLoggregatorConfig                       func(cfg *locketconfig.LocketConfig)
 	metronCAFile, metronServerCertFile, metronServerKeyFile string
+	metricsPort                                             int
 )
 
 var _ = SynchronizedBeforeSuite(func() []byte {
@@ -141,9 +144,14 @@ var _ = BeforeEach(func() {
 	Expect(err).NotTo(HaveOccurred())
 	receiversChan := testIngressServer.Receivers()
 	testIngressServer.Start()
+	metricsPort, _ = testIngressServer.Port()
 
 	testMetricsChan, signalMetricsChan = testhelpers.TestMetricChan(receiversChan)
 
+	modifyFuncLocketLoggregatorConfig = func(cfg *locketconfig.LocketConfig) {
+		cfg.LoggregatorConfig = setupMetronConfig(cfg.LoggregatorConfig)
+	}
+
 	modifyFuncBBSLoggregatorConfig = func(cfg *bbsconfig.BBSConfig) {
 		cfg.LoggregatorConfig = setupMetronConfig(cfg.LoggregatorConfig)
 	}
@@ -174,7 +182,7 @@ var _ = BeforeEach(func() {
 	driverPluginsPath = path.Join(componentMaker.VolmanDriverConfigDir(), fmt.Sprintf("node-%d", GinkgoParallelProcess()))
 	dockerdriver.WriteDriverSpec(logger, driverPluginsPath, "deaddriver", "json", []byte(`{"Name":"deaddriver","Addr":"https://127.0.0.1:1111"}`))
 
-	volmanClient, driverSyncer = componentMaker.VolmanClient(logger)
+	volmanClient, driverSyncer = componentMaker.VolmanClient(logger, metricsPort, metronCAFile, metronServerCertFile, metronServerKeyFile)
 	driverSyncerProcess = ginkgomon.Invoke(driverSyncer)
 })
 
@@ -189,6 +197,9 @@ var _ = AfterEach(func() {
 		len(destroyContainerErrors),
 	)
 
+	testIngressServer.Stop()
+	close(signalMetricsChan)
+
 	os.Remove(filepath.Join(driverPluginsPath, "deaddriver.json"))
 })
 
diff --git a/src/code.cloudfoundry.org/inigo/volman/volman_test.go b/src/code.cloudfoundry.org/inigo/volman/volman_test.go
@@ -71,7 +71,7 @@ var _ = Describe("Given volman and localdriver", func() {
 				return os.IsNotExist(err)
 			}).Should(Equal(false))
 
-			volmanClient, driverSyncer = componentMaker.VolmanClient(logger)
+			volmanClient, driverSyncer = componentMaker.VolmanClient(logger, metricsPort, metronCAFile, metronServerCertFile, metronServerKeyFile)
 			driverSyncerProcess = ginkgomon.Invoke(driverSyncer)
 
 			Eventually(func() bool {
diff --git a/src/code.cloudfoundry.org/inigo/world/components.go b/src/code.cloudfoundry.org/inigo/world/components.go
@@ -24,7 +24,7 @@ import (
 	"code.cloudfoundry.org/bbs/serviceclient"
 	"code.cloudfoundry.org/bbs/test_helpers"
 	cfhttp "code.cloudfoundry.org/cfhttp/v2"
-	loggingclient "code.cloudfoundry.org/diego-logging-client"
+	diego_logging_client "code.cloudfoundry.org/diego-logging-client"
 	sshproxyconfig "code.cloudfoundry.org/diego-ssh/cmd/ssh-proxy/config"
 	"code.cloudfoundry.org/diego-ssh/keys"
 	"code.cloudfoundry.org/dockerdriver"
@@ -384,7 +384,7 @@ type ComponentMaker interface {
 	SSHProxy(modifyConfigFuncs ...func(*sshproxyconfig.SSHProxyConfig)) ifrit.Runner
 	Setup()
 	Teardown()
-	VolmanClient(logger lager.Logger) (volman.Manager, ifrit.Runner)
+	VolmanClient(logger lager.Logger, metricsPort int, metronCAFile string, metronServerCertFile string, metronServerKeyFile string) (volman.Manager, ifrit.Runner)
 	VolmanDriver(logger lager.Logger) (ifrit.Runner, dockerdriver.Driver)
 }
 
@@ -1115,11 +1115,16 @@ func (maker commonComponentMaker) BBSURL() string {
 	return "https://" + maker.addresses.BBS
 }
 
-func (maker commonComponentMaker) VolmanClient(logger lager.Logger) (volman.Manager, ifrit.Runner) {
+func (maker commonComponentMaker) VolmanClient(logger lager.Logger, metricsPort int, metronCAFile string, metronServerCertFile string, metronServerKeyFile string) (volman.Manager, ifrit.Runner) {
 	driverConfig := volmanclient.NewDriverConfig()
 	driverConfig.DriverPaths = []string{path.Join(maker.volmanDriverConfigDir, fmt.Sprintf("node-%d", GinkgoParallelProcess()))}
 
-	metronClient, err := loggingclient.NewIngressClient(loggingclient.Config{})
+	metronClient, err := diego_logging_client.NewIngressClient(diego_logging_client.Config{
+		APIPort:    metricsPort,
+		CACertPath: metronCAFile,
+		CertPath:   metronServerCertFile,
+		KeyPath:    metronServerKeyFile,
+	})
 	Expect(err).NotTo(HaveOccurred())
 	return volmanclient.NewServer(logger, metronClient, driverConfig)
 }
@@ -1469,6 +1474,7 @@ func (maker v1ComponentMaker) BBS(modifyConfigFuncs ...func(*bbsconfig.BBSConfig
 		LockTTL:                     durationjson.Duration(5 * time.Second),
 		LockRetryInterval:           durationjson.Duration(1 * time.Second),
 		ReportInterval:              durationjson.Duration(1 * time.Minute),
+		DBConnectionTimeout:         durationjson.Duration(30 * time.Second),
 		ConvergenceWorkers:          20,
 		UpdateWorkers:               1000,
 		TaskCallbackWorkers:         1000,
