This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new b9c5b13ce37 Revert "[fix](journal) Fix infinite block due to initial
BDB journal failed (#29205) (#29310)" (#29373)
b9c5b13ce37 is described below
commit b9c5b13ce37e86bed60c87ed3c5bc465f99d4de5
Author: Kang <[email protected]>
AuthorDate: Tue Jan 2 09:45:35 2024 +0800
Revert "[fix](journal) Fix infinite block due to initial BDB journal failed
(#29205) (#29310)" (#29373)
This reverts commit d23a1171d7d53d67a90d9182b3b03a1f725ba6b8.
---
.../java/org/apache/doris/journal/bdbje/BDBJEJournal.java | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
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 cd0d54c6420..d805bf1d5a4 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
@@ -276,15 +276,6 @@ public class BDBJEJournal implements Journal { //
CHECKSTYLE IGNORE THIS LINE: B
@Override
public long getMaxJournalId() {
- return getMaxJournalIdInternal(true);
- }
-
- // get max journal id but do not check whether the txn is matched.
- private long getMaxJournalIdWithoutCheck() {
- return getMaxJournalIdInternal(false);
- }
-
- private long getMaxJournalIdInternal(boolean checkTxnMatched) {
long ret = -1;
if (bdbEnvironment == null) {
return ret;
@@ -301,7 +292,7 @@ public class BDBJEJournal implements Journal { //
CHECKSTYLE IGNORE THIS LINE: B
String dbName = dbNames.get(index).toString();
long dbNumberName = dbNames.get(index);
Database database = bdbEnvironment.openDatabase(dbName);
- if (checkTxnMatched && !isReplicaTxnAreMatched(database,
dbNumberName)) {
+ if (!isReplicaTxnAreMatched(database, dbNumberName)) {
LOG.warn("The current replica hasn't synced up with the master,
current db name: {}", dbNumberName);
if (index != 0) {
// Because roll journal occurs after write, the previous write
must have
@@ -432,7 +423,7 @@ public class BDBJEJournal implements Journal { //
CHECKSTYLE IGNORE THIS LINE: B
}
// set next journal id
- nextJournalId.set(getMaxJournalIdWithoutCheck() + 1);
+ nextJournalId.set(getMaxJournalId() + 1);
break;
} catch (InsufficientLogException insufficientLogEx) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
