Skip to content

Commit

Permalink
Fix: leader loop send need according memory vols
Browse files Browse the repository at this point in the history
Signed-off-by: leonrayang <[email protected]>
  • Loading branch information
leonrayang committed May 18, 2023
1 parent 7632e3f commit 4d85caf
Showing 1 changed file with 8 additions and 12 deletions.
20 changes: 8 additions & 12 deletions master/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,17 +133,13 @@ func (mgr *followerReadManager) getVolumeDpView() {

func (mgr *followerReadManager) sendFollowerVolumeDpView() {
var (
err error
volNames []string
err error
)
if err, volNames = mgr.c.loadVolsName(); err != nil {
log.LogErrorf("sendFollowerVolumeDpView. loadVolsName err %v", err)
return
}
for _, name := range volNames {
log.LogDebugf("followerReadManager.getVolumeDpView %v", name)
vols := mgr.c.copyVols()
for _, vol := range vols {
log.LogDebugf("followerReadManager.getVolumeDpView %v", vol.Name)
var body []byte
if body, err = mgr.c.vols[name].getDataPartitionsView(); err != nil {
if body, err = vol.getDataPartitionsView(); err != nil {
log.LogErrorf("followerReadManager.sendFollowerVolumeDpView err %v", err)
continue
}
Expand All @@ -152,13 +148,13 @@ func (mgr *followerReadManager) sendFollowerVolumeDpView() {
continue
}
mgr.c.masterClient.SetLeader(addr)
if err = mgr.c.masterClient.AdminAPI().PutDataPartitions(name, body); err != nil {
if err = mgr.c.masterClient.AdminAPI().PutDataPartitions(vol.Name, body); err != nil {
mgr.c.masterClient.SetLeader("")
log.LogErrorf("followerReadManager.sendFollowerVolumeDpView PutDataPartitions name %v addr %v err %v", name, addr, err)
log.LogErrorf("followerReadManager.sendFollowerVolumeDpView PutDataPartitions name %v addr %v err %v", vol.Name, addr, err)
continue
}
mgr.c.masterClient.SetLeader("")
log.LogDebugf("followerReadManager.sendFollowerVolumeDpView PutDataPartitions name %v addr %v err %v", name, addr, err)
log.LogDebugf("followerReadManager.sendFollowerVolumeDpView PutDataPartitions name %v addr %v err %v", vol.Name, addr, err)
}
}
}
Expand Down

0 comments on commit 4d85caf

Please sign in to comment.