natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-4.1' into cassandra-5.0

This commit is contained in:
Stefan Miklosovic 2025-07-30 17:19:41 +02:00
parent 18aa3445b3 fcaa1b3e39
commit cf83f8b2a4
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -28,6 +28,7 @@
* Fixed multiple single-node SAI query bugs relating to static columns (CASSANDRA-20338)
* Upgrade com.datastax.cassandra:cassandra-driver-core:3.11.5 to org.apache.cassandra:cassandra-driver-core:3.12.1 (CASSANDRA-17231)
Merged from 4.1:
* Do not crash on first boot with data_disk_usage_max_disk_size set when data directory is not created yet (CASSANDRA-20787)
* Rework / simplification of nodetool get/setguardrailsconfig commands (CASSANDRA-20778)
* IntrusiveStack.accumulate is not accumulating correctly (CASSANDRA-20670)
* Add nodetool get/setguardrailsconfig commands (CASSANDRA-19552)

2
src/java/org/apache/cassandra/config/DatabaseDescriptor.java
View File

@ -467,6 +467,8 @@ public class DatabaseDescriptor
applySslContext();
createAllDirectories();
applyGuardrails();
applyStartupChecks();

11
test/distributed/org/apache/cassandra/distributed/impl/Instance.java
View File

@ -608,7 +608,6 @@ public class Instance extends IsolatedExecutor implements IInvokableInstance
CONSISTENT_SIMULTANEOUS_MOVES_ALLOW.setBoolean(true);
}
mkdirs();
assert config.networkTopology().contains(config.broadcastAddress()) : String.format("Network topology %s doesn't contain the address %s",
config.networkTopology(), config.broadcastAddress());
@ -621,7 +620,6 @@ public class Instance extends IsolatedExecutor implements IInvokableInstance
LoggingSupportFactory.getLoggingSupport().onStartup();
FileUtils.setFSErrorHandler(new DefaultFSErrorHandler());
DatabaseDescriptor.createAllDirectories();
CassandraDaemon.getInstanceForTesting().migrateSystemDataIfNeeded();
CassandraDaemon.logSystemInfo(inInstancelogger);
CommitLog.instance.start();
@ -824,15 +822,6 @@ public class Instance extends IsolatedExecutor implements IInvokableInstance
).run();
}
private void mkdirs()
{
new File(config.getString("saved_caches_directory")).tryCreateDirectories();
new File(config.getString("hints_directory")).tryCreateDirectories();
new File(config.getString("commitlog_directory")).tryCreateDirectories();
for (String dir : (String[]) config.get("data_file_directories"))
new File(dir).tryCreateDirectories();
}
private Config loadConfig(IInstanceConfig overrides)
{
Map<String, Object> params = overrides.getParams();

1
test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailDiskUsageTest.java
View File

@ -72,6 +72,7 @@ public class GuardrailDiskUsageTest extends GuardrailTester
cluster = init(Cluster.build(2)
.withInstanceInitializer(DiskStateInjection::install)
.withConfig(c -> c.with(Feature.GOSSIP, Feature.NATIVE_PROTOCOL)
.set("data_disk_usage_max_disk_size", "10GiB")
.set("data_disk_usage_percentage_warn_threshold", 98)
.set("data_disk_usage_percentage_fail_threshold", 99)
.set("authenticator", "PasswordAuthenticator"))