update 5

matrixorigin · Dec 22, 2024 · d28c3d5 · d28c3d5
1 parent b11a795
commit d28c3d5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/pkg/vm/engine/tae/db/checkpoint/testutils.go b/pkg/vm/engine/tae/db/checkpoint/testutils.go
@@ -144,6 +144,14 @@ func (r *runner) ForceIncrementalCheckpoint(ts types.TS) (err error) {
 	if intent == nil {
 		return
 	}
+
+	entry := intent.(*CheckpointEntry)
+
+	if entry.end.LT(&ts) || !entry.AllChecked() {
+		err = ErrPendingCheckpoint
+		return
+	}
+
 	// TODO: use context
 	timeout := time.After(time.Minute * 2)
 	now := time.Now()
@@ -160,6 +168,8 @@ func (r *runner) ForceIncrementalCheckpoint(ts types.TS) (err error) {
 		)
 	}()
 
+	r.incrementalCheckpointQueue.Enqueue(struct{}{})
+
 	select {
 	case <-r.ctx.Done():
 		err = context.Cause(r.ctx)

diff --git a/pkg/vm/engine/tae/db/checkpoint/types.go b/pkg/vm/engine/tae/db/checkpoint/types.go
@@ -17,12 +17,15 @@ package checkpoint
 import (
 	"context"
 
+	"github.com/matrixorigin/matrixone/pkg/common/moerr"
 	"github.com/matrixorigin/matrixone/pkg/container/types"
 	"github.com/matrixorigin/matrixone/pkg/vm/engine/tae/catalog"
 	"github.com/matrixorigin/matrixone/pkg/vm/engine/tae/common"
 	"github.com/matrixorigin/matrixone/pkg/vm/engine/tae/containers"
 )
 
+var ErrPendingCheckpoint = moerr.NewPrevCheckpointNotFinished()
+
 type State int8
 
 const (