Merge remote-tracking branch 'origin/3.0' into fix/tsim

10a60940 · Shengliang Guan · d1efdeb5 · c3bf490f · 10a60940 · 10a60940
显示空白变更内容
内联并排

Showing with 4 addition and 2 deletion

Jenkinsfile2 Jenkinsfile2 +2 -2

source/dnode/vnode/src/meta/metaSnapshot.c source/dnode/vnode/src/meta/metaSnapshot.c +2 -0

未找到文件。
--- 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 {
                                    '''
                                }
                            }
-                        }
+                        }*/
                    }
                }
            }

--- 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;