From 0545ea234ca515c5889e2959c452753055934c12 Mon Sep 17 00:00:00 2001 From: wuyunfeng01 Date: Wed, 7 Aug 2019 19:02:48 +0800 Subject: [PATCH 1/2] Fix errors when es username and passwd is empty --- .../java/org/apache/doris/external/EsRestClient.java | 10 +++++++--- .../java/org/apache/doris/external/EsStateStore.java | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/fe/src/main/java/org/apache/doris/external/EsRestClient.java b/fe/src/main/java/org/apache/doris/external/EsRestClient.java index 1159cadc646f30..4ed29bb1b956bd 100644 --- a/fe/src/main/java/org/apache/doris/external/EsRestClient.java +++ b/fe/src/main/java/org/apache/doris/external/EsRestClient.java @@ -95,6 +95,7 @@ public String getIndexMetaData(String indexName) { /** * execute request for specific path + * * @param path the path must not leading with '/' * @return */ @@ -102,11 +103,14 @@ 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()) { diff --git a/fe/src/main/java/org/apache/doris/external/EsStateStore.java b/fe/src/main/java/org/apache/doris/external/EsStateStore.java index 8bab6180fc6bce..cbfc3e3fac56c2 100644 --- a/fe/src/main/java/org/apache/doris/external/EsStateStore.java +++ b/fe/src/main/java/org/apache/doris/external/EsStateStore.java @@ -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.error("Exception happens when fetch index [{}] meta data from remote es cluster", esTable.getName(), e); } } } From aed356ff1cab8b86bbba11163379761dd42d917a Mon Sep 17 00:00:00 2001 From: wuyunfeng01 Date: Wed, 7 Aug 2019 19:07:10 +0800 Subject: [PATCH 2/2] Change error level to warn level --- fe/src/main/java/org/apache/doris/external/EsRestClient.java | 2 +- fe/src/main/java/org/apache/doris/external/EsStateStore.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fe/src/main/java/org/apache/doris/external/EsRestClient.java b/fe/src/main/java/org/apache/doris/external/EsRestClient.java index 4ed29bb1b956bd..88cd61c0dbb4e1 100644 --- a/fe/src/main/java/org/apache/doris/external/EsRestClient.java +++ b/fe/src/main/java/org/apache/doris/external/EsRestClient.java @@ -121,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; diff --git a/fe/src/main/java/org/apache/doris/external/EsStateStore.java b/fe/src/main/java/org/apache/doris/external/EsStateStore.java index cbfc3e3fac56c2..c641bfbb911ba0 100644 --- a/fe/src/main/java/org/apache/doris/external/EsStateStore.java +++ b/fe/src/main/java/org/apache/doris/external/EsStateStore.java @@ -103,7 +103,7 @@ protected void runOneCycle() { } esTable.setEsTableState(esTableState); } catch (Throwable e) { - LOG.error("Exception happens when fetch index [{}] meta data from remote es cluster", esTable.getName(), e); + LOG.warn("Exception happens when fetch index [{}] meta data from remote es cluster", esTable.getName(), e); } } }