From 73472c2f3f9625b02013c5e4e9be563bb6ca9ca4 Mon Sep 17 00:00:00 2001 From: lance6716 Date: Sat, 13 Jul 2024 12:44:57 +0800 Subject: [PATCH] ddl/ingest: close writer before engine (#54569) close pingcap/tidb#54568 --- pkg/ddl/ingest/engine.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/ddl/ingest/engine.go b/pkg/ddl/ingest/engine.go index bfeadaac9f..d83784df5f 100644 --- a/pkg/ddl/ingest/engine.go +++ b/pkg/ddl/ingest/engine.go @@ -110,6 +110,12 @@ func (ei *engineInfo) Clean() { if ei.openedEngine == nil { return } + err := ei.closeWriters() + if err != nil { + logutil.Logger(ei.ctx).Error(LitErrCloseWriterErr, zap.Error(err), + zap.Int64("job ID", ei.jobID), zap.Int64("index ID", ei.indexID)) + } + indexEngine := ei.openedEngine closedEngine, err := indexEngine.Close(ei.ctx) if err != nil { @@ -118,11 +124,6 @@ func (ei *engineInfo) Clean() { return } ei.openedEngine = nil - err = ei.closeWriters() - if err != nil { - logutil.Logger(ei.ctx).Error(LitErrCloseWriterErr, zap.Error(err), - zap.Int64("job ID", ei.jobID), zap.Int64("index ID", ei.indexID)) - } // Here the local intermediate files will be removed. err = closedEngine.Cleanup(ei.ctx) if err != nil {