0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🐛 重复执行 重建索引 导致内核崩溃 https://github.com/siyuan-note/siyuan/issues/7238

Browse source
This commit is contained in:
Liang Ding 2023-02-03 22:42:02 +08:00
parent 4acc006b13
commit c7d51d2e6c
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 19 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
kernel/treenode/blocktree.go
View file

@ -391,36 +391,6 @@ func SaveBlockTree(force bool) {
os.MkdirAll(util.BlockTreePath, 0755)
size := uint64(0)
poolSize := runtime.NumCPU()
waitGroup := &sync.WaitGroup{}
p, _ := ants.NewPoolWithFunc(poolSize, func(arg interface{}) {
defer waitGroup.Done()
key := arg.(map[string]interface{})["key"].(string)
slice := arg.(map[string]interface{})["value"].(*btSlice)
if !force && slice.changed.IsZero() {
return
}
slice.m.Lock()
data, err := msgpack.Marshal(slice.data)
if nil != err {
logging.LogErrorf("marshal block tree failed: %s", err)
os.Exit(util.ExitCodeBlockTreeErr)
return
}
slice.m.Unlock()
p := filepath.Join(util.BlockTreePath, key) + ".msgpack"
if err = gulu.File.WriteFileSafer(p, data, 0644); nil != err {
logging.LogErrorf("write block tree failed: %s", err)
os.Exit(util.ExitCodeBlockTreeErr)
return
}
slice.changed = time.Time{}
size += uint64(len(data))
})
var count int
blockTrees.Range(func(key, value interface{}) bool {
slice := value.(*btSlice)
@ -428,19 +398,31 @@ func SaveBlockTree(force bool) {
return true
}
slice.m.Lock()
data, err := msgpack.Marshal(slice.data)
if nil != err {
logging.LogErrorf("marshal block tree failed: %s", err)
os.Exit(util.ExitCodeBlockTreeErr)
return false
}
slice.m.Unlock()
p := filepath.Join(util.BlockTreePath, key.(string)) + ".msgpack"
if err = gulu.File.WriteFileSafer(p, data, 0644); nil != err {
logging.LogErrorf("write block tree failed: %s", err)
os.Exit(util.ExitCodeBlockTreeErr)
return false
}
slice.changed = time.Time{}
size += uint64(len(data))
count++
waitGroup.Add(1)
p.Invoke(map[string]interface{}{"key": key, "value": value})
return true
})
if 0 < count {
//logging.LogInfof("wrote block trees [%d]", count)
logging.LogInfof("wrote block trees [%d]", count)
}
waitGroup.Wait()
p.Release()
runtime.GC()
elapsed := time.Since(start).Seconds()
if 2 < elapsed {
logging.LogWarnf("save block tree [size=%s] to [%s], elapsed [%.2fs]", humanize.Bytes(size), util.BlockTreePath, elapsed)