Skip to content

Commit

Permalink
server: add creating raft cluster when become leader.
Browse files Browse the repository at this point in the history
  • Loading branch information
qiuyesuifeng committed May 5, 2016
1 parent c9722d0 commit c4f2d41
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 11 deletions.
19 changes: 13 additions & 6 deletions server/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,25 +139,32 @@ func (s *Server) getRaftCluster() (*raftCluster, error) {
return s.cluster, nil
}

// Find in etcd
return nil, nil
}

func (s *Server) createRaftCluster() error {
if s.cluster.IsRunning() {
return nil
}

value, err := getValue(s.client, s.getClusterRootPath())
if err != nil {
return nil, errors.Trace(err)
return errors.Trace(err)
}
if value == nil {
return nil, nil
return nil
}

clusterMeta := metapb.Cluster{}
if err = proto.Unmarshal(value, &clusterMeta); err != nil {
return nil, errors.Trace(err)
return errors.Trace(err)
}

if err = s.cluster.Start(clusterMeta); err != nil {
return nil, errors.Trace(err)
return errors.Trace(err)
}

return s.cluster, nil
return nil
}

func encodeRegionSearchKey(endKey []byte) string {
Expand Down
6 changes: 3 additions & 3 deletions server/cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -336,12 +336,12 @@ func (s *testClusterCacheSuite) TestCache(c *C) {

cluster, err = s.svr.getRaftCluster()
c.Assert(err, IsNil)
c.Assert(cluster, IsNil)

allStores, err := cluster.GetAllStores()
allStores, err := s.svr.cluster.GetAllStores()
c.Assert(err, IsNil)
c.Assert(allStores, HasLen, 2)
for _, store := range allStores {
_, ok := stores[store.GetId()]
c.Assert(ok, IsTrue)
c.Assert(stores, HasKey, store.GetId())
}
}
1 change: 0 additions & 1 deletion server/conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ func (c *conn) run() {
log.Errorf("handle request %s err %v", request, errors.ErrorStack(err))
response = NewError(err)
}

if response == nil {
// we don't need to response, maybe error?
// if error, we will return an error response later.
Expand Down
8 changes: 7 additions & 1 deletion server/leader.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,13 @@ func (s *Server) campaignLeader() error {
s.enableLeader(true)
defer s.enableLeader(false)

// keeps the leader
// Try to create raft cluster.
err = s.createRaftCluster()
if err != nil {
return errors.Trace(err)
}

// Make the leader keepalived.
ch, err := lessor.KeepAlive(s.client.Ctx(), clientv3.LeaseID(leaseResp.ID))
if err != nil {
return errors.Trace(err)
Expand Down

0 comments on commit c4f2d41

Please sign in to comment.