mergify[bot]
commented
5 hours ago Cherry-pick of 0f041391bcab6461e079d0db2de8e7e1246a2ab9 has failed:
On branch mergify/bp/branch-3.3/pr-52099
Your branch is up to date with 'origin/branch-3.3'.
You are currently cherry-picking commit 0f041391bc.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: be/src/agent/agent_task.cpp
modified: be/src/agent/publish_version.cpp
modified: be/src/block_cache/disk_space_monitor.cpp
modified: be/src/connector/mysql_connector.cpp
modified: be/src/exec/connector_scan_node.cpp
modified: be/src/exec/es/es_scan_reader.cpp
modified: be/src/exec/mysql_scanner.cpp
modified: be/src/exec/pipeline/pipeline_driver_executor.cpp
modified: be/src/exec/pipeline/sort/partition_sort_sink_operator.cpp
modified: be/src/exec/schema_scan_node.cpp
modified: be/src/exec/schema_scanner.cpp
modified: be/src/exec/schema_scanner/schema_fe_metrics_scanner.cpp
modified: be/src/exec/tablet_info.cpp
modified: be/src/exprs/lambda_function.cpp
modified: be/src/gutil/atomicops-internals-x86.cc
modified: be/src/gutil/strings/split.cc
modified: be/src/runtime/lake_tablets_channel.cpp
modified: be/src/runtime/local_tablets_channel.cpp
modified: be/src/runtime/plan_fragment_executor.cpp
modified: be/src/runtime/routine_load/data_consumer_group.cpp
modified: be/src/runtime/routine_load/routine_load_task_executor.cpp
modified: be/src/storage/compaction.cpp
modified: be/src/storage/compaction_manager.cpp
modified: be/src/storage/compaction_task.h
modified: be/src/storage/default_compaction_policy.cpp
modified: be/src/storage/delta_writer.cpp
modified: be/src/storage/horizontal_compaction_task.cpp
modified: be/src/storage/inverted/clucene/clucene_inverted_reader.cpp
modified: be/src/storage/lake/delta_writer.cpp
modified: be/src/storage/lake/schema_change.cpp
modified: be/src/storage/lake/tablet_manager.cpp
modified: be/src/storage/lake/transactions.cpp
modified: be/src/storage/memtable.cpp
modified: be/src/storage/olap_runtime_range_pruner.hpp
modified: be/src/storage/persistent_index.cpp
modified: be/src/storage/publish_version_manager.cpp
modified: be/src/storage/replication_utils.cpp
modified: be/src/storage/rowset/json_column_compactor.cpp
modified: be/src/storage/rowset/json_column_iterator.cpp
modified: be/src/storage/rowset/json_column_writer.cpp
modified: be/src/storage/rowset/rowset.cpp
modified: be/src/storage/rowset/segment_iterator.cpp
modified: be/src/storage/schema_change.cpp
modified: be/src/storage/segment_flush_executor.cpp
modified: be/src/storage/segment_replicate_executor.cpp
modified: be/src/storage/size_tiered_compaction_policy.cpp
modified: be/src/storage/tablet_manager.cpp
modified: be/src/storage/task/engine_clone_task.cpp
modified: be/src/storage/txn_manager.cpp
modified: be/src/storage/update_manager.cpp
modified: be/src/storage/vertical_compaction_task.cpp
modified: be/src/util/dynamic_cache.h
modified: be/src/util/tdigest.cpp
modified: be/src/util/thrift_client.cpp
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: be/src/exec/olap_utils.h
both modified: be/src/exec/pipeline/scan/olap_scan_context.cpp
both modified: be/src/exec/tablet_sink.cpp
both modified: be/src/storage/tablet.cpp
both modified: be/src/storage/tablet_updates.cpp
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Why I'm doing:
Refactor Starrocks LOG to reduce the log file size.
What I'm doing:
Change all BE level1 verbose log to level2 because some info log will be set to level 1 in the future pr.
Fixes #issue
What type of PR is this:
Does this PR entail a change in behavior?
If yes, please specify the type of change:
Checklist:
Bugfix cherry-pick branch check:
This is an automatic backport of pull request #52099 done by Mergify.
Why I'm doing:
Refactor Starrocks LOG to reduce the log file size.
What I'm doing:
Change all BE level1 verbose log to level2 because some info log will be set to level 1 in the future pr.
Fixes #issue
What type of PR is this:
Does this PR entail a change in behavior?
If yes, please specify the type of change:
Checklist: