server/cache: address comment

tikv · Nov 17, 2016 · 80e12a1 · 80e12a1
1 parent 6489337
commit 80e12a1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/server/cache.go b/server/cache.go
@@ -244,7 +244,7 @@ func newClusterInfo(id IDAllocator) *clusterInfo {
 }
 
 // Return nil if cluster is not bootstrapped.
-func newClusterInfoWithKV(id IDAllocator, kv *kv) (*clusterInfo, error) {
+func loadClusterInfo(id IDAllocator, kv *kv) (*clusterInfo, error) {
 	c := newClusterInfo(id)
 	c.kv = kv
 

diff --git a/server/cache_test.go b/server/cache_test.go
@@ -215,7 +215,7 @@ func (s *testClusterInfoSuite) TestLoadClusterInfo(c *C) {
 	kv := server.kv
 
 	// Cluster is not bootstrapped.
-	cluster, err := newClusterInfoWithKV(server.idAlloc, kv)
+	cluster, err := loadClusterInfo(server.idAlloc, kv)
 	c.Assert(err, IsNil)
 	c.Assert(cluster, IsNil)
 
@@ -226,7 +226,7 @@ func (s *testClusterInfoSuite) TestLoadClusterInfo(c *C) {
 	stores := mustSaveStores(c, kv, n)
 	regions := mustSaveRegions(c, kv, n)
 
-	cluster, err = newClusterInfoWithKV(server.idAlloc, kv)
+	cluster, err = loadClusterInfo(server.idAlloc, kv)
 	c.Assert(err, IsNil)
 	c.Assert(cluster, NotNil)
 

diff --git a/server/cluster.go b/server/cluster.go
@@ -80,7 +80,7 @@ func (c *RaftCluster) start() error {
 		return nil
 	}
 
-	cluster, err := newClusterInfoWithKV(c.s.idAlloc, c.s.kv)
+	cluster, err := loadClusterInfo(c.s.idAlloc, c.s.kv)
 	if err != nil {
 		return errors.Trace(err)
 	}