Readonly transaction created by BackupUtil is not being cancelled by …

…stuck transaction monitor
JetBrains · Oct 24, 2023 · 53b064b · 53b064b
1 parent f7ac0d3
commit 53b064b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/environment/src/main/java/jetbrains/exodus/env/EnvironmentImpl.java b/environment/src/main/java/jetbrains/exodus/env/EnvironmentImpl.java
@@ -372,6 +372,17 @@ public TransactionBase beginReadonlyTransaction(final Runnable beginHook) {
  return new ReadonlyTransaction(this, false, beginHook);
  }
 
+ @NotNull
+ public TransactionBase beginReadOnlyUnmonitoredTransaction(){
+ checkIsOperative();
+ return new ReadonlyTransaction(this, false, null) {
+ @Override
+ boolean isIgnoreInStuckTransactionMonitor() {
+ return true;
+ }
+ };
+ }
+
  @NotNull
  public ReadWriteTransaction beginGCTransaction() {
  if (isReadOnly()) {

diff --git a/environment/src/main/java/jetbrains/exodus/env/TransactionBase.java b/environment/src/main/java/jetbrains/exodus/env/TransactionBase.java
@@ -215,6 +215,10 @@ boolean isGCTransaction() {
  return false;
  }
 
+ boolean isIgnoreInStuckTransactionMonitor(){
+ return false;
+ }
+
  @Nullable
  TreeMetaInfo getTreeMetaInfo(@NotNull final String name) {
  checkIsFinished();

diff --git a/environment/src/main/kotlin/jetbrains/exodus/env/StuckTransactionMonitor.kt b/environment/src/main/kotlin/jetbrains/exodus/env/StuckTransactionMonitor.kt
@@ -72,7 +72,7 @@ internal class StuckTransactionMonitor(env: EnvironmentImpl) : Job() {
  val timeBound = System.currentTimeMillis() - this
  env?.forEachActiveTransaction {
  val txn = it as TransactionBase
- if (!txn.isGCTransaction && txn.startTime < timeBound) {
+ if (!txn.isGCTransaction && !txn.isIgnoreInStuckTransactionMonitor && txn.startTime < timeBound) {
  callback(it)
  }
  }

diff --git a/environment/src/main/kotlin/jetbrains/exodus/env/management/BackupController.kt b/environment/src/main/kotlin/jetbrains/exodus/env/management/BackupController.kt
@@ -34,7 +34,7 @@ class BackupController(private val env: EnvironmentImpl) : MBeanBase(getObjectNa
  throw IllegalStateException("Backup is already in progress")
  }
 
- backupTransaction = env.beginReadonlyTransaction()
+ backupTransaction = env.beginReadOnlyUnmonitoredTransaction()
  return env.prepareForBackup()
  } finally {
  backupTransactionLock.unlock()