This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new d9bbeca431c [improve](env) Improve catalog not ready tips (#27715)
d9bbeca431c is described below
commit d9bbeca431c743510c348441717d4699798ccaff
Author: walter <w41te...@gmail.com>
AuthorDate: Fri Dec 1 22:52:43 2023 +0800
[improve](env) Improve catalog not ready tips (#27715)
---
.../main/java/org/apache/doris/catalog/Env.java | 64 ++++++++++++++++++++++
.../doris/httpv2/rest/RestBaseController.java | 4 +-
.../apache/doris/journal/bdbje/BDBJEJournal.java | 15 +++++
.../org/apache/doris/load/loadv2/TokenManager.java | 4 +-
.../java/org/apache/doris/persist/EditLog.java | 3 +
.../org/apache/doris/qe/MasterCatalogExecutor.java | 4 +-
.../java/org/apache/doris/qe/MasterOpExecutor.java | 4 +-
.../org/apache/doris/qe/MasterTxnExecutor.java | 4 +-
8 files changed, 87 insertions(+), 15 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
index 90dcd36ffc7..1f38b07d9f3 100755
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
@@ -281,11 +281,13 @@ import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.apache.thrift.TException;
import java.io.DataInputStream;
import java.io.File;
import java.io.IOException;
import java.net.HttpURLConnection;
+import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
@@ -381,6 +383,7 @@ public class Env {
// canRead can be true even if isReady is false.
// for example: OBSERVER transfer to UNKNOWN, then isReady will be set to
false, but canRead can still be true
private AtomicBoolean canRead = new AtomicBoolean(false);
+ private String toMasterProgress = "";
private BlockingQueue<FrontendNodeType> typeTransferQueue;
// node name is used for bdbje NodeName.
@@ -1386,6 +1389,7 @@ public class Env {
isReady.set(false);
canRead.set(false);
+ toMasterProgress = "open editlog";
editLog.open();
if (Config.edit_log_type.equalsIgnoreCase("bdb")) {
@@ -1395,6 +1399,7 @@ public class Env {
}
}
+ toMasterProgress = "replay journal";
long replayStartTime = System.currentTimeMillis();
// replay journals. -1 means replay all the journals larger than
current journal id.
replayJournal(-1);
@@ -1405,11 +1410,13 @@ public class Env {
checkBeExecVersion();
+ toMasterProgress = "roll editlog";
editLog.rollEditLog();
// Log meta_version
long journalVersion = MetaContext.get().getMetaVersion();
if (journalVersion < FeConstants.meta_version) {
+ toMasterProgress = "log meta version";
editLog.logMetaVersion(FeConstants.meta_version);
MetaContext.get().setMetaVersion(FeConstants.meta_version);
}
@@ -1451,6 +1458,7 @@ public class Env {
// MUST set master ip before starting checkpoint thread.
// because checkpoint thread need this info to select non-master FE to
push image
+ toMasterProgress = "log master info";
this.masterInfo = new
MasterInfo(Env.getCurrentEnv().getSelfNode().getHost(),
Config.http_port,
Config.rpc_port);
@@ -1464,6 +1472,8 @@ public class Env {
// so no need to check 'isReady' flag in this method
postProcessAfterMetadataReplayed(false);
+ toMasterProgress = "start daemon threads";
+
// start all daemon threads that only running on MASTER FE
startMasterOnlyDaemonThreads();
// start other daemon threads that should running on all FE
@@ -1471,6 +1481,7 @@ public class Env {
MetricRepo.init();
+ toMasterProgress = "finished";
canRead.set(true);
isReady.set(true);
checkLowerCaseTableNames();
@@ -5814,4 +5825,57 @@ public class Env {
alter.setRelation(relation);
this.alter.processAlterMTMV(alter, false);
}
+
+ // Ensure the env is ready, otherwise throw an exception.
+ public void checkReadyOrThrow() throws Exception {
+ if (isReady()) {
+ return;
+ }
+
+ StringBuilder sb = new StringBuilder();
+ sb.append("Node catalog is not ready, please wait for a while. ")
+ .append("To master progress: " + toMasterProgress + ".\n")
+ .append("Frontends: \n");
+
+ for (String name : frontends.keySet()) {
+ Frontend frontend = frontends.get(name);
+ if (name == null) {
+ continue;
+ }
+ sb.append(frontend.toString()).append("\n");
+ }
+
+ if (haProtocol instanceof BDBHA) {
+ try {
+ BDBHA ha = (BDBHA) haProtocol;
+ List<InetSocketAddress> electableNodes =
ha.getElectableNodes(true);
+ if (!electableNodes.isEmpty()) {
+ sb.append("Electable nodes: \n");
+ for (InetSocketAddress addr : electableNodes) {
+ sb.append(addr.toString()).append("\n");
+ }
+ }
+ List<InetSocketAddress> observerNodes = ha.getObserverNodes();
+ if (!observerNodes.isEmpty()) {
+ sb.append("Observer nodes: \n");
+ for (InetSocketAddress addr : electableNodes) {
+ sb.append(addr.toString()).append("\n");
+ }
+ }
+
+ } catch (Exception e) {
+ // pass
+ }
+ }
+
+ throw new Exception(sb.toString());
+ }
+
+ public void checkReadyOrThrowTException() throws TException {
+ try {
+ checkReadyOrThrow();
+ } catch (Exception e) {
+ throw new TException(e);
+ }
+ }
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/RestBaseController.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/RestBaseController.java
index ac388349889..76f81aa43a3 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/RestBaseController.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/RestBaseController.java
@@ -119,9 +119,7 @@ public class RestBaseController extends BaseController {
if (env.isMaster()) {
return null;
}
- if (!env.isReady()) {
- throw new Exception("Node catalog is not ready, please wait for a
while.");
- }
+ env.checkReadyOrThrow();
return redirectTo(request, new TNetworkAddress(env.getMasterHost(),
env.getMasterHttpPort()));
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBJEJournal.java
b/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBJEJournal.java
index 5df74ac2c3d..395f5b0467c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBJEJournal.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBJEJournal.java
@@ -36,10 +36,12 @@ import com.sleepycat.je.DatabaseException;
import com.sleepycat.je.DatabaseNotFoundException;
import com.sleepycat.je.LockMode;
import com.sleepycat.je.OperationStatus;
+import com.sleepycat.je.StatsConfig;
import com.sleepycat.je.rep.InsufficientLogException;
import com.sleepycat.je.rep.NetworkRestore;
import com.sleepycat.je.rep.NetworkRestoreConfig;
import com.sleepycat.je.rep.ReplicaWriteException;
+import com.sleepycat.je.rep.ReplicatedEnvironment;
import com.sleepycat.je.rep.RollbackException;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -518,4 +520,17 @@ public class BDBJEJournal implements Journal { //
CHECKSTYLE IGNORE THIS LINE: B
public BDBEnvironment getBDBEnvironment() {
return this.bdbEnvironment;
}
+
+ public String getBDBStats() {
+ if (bdbEnvironment == null) {
+ return "";
+ }
+
+ ReplicatedEnvironment repEnv =
bdbEnvironment.getReplicatedEnvironment();
+ if (repEnv == null) {
+ return "";
+ }
+
+ return repEnv.getRepStats(StatsConfig.DEFAULT).toString();
+ }
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/TokenManager.java
b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/TokenManager.java
index 80f6c3f9b50..fd06fa98138 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/TokenManager.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/TokenManager.java
@@ -122,9 +122,7 @@ public class TokenManager {
private TNetworkAddress getMasterAddress() throws TException {
- if (!Env.getCurrentEnv().isReady()) {
- throw new TException("Node catalog is not ready, please wait for a
while.");
- }
+ Env.getCurrentEnv().checkReadyOrThrowTException();
String masterHost = Env.getCurrentEnv().getMasterHost();
int masterRpcPort = Env.getCurrentEnv().getMasterRpcPort();
return new TNetworkAddress(masterHost, masterRpcPort);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java
b/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java
index c5da3e600e5..a1a02d20eb4 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java
@@ -1183,6 +1183,9 @@ public class EditLog {
} catch (Throwable t) {
// Throwable contains all Exception and Error, such as IOException
and
// OutOfMemoryError
+ if (journal instanceof BDBJEJournal) {
+ LOG.error("BDBJE stats : {}", ((BDBJEJournal)
journal).getBDBStats());
+ }
LOG.error("Fatal Error : write stream Exception", t);
System.exit(-1);
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/qe/MasterCatalogExecutor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/MasterCatalogExecutor.java
index a1e557b526b..bb0f5a88e14 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/MasterCatalogExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/MasterCatalogExecutor.java
@@ -45,9 +45,7 @@ public class MasterCatalogExecutor {
}
public void forward(long catalogId, long dbId) throws Exception {
- if (!Env.getCurrentEnv().isReady()) {
- throw new Exception("Current catalog is not ready, please wait for
a while.");
- }
+ Env.getCurrentEnv().checkReadyOrThrow();
String masterHost = Env.getCurrentEnv().getMasterHost();
int masterRpcPort = Env.getCurrentEnv().getMasterRpcPort();
TNetworkAddress thriftAddress = new TNetworkAddress(masterHost,
masterRpcPort);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/MasterOpExecutor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/MasterOpExecutor.java
index da108514b91..20576e53ca7 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/MasterOpExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/MasterOpExecutor.java
@@ -88,9 +88,7 @@ public class MasterOpExecutor {
// Send request to Master
private TMasterOpResult forward(TMasterOpRequest params) throws Exception {
- if (!ctx.getEnv().isReady()) {
- throw new Exception("Node catalog is not ready, please wait for a
while.");
- }
+ ctx.getEnv().checkReadyOrThrow();
String masterHost = ctx.getEnv().getMasterHost();
int masterRpcPort = ctx.getEnv().getMasterRpcPort();
TNetworkAddress thriftAddress = new TNetworkAddress(masterHost,
masterRpcPort);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/qe/MasterTxnExecutor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/MasterTxnExecutor.java
index 96ff34accb6..07a7290f780 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/MasterTxnExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/MasterTxnExecutor.java
@@ -46,9 +46,7 @@ public class MasterTxnExecutor {
}
private TNetworkAddress getMasterAddress() throws TException {
- if (!ctx.getEnv().isReady()) {
- throw new TException("Node catalog is not ready, please wait for a
while.");
- }
+ ctx.getEnv().checkReadyOrThrowTException();
String masterHost = ctx.getEnv().getMasterHost();
int masterRpcPort = ctx.getEnv().getMasterRpcPort();
return new TNetworkAddress(masterHost, masterRpcPort);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
