From 03a51933326990f7ac4b6735966c198448da38b0 Mon Sep 17 00:00:00 2001 From: zhangdong <493738387@qq.com> Date: Mon, 15 May 2023 14:42:39 +0800 Subject: [PATCH] Remove excess code --- be/src/agent/heartbeat_server.cpp | 1 - fe/fe-core/src/main/java/org/apache/doris/ha/BDBHA.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/be/src/agent/heartbeat_server.cpp b/be/src/agent/heartbeat_server.cpp index 64cecd2cdc6ce8..de2cc5d9d9efa4 100644 --- a/be/src/agent/heartbeat_server.cpp +++ b/be/src/agent/heartbeat_server.cpp @@ -120,7 +120,6 @@ Status HeartbeatServer::_heartbeat(const TMasterInfo& master_info) { //step4: check if the IP of FQDN belongs to the current machine and update BackendOptions._s_localhost bool set_new_localhost = false; - BackendOptions::set_localhost(master_info.backend_ip); for (auto& addr : hosts) { if (addr.get_host_address() == ip) { BackendOptions::set_localhost(master_info.backend_ip); diff --git a/fe/fe-core/src/main/java/org/apache/doris/ha/BDBHA.java b/fe/fe-core/src/main/java/org/apache/doris/ha/BDBHA.java index 3ce28aa59fba49..802101fcfde3bc 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/ha/BDBHA.java +++ b/fe/fe-core/src/main/java/org/apache/doris/ha/BDBHA.java @@ -91,11 +91,11 @@ public boolean fencing() { throw new Exception(status.toString()); } } catch (Exception e) { - LOG.error("fencing failed. tried {} times", i, e); + LOG.warn("fencing failed. tried {} times", i, e); try { Thread.sleep(2000); } catch (InterruptedException e1) { - LOG.warn("", e1); + LOG.warn("fencing sleep exception:", e1); } } }