Skip to content

fix MetaBaseAction bug when check ip of FE #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
imay merged 1 commit into from
Sep 26, 2017
Merged

fix MetaBaseAction bug when check ip of FE #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fe/src/com/baidu/palo/catalog/Catalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ private FrontendNodeType getFeNodeType() {

return ret;
} catch (Exception e) {
LOG.warn(e);
LOG.warn("http connect error.", e);
}

return FrontendNodeType.UNKNOWN;
Expand Down
5 changes: 2 additions & 3 deletions fe/src/com/baidu/palo/http/meta/MetaBaseAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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");
}
}
Expand Down