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

Merge branch 'cassandra-5.0' into cassandra-6.0 

* cassandra-5.0:
  Rename conflicting nodetool import --copy-data short option from -p to -cd
This commit is contained in:
Maxim Muzafarov 2026-06-19 22:17:45 +02:00
parent 9a896cbaeb 3fa111c70f
commit d1212e8017
No known key found for this signature in database
GPG Key ID: 7FEC714D84388C16
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -62,6 +62,7 @@ Merged from 4.1:
* Add Paxos v2 option and informatin in cassandra.yaml (CASSANDRA-21316)
* Harden data resurrection startup check with atomic heartbeat file write with fallback (CASSANDRA-21290)
Merged from 4.0:
* Rename conflicting nodetool import --copy-data short option from -p to -cd (CASSANDRA-20214)
* Fix PasswordObfuscator failing to obfuscate certain passwords (CASSANDRA-21113)
* Fix negative memtable allocator ownership when an update is shadowed by an existing row deletion (CASSANDRA-21469)
* Consider first token of SSTable when calculating SSTable intersection in LeveledScanner (CASSANDRA-21369)

12
test/unit/org/apache/cassandra/db/ImportTest.java
View File

@ -110,7 +110,7 @@ public class ImportTest extends CQLTester
// copy is true - so importing will be done by copying
importSSTables(SSTableImporter.Options.options(backupDir.toString()).copyData(true).build(), 10);
// files are left there as they were just copied
Assert.assertNotEquals(0, countFiles(backupDir));
assertNotEquals(0, countFiles(backupDir));
}
private File prepareBasicImporting() throws Throwable
@ -379,9 +379,9 @@ public class ImportTest extends CQLTester
// then we moved out 1 sstable, a correct one (in backupdirCorrect).
// now import should fail import on backupdir, but import the one in backupdirCorrect.
SSTableImporter.Options options = SSTableImporter.Options.options(Sets.newHashSet(backupdir.toString(), backupdirCorrect.toString())).copyData(copy).verifySSTables(verify).build();
SSTableImporter importer = new SSTableImporter(getCurrentColumnFamilyStore());
List<String> failedDirectories = importer.importNewSSTables(options);
assertEquals(Collections.singletonList(backupdir.toString()), failedDirectories);
ToolRunner.ToolResult result = assertImportFailed(getCurrentColumnFamilyStore(), options);
assertThat(result.getStderr()).contains("Some directories failed to import, check server logs for details");
assertThat(result.getStderr()).contains(backupdir.toString());
UntypedResultSet res = execute("SELECT * FROM %s");
for (UntypedResultSet.Row r : res)
{
@ -717,7 +717,7 @@ public class ImportTest extends CQLTester
assertEquals(10, execute(String.format("select * from %s.%s", KEYSPACE, table)).size());
// files are left there as they were just copied
Assert.assertNotEquals(0, countFiles(backupDir));
assertNotEquals(0, countFiles(backupDir));
}
finally
{
@ -759,7 +759,7 @@ public class ImportTest extends CQLTester
assertEquals(10, execute(String.format("select * from %s.%s", KEYSPACE, table)).size());
// files are left there as they were just copied
Assert.assertNotEquals(0, countFiles(backupDir));
assertNotEquals(0, countFiles(backupDir));
}
finally
{