You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2019/07/23 16:12:24 UTC
[asterixdb] 03/03: Merge commit '8c99391' from stabilization-f69489
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 71e8ad084dc1f2cced283a17dcc4539733459ade
Merge: 81074ed 8c99391
Author: Murtadha Hubail <mh...@apache.org>
AuthorDate: Tue Jul 23 01:30:39 2019 +0300
Merge commit '8c99391' from stabilization-f69489
Change-Id: I139c265ba998c32ec049c8a8bbd7a5a213895d2a
.../asterix/test/logging/CheckpointingTest.java | 11 +++++--
.../test/resources/cc-small-txn-log-partition.conf | 1 +
.../api/cluster_state_1/cluster_state_1.1.regexadm | 2 +-
.../cluster_state_1_full.1.regexadm | 2 +-
.../cluster_state_1_less.1.regexadm | 2 +-
.../common/config/TransactionProperties.java | 2 +-
.../recovery/AbstractCheckpointManager.java | 37 +++++++++++++---------
.../service/recovery/CheckpointThread.java | 3 +-
.../protocols/muxdemux/ChannelControlBlock.java | 1 -
9 files changed, 37 insertions(+), 24 deletions(-)
diff --cc asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/TransactionProperties.java
index fb6ca6b,b294828..0477147
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/TransactionProperties.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/TransactionProperties.java
@@@ -55,13 -49,12 +55,13 @@@ public class TransactionProperties exte
"The checkpoint threshold (in terms of LSNs (log sequence numbers) that have been written to the "
+ "transaction log, i.e., the length of the transaction log) for transaction logs"),
TXN_LOG_CHECKPOINT_POLLFREQUENCY(
- INTEGER,
+ POSITIVE_INTEGER,
120,
- "The frequency (in seconds) the checkpoint thread should check to see if a checkpoint should be written"),
- TXN_LOG_CHECKPOINT_HISTORY(INTEGER, 2, "The number of checkpoints to keep in the transaction log"),
+ "The frequency (in seconds) the checkpoint thread should check to see if a checkpoint should be "
+ + "written"),
- TXN_LOG_CHECKPOINT_HISTORY(UNSIGNED_INTEGER, 0, "The number of checkpoints to keep in the transaction log"),
++ TXN_LOG_CHECKPOINT_HISTORY(UNSIGNED_INTEGER, 2, "The number of checkpoints to keep in the transaction log"),
TXN_LOCK_ESCALATIONTHRESHOLD(
- INTEGER,
+ UNSIGNED_INTEGER,
1000,
"The maximum number of entity locks to obtain before upgrading to a dataset lock"),
TXN_LOCK_SHRINKTIMER(
diff --cc asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/CheckpointThread.java
index 446eec5,1965adc..cbc5e35
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/CheckpointThread.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/CheckpointThread.java
@@@ -85,13 -94,9 +85,12 @@@ public class CheckpointThread extends T
if (currentCheckpointAttemptMinLSN >= targetCheckpointLSN) {
lastCheckpointLSN = currentCheckpointAttemptMinLSN;
}
-
- } catch (Exception e) {
- LOGGER.log(Level.ERROR, "checkpoint attempt failed", e);
}
+ } catch (InterruptedException e) {
+ LOGGER.info("Checkpoint thread interrupted", e);
+ Thread.currentThread().interrupt();
+ } catch (Exception e) {
- LOGGER.error("Error during checkpoint", e);
++ LOGGER.error("checkpoint attempt failed", e);
}
}
}