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

[CP] [Arb] fix wrong rs_server_status

Browse Source
This commit is contained in:
BinChenn
2023-04-28 07:45:26 +00:00
committed by ob-robot
parent 096d1eccdf
commit dc182c9307
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/logservice/ob_net_keepalive_adapter.cpp
View File

@ -37,7 +37,7 @@ int ObNetKeepAliveAdapter::in_black_or_stopped_(const common::ObAddr &server,
} else if (OB_FAIL(net_keepalive_->in_black(server, in_blacklist, &ka_data))) {
CLOG_LOG(WARN, "in_black failed", K(ret), K(server));
} else {
is_server_stopped = (share::RSS_IS_STOPPED == ka_data.rs_server_status_)
is_server_stopped = (share::RSS_IS_WORKING != ka_data.rs_server_status_)
|| (ka_data.start_service_time_ <= 0 || OB_INVALID_TIMESTAMP == ka_data.start_service_time_);
if (is_server_stopped
&& REACH_TIME_INTERVAL(1 * 1000 * 1000)) {

6
src/rootserver/ob_root_service.cpp
View File

@ -2254,7 +2254,11 @@ int ObRootService::renew_lease(const ObLeaseRequest &lease_request, ObLeaseRespo
lease_response.force_frozen_status_ = to_alive;
lease_response.baseline_schema_version_ = baseline_schema_version_;
// set observer stopped after has no leader
lease_response.rs_server_status_ = is_stopped ? RSS_IS_STOPPED : RSS_IS_WORKING;
if (is_full_service()) {
lease_response.rs_server_status_ = is_stopped ? RSS_IS_STOPPED : RSS_IS_WORKING;
} else {
lease_response.rs_server_status_ = RSS_INVALID;
}
(void)OTC_MGR.get_lease_response(lease_response);
// after split schema, the schema_version is not used, but for the legality detection, set schema_version to sys's schema_version