Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix stopped checkpoint 1.0 #13308

Merged
merged 3 commits into from
Dec 8, 2023
Merged

Fix stopped checkpoint 1.0 #13308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9214130
fix stopped checkpoint (#13135)
aptend Nov 30, 2023
7227f65
fix wrong sysblock (#13218)
aptend Dec 5, 2023
75d0741
Merge branch '1.0-dev' into fix-stop1.0
sukki37 Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 9 additions & 2 deletions pkg/vm/engine/tae/logtail/collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,8 @@ func (d *dirtyCollector) tryCompactTree(
}

tbl.Stats.RLock()
if tbl.Stats.LastFlush.GreaterEq(to) {
lastFlush := tbl.Stats.LastFlush
if lastFlush.GreaterEq(to) {
tree.Shrink(id)
tbl.Stats.RUnlock()
continue
Expand Down Expand Up @@ -454,7 +455,13 @@ func (d *dirtyCollector) tryCompactTree(
continue
}
if !blk.IsAppendable() {
found, _ := blk.GetBlockData().HasDeleteIntentsPreparedIn(from, to)
newFrom := from
if lastFlush.Greater(newFrom) {
newFrom = lastFlush
}
// sometimes, delchain is no cleared after flushing table tail.
// the reason is still unknown, but here bumping the check from ts to lastFlush is correct anyway.
found, _ := blk.GetBlockData().HasDeleteIntentsPreparedIn(newFrom, to)
if !found {
dirtySeg.Shrink(bid)
continue
Expand Down
21 changes: 2 additions & 19 deletions pkg/vm/engine/tae/rpc/handle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ import (
"github.com/matrixorigin/matrixone/pkg/vm/engine/tae/containers"
"github.com/matrixorigin/matrixone/pkg/vm/engine/tae/db"
"github.com/matrixorigin/matrixone/pkg/vm/engine/tae/gc"
"github.com/matrixorigin/matrixone/pkg/vm/engine/tae/iface/handle"
"github.com/matrixorigin/matrixone/pkg/vm/engine/tae/iface/rpchandle"
"github.com/matrixorigin/matrixone/pkg/vm/engine/tae/iface/txnif"
"github.com/matrixorigin/matrixone/pkg/vm/engine/tae/logtail"
Expand Down Expand Up @@ -356,17 +355,6 @@ func (h *Handle) handleRequests(
req,
&db.WriteResp{},
)
if moerr.IsMoErrCode(err, moerr.ErrDuplicateEntry) && (strings.HasPrefix(req.TableName, "bmsql") || strings.HasPrefix(req.TableName, "sbtest")) {
for _, rreq := range txnCtx.reqs {
if crreq, ok := rreq.(*db.WriteReq); ok {
logutil.Infof("[precommit] dup handle write typ: %v, %d-%s, %s txn: %s",
crreq.Type, crreq.TableID,
crreq.TableName, common.MoBatchToString(crreq.Batch, 3),
txn.String(),
)
}
}
}
write++
default:
panic(moerr.NewNYI(ctx, "Pls implement me"))
Expand Down Expand Up @@ -998,23 +986,18 @@ func (h *Handle) HandleWrite(
)
logutil.Debugf("[precommit] write batch: %s", common.DebugMoBatch(req.Batch))
})
var dbase handle.Database
var tb handle.Relation
defer func() {
common.DoIfDebugEnabled(func() {
logutil.Debugf("[precommit] handle write end txn: %s", txn.String())
})
if err != nil && moerr.IsMoErrCode(err, moerr.ErrDuplicateEntry) && (strings.HasPrefix(req.TableName, "bmsql") || strings.HasPrefix(req.TableName, "sbtest")) {
logutil.Infof("[precommit] dup handle catalog on dup %s ", tb.GetMeta().(*catalog2.TableEntry).PPString(common.PPL1, 0, ""))
}
}()

dbase, err = txn.GetDatabaseByID(req.DatabaseId)
dbase, err := txn.GetDatabaseByID(req.DatabaseId)
if err != nil {
return
}

tb, err = dbase.GetRelationByID(req.TableID)
tb, err := dbase.GetRelationByID(req.TableID)
if err != nil {
return
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/vm/engine/tae/txn/txnimpl/block.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ func (it *blockIt) GetBlock() handle.Block {
}

func buildBlock(table *txnTable, meta *catalog.BlockEntry) handle.Block {
if meta.GetSegment().GetTable().GetDB().IsSystemDB() {
if isSysTableId(meta.GetSegment().GetTable().ID) {
return newSysBlock(table, meta)
}
return newBlock(table, meta)
Expand Down
6 changes: 3 additions & 3 deletions pkg/vm/engine/tae/txn/txnimpl/sysblock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,9 @@ func FillColumnRow(table *catalog.TableEntry, node *catalog.MVCCNode[*catalog.Ta
}
}

func (blk *txnSysBlock) GetDeltaPersistedTS() types.TS {
return types.TS{}
}
// func (blk *txnSysBlock) GetDeltaPersistedTS() types.TS {
// return types.TS{}.Next()
// }

func (blk *txnSysBlock) getColumnTableVec(ts types.TS, colIdx int) (colData containers.Vector, err error) {
col := catalog.SystemColumnSchema.ColDefs[colIdx]
Expand Down