From bffea34cb9a5306b51b256d3aafe1aaebb03c2c5 Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Thu, 28 Jul 2022 18:00:33 +0800 Subject: [PATCH 1/2] ci: remove packaging stage --- Jenkinsfile2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 83fa1479dc..e9e7538872 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -443,7 +443,7 @@ pipeline { } } } - catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { + /*catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { timeout(time: 15, unit: 'MINUTES'){ script { sh ''' @@ -455,7 +455,7 @@ pipeline { ''' } } - } + }*/ } } } From 2af6f2fc3ae14803a2cc1f60c1f7d09eb993ecf1 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Fri, 29 Jul 2022 09:43:54 +0000 Subject: [PATCH 2/2] fix: replica bug --- source/dnode/vnode/src/meta/metaSnapshot.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/dnode/vnode/src/meta/metaSnapshot.c b/source/dnode/vnode/src/meta/metaSnapshot.c index 85261d302e..46609cf561 100644 --- a/source/dnode/vnode/src/meta/metaSnapshot.c +++ b/source/dnode/vnode/src/meta/metaSnapshot.c @@ -145,6 +145,8 @@ int32_t metaSnapWriterOpen(SMeta* pMeta, int64_t sver, int64_t ever, SMetaSnapWr pWriter->sver = sver; pWriter->ever = ever; + metaBegin(pMeta); + *ppWriter = pWriter; return code;