Skip to content

Commit 1035179

Browse files
bobhan1pull[bot]
authored andcommitted
[refactor-WIP](TaskWorkerPool) add DropTableTaskPool for DROP_TABLE task (#19793)
1 parent ab26a6b commit 1035179

3 files changed

Lines changed: 70 additions & 58 deletions

File tree

‎be/src/agent/agent_server.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,9 @@ AgentServer::AgentServer(ExecEnv* exec_env, const TMasterInfo& master_info)
8585
_create_tablet_workers.reset(
8686
new CreateTableTaskPool(exec_env, TaskWorkerPool::ThreadModel::MULTI_THREADS));
8787
_create_tablet_workers->start();
88-
CREATE_AND_START_POOL(DROP_TABLE, _drop_tablet_workers);
88+
_drop_tablet_workers.reset(
89+
new DropTableTaskPool(exec_env, TaskWorkerPool::ThreadModel::MULTI_THREADS));
90+
_drop_tablet_workers->start();
8991

9092
// Both PUSH and REALTIME_PUSH type use _push_workers
9193
CREATE_AND_START_POOL(PUSH, _push_workers);

‎be/src/agent/task_worker_pool.cpp‎

Lines changed: 59 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,6 @@ void TaskWorkerPool::start() {
139139
case TaskWorkerType::CREATE_TABLE:
140140
break;
141141
case TaskWorkerType::DROP_TABLE:
142-
_worker_count = config::drop_tablet_worker_count;
143-
_cb = std::bind<void>(&TaskWorkerPool::_drop_tablet_worker_thread_callback, this);
144142
break;
145143
case TaskWorkerType::PUSH:
146144
case TaskWorkerType::REALTIME_PUSH:
@@ -367,59 +365,6 @@ uint32_t TaskWorkerPool::_get_next_task_index(int32_t thread_count,
367365
return index;
368366
}
369367

370-
void TaskWorkerPool::_drop_tablet_worker_thread_callback() {
371-
while (_is_work) {
372-
TAgentTaskRequest agent_task_req;
373-
TDropTabletReq drop_tablet_req;
374-
{
375-
std::unique_lock<std::mutex> worker_thread_lock(_worker_thread_lock);
376-
_worker_thread_condition_variable.wait(
377-
worker_thread_lock, [this]() { return !_is_work || !_tasks.empty(); });
378-
if (!_is_work) {
379-
return;
380-
}
381-
382-
agent_task_req = _tasks.front();
383-
drop_tablet_req = agent_task_req.drop_tablet_req;
384-
_tasks.pop_front();
385-
}
386-
387-
Status status;
388-
TabletSharedPtr dropped_tablet = StorageEngine::instance()->tablet_manager()->get_tablet(
389-
drop_tablet_req.tablet_id, false);
390-
if (dropped_tablet != nullptr) {
391-
status = StorageEngine::instance()->tablet_manager()->drop_tablet(
392-
drop_tablet_req.tablet_id, drop_tablet_req.replica_id,
393-
drop_tablet_req.is_drop_table_or_partition);
394-
} else {
395-
status = Status::NotFound("could not find tablet {}", drop_tablet_req.tablet_id);
396-
}
397-
if (status.ok()) {
398-
// if tablet is dropped by fe, then the related txn should also be removed
399-
StorageEngine::instance()->txn_manager()->force_rollback_tablet_related_txns(
400-
dropped_tablet->data_dir()->get_meta(), drop_tablet_req.tablet_id,
401-
drop_tablet_req.schema_hash, dropped_tablet->tablet_uid());
402-
LOG_INFO("successfully drop tablet")
403-
.tag("signature", agent_task_req.signature)
404-
.tag("tablet_id", drop_tablet_req.tablet_id);
405-
} else {
406-
LOG_WARNING("failed to drop tablet")
407-
.tag("signature", agent_task_req.signature)
408-
.tag("tablet_id", drop_tablet_req.tablet_id)
409-
.error(status);
410-
}
411-
412-
TFinishTaskRequest finish_task_request;
413-
finish_task_request.__set_backend(BackendOptions::get_local_backend());
414-
finish_task_request.__set_task_type(agent_task_req.task_type);
415-
finish_task_request.__set_signature(agent_task_req.signature);
416-
finish_task_request.__set_task_status(status.to_thrift());
417-
418-
_finish_task(finish_task_request);
419-
_remove_task_info(agent_task_req.task_type, agent_task_req.signature);
420-
}
421-
}
422-
423368
void TaskWorkerPool::_alter_inverted_index_worker_thread_callback() {
424369
while (_is_work) {
425370
TAgentTaskRequest agent_task_req;
@@ -1879,4 +1824,63 @@ void CreateTableTaskPool::_create_tablet_worker_thread_callback() {
18791824
}
18801825
}
18811826

1827+
DropTableTaskPool::DropTableTaskPool(ExecEnv* env, ThreadModel thread_model)
1828+
: TaskWorkerPool(TaskWorkerType::DROP_TABLE, env, *env->master_info(), thread_model) {
1829+
_worker_count = config::drop_tablet_worker_count;
1830+
_cb = [this]() { _drop_tablet_worker_thread_callback(); };
1831+
}
1832+
1833+
void DropTableTaskPool::_drop_tablet_worker_thread_callback() {
1834+
while (_is_work) {
1835+
TAgentTaskRequest agent_task_req;
1836+
TDropTabletReq drop_tablet_req;
1837+
{
1838+
std::unique_lock<std::mutex> worker_thread_lock(_worker_thread_lock);
1839+
_worker_thread_condition_variable.wait(
1840+
worker_thread_lock, [this]() { return !_is_work || !_tasks.empty(); });
1841+
if (!_is_work) {
1842+
return;
1843+
}
1844+
1845+
agent_task_req = _tasks.front();
1846+
drop_tablet_req = agent_task_req.drop_tablet_req;
1847+
_tasks.pop_front();
1848+
}
1849+
1850+
Status status;
1851+
TabletSharedPtr dropped_tablet = StorageEngine::instance()->tablet_manager()->get_tablet(
1852+
drop_tablet_req.tablet_id, false);
1853+
if (dropped_tablet != nullptr) {
1854+
status = StorageEngine::instance()->tablet_manager()->drop_tablet(
1855+
drop_tablet_req.tablet_id, drop_tablet_req.replica_id,
1856+
drop_tablet_req.is_drop_table_or_partition);
1857+
} else {
1858+
status = Status::NotFound("could not find tablet {}", drop_tablet_req.tablet_id);
1859+
}
1860+
if (status.ok()) {
1861+
// if tablet is dropped by fe, then the related txn should also be removed
1862+
StorageEngine::instance()->txn_manager()->force_rollback_tablet_related_txns(
1863+
dropped_tablet->data_dir()->get_meta(), drop_tablet_req.tablet_id,
1864+
drop_tablet_req.schema_hash, dropped_tablet->tablet_uid());
1865+
LOG_INFO("successfully drop tablet")
1866+
.tag("signature", agent_task_req.signature)
1867+
.tag("tablet_id", drop_tablet_req.tablet_id);
1868+
} else {
1869+
LOG_WARNING("failed to drop tablet")
1870+
.tag("signature", agent_task_req.signature)
1871+
.tag("tablet_id", drop_tablet_req.tablet_id)
1872+
.error(status);
1873+
}
1874+
1875+
TFinishTaskRequest finish_task_request;
1876+
finish_task_request.__set_backend(BackendOptions::get_local_backend());
1877+
finish_task_request.__set_task_type(agent_task_req.task_type);
1878+
finish_task_request.__set_signature(agent_task_req.signature);
1879+
finish_task_request.__set_task_status(status.to_thrift());
1880+
1881+
_finish_task(finish_task_request);
1882+
_remove_task_info(agent_task_req.task_type, agent_task_req.signature);
1883+
}
1884+
}
1885+
18821886
} // namespace doris

‎be/src/agent/task_worker_pool.h‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,6 @@ class TaskWorkerPool {
185185
uint32_t _get_next_task_index(int32_t thread_count, std::deque<TAgentTaskRequest>& tasks,
186186
TPriority::type priority);
187187

188-
void _create_tablet_worker_thread_callback();
189-
void _drop_tablet_worker_thread_callback();
190188
void _push_worker_thread_callback();
191189
void _publish_version_worker_thread_callback();
192190
void _clear_transaction_task_worker_thread_callback();
@@ -273,4 +271,12 @@ class CreateTableTaskPool : public TaskWorkerPool {
273271
DISALLOW_COPY_AND_ASSIGN(CreateTableTaskPool);
274272
};
275273

274+
class DropTableTaskPool : public TaskWorkerPool {
275+
public:
276+
DropTableTaskPool(ExecEnv* env, ThreadModel thread_model);
277+
void _drop_tablet_worker_thread_callback();
278+
279+
DISALLOW_COPY_AND_ASSIGN(DropTableTaskPool);
280+
};
281+
276282
} // namespace doris

0 commit comments

Comments
 (0)