v6.1.2-20230423
* cherry-pick 1a94e5d Signed-off-by: hillium <yujuncen@pingcap.com> * run gofmt Signed-off-by: hillium <yujuncen@pingcap.com> * fix a typo Signed-off-by: hillium <yujuncen@pingcap.com> --------- Signed-off-by: hillium <yujuncen@pingcap.com>