9005: Rename ClearCache to RefreshServiceDiscovery

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

diff --git a/sdk/go/keepclient/discover.go b/sdk/go/keepclient/discover.go
index c5413d4a4b067c041141b89109afd81a144ed2a6..e2cd329fc4c22ccfdb73ff6099ce8c95f6f28d16 100644 (file)
--- a/sdk/go/keepclient/discover.go
+++ b/sdk/go/keepclient/discover.go
@@ -15,7 +15,7 @@ import (
 )
 
 // ClearCache clears the Keep service discovery cache.
 )
 
 // ClearCache clears the Keep service discovery cache.

-func ClearCache() {
+func RefreshServiceDiscovery() {

        svcListCacheMtx.Lock()
        defer svcListCacheMtx.Unlock()
        for _, ent := range svcListCache {
        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.
 
 // ClearCacheOnSIGHUP installs a signal handler that calls
 // ClearCache when SIGHUP is received.

-func ClearCacheOnSIGHUP() {
+func RefreshServiceDiscoveryOnSIGHUP() {

        svcListCacheMtx.Lock()
        defer svcListCacheMtx.Unlock()
        if svcListCacheSignal != nil {
        svcListCacheMtx.Lock()
        defer svcListCacheMtx.Unlock()
        if svcListCacheSignal != nil {


@@ -35,7 +35,7 @@ func ClearCacheOnSIGHUP() {
        signal.Notify(svcListCacheSignal, syscall.SIGHUP)
        go func() {
                for range svcListCacheSignal {
        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 ff0f57bbe6ce58c091e9c5a94b98cda67e077424..724d7ff3214db2315053d5e94f09e5e91adb070e 100644 (file)
--- 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) {
 type StandaloneSuite struct{}
 
 func (s *StandaloneSuite) SetUpTest(c *C) {

-       ClearCache()
+       RefreshServiceDiscovery()

 }
 
 func pythonDir() string {
 }
 
 func pythonDir() string {


@@ -55,7 +55,7 @@ func (s *ServerRequiredSuite) TearDownSuite(c *C) {
 }
 
 func (s *ServerRequiredSuite) SetUpTest(c *C) {
 }
 
 func (s *ServerRequiredSuite) SetUpTest(c *C) {

-       ClearCache()
+       RefreshServiceDiscovery()

 }
 
 func (s *ServerRequiredSuite) TestMakeKeepClient(c *C) {
 }
 
 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) }()
                &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)
 
        // 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 4ec0a38f059cd95781e2e4e215939891383965ed..b7e39c6041d256188350d464da86ee39fb29bdeb 100644 (file)
--- 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()
 
 func (h *handler) setup() {
        h.clientPool = arvadosclient.MakeClientPool()

-       keepclient.ClearCacheOnSIGHUP()
+       keepclient.RefreshServiceDiscoveryOnSIGHUP()

 }
 
 // ServeHTTP implements http.Handler.
 }
 
 // ServeHTTP implements http.Handler.

diff --git a/services/keepstore/pull_worker_integration_test.go b/services/keepstore/pull_worker_integration_test.go
index c0ea4fae210bd4d22daede36840d5d9d18181002..34c2f61a37a01097ec1ce257f49f5ccb9c33e246 100644 (file)
--- 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)
        // start api and keep servers
        arvadostest.StartAPI()
        arvadostest.StartKeep(2, false)

-       keepclient.ClearCache()
+       keepclient.RefreshServiceDiscovery()

 
        // make arvadosclient
        arv, err := arvadosclient.MakeArvadosClient()
 
        // 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 60c5fb51d135dd9e58f87e106457978ea2aa44ef..51a0938b047b3951ca7b178c3a9e97ddb6108989 100644 (file)
--- 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)
 func (s *DoMainTestSuite) SetUpTest(c *C) {
        logOutput := io.MultiWriter(&logBuffer)
        log.SetOutput(logOutput)

-       keepclient.ClearCache()
+       keepclient.RefreshServiceDiscovery()

 }
 
 func (s *DoMainTestSuite) TearDownTest(c *C) {
 }
 
 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)
 
        c.Assert(ttl, Equals, blobSignatureTTL)
        c.Check(err, IsNil)
 

-       keepclient.ClearCache()
+       keepclient.RefreshServiceDiscovery()

 }
 
 // Setup test data
 }
 
 // Setup test data

diff --git a/tools/keep-rsync/keep-rsync_test.go b/tools/keep-rsync/keep-rsync_test.go
index d17c4718dfbdd8cf0b0f5e5da5e3cef1217e7815..ec0c70f7ef3c9134d063bfcfdf2394dfaf1f0ae5 100644 (file)
--- 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)
 
        // Start Keep servers
        arvadostest.StartKeep(3, enforcePermissions)

-       keepclient.ClearCache()
+       keepclient.RefreshServiceDiscovery()

 
        // setup keepclients
        var err error
 
        // 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)
        // 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)
 
        err := doMain()
        c.Check(err, IsNil)