Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion components/prophet/cluster/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -503,9 +503,11 @@ func (c *RaftCluster) processResourceHeartbeat(res *core.CachedResource) error {
if origin.GetLeader().GetID() == 0 {
isNew = true
} else {
util.GetLogger().Infof("resource %d leader changed from container %d to container %d",
util.GetLogger().Infof("resource %d leader changed from peer %d-%d to peer %d-%d",
res.Meta.ID(),
origin.GetLeader().GetID(),
origin.GetLeader().GetContainerID(),
res.GetLeader().GetID(),
res.GetLeader().GetContainerID())
}
saveCache = true
Expand Down Expand Up @@ -618,7 +620,15 @@ func (c *RaftCluster) processResourceHeartbeat(res *core.CachedResource) error {
resourceEventCounter.WithLabelValues("update_kv").Inc()
}
if saveKV || saveCache || isNew {
util.GetLogger().Infof("begin to add notify for resource %d leader changed to peer %d-%d",
res.Meta.ID(),
res.GetLeader().GetID(),
res.GetLeader().GetContainerID())
c.changedEvents <- event.NewResourceEvent(res.Meta, res.GetLeader().GetID(), false, false)
util.GetLogger().Infof("end to add notify for resource %d leader changed to peer %d-%d",
res.Meta.ID(),
res.GetLeader().GetID(),
res.GetLeader().GetContainerID())
}
if saveCache {
c.changedEvents <- event.NewResourceStatsEvent(res.GetStat())
Expand Down
8 changes: 7 additions & 1 deletion raftstore/router.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ func (r *defaultRouter) LeaderPeerStore(shardID uint64) bhmetapb.Store {
if value, ok := r.leaders.Load(shardID); ok {
return value.(bhmetapb.Store)
}
logger.Debugf("shard %d missing leader", shardID)
logger.Warningf("shard %d missing leader", shardID)
return bhmetapb.Store{}
}

Expand Down Expand Up @@ -242,6 +242,10 @@ func (r *defaultRouter) updateShard(data []byte, leader uint64, removed bool, cr
logger.Fatalf("unmarshal shard failed with %+v", err)
}

if leader > 0 {
logger.Infof("shard %d leader changed to %d", res.meta.ID, leader)
}

if removed {
r.removedHandleFunc(res.meta.ID)
if value, ok := r.keyRanges.Load(res.meta.Group); ok {
Expand Down Expand Up @@ -286,12 +290,14 @@ func (r *defaultRouter) updateLeader(shardID, leader uint64) {
if p.ID == leader {
r.missingStoreLeaderChanged.Delete(shardID)
r.leaders.Store(shard.ID, r.mustGetStore(p.ContainerID))
logger.Infof("shard %d leader changed to %d, updated", shardID, leader)
return
}
}

// the shard updated will notify later
r.missingStoreLeaderChanged.Store(shardID, leader)
logger.Warningf("shard %d leader changed to %d, skipped, missing store", shardID, leader)
}

func (r *defaultRouter) mustGetStore(id uint64) bhmetapb.Store {
Expand Down