address

tikv · May 18, 2017 · 458a3a3 · 458a3a3
1 parent a62739b
commit 458a3a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/server/api/cluster_test.go b/server/api/cluster_test.go
@@ -63,7 +63,7 @@ func (s *testClusterInfo) TestGetClusterStatus(c *C) {
 	url := fmt.Sprintf("%s/cluster/status", s.urlPrefix)
 	status := server.ClusterStatus{}
 	err := readJSONWithURL(url, &status)
-	c.Assert(status.RaftBootstrapTime, IsNil)
+	c.Assert(status.RaftBootstrapTime, Equals, time.Time{})
 	now := time.Now()
 	mustBootstrapCluster(c, s.svr)
 	err = readJSONWithURL(url, &status)

diff --git a/server/cluster.go b/server/cluster.go
@@ -66,7 +66,7 @@ type RaftCluster struct {
 
 // ClusterStatus saves some state information
 type ClusterStatus struct {
-	RaftBootstrapTime *time.Time `json:"raft_bootstrap_time,omitempty"`
+	RaftBootstrapTime time.Time `json:"raft_bootstrap_time,omitempty"`
 }
 
 func newRaftCluster(s *Server, clusterID uint64) *RaftCluster {
@@ -84,9 +84,7 @@ func (c *RaftCluster) loadClusterStatus() error {
 	if err != nil {
 		return errors.Trace(err)
 	}
-	if t != zeroTime {
-		status.RaftBootstrapTime = &t
-	}
+	status.RaftBootstrapTime = t
 	c.status = status
 	return nil
 }