Merge branch 'master' into fix-filecache-leak-v2

apache · Jan 16, 2025 · a8efb89 · a8efb89
2 parents a06fe6e + 56fceb4
commit a8efb89
Show file tree

Hide file tree

Showing 196 changed files with 3,004 additions and 1,351 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -88,9 +88,10 @@ github:
           - P0 Regression (Doris Regression)
           - External Regression (Doris External Regression)
           - cloud_p0 (Doris Cloud Regression)
-      #required_pull_request_reviews:
-      #  dismiss_stale_reviews: true
-      #  required_approving_review_count: 1
+        required_pull_request_reviews:
+          require_code_owner_reviews: true
+          required_approving_review_count: 1
+          dismiss_stale_reviews: true
 
     branch-2.1:
       required_status_checks:

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -14,8 +14,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-be/src/io/* @platoneko @gavinchou @dataroaring
+
+# for more syntax help and usage example
+# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners#codeowners-syntax
+
+be/src/io/ @gavinchou @dataroaring
 be/src/agent/be_exec_version_manager.cpp @BiteTheDDDDt
 fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java @dataroaring @CalvinKirs @morningman
 **/pom.xml @CalvinKirs @morningman
 fe/fe-common/src/main/java/org/apache/doris/common/FeMetaVersion.java @dataroaring @morningman @yiguolei @xiaokang
+fe/fe-core/src/main/java/org/apache/doris/cloud/ @luwei16 @gavinchou @dearding @dataroaring
+cloud/src/meta-service/*job* @luwei16 @gavinchou @dataroaring
+cloud/src/meta-service/*meta_service_txn* @swjtu-zhanglei @gavinchou @dataroaring
+cloud/src/meta-service/*resource* @deardeng @gavinchou @dataroaring
+cloud/src/resource-manager/* @deardeng @gavinchou @dataroaring
+cloud/src/recycler/* @swjtu-zhanglei @gavinchou @dataroaring
+be/src/cloud/*compact* @luwei16 @gavinchou @dataroaring
+be/src/cloud/*schema* @luwei16 @gavinchou @dataroaring
+cloud/ @gavinchou @dataroaring @w41ter
+be/src/cloud/ @gavinchou @dataroaring
+gensrc/proto/olap_file.proto @gavinchou @dataroaring @yiguolei
+gensrc/proto/cloud.proto @gavinchou @dataroaring @w41ter
diff --git a/be/src/cloud/cloud_schema_change_job.cpp b/be/src/cloud/cloud_schema_change_job.cpp
@@ -395,7 +395,7 @@ Status CloudSchemaChangeJob::_convert_historical_rowsets(const SchemaChangeParam
     DBUG_EXECUTE_IF("CloudSchemaChangeJob::_convert_historical_rowsets.test_conflict", {
         std::srand(static_cast<unsigned int>(std::time(nullptr)));
         int random_value = std::rand() % 100;
-        if (random_value < 50) {
+        if (random_value < 20) {
             return Status::Error<ErrorCode::DELETE_BITMAP_LOCK_ERROR>("test txn conflict");
         }
     });