Merge pull request pingcap#7 from knull-cn/hack5.3

Hack5.3: bug fix
lichunzhu · Jan 5, 2022 · d61c7c2 · d61c7c2
2 parents f79ac8b + a8e9967
commit d61c7c2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ddl/sst/engine.go b/ddl/sst/engine.go
@@ -76,6 +76,9 @@ func (ec *engineCache) releaseRef(startTs uint64) {
 	ec.mtx.RLock()
 	ei := ec.cache[startTs]
 	ec.mtx.RUnlock()
+	if ei == nil {
+		return
+	}
 	atomic.CompareAndSwapInt32(&ei.ref, 1, 0)
 }
 

diff --git a/ddl/sst/index.go b/ddl/sst/index.go
@@ -166,8 +166,8 @@ func FinishIndexOp(ctx context.Context, startTs uint64, exec sqlexec.RestrictedS
 	if err != nil {
 		return err
 	}
-	defer ec.releaseRef(startTs)
 	flushKvs(ctx, ei)
+	defer ec.releaseRef(startTs)
 	//
 	LogInfo("FinishIndexOp %d;kvs=%d.", startTs, ei.size)
 	//
@@ -196,6 +196,8 @@ func FinishIndexOp(ctx context.Context, startTs uint64, exec sqlexec.RestrictedS
 	if err != nil {
 		return fmt.Errorf("engine.Cleanup err:%w", err)
 	}
+	// should release before ReleaseEngine
+	ec.releaseRef(startTs)
 	ec.ReleaseEngine(startTs)
 	return nil
 }