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 trunk

This commit is contained in:
Stefan Miklosovic 2023-03-26 23:29:46 +02:00
parent 4444721b6d 4ac89e6451
commit eca75a42ef
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -125,6 +125,7 @@
* Rename DisableFlag class to EnableFlag on guardrails (CASSANDRA-17544)
4.1.2
* Fix NPE when loading snapshots and data directory is one directory from root (CASSANDRA-18359)
* Do not submit hints when hinted_handoff_enabled=false (CASSANDRA-18304)
* Fix COPY ... TO STDOUT behavior in cqlsh (CASSANDRA-18353)
* Remove six and Py2SaferScanner merge cruft (CASSANDRA-18354)

4
src/java/org/apache/cassandra/service/snapshot/SnapshotLoader.java
View File

@ -107,6 +107,10 @@ public class SnapshotLoader
@Override
public FileVisitResult preVisitDirectory(Path subdir, BasicFileAttributes attrs)
{
// see CASSANDRA-18359
if (subdir.getParent() == null || subdir.getParent().getFileName() == null)
return FileVisitResult.CONTINUE;
if (subdir.getParent().getFileName().toString().equals(SNAPSHOT_SUBDIR))
{
logger.trace("Processing directory " + subdir);