🎨 改进内核任务调度机制提升稳定性 https://github.com/siyuan-note/siyuan/issues/7113

kernel/api/block.go

@@ -175,8 +175,8 @@ func checkBlockExist(c *gin.Context) {
 		return
 	}
 	if errors.Is(err, model.ErrIndexing) {
-		ret.Code = 3
-		ret.Data = id
+		ret.Code = 0
+		ret.Data = false
 		return
 	}
 	ret.Data = nil != b
@@ -384,7 +384,7 @@ func getBlockInfo(c *gin.Context) {
 	}
 	if errors.Is(err, model.ErrIndexing) {
 		ret.Code = 3
-		ret.Data = id
+		ret.Msg = model.Conf.Language(56)
 		return
 	}
 	if nil == block {
@@ -415,7 +415,7 @@ func getBlockInfo(c *gin.Context) {
 	}
 	if errors.Is(err, model.ErrIndexing) {
 		ret.Code = 3
-		ret.Data = id
+		ret.Data = model.Conf.Language(56)
 		return
 	}
 	rootTitle := root.IAL["title"]

kernel/model/block.go

@@ -393,7 +393,7 @@ func getBlock(id string) (ret *Block, err error) {
 
 	tree, err := loadTreeByBlockID(id)
 	if nil != err {
-		if indexing {
+		if isIndexing() {
 			err = ErrIndexing
 		}
 		return

kernel/model/index.go

@@ -54,10 +54,12 @@ func (box *Box) Index() {
 
 var indexing = false
 
-func waitForIndexing() {
-	for indexing {
+func isIndexing() (ret bool) {
+	for i := 0; indexing || i > 7; i++ {
 		time.Sleep(time.Millisecond * 100)
+		ret = true
 	}
+	return
 }
 
 func index(boxID string) {

kernel/task/queue.go

@@ -144,8 +144,6 @@ func StatusLoop() {
 	}
 }
 
-var taskWaitGroup = sync.WaitGroup{}
-
 func Loop() {
 	for {
 		time.Sleep(10 * time.Millisecond)
@@ -163,9 +161,7 @@ func Loop() {
 			break
 		}
 
-		taskWaitGroup.Add(1)
 		go execTask(task)
-		taskWaitGroup.Wait()
 	}
 }
 
@@ -202,5 +198,4 @@ func execTask(task *Task) {
 	}
 
 	task.Handler.Call(args)
-	taskWaitGroup.Done()
 }