Commit 6d6a35a
Fix ConfigurationException in integration tests
CASSANDRA-15234 introduced several changes to cassandra.yaml
This results in ConifugrationExceptions during ccm start.
As a workaround this change adds as jvmArg "-Dcassandra.allow_new_old_config_keys=true"
if the Cassandra version is at least 4.1.0 and this arg was not added yet.
Additionally any config key explicitly added by driver code has been
conditionally changed to new form depending on Cassandra version.
JvmArg "-Dcassandra.allow_duplicate_config_keys=false" has been added to
ensure that nothing gets implicitly overwritten with wrong value.1 parent 834f231 commit 6d6a35a
4 files changed
Lines changed: 36 additions & 5 deletions
File tree
- core/src/main/java/com/datastax/oss/driver/api/core
- integration-tests/src/test/java/com/datastax/oss/driver/core/metadata
- test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
| 53 | + | |
53 | 54 | | |
54 | 55 | | |
55 | 56 | | |
| |||
Lines changed: 5 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
63 | | - | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
64 | 68 | | |
65 | 69 | | |
66 | 70 | | |
| |||
Lines changed: 23 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
204 | 204 | | |
205 | 205 | | |
206 | 206 | | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
207 | 214 | | |
208 | 215 | | |
209 | 216 | | |
| |||
324 | 331 | | |
325 | 332 | | |
326 | 333 | | |
327 | | - | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
328 | 340 | | |
329 | 341 | | |
330 | 342 | | |
| |||
387 | 399 | | |
388 | 400 | | |
389 | 401 | | |
390 | | - | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
391 | 412 | | |
392 | 413 | | |
393 | 414 | | |
| |||
Lines changed: 7 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
34 | | - | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
35 | 40 | | |
36 | 41 | | |
37 | 42 | | |
| |||
0 commit comments