patch 4.0

This commit is contained in:
wangzelin.wzl
2022-10-24 10:34:53 +08:00
parent 4ad6e00ec3
commit 93a1074b0c
10533 changed files with 2588271 additions and 2299373 deletions

View File

@ -18,39 +18,46 @@
#include "share/config/ob_server_config.h"
#include "share/ob_server_status.h"
#include "rootserver/ob_server_manager.h"
#include "rootserver/ob_rebalance_task_mgr.h"
#include "rootserver/ob_disaster_recovery_task_mgr.h"
#include "rootserver/ob_root_utils.h"
#include "observer/ob_server_struct.h"
namespace oceanbase {
namespace rootserver {
namespace oceanbase
{
namespace rootserver
{
using namespace common;
using namespace share;
ObAllServerTask::ObAllServerTask(
ObServerManager& server_manager, ObRebalanceTaskMgr& rebalance_task_mgr, const ObAddr& server, bool with_rootserver)
: server_manager_(server_manager),
rebalance_task_mgr_(rebalance_task_mgr),
server_(server),
with_rootserver_(with_rootserver)
{}
ObAllServerTask::ObAllServerTask(ObServerManager &server_manager,
ObDRTaskMgr &disaster_recovery_task_mgr,
const ObAddr &server,
bool with_rootserver)
: server_manager_(server_manager),
disaster_recovery_task_mgr_(disaster_recovery_task_mgr),
server_(server),
with_rootserver_(with_rootserver)
{
}
ObAllServerTask::~ObAllServerTask()
{}
{
}
int ObAllServerTask::process()
{
int ret = OB_SUCCESS;
if (OB_ISNULL(ObCurTraceId::get_trace_id())) {
// Prevent the current trace_id from being overwritten
//Prevent the current trace_id from being overwritten
ObCurTraceId::init(GCONF.self_addr_);
}
THIS_WORKER.set_timeout_ts(INT64_MAX);
if (!ObRootServiceRoleChecker::is_rootserver(reinterpret_cast<ObIPartPropertyGetter*>(GCTX.ob_service_))) {
ret = OB_NOT_MASTER;
LOG_WARN("not master", K(ret));
} else if (OB_FAIL(server_manager_.adjust_server_status(server_, rebalance_task_mgr_, with_rootserver_))) {
if (!ObRootServiceRoleChecker::is_rootserver()) {
ret = OB_NOT_MASTER;
LOG_WARN("not master", K(ret));
} else if (OB_FAIL(server_manager_.adjust_server_status(
server_, disaster_recovery_task_mgr_, with_rootserver_))) {
LOG_WARN("fail to adjust server status", K(ret), K(server_));
}
return ret;
@ -61,24 +68,20 @@ int64_t ObAllServerTask::get_deep_copy_size() const
return sizeof(*this);
}
ObAsyncTask* ObAllServerTask::deep_copy(char* buf, const int64_t buf_size) const
ObAsyncTask *ObAllServerTask::deep_copy(char *buf, const int64_t buf_size) const
{
int ret = OB_SUCCESS;
ObAllServerTask* task = NULL;
ObAllServerTask *task = NULL;
if (NULL == buf || buf_size < static_cast<int64_t>(sizeof(ObAllServerTask))) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("buf is null or buf size not large enough",
"buf",
OB_P(buf),
K(buf_size),
"need size",
sizeof(ObAllServerTask),
K(ret));
LOG_WARN("buf is null or buf size not large enough", "buf", OB_P(buf), K(buf_size),
"need size", sizeof(ObAllServerTask), K(ret));
} else {
task = new (buf) ObAllServerTask(server_manager_, rebalance_task_mgr_, server_, with_rootserver_);
task = new(buf) ObAllServerTask(server_manager_,
disaster_recovery_task_mgr_, server_, with_rootserver_);
}
return task;
}
} // end namespace rootserver
} // end namespace oceanbase
}//end namespace rootserver
}//end namespace oceanbase