This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit d37a96735b8a512c61bbc70e365708185a884596 Merge: 32194ec be649d5 Author: Brandon Williams <[email protected]> AuthorDate: Wed Sep 15 13:41:01 2021 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt | 2 ++ src/java/org/apache/cassandra/utils/WindowsTimer.java | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --cc CHANGES.txt index f589208,94340d8..2416635 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,6 +1,14 @@@ -3.0.26: +3.11.12 + * Make assassinate more resilient to missing tokens (CASSANDRA-16847) + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) + * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135) + * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835) + * Fix ant-junit dependency issue (CASSANDRA-16827) + * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072) + * Avoid sending CDC column if not enabled (CASSANDRA-16770) +Merged from 3.0: + * Catch UnsatisfiedLinkError in WindowsTimer (CASSANDRA-16085) + * Avoid removing batch when it's not created during view replication (CASSANDRA-16175) * Make the addition of regular column to COMPACT tables throw an InvalidRequestException (CASSANDRA-14564) * Fix materialized view schema backup as table (CASSANDRA-12734) * Avoid signaling DigestResolver until the minimum number of responses are guaranteed to be visible (CASSANDRA-16883) diff --cc src/java/org/apache/cassandra/utils/WindowsTimer.java index bbd162c,f004979..726f9d0 --- a/src/java/org/apache/cassandra/utils/WindowsTimer.java +++ b/src/java/org/apache/cassandra/utils/WindowsTimer.java @@@ -54,8 -61,10 +61,10 @@@ public final class WindowsTime if (period == 0) return; assert(period > 0); + if (!available) + return; if (timeBeginPeriod(period) != 0) - logger.warn("Failed to set timer to : " + period + ". Performance will be degraded."); + logger.warn("Failed to set timer to : {}. Performance will be degraded.", period); } public static void endTimerPeriod(int period) @@@ -63,7 -72,9 +72,9 @@@ if (period == 0) return; assert(period > 0); + if (!available) + return; if (timeEndPeriod(period) != 0) - logger.warn("Failed to end accelerated timer period. System timer will remain set to: " + period + " ms."); + logger.warn("Failed to end accelerated timer period. System timer will remain set to: {} ms.", period); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
