This is an automated email from the ASF dual-hosted git repository.
blerer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3cca9ab Fix LZ4 startup check
3cca9ab is described below
commit 3cca9ab22f6ff675c6332671da1304fac9aad77c
Author: David Capwell <dcapw...@apple.com>
AuthorDate: Tue Jul 7 16:04:44 2020 -0700
Fix LZ4 startup check
patch by David Capwell; reviewed by Benjamin Lerer for CASSANDRA-15929
The patch ensures that class loading issues are correctly handled by the
startup check.
---
src/java/org/apache/cassandra/service/StartupChecks.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/java/org/apache/cassandra/service/StartupChecks.java
b/src/java/org/apache/cassandra/service/StartupChecks.java
index 12bb309..7754c6f 100644
--- a/src/java/org/apache/cassandra/service/StartupChecks.java
+++ b/src/java/org/apache/cassandra/service/StartupChecks.java
@@ -148,7 +148,7 @@ public class StartupChecks
{
LZ4Factory.nativeInstance(); // make sure native loads
}
- catch (AssertionError e)
+ catch (AssertionError | LinkageError e)
{
logger.warn("lz4-java was unable to load native libraries; this
will lower the performance of lz4 (network/sstables/etc.): {}",
Throwables.getRootCause(e).getMessage());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
