Skip to content

[fix](schema-change) Fix null new tablet when cleaning up sc job on failure #53952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dataroaring merged 2 commits into from
Jul 30, 2025
Merged

[fix](schema-change) Fix null new tablet when cleaning up sc job on failure #53952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27921ad
[fix](schema-change) Fix null new tablet when cleaning up sc job on f…
Hastyshell Jul 28, 2025
0f1aeb9
fix grammar error
Hastyshell Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion be/src/agent/task_worker_pool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ void alter_cloud_tablet(CloudStorageEngine& engine, const TAgentTaskRequest& age
job.process_alter_tablet(agent_task_req.alter_tablet_req_v2),
[&](const doris::Exception& ex) {
DorisMetrics::instance()->create_rollup_requests_failed->increment(1);
job.clean_up_on_failed();
job.clean_up_on_failure();
});
return Status::OK();
}();
Expand Down
5 changes: 4 additions & 1 deletion be/src/cloud/cloud_schema_change_job.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,10 @@ Status CloudSchemaChangeJob::_process_delete_bitmap(int64_t alter_version,
return Status::OK();
}

void CloudSchemaChangeJob::clean_up_on_failed() {
void CloudSchemaChangeJob::clean_up_on_failure() {
if (_new_tablet == nullptr) {
return;
Copy link
Contributor

@gavinchou gavinchou Jul 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

log here?

Copy link
Collaborator Author

@Hastyshell Hastyshell Jul 28, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think log here is pointless.
If get tablet failed, we could find details through log msg like this one:

W20250727 00:45:38.585387  5797 cloud_tablet_mgr.cpp:206] failed to tablet 1753547556254: [INVALID_ARGUMENT]failed to get tablet meta: empty instance_id
W20250727 00:45:38.599696  5797 status.h:426] meet error status: [INTERNAL_ERROR]failed to get tablet 1753547556254
        0#  doris::CloudTabletMgr::get_tablet(long, bool, bool, doris::SyncRowsetStats*, bool) at /home/zcp/repo_center/doris_branch-3.0/doris/be/src/common/status.h:378
        1#  doris::CloudSchemaChangeJob::process_alter_tablet(doris::TAlterTabletReqV2 const&) at /home/zcp/repo_center/doris_branch-3.0/doris/be/src/util/expected.hpp:1986
        2#  doris::alter_cloud_tablet_callback(doris::CloudStorageEngine&, doris::TAgentTaskRequest const&) at /home/zcp/repo_center/doris_branch-3.0/doris/be/src/common/status.h:505
        3#  std::_Function_handler<void (), doris::TaskWorkerPool::submit_task(doris::TAgentTaskRequest const&)::$_0::operator()<doris::TAgentTaskRequest const&>(doris::TAgentTaskRequest const&) const::{lambda()#1}>::_M_invoke(std::_Any_data const&) at /home/zcp/repo_center/doris_branch-3.0/doris/be/src/agent/task_worker_pool.cpp:546
        4#  doris::ThreadPool::dispatch_thread() at /var/local/ldb-toolchain/bin/../lib/gcc/x86_64-linux-gnu/11/../../../../include/c++/11/bits/shared_ptr_base.h:1267
        5#  doris::Thread::supervise_thread(void*) at /var/local/ldb-toolchain/bin/../usr/include/pthread.h:563
        6#  ?
        7#  ?

}
if (_new_tablet->keys_type() == KeysType::UNIQUE_KEYS &&
_new_tablet->enable_unique_key_merge_on_write()) {
_cloud_storage_engine.meta_mgr().remove_delete_bitmap_update_lock(
Expand Down
2 changes: 1 addition & 1 deletion be/src/cloud/cloud_schema_change_job.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class CloudSchemaChangeJob {
// This method is idempotent for a same request.
Status process_alter_tablet(const TAlterTabletReqV2& request);

void clean_up_on_failed();
void clean_up_on_failure();

private:
Status _convert_historical_rowsets(const SchemaChangeParams& sc_params,
Expand Down
Loading