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 8957c08f1999033d7b747d0567b0f021c667d5d9
Merge: e318841 624d016
Author: David Capwell <dcapw...@gmail.com>
AuthorDate: Thu Jul 30 19:25:28 2020 -0700
Merge branch 'cassandra-3.0' into cassandra-3.11
src/java/org/apache/cassandra/io/util/FileUtils.java | 2 +-
test/distributed/org/apache/cassandra/distributed/impl/Instance.java | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --cc src/java/org/apache/cassandra/io/util/FileUtils.java
index 30a0b0e,5a21729..e1fd380
--- a/src/java/org/apache/cassandra/io/util/FileUtils.java
+++ b/src/java/org/apache/cassandra/io/util/FileUtils.java
@@@ -77,10 -75,10 +77,10 @@@ public final class FileUtil
}
catch (Throwable t)
{
+ logger.error("Cannot initialize un-mmaper. (Are you using a
non-Oracle JVM?) Compacted data files will not be removed promptly. Consider
using an Oracle JVM or using standard disk access mode", t);
JVMStabilityInspector.inspectThrowable(t);
- logger.info("Cannot initialize un-mmaper. (Are you using a
non-Oracle JVM?) Compacted data files will not be removed promptly. Consider
using an Oracle JVM or using standard disk access mode");
}
- canCleanDirectBuffers = canClean;
+ isCleanerAvailable = canClean;
}
public static void createHardLink(String from, String to)
diff --cc test/distributed/org/apache/cassandra/distributed/impl/Instance.java
index 19cb2a0,95fefd2..ac20e84
--- a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
@@@ -467,7 -511,8 +465,8 @@@ public class Instance extends IsolatedE
assert
config.networkTopology().contains(config.broadcastAddress());
DistributedTestSnitch.assign(config.networkTopology());
- DatabaseDescriptor.setDaemonInitialized();
+ DatabaseDescriptor.daemonInitialization();
+ FileUtils.setFSErrorHandler(new DefaultFSErrorHandler());
DatabaseDescriptor.createAllDirectories();
// We need to persist this as soon as possible after startup
checks.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
