mirror of
https://github.com/cubefs/cubefs.git
synced 2026-08-02 02:00:56 +00:00
fix(proxy): set the correct number of volumes to buffer upon restart
with: #1000705228 #1000420053 Signed-off-by: xiejian <xiejian3@oppo.com>
This commit is contained in:
parent
df7cec5ad0
commit
407a763600
@ -105,7 +105,7 @@ func (v *volumeMgr) handleFullVols(ctx context.Context, isBackup bool) {
|
||||
if len(fullVols) > 0 {
|
||||
for _, vid := range fullVols {
|
||||
info.Delete(vid)
|
||||
span.Debugf("volume is full, vid: %v,codeMode: %v", vid, codeMode)
|
||||
span.Infof("volume is full, vid: %v,codeMode: %v", vid, codeMode)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -155,7 +155,7 @@ func (v *volumeMgr) discardVolume(ctx context.Context, token string, isBackup bo
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
span.Debugf("retain failed vid: %v", vid)
|
||||
span.Infof("retain failed vid: %v", vid)
|
||||
for _, info := range v.modeInfos {
|
||||
if vol, ok := info.Get(vid, isBackup); ok {
|
||||
vol.mu.Lock()
|
||||
|
||||
@ -177,6 +177,7 @@ func (m *modeInfo) getAvailableList(fsize int64, switchable bool) (vols []*volum
|
||||
tmp := m.current
|
||||
m.current = m.backup
|
||||
m.backup = tmp
|
||||
log.Infof("switch current and backup, current total free: %d, total num: %d", totalFree, m.current.Len())
|
||||
}
|
||||
if m.current.TotalFree() < fsize {
|
||||
m.lock.Unlock()
|
||||
@ -600,6 +601,9 @@ func (v *volumeMgr) allocVolumeLoop(mode codemode.CodeMode) {
|
||||
}
|
||||
modeCfg := v.getCodeModeConfig(allocArg.CodeMode)
|
||||
for index, vol := range volumeRets {
|
||||
if allocArg.IsInit && index >= 2*modeCfg.DefaultAllocVolsNum {
|
||||
break
|
||||
}
|
||||
allocVolInfo := &volume{
|
||||
AllocVolumeInfo: vol,
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user