Skip to content

[Doris On ES][Bug-Fix] Fix errors when es username and passwd is empty #1601

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 2 commits into from
Aug 8, 2019
Merged

[Doris On ES][Bug-Fix] Fix errors when es username and passwd is empty #1601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0545ea2
Fix errors when es username and passwd is empty
wuyunfeng Aug 7, 2019
aed356f
Change error level to warn level
wuyunfeng Aug 7, 2019
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
12 changes: 8 additions & 4 deletions fe/src/main/java/org/apache/doris/external/EsRestClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,18 +95,22 @@ public String getIndexMetaData(String indexName) {

/**
* execute request for specific path
*
* @param path the path must not leading with '/'
* @return
*/
private String execute(String path) {
selectNextNode();
boolean nextNode;
do {
Request request = new Request.Builder()
.get()
.addHeader("Authorization", basicAuth)
Request.Builder builder = new Request.Builder();
if (!Strings.isEmpty(basicAuth)) {
builder.addHeader("Authorization", basicAuth);
}
Request request = builder.get()
.url(currentNode + "/" + path)
.build();
LOG.trace("es rest client request URL: {}", currentNode + "/" + path);
try {
Response response = networkClient.newCall(request).execute();
if (response.isSuccessful()) {
Expand All @@ -117,7 +121,7 @@ private String execute(String path) {
}
nextNode = selectNextNode();
if (!nextNode) {
LOG.error("try all nodes [{}],no other nodes left", nodes);
LOG.warn("try all nodes [{}],no other nodes left", nodes);
}
} while (nextNode);
return null;
Expand Down
2 changes: 1 addition & 1 deletion fe/src/main/java/org/apache/doris/external/EsStateStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ protected void runOneCycle() {
}
esTable.setEsTableState(esTableState);
} catch (Throwable e) {
LOG.error("errors while load table {} state from es", esTable.getName());
LOG.warn("Exception happens when fetch index [{}] meta data from remote es cluster", esTable.getName(), e);
}
}
}
Expand Down