hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add new value 'manual_migrate' to migrate_unit event in RS event table.

Browse Source
This commit is contained in:
LeonChaoHi
2023-09-25 07:40:14 +00:00
committed by ob-robot
parent 3b8d433e92
commit 2782e487cf
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/rootserver/ob_unit_manager.cpp
View File

@ -106,6 +106,15 @@ double ObUnitManager::ObUnitLoad::get_demand(ObResourceType resource_type) const
return ret; return ret;
} }
const char *ObUnitManager::end_migrate_op_type_to_str(const ObUnitManager::EndMigrateOp &t)
{
const char* str = "UNKNOWN";
if (EndMigrateOp::COMMIT == t) { str = "COMMIT"; }
else if (EndMigrateOp::ABORT == t) { str = "ABORT"; }
else if (EndMigrateOp::REVERSE == t) { str = "REVERSE"; }
else { str = "NONE"; }
return str;
}
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
ObUnitManager::ObUnitManager(ObServerManager &server_mgr, ObZoneManager &zone_mgr) ObUnitManager::ObUnitManager(ObServerManager &server_mgr, ObZoneManager &zone_mgr)
: inited_(false), loaded_(false), proxy_(NULL), server_config_(NULL), : inited_(false), loaded_(false), proxy_(NULL), server_config_(NULL),
@ -8439,7 +8448,8 @@ int ObUnitManager::migrate_unit_(const uint64_t unit_id, const ObAddr &dst, cons
"unit_id", unit->unit_id_, "unit_id", unit->unit_id_,
"migrate_from_server", unit->migrate_from_server_, "migrate_from_server", unit->migrate_from_server_,
"server", unit->server_, "server", unit->server_,
"tenant_id", pool->tenant_id_); "tenant_id", pool->tenant_id_,
"manual_migrate", is_manual ? "YES" : "NO");
} }
} }
LOG_INFO("finish migrate unit", KR(ret), K(unit_id), K(dst), K(is_manual)); LOG_INFO("finish migrate unit", KR(ret), K(unit_id), K(dst), K(is_manual));
@ -8725,6 +8735,7 @@ int ObUnitManager::end_migrate_unit(const uint64_t unit_id, const EndMigrateOp e
} else { } else {
const ObAddr migrate_from_server = unit->migrate_from_server_; const ObAddr migrate_from_server = unit->migrate_from_server_;
const ObAddr unit_server = unit->server_; const ObAddr unit_server = unit->server_;
const bool is_manual = unit->is_manual_migrate();
ObUnit new_unit = *unit; ObUnit new_unit = *unit;
new_unit.is_manual_migrate_ = false; // clear manual_migrate new_unit.is_manual_migrate_ = false; // clear manual_migrate
// generate new unit // generate new unit
@ -8782,10 +8793,11 @@ int ObUnitManager::end_migrate_unit(const uint64_t unit_id, const EndMigrateOp e
} }
ROOTSERVICE_EVENT_ADD("unit", "finish_migrate_unit", ROOTSERVICE_EVENT_ADD("unit", "finish_migrate_unit",
"unit_id", unit_id, "unit_id", unit_id,
"end_op", end_migrate_op, "end_op", end_migrate_op_type_to_str(end_migrate_op),
"migrate_from_server", migrate_from_server, "migrate_from_server", migrate_from_server,
"server", unit_server, "server", unit_server,
"tenant_id", tenant_id); "tenant_id", tenant_id,
"manual_migrate", is_manual ? "YES" : "NO");
// complete the job if exists // complete the job if exists
char ip_buf[common::MAX_IP_ADDR_LENGTH]; char ip_buf[common::MAX_IP_ADDR_LENGTH];

2
src/rootserver/ob_unit_manager.h
View File

@ -118,6 +118,8 @@ public:
REVERSE, REVERSE,
}; };
const char *end_migrate_op_type_to_str(const EndMigrateOp &t);
public: public:
ObUnitManager(ObServerManager &server_mgr, ObZoneManager &zone_mgr); ObUnitManager(ObServerManager &server_mgr, ObZoneManager &zone_mgr);
virtual ~ObUnitManager(); virtual ~ObUnitManager();