database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix bug that heartbeat error msg may be null (#574)

Browse Source
This commit is contained in:
Mingyu Chen
2019-01-23 17:24:29 +08:00
committed by GitHub
parent 4f3954fd77
commit c82879cb2e
8 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fe/src/main/java/org/apache/doris/alter/SchemaChangeJob.java
View File

@ -704,7 +704,9 @@ public class SchemaChangeJob extends AlterJob {
}
if (replica.getLastFailedVersion() > 0) {
-- healthNum;
LOG.warn("replica {} of tablet {} last failed version > 0, set it as bad",
replica, tablet.getId());
--healthNum;
continue;
}
}

2
fe/src/main/java/org/apache/doris/catalog/BrokerMgr.java
View File

@ -324,7 +324,7 @@ public class BrokerMgr {
row.add(String.valueOf(broker.isAlive));
row.add(TimeUtils.longToTimeString(broker.lastStartTime));
row.add(TimeUtils.longToTimeString(broker.lastUpdateTime));
row.add(broker.msg);
row.add(broker.heartbeatErrMsg);
result.addRow(row);
}
}

6
fe/src/main/java/org/apache/doris/catalog/FsBroker.java
View File

@ -30,7 +30,7 @@ public class FsBroker implements Writable, Comparable<FsBroker> {
public String ip;
public int port;
// msg for ping result
public String msg;
public String heartbeatErrMsg = "";
public long lastUpdateTime;
public long lastStartTime = -1;
@ -59,13 +59,13 @@ public class FsBroker implements Writable, Comparable<FsBroker> {
lastStartTime = hbResponse.getHbTime();
}
lastUpdateTime = hbResponse.getHbTime();
msg = "";
heartbeatErrMsg = "";
} else {
if (isAlive) {
isAlive = false;
isChanged = true;
}
msg = hbResponse.getMsg();
heartbeatErrMsg = hbResponse.getMsg() == null ? "Unknown error" : hbResponse.getMsg();
}
return isChanged;

3
fe/src/main/java/org/apache/doris/catalog/Replica.java
View File

@ -349,7 +349,7 @@ public class Replica implements Writable {
@Override
public String toString() {
StringBuffer strBuffer = new StringBuffer("replicaId=");
StringBuffer strBuffer = new StringBuffer("[replicaId=");
strBuffer.append(id);
strBuffer.append(", BackendId=");
strBuffer.append(backendId);
@ -373,6 +373,7 @@ public class Replica implements Writable {
strBuffer.append(lastFailedTimestamp);
strBuffer.append(", schemaHash");
strBuffer.append(schemaHash);
strBuffer.append("]");
return strBuffer.toString();
}

2
fe/src/main/java/org/apache/doris/common/Config.java
View File

@ -743,6 +743,6 @@ public class Config extends ConfigBase {
* if set to true, TabletScheduler will not do balance.
*/
@ConfField(mutable = true, masterOnly = true)
public static boolean disable_balance = false; // 10%
public static boolean disable_balance = false;
}

2
fe/src/main/java/org/apache/doris/common/proc/FrontendsProcNode.java
View File

@ -108,7 +108,7 @@ public class FrontendsProcNode implements ProcNodeInterface {
info.add(String.valueOf(isHelperNode(helperNodes, fe)));
info.add(fe.getMsg());
info.add(fe.getHeartbeatErrMsg());
infos.add(info);
}

2
fe/src/main/java/org/apache/doris/system/Backend.java
View File

@ -566,7 +566,7 @@ public class Backend implements Writable {
LOG.info("{} is dead,", this.toString());
}
heartbeatErrMsg = hbResponse.getMsg();
heartbeatErrMsg = hbResponse.getMsg() == null ? "Unknown error" : hbResponse.getMsg();
}
return isChanged;

10
fe/src/main/java/org/apache/doris/system/Frontend.java
View File

@ -40,7 +40,7 @@ public class Frontend implements Writable {
private long replayedJournalId;
private long lastUpdateTime;
private String msg = "";
private String heartbeatErrMsg = "";
private boolean isAlive = false;
@ -101,8 +101,8 @@ public class Frontend implements Writable {
return replayedJournalId;
}
public String getMsg() {
return msg;
public String getHeartbeatErrMsg() {
return heartbeatErrMsg;
}
public long getLastUpdateTime() {
@ -123,14 +123,14 @@ public class Frontend implements Writable {
rpcPort = hbResponse.getRpcPort();
replayedJournalId = hbResponse.getReplayedJournalId();
lastUpdateTime = hbResponse.getHbTime();
msg = "";
heartbeatErrMsg = "";
isChanged = true;
} else {
if (isAlive) {
isAlive = false;
isChanged = true;
}
msg = hbResponse.getMsg();
heartbeatErrMsg = hbResponse.getMsg() == null ? "Unknown error" : hbResponse.getMsg();
}
return isChanged;
}