You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by dc...@apache.org on 2020/08/19 22:27:19 UTC
[cassandra] branch cassandra-3.11 updated (7d2d250 -> 0076217)
This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 7d2d250 Merge branch 'cassandra-3.0' into cassandra-3.11
new c9ba33c Handle difference in timestamp precision between java8 and java11 in LogFIle.java
new 0076217 Merge branch 'cassandra-3.0' into cassandra-3.11
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
.../org/apache/cassandra/db/lifecycle/LogFile.java | 17 ++++++-
.../cassandra/db/lifecycle/LogTransactionTest.java | 53 ++++++++++++++++++++++
3 files changed, 69 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
Posted by dc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 00762178992d07696054729163f33d7e4a2972a8
Merge: 7d2d250 c9ba33c
Author: David Capwell <dc...@apache.org>
AuthorDate: Wed Aug 19 15:24:59 2020 -0700
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 1 +
.../org/apache/cassandra/db/lifecycle/LogFile.java | 17 ++++++-
.../cassandra/db/lifecycle/LogTransactionTest.java | 53 ++++++++++++++++++++++
3 files changed, 69 insertions(+), 2 deletions(-)
diff --cc CHANGES.txt
index a6bc9d9,2d66ee2..eef996d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -6,9 -3,10 +6,10 @@@ Merged from 3.0
* Check for endpoint collision with hibernating nodes (CASSANDRA-14599)
* Operational improvements and hardening for replica filtering protection (CASSANDRA-15907)
* stop_paranoid disk failure policy is ignored on CorruptSSTableException after node is up (CASSANDRA-15191)
- * 3.x fails to start if commit log has range tombstones from a column which is also deleted (CASSANDRA-15970)
* Forbid altering UDTs used in partition keys (CASSANDRA-15933)
* Fix empty/null json string representation (CASSANDRA-15896)
+ * 3.x fails to start if commit log has range tombstones from a column which is also deleted (CASSANDRA-15970)
+ * Handle difference in timestamp precision between java8 and java11 in LogFIle.java (CASSANDRA-16050)
Merged from 2.2:
* Fix CQL parsing of collections when the column type is reversed (CASSANDRA-15814)
diff --cc src/java/org/apache/cassandra/db/lifecycle/LogFile.java
index 0ff7cf1,ac64f13..39bfaa9
--- a/src/java/org/apache/cassandra/db/lifecycle/LogFile.java
+++ b/src/java/org/apache/cassandra/db/lifecycle/LogFile.java
@@@ -235,12 -231,16 +235,15 @@@ final class LogFile implements AutoClos
// it matches. Because we delete files from oldest to newest, the latest update time should
// always match.
record.status.onDiskRecord = record.withExistingFiles(existingFiles);
- if (record.updateTime != record.status.onDiskRecord.updateTime && record.status.onDiskRecord.updateTime > 0)
+ // we can have transaction files with mismatching updateTime resolutions due to switching between jdk8 and jdk11, truncate both to be consistent:
+ if (truncateMillis(record.updateTime) != truncateMillis(record.status.onDiskRecord.updateTime) && record.status.onDiskRecord.updateTime > 0)
{
record.setError(String.format("Unexpected files detected for sstable [%s]: " +
- "last update time [%tT] should have been [%tT]",
- "record [%s]: last update time [%tc] (%d) should have been [%tc] (%d)",
++ "last update time [%tc] (%d) should have been [%tc] (%d)",
record.fileName(),
- record,
record.status.onDiskRecord.updateTime,
+ record.status.onDiskRecord.updateTime,
+ record.updateTime,
record.updateTime));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org