From b61e40d86957d0ab4e26a9338234dbf285a53ddc Mon Sep 17 00:00:00 2001 From: obdev Date: Thu, 27 Jul 2023 10:54:06 +0000 Subject: [PATCH] [RS] Fix errcode missing in unit_manager and server_balancer. --- src/rootserver/ob_server_balancer.cpp | 4 ++-- src/rootserver/ob_unit_manager.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rootserver/ob_server_balancer.cpp b/src/rootserver/ob_server_balancer.cpp index 5f4a106a2b..f8488d5f6d 100644 --- a/src/rootserver/ob_server_balancer.cpp +++ b/src/rootserver/ob_server_balancer.cpp @@ -4607,9 +4607,9 @@ int ObServerBalancer::make_single_wild_server_empty_by_units( // sort cannot fail } else if (OB_FAIL(cmp.get_ret())) { LOG_WARN("fail to sort", K(ret)); - } else if (try_balance_single_unit_by_cm( + } else if (OB_FAIL(try_balance_single_unit_by_cm( unit_load, available_server_loads, task_array, - excluded_servers, pool_occupation, do_balance)) { + excluded_servers, pool_occupation, do_balance))) { LOG_WARN("fail to try balance single unit by cmp and memory", K(ret)); } else if (do_balance) { // do execute balance according to cpu and memory, no more to do diff --git a/src/rootserver/ob_unit_manager.cpp b/src/rootserver/ob_unit_manager.cpp index 2a1947fe93..a87c38596b 100644 --- a/src/rootserver/ob_unit_manager.cpp +++ b/src/rootserver/ob_unit_manager.cpp @@ -9224,7 +9224,7 @@ int ObUnitManager::delete_units_in_zones( || OB_UNLIKELY(to_be_removed_zones.count() <= 0)) { ret = OB_INVALID_ARGUMENT; LOG_WARN("invalid argument", K(ret), K(resource_pool_id), K(to_be_removed_zones)); - } else if (get_units_by_pool(resource_pool_id, units)) { + } else if (OB_FAIL(get_units_by_pool(resource_pool_id, units))) { LOG_WARN("fail to get units by pool", K(ret), K(resource_pool_id)); } else if (OB_UNLIKELY(NULL == units)) { ret = OB_ERR_UNEXPECTED;