From 75e00445b6de230493e9ee37483dd4c469db29b1 Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@curoverse.com>
Date: Thu, 1 Jun 2017 15:26:42 -0400
Subject: [PATCH] 9005: Rename ClearCache to RefreshServiceDiscovery

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>
---
 sdk/go/keepclient/discover.go                      | 6 +++---
 sdk/go/keepclient/keepclient_test.go               | 6 +++---
 services/keep-web/handler.go                       | 2 +-
 services/keepstore/pull_worker_integration_test.go | 2 +-
 tools/keep-block-check/keep-block-check_test.go    | 4 ++--
 tools/keep-rsync/keep-rsync_test.go                | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sdk/go/keepclient/discover.go b/sdk/go/keepclient/discover.go
index c5413d4a4b..e2cd329fc4 100644
--- a/sdk/go/keepclient/discover.go
+++ b/sdk/go/keepclient/discover.go
@@ -15,7 +15,7 @@ import (
 )
 
 // ClearCache clears the Keep service discovery cache.
-func ClearCache() {
+func RefreshServiceDiscovery() {
 	svcListCacheMtx.Lock()
 	defer svcListCacheMtx.Unlock()
 	for _, ent := range svcListCache {
@@ -25,7 +25,7 @@ func ClearCache() {
 
 // ClearCacheOnSIGHUP installs a signal handler that calls
 // ClearCache when SIGHUP is received.
-func ClearCacheOnSIGHUP() {
+func RefreshServiceDiscoveryOnSIGHUP() {
 	svcListCacheMtx.Lock()
 	defer svcListCacheMtx.Unlock()
 	if svcListCacheSignal != nil {
@@ -35,7 +35,7 @@ func ClearCacheOnSIGHUP() {
 	signal.Notify(svcListCacheSignal, syscall.SIGHUP)
 	go func() {
 		for range svcListCacheSignal {
-			ClearCache()
+			RefreshServiceDiscovery()
 		}
 	}()
 }
diff --git a/sdk/go/keepclient/keepclient_test.go b/sdk/go/keepclient/keepclient_test.go
index ff0f57bbe6..724d7ff321 100644
--- a/sdk/go/keepclient/keepclient_test.go
+++ b/sdk/go/keepclient/keepclient_test.go
@@ -36,7 +36,7 @@ type ServerRequiredSuite struct{}
 type StandaloneSuite struct{}
 
 func (s *StandaloneSuite) SetUpTest(c *C) {
-	ClearCache()
+	RefreshServiceDiscovery()
 }
 
 func pythonDir() string {
@@ -55,7 +55,7 @@ func (s *ServerRequiredSuite) TearDownSuite(c *C) {
 }
 
 func (s *ServerRequiredSuite) SetUpTest(c *C) {
-	ClearCache()
+	RefreshServiceDiscovery()
 }
 
 func (s *ServerRequiredSuite) TestMakeKeepClient(c *C) {
@@ -1247,7 +1247,7 @@ func (s *ServerRequiredSuite) TestMakeKeepClientWithNonDiskTypeService(c *C) {
 		&blobKeepService)
 	c.Assert(err, Equals, nil)
 	defer func() { arv.Delete("keep_services", blobKeepService["uuid"].(string), nil, nil) }()
-	ClearCache()
+	RefreshServiceDiscovery()
 
 	// Make a keepclient and ensure that the testblobstore is included
 	kc, err := MakeKeepClient(arv)
diff --git a/services/keep-web/handler.go b/services/keep-web/handler.go
index 4ec0a38f05..b7e39c6041 100644
--- a/services/keep-web/handler.go
+++ b/services/keep-web/handler.go
@@ -64,7 +64,7 @@ func parseCollectionIDFromURL(s string) string {
 
 func (h *handler) setup() {
 	h.clientPool = arvadosclient.MakeClientPool()
-	keepclient.ClearCacheOnSIGHUP()
+	keepclient.RefreshServiceDiscoveryOnSIGHUP()
 }
 
 // ServeHTTP implements http.Handler.
diff --git a/services/keepstore/pull_worker_integration_test.go b/services/keepstore/pull_worker_integration_test.go
index c0ea4fae21..34c2f61a37 100644
--- a/services/keepstore/pull_worker_integration_test.go
+++ b/services/keepstore/pull_worker_integration_test.go
@@ -29,7 +29,7 @@ func SetupPullWorkerIntegrationTest(t *testing.T, testData PullWorkIntegrationTe
 	// start api and keep servers
 	arvadostest.StartAPI()
 	arvadostest.StartKeep(2, false)
-	keepclient.ClearCache()
+	keepclient.RefreshServiceDiscovery()
 
 	// make arvadosclient
 	arv, err := arvadosclient.MakeArvadosClient()
diff --git a/tools/keep-block-check/keep-block-check_test.go b/tools/keep-block-check/keep-block-check_test.go
index 60c5fb51d1..51a0938b04 100644
--- a/tools/keep-block-check/keep-block-check_test.go
+++ b/tools/keep-block-check/keep-block-check_test.go
@@ -64,7 +64,7 @@ func (s *DoMainTestSuite) SetUpSuite(c *C) {
 func (s *DoMainTestSuite) SetUpTest(c *C) {
 	logOutput := io.MultiWriter(&logBuffer)
 	log.SetOutput(logOutput)
-	keepclient.ClearCache()
+	keepclient.RefreshServiceDiscovery()
 }
 
 func (s *DoMainTestSuite) TearDownTest(c *C) {
@@ -91,7 +91,7 @@ func setupKeepBlockCheckWithTTL(c *C, enforcePermissions bool, keepServicesJSON
 	c.Assert(ttl, Equals, blobSignatureTTL)
 	c.Check(err, IsNil)
 
-	keepclient.ClearCache()
+	keepclient.RefreshServiceDiscovery()
 }
 
 // Setup test data
diff --git a/tools/keep-rsync/keep-rsync_test.go b/tools/keep-rsync/keep-rsync_test.go
index d17c4718df..ec0c70f7ef 100644
--- a/tools/keep-rsync/keep-rsync_test.go
+++ b/tools/keep-rsync/keep-rsync_test.go
@@ -99,7 +99,7 @@ func setupRsync(c *C, enforcePermissions bool, replications int) {
 
 	// Start Keep servers
 	arvadostest.StartKeep(3, enforcePermissions)
-	keepclient.ClearCache()
+	keepclient.RefreshServiceDiscovery()
 
 	// setup keepclients
 	var err error
@@ -463,7 +463,7 @@ func (s *DoMainTestSuite) Test_doMainWithSrcAndDstConfig(c *C) {
 	// actual copying to dst will happen, but that's ok.
 	arvadostest.StartKeep(2, false)
 	defer arvadostest.StopKeep(2)
-	keepclient.ClearCache()
+	keepclient.RefreshServiceDiscovery()
 
 	err := doMain()
 	c.Check(err, IsNil)
-- 
2.30.2