From 16285e937968cafa4be2c9f519403fcec38fc6f2 Mon Sep 17 00:00:00 2001 From: lingbin Date: Tue, 26 Sep 2017 14:57:49 +0800 Subject: [PATCH] fix MetaBaseAction bug when check ip of FE --- fe/src/com/baidu/palo/catalog/Catalog.java | 2 +- fe/src/com/baidu/palo/http/meta/MetaBaseAction.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fe/src/com/baidu/palo/catalog/Catalog.java b/fe/src/com/baidu/palo/catalog/Catalog.java index 967691f6cc8f48..42458a66a6d85f 100644 --- a/fe/src/com/baidu/palo/catalog/Catalog.java +++ b/fe/src/com/baidu/palo/catalog/Catalog.java @@ -662,7 +662,7 @@ private FrontendNodeType getFeNodeType() { return ret; } catch (Exception e) { - LOG.warn(e); + LOG.warn("http connect error.", e); } return FrontendNodeType.UNKNOWN; diff --git a/fe/src/com/baidu/palo/http/meta/MetaBaseAction.java b/fe/src/com/baidu/palo/http/meta/MetaBaseAction.java index 42a882e3814b89..22d114caceb85a 100644 --- a/fe/src/com/baidu/palo/http/meta/MetaBaseAction.java +++ b/fe/src/com/baidu/palo/http/meta/MetaBaseAction.java @@ -59,9 +59,8 @@ public void execute(BaseRequest request, BaseResponse response) { writeResponse(request, response, HttpResponseStatus.BAD_REQUEST); return; } - } else { - super.execute(request, response); } + super.execute(request, response); } protected boolean needCheckClientIsFe() { @@ -95,7 +94,7 @@ private boolean isFromValidFe(BaseRequest request) { private void checkFromValidFe(BaseRequest request, BaseResponse response) throws InvalidClientException { - if (isFromValidFe(request)) { + if (!isFromValidFe(request)) { throw new InvalidClientException("invalid client host"); } }