You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2021/01/30 12:34:43 UTC
[incubator-doris] branch master updated: [Bugs] Fix bugs that FE
heartbeat api of httpv2 does not return version info (#5306)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new cd96ded [Bugs] Fix bugs that FE heartbeat api of httpv2 does not return version info (#5306)
cd96ded is described below
commit cd96ded1ad79ebf86d7a94a94434edd2ab9319c2
Author: Mingyu Chen <mo...@gmail.com>
AuthorDate: Sat Jan 30 20:34:33 2021 +0800
[Bugs] Fix bugs that FE heartbeat api of httpv2 does not return version info (#5306)
Co-authored-by: morningman <ch...@baidu.com>
---
be/src/exec/broker_scanner.cpp | 2 +-
.../apache/doris/httpv2/rest/BootstrapFinishAction.java | 15 +++++++++++++--
.../main/java/org/apache/doris/system/HeartbeatMgr.java | 4 ++--
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/be/src/exec/broker_scanner.cpp b/be/src/exec/broker_scanner.cpp
index 99a8d8f..5b67f58 100644
--- a/be/src/exec/broker_scanner.cpp
+++ b/be/src/exec/broker_scanner.cpp
@@ -389,7 +389,7 @@ bool BrokerScanner::line_to_src_tuple(const Slice& line) {
if (!validate_utf8(line.data, line.size)) {
std::stringstream error_msg;
error_msg << "data is not encoded by UTF-8";
- _state->append_error_msg_to_file(std::string(line.data, line.size), error_msg.str());
+ _state->append_error_msg_to_file("Unable to display", error_msg.str());
_counter->num_rows_filtered++;
return false;
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/BootstrapFinishAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/BootstrapFinishAction.java
index 254b32b..23460ed 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/BootstrapFinishAction.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/BootstrapFinishAction.java
@@ -19,6 +19,7 @@ package org.apache.doris.httpv2.rest;
import org.apache.doris.catalog.Catalog;
import org.apache.doris.common.Config;
+import org.apache.doris.common.Version;
import org.apache.doris.httpv2.entity.ResponseEntityBuilder;
import com.google.common.base.Strings;
@@ -54,6 +55,7 @@ public class BootstrapFinishAction {
public static final String REPLAYED_JOURNAL_ID = "replayedJournalId";
public static final String QUERY_PORT = "queryPort";
public static final String RPC_PORT = "rpcPort";
+ public static final String VERSION = "version";
@RequestMapping(path = "/api/bootstrap", method = RequestMethod.GET)
public ResponseEntity execute(HttpServletRequest request, HttpServletResponse response) {
@@ -73,12 +75,10 @@ public class BootstrapFinishAction {
return ResponseEntityBuilder.badRequest("invalid cluster id format: " + clusterIdStr);
}
-
if (clusterId != Catalog.getCurrentCatalog().getClusterId()) {
return ResponseEntityBuilder.okWithCommonError("invalid cluster id: " + clusterId);
}
-
if (!token.equals(Catalog.getCurrentCatalog().getToken())) {
return ResponseEntityBuilder.okWithCommonError("invalid token: " + token);
}
@@ -88,6 +88,7 @@ public class BootstrapFinishAction {
result.setReplayedJournalId(replayedJournalId);
result.setQueryPort(Config.query_port);
result.setRpcPort(Config.rpc_port);
+ result.setVersion(Version.DORIS_BUILD_VERSION + "-" + Version.DORIS_BUILD_SHORT_HASH);
}
return ResponseEntityBuilder.ok(result);
@@ -103,6 +104,7 @@ public class BootstrapFinishAction {
private long replayedJournalId = 0;
private int queryPort = 0;
private int rpcPort = 0;
+ private String version = "";
public BootstrapResult() {
@@ -131,5 +133,14 @@ public class BootstrapFinishAction {
public int getRpcPort() {
return rpcPort;
}
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
}
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/system/HeartbeatMgr.java b/fe/fe-core/src/main/java/org/apache/doris/system/HeartbeatMgr.java
index 22201e0..32bfd60 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/system/HeartbeatMgr.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/system/HeartbeatMgr.java
@@ -327,9 +327,9 @@ public class HeartbeatMgr extends MasterDaemon {
long replayedJournalId = dataObj.getLong(BootstrapFinishAction.REPLAYED_JOURNAL_ID);
int queryPort = dataObj.getInt(BootstrapFinishAction.QUERY_PORT);
int rpcPort = dataObj.getInt(BootstrapFinishAction.RPC_PORT);
- // TODO(wb) support new return for version here
+ String version = dataObj.getString(BootstrapFinishAction.VERSION);
return new FrontendHbResponse(fe.getNodeName(), queryPort, rpcPort, replayedJournalId,
- System.currentTimeMillis(), "unknown");
+ System.currentTimeMillis(), version);
}
} else {
throw new Exception("invalid return value: " + result);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org