(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 9e51f6701e623efe08ca75c4a50220c66b1b6f2e Merge: ffc0f01b0e 2521b83c92 Author: Jacek Lewandowski AuthorDate: Fri Aug 30 10:41:42 2024 +0200 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Fix rendering UNSET collection types in query tracing CHANGES.txt| 1 + .../transport/messages/ExecuteMessage.java | 5 +++- .../org/apache/cassandra/cql3/TraceCqlTest.java| 29 ++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index 26cb5d2c29,bdecf8f324..c4bde7339e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -128,12 -71,10 +128,13 @@@ Merged from 4.1 * Fix hints delivery for a node going down repeatedly (CASSANDRA-19495) * Do not go to disk for reading hints file sizes (CASSANDRA-19477) * Fix system_views.settings to handle array types (CASSANDRA-19475) - * Memoize Cassandra verion and add a backoff interval for failed schema pulls (CASSANDRA-18902) * Fix StackOverflowError on ALTER after many previous schema changes (CASSANDRA-19166) + * Memoize Cassandra verion (CASSANDRA-18902) Merged from 4.0: ++ * Fix rendering UNSET collection types in query tracing (CASSANDRA-19880) + * Fix latency reported by ideal consistency level monitoring (CASSANDRA-19651) + * Use default commitlog settings in test YAMLs (CASSANDRA-19830) + * Do not spam log with SSLExceptions (CASSANDRA-18839) * Fix schema.cql created by a snapshot after dropping more than one column (CASSANDRA-19747) * UnsupportedOperationException when reducing scope for LCS compactions (CASSANDRA-19704) * Make LWT conditions behavior on frozen and non-frozen columns consistent for null column values (CASSANDRA-19637) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (ffc0f01b0e -> 9e51f6701e)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from ffc0f01b0e Add a concept for retrying messages add c53d3ac8c6 Fix rendering UNSET collection types in query tracing add 505aff4517 Merge branch 'cassandra-4.0' into cassandra-4.1 add 2521b83c92 Merge branch 'cassandra-4.1' into cassandra-5.0 new 9e51f6701e Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.txt| 1 + .../transport/messages/ExecuteMessage.java | 5 +++- .../org/apache/cassandra/cql3/TraceCqlTest.java| 29 ++ 3 files changed, 34 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated (c3c44a7feb -> 2521b83c92)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from c3c44a7feb Merge branch 'cassandra-5.0.x' into cassandra-5.0 add c53d3ac8c6 Fix rendering UNSET collection types in query tracing add 505aff4517 Merge branch 'cassandra-4.0' into cassandra-4.1 add 2521b83c92 Merge branch 'cassandra-4.1' into cassandra-5.0 No new revisions were added by this update. Summary of changes: CHANGES.txt| 2 ++ .../transport/messages/ExecuteMessage.java | 5 +++- .../org/apache/cassandra/cql3/TraceCqlTest.java| 29 ++ 3 files changed, 35 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.0 updated (6da9141d3c -> c53d3ac8c6)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 6da9141d3c Fix latency reported by ideal consistency level monitoring add c53d3ac8c6 Fix rendering UNSET collection types in query tracing No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../transport/messages/ExecuteMessage.java | 5 +++- .../org/apache/cassandra/cql3/TraceCqlTest.java| 29 ++ 3 files changed, 34 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.1 updated (02f38208b1 -> 505aff4517)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 02f38208b1 Merge branch 'cassandra-4.0' into cassandra-4.1 add c53d3ac8c6 Fix rendering UNSET collection types in query tracing add 505aff4517 Merge branch 'cassandra-4.0' into cassandra-4.1 No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../transport/messages/ExecuteMessage.java | 5 +++- .../org/apache/cassandra/cql3/TraceCqlTest.java| 29 ++ 3 files changed, 34 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) branch ds-trunk-5.0--2024-07-24 deleted (was 8bc66787)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch ds-trunk-5.0--2024-07-24 in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git was 8bc66787 update deps This change permanently discards the following revisions: discard 8bc66787 update deps discard 9a13a045 Update .gitignore to include venv dir discard 097ebfc1 CC5 fix secondary_indexes_test::TestPreJoinCallback tests discard 4a64d1c2 CC5 fix test_sstablelevelreset discard 651edfa5 CC5 fix test_disk_usage_guardrail discard 92bd7ce8 CC5 fix pushed_notifications discard afa43a28 CC5 fix jmx_test.py::TestJMX::test_compaction discard 15862181 CC5 fix support_guardrails() discard 2c1777cc CNDB-9974: Fix test_udf_scripting discard 30240a9b CNDB-9974: Fix tests for CASSANDRA-18252 - removal of scripted UDFs discard b5cb1da6 CNDB-10152: Fix Python DTests calls to pytest.fail() and skip() for newer pytest versions. Pin lowest expected pytest version in requirements.txt discard 63ebd01b CNDB-10194 Fix dtests not running in jenkins Replace java_version with CURRENT_JAVA_VERSION in upgrade_through_versions_test.py Ignore JAVAxx_HOME in upgrade_manifest.jdk_compatible_steps Add additional debugging discard 3b4e665b STAR-1709: Add 'Small commitlog volume detected' to acceptable error messages (#65) discard 02e67cdd STAR-1589: Fix typos in bootstrap_test.py (#62) discard e885e2f0 Star 1329 (#61) discard 8f9f4d8d STAR-899 Fix class name used from SchemaManager to Schema (#58) discard a0940e67 STAR-386: Increase client timeout (#56) discard ae43e91b STAR-394: Fix various timeouts (#57) discard 1056bd73 STAR-1200: Better logging for dtests (#55) discard 870ea8b1 STAR-899: Fix merge_schema_failure_4x.btm script to reflect our changed schema handling (#54) discard 1eb8a486 STAR-843: Update dtests for ULID based generation ID discard 084c47e6 STAR-822: Update test_consistent_repair dtest discard 453027ef STAR-836 Fix TestCompaction_with_UnifiedCompactionStrategy.bloomfilter_size_test (#41) discard 249d932c STAR-826 Add missing import (#40) discard f7320168 STAR-13 Run tests for UnifiedCompactionStrategy (#22) discard 499af0a0 STAR-385 Retry cluster stop after exception stopping 'gently' (#36) discard 4948edda STAR-386 Increase client timeout for test_simultaneous_bootstrap (#37) discard 0e9ebad9 STAR-517. Skip as it is not possible to test it reliably. (#34) discard b5856e9e STAR-386: Add logging around failure to get timestamp info (#28) discard 8a24acda STAR-765: Add tests for cloud connection. (#23) discard 3aee7310 STAR-543: Port guardrail tests and changes (#19) discard a28f01ab STAR-432: Add tests for consistency level options (#18) discard d7104e84 STAR-431: Add more tests to make sure commands work without --no-file-io too discard 3f68e3aa STAR-431: Add option to prevent any file-I/O from cqlsh discard aa0ec1ad STAR-452: add EverywhereStrategy smoke test (#10) discard e6505d94 STAR-254: add DateRange and Geo tests (#9) discard c035bbd1 STAR-14: Fix expectations to include memtable table parameter discard c0802af0 STAR-247: Add allowed warning for running scrub test discard 0a03225d STAR-247: Standalone scrubber should use the same default sstable format as specified for the test discard 453b2abf STAR-247: Allow to easily run tests against big or bti sstable format discard cd7a7240 STAR-582 fix repair error on one node cluster (#20) discard 6e2e4b2a Add pytest cache and vscode folders to gitignore (#21) discard c65e7ab5 STAR-564 Check only MODIFY on base when updating table with MV (#17) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 33/43: CNDB-10152: Fix Python DTests calls to pytest.fail() and skip() for newer pytest versions. Pin lowest expected pytest version in requirements.txt
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit b5cb1da62ad5ef646eba8bed86def3feee7d76b8
Author: Ekaterina Dimitrova
AuthorDate: Tue Jul 16 17:37:07 2024 -0400
CNDB-10152: Fix Python DTests calls to pytest.fail() and skip() for newer
pytest versions. Pin lowest expected pytest version in requirements.txt
---
bootstrap_test.py | 4 ++--
compaction_test.py | 8
conftest.py| 2 +-
mixed_version_test.py | 2 +-
native_transport_ssl_test.py | 4 ++--
offline_tools_test.py | 2 +-
paging_test.py | 2 +-
pushed_notifications_test.py | 4 ++--
rebuild_test.py| 2 +-
replica_side_filtering_test.py | 4 ++--
requirements.txt | 2 +-
upgrade_tests/cql_tests.py | 6 +++---
upgrade_tests/paging_test.py | 2 +-
upgrade_tests/upgrade_base.py | 2 +-
14 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/bootstrap_test.py b/bootstrap_test.py
index 9504e556..5b4e4882 100644
--- a/bootstrap_test.py
+++ b/bootstrap_test.py
@@ -1034,7 +1034,7 @@ class BootstrapTester(Tester):
try:
node2.nodetool('join')
-pytest.fail('nodetool should have errored and failed to join ring')
+pytest.fail(reason='nodetool should have errored and failed to
join ring')
except ToolError as t:
assert "Cannot join the ring until bootstrap completes" in t.stdout
@@ -1059,7 +1059,7 @@ class BootstrapTester(Tester):
try:
node3.nodetool('join')
-pytest.fail('nodetool should have errored and failed to join ring')
+pytest.fail(reason='nodetool should have errored and failed to
join ring')
except ToolError as t:
assert "Cannot join the ring until bootstrap completes" in t.stdout
diff --git a/compaction_test.py b/compaction_test.py
index d79f1326..a4e93eab 100644
--- a/compaction_test.py
+++ b/compaction_test.py
@@ -218,7 +218,7 @@ class TestCompaction(Tester):
self.skip_if_not_supported(strategy)
if strategy != 'DateTieredCompactionStrategy':
-pytest.skip('Not implemented unless DateTieredCompactionStrategy
is used')
+pytest.skip(reason='Not implemented unless
DateTieredCompactionStrategy is used')
cluster = self.cluster
cluster.populate(1).start()
@@ -561,7 +561,7 @@ class TestCompaction(Tester):
@jira_ticket CASSANDRA-11550
"""
if not hasattr(self, 'strategy') or strategy !=
'LeveledCompactionStrategy':
-pytest.skip('Not implemented unless LeveledCompactionStrategy is
used')
+pytest.skip(reason='Not implemented unless
LeveledCompactionStrategy is used')
cluster = self.cluster
cluster.populate(1).start()
@@ -605,11 +605,11 @@ class TestCompaction(Tester):
def skip_if_no_major_compaction(self, strategy):
if self.cluster.version() < '2.2' and strategy ==
'LeveledCompactionStrategy':
-pytest.skip('major compaction not implemented for LCS in this
version of Cassandra')
+pytest.skip(reason='major compaction not implemented for LCS in
this version of Cassandra')
def skip_if_not_supported(self, strategy):
if self.cluster.version() >= '5.0' and strategy ==
'DateTieredCompactionStrategy':
-pytest.skip('DateTieredCompactionStrategy is not supported in
Cassandra 5.0 and later')
+pytest.skip(reason='DateTieredCompactionStrategy is not supported
in Cassandra 5.0 and later')
def grep_sstables_in_each_level(node, table_name):
output = node.nodetool('tablestats').stdout
diff --git a/conftest.py b/conftest.py
index 785eceda..3d72c6a4 100644
--- a/conftest.py
+++ b/conftest.py
@@ -372,7 +372,7 @@ def fixture_dtest_setup(request,
errors = check_logs_for_errors(dtest_setup)
if len(errors) > 0:
failed = True
-pytest.fail('Unexpected error found in node logs (see stdout
for full details). Errors: [{errors}]'
+pytest.fail(reason='Unexpected error found in node logs (see
stdout for full details). Errors: [{errors}]'
.format(errors=str.join(", ", errors)),
pytrace=False)
finally:
try:
diff --git a/mixed_version_test.py b/mixed_version_test.py
index e4ad313f..a30d7341 100644
--- a/mixed_version_test.py
+++ b/mixed_version_test.py
@@ -31,7 +31,7 @@ class TestSchemaChanges(Tester):
elif ori
(cassandra-dtest) 39/43: CC5 fix test_disk_usage_guardrail
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit 651edfa5b37994b153714bd5be9e468ba2dd0ab7
Author: Brandon Williams
AuthorDate: Mon Jul 22 17:56:19 2024 -0500
CC5 fix test_disk_usage_guardrail
---
guardrails_test.py | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/guardrails_test.py b/guardrails_test.py
index bf883bba..7298c0ab 100644
--- a/guardrails_test.py
+++ b/guardrails_test.py
@@ -44,8 +44,11 @@ class TestGuardrails(BaseGuardrailsTester):
"""
self.fixture_dtest_setup.ignore_log_patterns = ["Write request failed
because disk usage exceeds failure threshold"]
-guardrails_config = {'guardrails':
{'disk_usage_percentage_warn_threshold': 98,
-
'disk_usage_percentage_failure_threshold': 99}}
+if self.supports_guardrails():
+guardrails_config = {'guardrails':
{'disk_usage_percentage_warn_threshold': 98,
+
'disk_usage_percentage_failure_threshold': 99}}
+else:
+guardrails_config = {'data_disk_usage_percentage_warn_threshold':
98, 'data_disk_usage_percentage_fail_threshold': 99}
logger.debug("prepare 2-node cluster with rf=1 and guardrails enabled")
session = self.prepare(rf=1, nodes=2, options=guardrails_config,
extra_jvm_args=['-Dcassandra.disk_usage.monitor_interval_ms=100'],
install_byteman=True)
@@ -83,7 +86,10 @@ class TestGuardrails(BaseGuardrailsTester):
fut = session2.execute_async("INSERT INTO t(id, v) VALUES({v},
{v})".format(v=x))
fut.result()
if fut.warnings:
-assert ["Replica disk usage exceeds warn threshold"] ==
fut.warnings
+if self.supports_guardrails():
+assert ["Replica disk usage exceeds warn threshold"] ==
fut.warnings
+else:
+assert ["Guardrail replica_disk_usage violated: Replica
disk usage exceeds warning threshold"] == fut.warnings
warnings = warnings + 1
assert rows != warnings,"Expect node2 emits some warnings, but got all
warnings"
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 22/43: STAR-822: Update test_consistent_repair dtest
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit 084c47e6593e9e57081f323ceeff8a2e4ac2afd0
Author: Jacek Lewandowski
AuthorDate: Mon Aug 16 11:31:18 2021 +0200
STAR-822: Update test_consistent_repair dtest
In DB-4215 compaction has been separated from repairs and that separation
seems to be pulled from DSE along with UCS. Therefore, checking for the repair
status depending on whether compaction was run or not is nor relevant any
longer.
This commit updates the test_consistent_repair to the version we have in
apollo-dtest.
(cherry picked from commit b454087c306ee5121fc338da679c842973229099)
(cherry picked from commit 0465be493e460b92e894a6ec34b9b5b8df701e33)
(cherry picked from commit 3348bc719b187fb80df2954020d5d92da78a62af)
(cherry picked from commit c71c48053d3be4724aabd4d715e23a430f4ab78a)
(cherry picked from commit 3cc377cdd4d05d466faa3dfd8ab2092f3d08fabe)
---
repair_tests/incremental_repair_test.py | 22 ++
1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/repair_tests/incremental_repair_test.py
b/repair_tests/incremental_repair_test.py
index d18b390d..26f11ded 100644
--- a/repair_tests/incremental_repair_test.py
+++ b/repair_tests/incremental_repair_test.py
@@ -145,38 +145,20 @@ class TestIncRepair(Tester):
results = list(session.execute("SELECT * FROM system.repairs"))
assert len(results) == 0, str(results)
-# disable compaction so we can verify sstables are marked pending
repair
-for node in self.cluster.nodelist():
-node.nodetool('disableautocompaction ks tbl')
-
+# repair
node1.repair(options=['ks'])
# check that all participating nodes have the repair recorded in their
system
# table, that all nodes are listed as participants, and that all
sstables are
# (still) marked pending repair
expected_participants = {n.address() for n in self.cluster.nodelist()}
-expected_participants_wp = {n.address_and_port() for n in
self.cluster.nodelist()}
-recorded_pending_ids = set()
for node in self.cluster.nodelist():
session = self.patient_exclusive_cql_connection(node)
results = list(session.execute("SELECT * FROM system.repairs"))
assert len(results) == 1
result = results[0]
assert set(result.participants) == expected_participants
-if hasattr(result, "participants_wp"):
-assert set(result.participants_wp) == expected_participants_wp
-assert result.state, ConsistentState.FINALIZED == "4=FINALIZED"
-pending_id = result.parent_id
-self.assertAllPendingRepairSSTables(node, 'ks', pending_id)
-recorded_pending_ids.add(pending_id)
-
-assert len(recorded_pending_ids) == 1
-
-# sstables are compacted out of pending repair by a compaction
-# task, we disabled compaction earlier in the test, so here we
-# force the compaction and check that all sstables are promoted
-for node in self.cluster.nodelist():
-node.nodetool('compact ks tbl')
+assert result.state == ConsistentState.FINALIZED, str(result.state)
self.assertAllRepairedSSTables(node, 'ks')
def test_sstable_marking(self):
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 40/43: CC5 fix test_sstablelevelreset
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24 in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git commit 4a64d1c27992c9885d6247da1ad60ed7c15d2356 Author: Brandon Williams AuthorDate: Tue Jul 23 13:23:10 2024 -0500 CC5 fix test_sstablelevelreset --- offline_tools_test.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/offline_tools_test.py b/offline_tools_test.py index 1d65349d..cf319395 100644 --- a/offline_tools_test.py +++ b/offline_tools_test.py @@ -472,7 +472,8 @@ class TestOfflineTools(Tester): "Picked up JAVA_TOOL_OPTIONS:", # Warnings for backward compatibility should be logged CASSANDRA-15234 "Small commitlog volume detected", - "parameters have been deprecated. They have new names and/or value format"] + "parameters have been deprecated. They have new names and/or value format", + "Unable to determine block size for commit log directory: null"] if len(error) > 0: for line in error.splitlines(): - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 42/43: Update .gitignore to include venv dir
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24 in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git commit 9a13a0452dc0794253433ece3502f677eb11731d Author: Jacek Lewandowski AuthorDate: Wed Jul 24 13:24:09 2024 +0200 Update .gitignore to include venv dir --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2f759f0f..2a661466 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,5 @@ pyvenv.cfg src/ .vscode/ -pytest.ini \ No newline at end of file +pytest.ini +venv \ No newline at end of file - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 23/43: STAR-843: Update dtests for ULID based generation ID
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit 1eb8a486033ea747807b2850ce306cb5dd99c202
Author: Jacek Lewandowski
AuthorDate: Fri Aug 20 10:25:19 2021 +0200
STAR-843: Update dtests for ULID based generation ID
(cherry picked from commit fd2ebacba869cd2eb5add9ce4d64e355a3ae350f)
(cherry picked from commit b85b0f00b5087c9eb76c37ce2396f0553ebd4100)
(cherry picked from commit 2e1b38a2965204a8d35a982c9da0acc4d4738ab9)
(cherry picked from commit 31b29946c23253acee54a3ab1a41dd80676ae80b)
(cherry picked from commit a265fbf6205872f738df7b523abd574dd436be3c)
---
scrub_test.py | 31 +++
1 file changed, 31 insertions(+)
diff --git a/scrub_test.py b/scrub_test.py
index 077a1b0d..3a113fc0 100644
--- a/scrub_test.py
+++ b/scrub_test.py
@@ -193,6 +193,25 @@ class TestHelper(Tester):
def uuid_sstable_identifiers_enabled(self, session):
return 'true' == session.execute("select value from
system_views.settings where name = 'uuid_sstable_identifiers_enabled'")[0][0]
+def get_latest_generation(self, sstables):
+"""
+Get the latest generation ID of the provided sstables
+"""
+latest_gen = None
+for table_or_index, table_sstables in list(sstables.items()):
+gen = max(parse.search('{}-{generation}-{}.{}',
s).named['generation'] for s in table_sstables)
+latest_gen = gen if latest_gen is None else max([gen, latest_gen])
+return latest_gen
+
+def get_earliest_generation(self, sstables):
+"""
+Get the earliest generation ID of the provided sstables
+"""
+earliest_gen = None
+for table_or_index, table_sstables in list(sstables.items()):
+gen = min(parse.search('{}-{generation}-{}.{}',
s).named['generation'] for s in table_sstables)
+earliest_gen = gen if earliest_gen is None else min([gen,
earliest_gen])
+return earliest_gen
@since('2.2')
class TestScrubIndexes(TestHelper):
@@ -258,13 +277,16 @@ class TestScrubIndexes(TestHelper):
if should_assert_sstables:
self.increase_sstable_generations(initial_sstables)
assert initial_sstables == scrubbed_sstables
+assert self.get_latest_generation(initial_sstables) <
self.get_earliest_generation(scrubbed_sstables)
users = self.query_users(session)
assert initial_users == users
# Scrub and check sstables and data again
+initial_sstables = scrubbed_sstables
scrubbed_sstables = self.scrub('users', 'gender_idx', 'state_idx',
'birth_year_idx')
+assert self.get_latest_generation(initial_sstables) <
self.get_earliest_generation(scrubbed_sstables)
if should_assert_sstables:
self.increase_sstable_generations(initial_sstables)
assert initial_sstables == scrubbed_sstables
@@ -301,6 +323,7 @@ class TestScrubIndexes(TestHelper):
scrubbed_sstables = self.standalonescrub('users', 'gender_idx',
'state_idx', 'birth_year_idx')
+assert self.get_latest_generation(initial_sstables) <
self.get_earliest_generation(scrubbed_sstables)
if should_assert_sstables:
self.increase_sstable_generations(initial_sstables)
assert initial_sstables == scrubbed_sstables
@@ -337,6 +360,7 @@ class TestScrubIndexes(TestHelper):
initial_sstables = self.flush('users', 'user_uuids_idx')
scrubbed_sstables = self.scrub('users', 'user_uuids_idx')
+assert self.get_latest_generation(initial_sstables) <
self.get_earliest_generation(scrubbed_sstables)
if should_assert_sstables:
self.increase_sstable_generations(initial_sstables)
assert initial_sstables == scrubbed_sstables
@@ -344,8 +368,10 @@ class TestScrubIndexes(TestHelper):
users = list(session.execute(("SELECT * from users where uuids
contains {some_uuid}").format(some_uuid=_id)))
assert initial_users == users
+initial_sstables = scrubbed_sstables
scrubbed_sstables = self.scrub('users', 'user_uuids_idx')
+assert self.get_latest_generation(initial_sstables) <
self.get_earliest_generation(scrubbed_sstables)
if should_assert_sstables:
self.increase_sstable_generations(initial_sstables)
assert initial_sstables == scrubbed_sstables
@@ -402,6 +428,7 @@ class TestScrub(TestHelper):
initial_sstables = self.flush('users')
scrubbed_sstabl
(cassandra-dtest) 31/43: STAR-1709: Add 'Small commitlog volume detected' to acceptable error messages (#65)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24 in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git commit 3b4e665ba4a894b4ccb75c829070fd7b1f6c4985 Author: Jacek Lewandowski <6516951+jacek-lewandow...@users.noreply.github.com> AuthorDate: Thu Nov 3 16:29:56 2022 +0100 STAR-1709: Add 'Small commitlog volume detected' to acceptable error messages (#65) (cherry picked from commit a23b2b93b9e487a3836380af6a55a0d7285ab260) (cherry picked from commit 34ced4f1f23e07a31dfadbc7c1a34c7fa9b26b24) --- offline_tools_test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/offline_tools_test.py b/offline_tools_test.py index e69786ea..81bbec0d 100644 --- a/offline_tools_test.py +++ b/offline_tools_test.py @@ -471,6 +471,7 @@ class TestOfflineTools(Tester): "Class JavaLaunchHelper is implemented in both", "Picked up JAVA_TOOL_OPTIONS:", # Warnings for backward compatibility should be logged CASSANDRA-15234 + "Small commitlog volume detected", "parameters have been deprecated. They have new names and/or value format"] if len(error) > 0: - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 27/43: STAR-386: Increase client timeout (#56)
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit a0940e67845be5843c6badb4c6e0741841594af4
Author: Jacek Lewandowski <6516951+jacek-lewandow...@users.noreply.github.com>
AuthorDate: Tue Mar 22 10:57:15 2022 +0100
STAR-386: Increase client timeout (#56)
(cherry picked from commit 4fc6bbc995ad466b2db1eb79d9221b1838e4f89b)
(cherry picked from commit 321c7ff0b9d7755eeafdecc99e828c9218aade5f)
(cherry picked from commit 24fea6b123e2002a9eb137bb767821af049e1b58)
(cherry picked from commit f8dda73f3f7a52922a94afa594562436d2347a14)
---
bootstrap_test.py | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/bootstrap_test.py b/bootstrap_test.py
index a9b72094..e9d6ac0e 100644
--- a/bootstrap_test.py
+++ b/bootstrap_test.py
@@ -894,6 +894,12 @@ class BootstrapTester(Tester):
" cannot bootstrap while
cassandra.consistent.rangemovement is true"
cluster = self.cluster
+configuration_options = {
+'request_timeout_in_ms': 12,
+'read_request_timeout_in_ms': 12,
+'range_request_timeout_in_ms': 12
+}
+cluster.set_configuration_options(configuration_options)
cluster.set_environment_variable('CASSANDRA_TOKEN_PREGENERATION_DISABLED',
'True')
cluster.populate(1)
cluster.start()
@@ -929,8 +935,10 @@ class BootstrapTester(Tester):
# bugs like 9484, where count(*) fails at higher
# data loads.
for _ in range(5):
+logger.info("Querying: SELECT count(*) from keyspace1.standard1")
# Improve reliability for slower/loaded test systems by using
larger client timeout
-assert_one(session, "SELECT count(*) from keyspace1.standard1",
[50], cl=ConsistencyLevel.ONE, timeout=30)
+assert_one(session, "SELECT count(*) from keyspace1.standard1",
[50], cl=ConsistencyLevel.ONE, timeout=180)
+logger.info("Querying completed")
def test_cleanup(self):
"""
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 24/43: STAR-899: Fix merge_schema_failure_4x.btm script to reflect our changed schema handling (#54)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24 in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git commit 870ea8b15f12bab7affa5f70826016491b574672 Author: Jacek Lewandowski <6516951+jacek-lewandow...@users.noreply.github.com> AuthorDate: Mon Mar 21 10:30:13 2022 +0100 STAR-899: Fix merge_schema_failure_4x.btm script to reflect our changed schema handling (#54) (cherry picked from commit a6b3347327f7eb3ed70098dd9eb77bbd5de4d71e) (cherry picked from commit 32e81d3701da0b6a01550349ec9b55a04b155957) (cherry picked from commit c4475e0918cf57802c07494be8b4327e4defd827) (cherry picked from commit 90dd2d6a391d49c1b50bbe8b5a47fda882a074a1) --- byteman/merge_schema_failure_4x.btm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/byteman/merge_schema_failure_4x.btm b/byteman/merge_schema_failure_4x.btm index 996852de..8ac84a43 100644 --- a/byteman/merge_schema_failure_4x.btm +++ b/byteman/merge_schema_failure_4x.btm @@ -2,8 +2,8 @@ # Inject node failure on merge schema exit. # RULE inject node failure on merge schema exit -CLASS org.apache.cassandra.schema.Schema -METHOD merge +CLASS org.apache.cassandra.schema.SchemaManager +METHOD mergeAndUpdateVersion AT EXIT # set flag to only run this rule once. IF TRUE - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 14/43: STAR-765: Add tests for cloud connection. (#23)
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit 8a24acdad4800d0e1d8a49cae65b9b3f4f7bb3bb
Author: Tomek Ĺasica
AuthorDate: Wed Jun 16 12:59:43 2021 +0200
STAR-765: Add tests for cloud connection. (#23)
* STAR-765: Add tests for cloud connection.
It is not possible without some infrastructre or tooling effort to trully
test cloud connection.
Instead added tests focus on proper cqlsh behavior when secure connect
bundle is specified:
- proper default consistency level
- debug information
- reading from cqlshrc and parameters
- skipping host / port information
Testing validation is based on error msgs and debug info.
(cherry picked from commit 9f8cba36d6bfbed92f9df0ccd86d8048d845d59b)
(cherry picked from commit 50bf8511799fc7f97d9f47a873630fef0c317108)
(cherry picked from commit e83d99a9e72dbe968af8dc25bf23c31571b27cb6)
(cherry picked from commit a7ef525eb1c5e1ee58470af15ba9aeea4054224b)
(cherry picked from commit 0dcfd76054d0c0c6a94c15a0b49c7ac3863e9c84)
(cherry picked from commit adbcf83d4af559b7e2c19540d6b2989d1d522035)
(cherry picked from commit a50effb8461495b2365f7df620aac8101cd12b91)
(cherry picked from commit 1120d6596498336f56e7f7b7d0d7056ed1be033a)
---
cqlsh_tests/cqlshrc.sample.cloud| 17 +
cqlsh_tests/secure-connect-test.zip | Bin 0 -> 12369 bytes
cqlsh_tests/test_cqlsh.py | 1 +
cqlsh_tests/test_cqlsh_cloud.py | 125
4 files changed, 143 insertions(+)
diff --git a/cqlsh_tests/cqlshrc.sample.cloud b/cqlsh_tests/cqlshrc.sample.cloud
new file mode 100644
index ..62528670
--- /dev/null
+++ b/cqlsh_tests/cqlshrc.sample.cloud
@@ -0,0 +1,17 @@
+; Copyright DataStax, Inc.
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+; Sample ~/.cqlshrc file with cloud configuration.
+[connection]
+secure_connect_bundle = /path/to/creds.zip
diff --git a/cqlsh_tests/secure-connect-test.zip
b/cqlsh_tests/secure-connect-test.zip
new file mode 100644
index ..bcd4a7fb
Binary files /dev/null and b/cqlsh_tests/secure-connect-test.zip differ
diff --git a/cqlsh_tests/test_cqlsh.py b/cqlsh_tests/test_cqlsh.py
index 5eea39ae..4395e0aa 100644
--- a/cqlsh_tests/test_cqlsh.py
+++ b/cqlsh_tests/test_cqlsh.py
@@ -98,6 +98,7 @@ class CqlshMixin():
logger.debug("Cqlsh command stderr:\n" + stderr)
return stdout, stderr
+
class TestCqlsh(Tester, CqlshMixin):
# override cluster options to enable user defined functions
diff --git a/cqlsh_tests/test_cqlsh_cloud.py b/cqlsh_tests/test_cqlsh_cloud.py
new file mode 100644
index ..626eaaba
--- /dev/null
+++ b/cqlsh_tests/test_cqlsh_cloud.py
@@ -0,0 +1,125 @@
+# coding=utf-8
+
+# Copyright DataStax, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import logging
+import pytest
+from ccmlib.node import ToolError
+
+from dtest import Tester
+
+logger = logging.getLogger(__name__)
+since = pytest.mark.since
+
+
+@since("4.0")
+class TestSecureBundleConnection(Tester):
+"""
+Tests related to cqlsh behavior for cloud e.g. secure bundle connection.
+We only test cqlshrc behavior.
+Testing if the connection using secure bundle is really working
+requires a true cluster with generated secure bundle to run.
+And this is not possible without testing infrastructure/tooling changes.
+
+We can assume that it is correctly tested by the python driver or
+will be tested in the next stage of testing (cloud native).
+
+Validation is done using --debug information or error msgs.
+
+Inspired by STAR-765.
+"""
+
+CQLSHRC_PATH = 'cqlsh_tests/cqlshrc.sample.cloud'
+BUNDLE_PATH = 'cqlsh
(cassandra-dtest) 35/43: CNDB-9974: Fix test_udf_scripting
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit 2c1777cc5be56bcc4a50f28511fbaf8eba4e465d
Author: Ekaterina Dimitrova
AuthorDate: Mon Jul 15 11:50:37 2024 -0400
CNDB-9974: Fix test_udf_scripting
---
user_functions_test.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/user_functions_test.py b/user_functions_test.py
index eb53a5de..f419337d 100644
--- a/user_functions_test.py
+++ b/user_functions_test.py
@@ -170,7 +170,7 @@ class TestUserFunctions(Tester):
# should now work - unambiguous
session.execute("DROP FUNCTION overloaded")
-@since('3.0', max_version='4.0.x')
+@since('3.0', max_version='3.11.x')
def test_udf_scripting(self):
session = self.prepare()
session.execute("create table nums (key int primary key, val double);")
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 41/43: CC5 fix secondary_indexes_test::TestPreJoinCallback tests
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit 097ebfc1a6a07a90c7301bb0c94c24e51399730d
Author: Brandon Williams
AuthorDate: Tue Jul 23 15:35:52 2024 -0500
CC5 fix secondary_indexes_test::TestPreJoinCallback tests
---
secondary_indexes_test.py | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/secondary_indexes_test.py b/secondary_indexes_test.py
index 1e14d636..2dc34881 100644
--- a/secondary_indexes_test.py
+++ b/secondary_indexes_test.py
@@ -1224,7 +1224,7 @@ class TestPreJoinCallback(Tester):
node2 = new_node(cluster)
node2.set_configuration_options(values={'initial_token': token})
node2.start(wait_for_binary_proto=True)
-assert node2.grep_log('Executing pre-join post-bootstrap tasks')
+assert node2.grep_log('Executing pre-join post-bootstrap tasks',
filename='debug.log')
self._base_test(bootstrap)
@@ -1255,7 +1255,7 @@ class TestPreJoinCallback(Tester):
node2.nodetool(BootstrapTester.nodetool_resume_command(cluster))
node2.watch_log_for('Starting listening for CQL clients')
assert_bootstrap_state(self, node2, 'COMPLETED')
-assert node2.grep_log('Executing pre-join post-bootstrap tasks')
+assert node2.grep_log('Executing pre-join post-bootstrap tasks',
filename='debug.log')
self._base_test(resume)
@@ -1265,10 +1265,10 @@ class TestPreJoinCallback(Tester):
node2.set_configuration_options(values={'initial_token': token})
node2.start(join_ring=False, wait_for_binary_proto=True,
wait_other_notice=240)
assert node2.grep_log('Not joining ring as requested')
-assert not node2.grep_log('Executing pre-join')
+assert not node2.grep_log('Executing pre-join',
filename='debug.log')
node2.nodetool("join")
-assert node2.grep_log('Executing pre-join post-bootstrap tasks')
+assert node2.grep_log('Executing pre-join post-bootstrap tasks',
filename='debug.log')
self._base_test(manual_join)
@@ -1278,10 +1278,10 @@ class TestPreJoinCallback(Tester):
node2.set_configuration_options(values={'initial_token': token})
node2.start(jvm_args=["-Dcassandra.write_survey=true"],
wait_for_binary_proto=True)
assert node2.grep_log('Startup complete, but write survey mode is
active, not becoming an active ring member.')
-assert not node2.grep_log('Executing pre-join')
+assert not node2.grep_log('Executing pre-join',
filename='debug.log')
node2.nodetool("join")
assert node2.grep_log('Leaving write survey mode and joining ring
at operator request')
-assert node2.grep_log('Executing pre-join post-bootstrap tasks')
+assert node2.grep_log('Executing pre-join post-bootstrap tasks',
filename='debug.log')
self._base_test(write_survey_and_join)
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 26/43: STAR-394: Fix various timeouts (#57)
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit ae43e91b5209b08d4d19433d62b7efca8343946d
Author: Jacek Lewandowski <6516951+jacek-lewandow...@users.noreply.github.com>
AuthorDate: Mon Mar 21 22:40:00 2022 +0100
STAR-394: Fix various timeouts (#57)
(cherry picked from commit adc354645eb7e7d0f49068881ef70cec183de8c7)
(cherry picked from commit c3dc2f54c63423d186e4a0864ce991518115fd0c)
(cherry picked from commit a586a26f9069a3be289f8745e3389bd7ec369a5e)
(cherry picked from commit 181ad9e4bcdb11bca0ac55d36fce2ae4aa06619f)
---
cqlsh_tests/test_cqlsh_copy.py | 9 ++---
dtest_setup.py | 6 --
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/cqlsh_tests/test_cqlsh_copy.py b/cqlsh_tests/test_cqlsh_copy.py
index 67ea0cdc..a2e69136 100644
--- a/cqlsh_tests/test_cqlsh_copy.py
+++ b/cqlsh_tests/test_cqlsh_copy.py
@@ -123,9 +123,9 @@ class TestCqlshCopy(Tester):
if auth_enabled:
self.node1.watch_log_for('Created default superuser')
-self.session = self.patient_cql_connection(self.node1,
user='cassandra', password='cassandra')
+self.session = self.patient_cql_connection(self.node1,
user='cassandra', password='cassandra', request_timeout=30.0)
else:
-self.session = self.patient_cql_connection(self.node1)
+self.session = self.patient_cql_connection(self.node1,
request_timeout=30.0)
self.session.execute('DROP KEYSPACE IF EXISTS ks')
self.ks = 'ks'
@@ -2387,6 +2387,9 @@ class TestCqlshCopy(Tester):
# enough for truncating larger tables, see CASSANDRA-11157
if 'truncate_request_timeout_in_ms' not in configuration_options:
configuration_options['truncate_request_timeout_in_ms'] = 6
+configuration_options['request_timeout_in_ms'] = 6
+configuration_options['read_request_timeout_in_ms'] = 6
+configuration_options['range_request_timeout_in_ms'] = 6
self.prepare(nodes=nodes, partitioner=partitioner,
configuration_options=configuration_options)
@@ -2406,7 +2409,7 @@ class TestCqlshCopy(Tester):
else:
count_statement = SimpleStatement("SELECT COUNT(*) FROM
{}".format(stress_table), consistency_level=ConsistencyLevel.ALL,
retry_policy=FlakyRetryPolicy(max_retries=3))
-ret = rows_to_list(self.session.execute(count_statement))[0][0]
+ret = rows_to_list(self.session.execute(query=count_statement,
timeout=60.0))[0][0]
logger.debug('Generated {} records'.format(ret))
assert ret >= num_operations, 'cassandra-stress did not import
enough records'
return ret
diff --git a/dtest_setup.py b/dtest_setup.py
index 2aa7b0f4..f5a9e808 100644
--- a/dtest_setup.py
+++ b/dtest_setup.py
@@ -256,7 +256,9 @@ class DTestSetup(object):
protocol_version=protocol_version,
port=port,
ssl_options=ssl_opts,
-connect_timeout=15,
+connect_timeout=60,
+idle_heartbeat_timeout=60,
+idle_heartbeat_interval=60,
allow_beta_protocol_version=True,
execution_profiles=profiles)
session = cluster.connect(wait_for_all_pools=True)
@@ -268,7 +270,7 @@ class DTestSetup(object):
return session
def patient_cql_connection(self, node, keyspace=None,
- user=None, password=None, timeout=30,
compression=True,
+ user=None, password=None, timeout=60,
compression=True,
protocol_version=None, port=None,
ssl_opts=None, **kwargs):
"""
Returns a connection after it stops throwing NoHostAvailables due to
not being ready.
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 09/43: STAR-452: add EverywhereStrategy smoke test (#10)
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit aa0ec1ad16c70e331cf551aaf8b6bdfcc9bb30b9
Author: Jaroslaw Grabowski
AuthorDate: Wed Apr 21 14:50:11 2021 +0200
STAR-452: add EverywhereStrategy smoke test (#10)
(cherry picked from commit eb3049c6e2e79dd13da68187cf3d67a2577228cf)
(cherry picked from commit fe23e0b086ef342de3003ff27c163217dd8fd207)
(cherry picked from commit af5e094eb6ad961c9aee0ab465f128908ca1bcfa)
(cherry picked from commit caaa548d0ad3f9bb224048d8f070fea45340974a)
(cherry picked from commit 31b6a863c0ebb0603ef532a342ccecdf35721dd9)
(cherry picked from commit c32760d592334be9e7ddf06c9d36647b7904f969)
(cherry picked from commit abc36a89f8dbde26a97a3332e4260d9734e5c6d7)
(cherry picked from commit 510ee55b6746c8e1a7dca35ef19e1bddfb499564)
(cherry picked from commit c7d5965e3c66bd87dc52ead26014e610b435d00b)
---
bootstrap_test.py | 50 ++
dtest.py | 2 +
...AR-452: add EverywhereStrategy smoke test (#10) | 41 ++
3 files changed, 93 insertions(+)
diff --git a/bootstrap_test.py b/bootstrap_test.py
index ec01b892..043a734a 100644
--- a/bootstrap_test.py
+++ b/bootstrap_test.py
@@ -1075,6 +1075,56 @@ class BootstrapTester(Tester):
nt_resume_cmd += ' -f'
return nt_resume_cmd
+@since('4.0')
+@pytest.mark.no_vnodes
+def test_simple_bootstrap_with_everywhere_strategy(self):
+cluster = self.cluster
+tokens = cluster.balanced_tokens(2)
+cluster.set_configuration_options(values={'num_tokens': 1})
+
+logger.debug("[node1, node2] tokens: %r" % (tokens,))
+
+keys = 1
+
+# Create a single node cluster
+cluster.populate(1)
+node1 = cluster.nodelist()[0]
+node1.set_configuration_options(values={'initial_token': tokens[0]})
+cluster.start()
+
+session = self.patient_cql_connection(node1)
+create_ks(session, 'ks', 'EverywhereStrategy')
+create_cf(session, 'cf', columns={'c1': 'text', 'c2': 'text'})
+
+insert_statement = session.prepare("INSERT INTO ks.cf (key, c1, c2)
VALUES (?, 'value1', 'value2')")
+execute_concurrent_with_args(session, insert_statement, [['k%d' % k]
for k in range(keys)])
+
+node1.flush()
+node1.compact()
+
+# Reads inserted data all during the bootstrap process. We shouldn't
+# get any error
+query_c1c2(session, random.randint(0, keys - 1), ConsistencyLevel.ONE)
+session.shutdown()
+
+# Bootstrapping a new node in the current version
+node2 = new_node(cluster)
+node2.set_configuration_options(values={'initial_token': tokens[1]})
+node2.start(wait_for_binary_proto=True)
+node2.compact()
+
+node1.cleanup()
+logger.debug("node1 size for ks.cf after cleanup: %s" %
float(data_size(node1,'ks','cf')))
+node1.compact()
+logger.debug("node1 size for ks.cf after compacting: %s" %
float(data_size(node1,'ks','cf')))
+
+logger.debug("node2 size for ks.cf after compacting: %s" %
float(data_size(node2,'ks','cf')))
+
+size1 = float(data_size(node1,'ks','cf'))
+size2 = float(data_size(node2,'ks','cf'))
+assert_almost_equal(size1, size2, error=0.3)
+
+assert_bootstrap_state(self, node2, 'COMPLETED')
class TestBootstrap(BootstrapTester):
"""
diff --git a/dtest.py b/dtest.py
index da7b31a7..fbbf4e30 100644
--- a/dtest.py
+++ b/dtest.py
@@ -383,6 +383,8 @@ def create_ks(session, name, rf):
if isinstance(rf, int):
# we assume simpleStrategy
query = query % (name, "'class':'SimpleStrategy',
'replication_factor':%d" % rf)
+elif 'EverywhereStrategy' in rf:
+query = query % (name,
"'class':'org.apache.cassandra.locator.EverywhereStrategy'")
else:
assert len(rf) >= 0, "At least one datacenter/rf pair is needed"
# we assume networkTopologyStrategy
diff --git a/update-history/oss-4.0.11/23-510ee55b STAR-452: add
EverywhereStrategy smoke test (#10) b/update-history/oss-4.0.11/23-510ee55b
STAR-452: add EverywhereStrategy smoke test (#10)
new file mode 100644
index ..2d3121de
--- /dev/null
+++ b/update-history/oss-4.0.11/23-510ee55b STAR-452: add EverywhereStrategy
smoke test (#10)
@@ -0,0 +1
(cassandra-dtest) 20/43: STAR-826 Add missing import (#40)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24 in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git commit 249d932c228b02af0b6e989faad21aa44cb8ab7b Author: Aleksandr Sorokoumov <918393+ger...@users.noreply.github.com> AuthorDate: Fri Jul 16 17:55:55 2021 +0200 STAR-826 Add missing import (#40) (cherry picked from commit 7c8489fe7b4435912d7b383a82d56f9038249934) (cherry picked from commit 9196eaa474b401904da0e56ecc7bfa97035aca7f) (cherry picked from commit 28c71d11e56dd950b05c37abf9931e7f9f4dfc87) (cherry picked from commit 2880475b0cae0f0e10a82295558479eb5da926e9) (cherry picked from commit 2a984ffe70b94e9a067a7d9f6de16a53c8d191e3) (cherry picked from commit aad664ba397ab601668cf3592712d70e4741) --- repair_tests/repair_test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/repair_tests/repair_test.py b/repair_tests/repair_test.py index 341276ee..18861c84 100644 --- a/repair_tests/repair_test.py +++ b/repair_tests/repair_test.py @@ -1,6 +1,7 @@ import os import os.path import threading +import tempfile import time import re import pytest - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) branch ds-trunk-5.0--2024-07-24 created (now 8bc66787)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch ds-trunk-5.0--2024-07-24 in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git at 8bc66787 update deps This branch includes the following new commits: new c65e7ab5 STAR-564 Check only MODIFY on base when updating table with MV (#17) new 6e2e4b2a Add pytest cache and vscode folders to gitignore (#21) new cd7a7240 STAR-582 fix repair error on one node cluster (#20) new 453b2abf STAR-247: Allow to easily run tests against big or bti sstable format new 0a03225d STAR-247: Standalone scrubber should use the same default sstable format as specified for the test new c0802af0 STAR-247: Add allowed warning for running scrub test new c035bbd1 STAR-14: Fix expectations to include memtable table parameter new e6505d94 STAR-254: add DateRange and Geo tests (#9) new aa0ec1ad STAR-452: add EverywhereStrategy smoke test (#10) new 3f68e3aa STAR-431: Add option to prevent any file-I/O from cqlsh new d7104e84 STAR-431: Add more tests to make sure commands work without --no-file-io too new a28f01ab STAR-432: Add tests for consistency level options (#18) new 3aee7310 STAR-543: Port guardrail tests and changes (#19) new 8a24acda STAR-765: Add tests for cloud connection. (#23) new b5856e9e STAR-386: Add logging around failure to get timestamp info (#28) new 0e9ebad9 STAR-517. Skip as it is not possible to test it reliably. (#34) new 4948edda STAR-386 Increase client timeout for test_simultaneous_bootstrap (#37) new 499af0a0 STAR-385 Retry cluster stop after exception stopping 'gently' (#36) new f7320168 STAR-13 Run tests for UnifiedCompactionStrategy (#22) new 249d932c STAR-826 Add missing import (#40) new 453027ef STAR-836 Fix TestCompaction_with_UnifiedCompactionStrategy.bloomfilter_size_test (#41) new 084c47e6 STAR-822: Update test_consistent_repair dtest new 1eb8a486 STAR-843: Update dtests for ULID based generation ID new 870ea8b1 STAR-899: Fix merge_schema_failure_4x.btm script to reflect our changed schema handling (#54) new 1056bd73 STAR-1200: Better logging for dtests (#55) new ae43e91b STAR-394: Fix various timeouts (#57) new a0940e67 STAR-386: Increase client timeout (#56) new 8f9f4d8d STAR-899 Fix class name used from SchemaManager to Schema (#58) new e885e2f0 Star 1329 (#61) new 02e67cdd STAR-1589: Fix typos in bootstrap_test.py (#62) new 3b4e665b STAR-1709: Add 'Small commitlog volume detected' to acceptable error messages (#65) new 63ebd01b CNDB-10194 Fix dtests not running in jenkins Replace java_version with CURRENT_JAVA_VERSION in upgrade_through_versions_test.py Ignore JAVAxx_HOME in upgrade_manifest.jdk_compatible_steps Add additional debugging new b5cb1da6 CNDB-10152: Fix Python DTests calls to pytest.fail() and skip() for newer pytest versions. Pin lowest expected pytest version in requirements.txt new 30240a9b CNDB-9974: Fix tests for CASSANDRA-18252 - removal of scripted UDFs new 2c1777cc CNDB-9974: Fix test_udf_scripting new 15862181 CC5 fix support_guardrails() new afa43a28 CC5 fix jmx_test.py::TestJMX::test_compaction new 92bd7ce8 CC5 fix pushed_notifications new 651edfa5 CC5 fix test_disk_usage_guardrail new 4a64d1c2 CC5 fix test_sstablelevelreset new 097ebfc1 CC5 fix secondary_indexes_test::TestPreJoinCallback tests new 9a13a045 Update .gitignore to include venv dir new 8bc66787 update deps The 43 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 08/43: STAR-254: add DateRange and Geo tests (#9)
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit e6505d94b64ec07ca846c647d6c744dc154c5f1a
Author: Jaroslaw Grabowski
AuthorDate: Tue Apr 20 11:12:04 2021 +0200
STAR-254: add DateRange and Geo tests (#9)
* STAR-254 add tests for geo and date range types
(cherry picked from commit d15a708fb52aec3f5e2f5e69ecc6b9b1780d2942)
(cherry picked from commit 5bd412faa8716d8d3442b99867d939bbe150460e)
(cherry picked from commit 3a6ba36bacbf147970e43e68c559cd913d358adf)
(cherry picked from commit 8a10d56986c1778b62843173801485096c59c613)
(cherry picked from commit 30e81dc3be20125bfaed39e1882324730bf113a0)
(cherry picked from commit 5600c72e0a7ff6cb119483bbdde190353a2bb4c6)
(cherry picked from commit b45414e394ef252f4d2b44f255b4b7a102762d78)
(cherry picked from commit 80809909717b82cb064dcd9f482a2d5db6f157d0)
(cherry picked from commit ba3f6699101da313fe3554c9dc72ffc9fb150cb8)
---
cqlsh_tests/test_cqlsh_copy.py | 76 +
cqlsh_tests/test_cqlsh_types.py | 67
2 files changed, 143 insertions(+)
diff --git a/cqlsh_tests/test_cqlsh_copy.py b/cqlsh_tests/test_cqlsh_copy.py
index 396de32e..2f4725f2 100644
--- a/cqlsh_tests/test_cqlsh_copy.py
+++ b/cqlsh_tests/test_cqlsh_copy.py
@@ -3336,3 +3336,79 @@ class TestCqlshCopy(Tester):
_test_invalid_data_for_sets()
_test_invalid_data_for_lists()
_test_invalid_data_for_maps()
+
+@since('4.0')
+def test_geotypes_copy(self):
+"""
+Tests whether cqlsh COPY properly handles geo types with empty and
null values.
+
+@since 4.0.0
+
+Steps:
+* insert several geoTypes with null and empty values among them into a
table
+* cqlsh copy contents to .csv file and save them in a list
+* wipe the table comletely of all data
+* cqlsh copy contents from .csv back into the table
+* get the contents of the table into a list
+* assert the pre wiped data is the same as the newly copied data
+:return
+"""
+self.prepare()
+
+self.session.execute("create table geo (k int primary key, point
'PointType', line 'LineStringType', poly 'PolygonType');")
+self.session.execute("insert into geo (k, point, line, poly) VALUES
(0, 'point(1.2 3.4)', 'linestring(1.0 1.1, 2.0 2.1, 3.0 3.1)', 'POLYGON ((10.1
10.0, 110.0 10.0, 110.0 110.0, 10.0 110.0, 10.0 10.0), (20.0 20.0, 20.0 30.0,
30.0 30.0, 30.0 20.0, 20.0 20.0))');")
+self.session.execute("insert into geo (k, point, line, poly) VALUES
(2, 'point(1.2 3.4)', 'linestring EMPTY', 'POLYGON EMPTY');")
+self.session.execute("insert into geo (k) VALUES (1);")
+
+# make sure data is inserted
+data_actual = rows_to_list(self.session.execute("select * from geo;"))
+assert len(data_actual) == 3
+
+# dump data to CSV and truncate
+tempfile = self.get_temp_file()
+self.run_cqlsh(cmds="COPY ks.geo TO
'{name}'".format(name=tempfile.name))
+self.run_cqlsh(cmds="truncate ks.geo;")
+
+# import data back
+self.run_cqlsh(cmds="COPY ks.geo FROM
'{name}'".format(name=tempfile.name))
+data_copy = rows_to_list(self.session.execute("select * from geo;"))
+
+assert data_actual == data_copy
+
+@since("4.0")
+def test_date_range_copy(self):
+"""
+DateRangeTests.test_copy_command
+
+Tests whether cqlsh COPY properly handles date_range types, including
null values.
+@note we cannot insert empty value ('') as it is not presented as null
in cqlsh but it is in COPY
+"""
+self.prepare()
+
+self.session.execute("create table incomes (org text, period
'DateRangeType', incomes int, ver 'DateRangeType', primary key (org, period));")
+# insert some data
+self.session.execute("insert into incomes(org, period, incomes) values
('A','2014', 20140);")
+self.session.execute("insert into incomes(org, period, incomes) values
('A','2015', 201500);")
+self.session.execute("insert into incomes(org, period, incomes) values
('A','[2016-01-01 TO 2016-06-30]', 1007);")
+self.session.execute("insert into incomes(org, period, incomes) values
('B','[2017-02-12 12:30:07 TO 2017-02-17 13:39:43.789]', 777);")
+self.session.exe
(cassandra-dtest) 29/43: Star 1329 (#61)
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit e885e2f0ed1508413f67fe49807b8eed24112d88
Author: Mike Adamson
AuthorDate: Tue Jul 12 10:06:57 2022 +0100
Star 1329 (#61)
* Use converged-cassandra branch of ccm
* Make sure metadata is correctly cleaned
(cherry picked from commit 0e4aaec5f3c77cce1b362c98afacc7700a0a3188)
(cherry picked from commit de5b64bb86fd125633cfe12c7f43cf0dcf49c3c1)
(cherry picked from commit 2dd11030271d0f7e1ffd94bc8964f056a9870ce8)
---
bootstrap_test.py | 13 ++---
replace_address_test.py | 8 +++-
requirements.txt| 2 +-
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/bootstrap_test.py b/bootstrap_test.py
index e9d6ac0e..ceed5a22 100644
--- a/bootstrap_test.py
+++ b/bootstrap_test.py
@@ -734,13 +734,7 @@ class BootstrapTester(Tester):
node2.stop(wait_other_notice=False)
# Wipe its data
-for data_dir in node2.data_directories():
-logger.debug("Deleting {}".format(data_dir))
-shutil.rmtree(data_dir)
-
-commitlog_dir = os.path.join(node2.get_path(), 'commitlogs')
-logger.debug("Deleting {}".format(commitlog_dir))
-shutil.rmtree(commitlog_dir)
+self_cleanup(node2)
# Now start it, it should be allowed to join
mark = node2.mark_log()
@@ -987,6 +981,11 @@ class BootstrapTester(Tester):
logger.debug("Deleting {}".format(data_dir))
shutil.rmtree(data_dir)
shutil.rmtree(commitlog_dir)
+metadata_dir = os.path.join(node.get_path(), 'metadata')
+if os.path.exists(metadata_dir):
+debug("Deleting {}".format(metadata_dir))
+shutil.rmtree(metadata_dir)
+
@since('2.2')
@pytest.mark.ported_to_in_jvm # see
org.apache.cassandra.distributed.test.BootstrapBinaryDisabledTest
diff --git a/replace_address_test.py b/replace_address_test.py
index 9430aa21..48903228 100644
--- a/replace_address_test.py
+++ b/replace_address_test.py
@@ -388,6 +388,7 @@ class TestReplaceAddress(BaseReplaceAddressTest):
# completely delete the data, commitlog, and saved caches
for d in chain([os.path.join(node3.get_path(), "commitlogs")],
[os.path.join(node3.get_path(), "saved_caches")],
+ [os.path.join(node3.get_path(), "metadata")],
node3.data_directories()):
if os.path.exists(d):
rmtree(d)
@@ -424,6 +425,7 @@ class TestReplaceAddress(BaseReplaceAddressTest):
for d in chain([os.path.join(node3.get_path(), "commitlogs")],
[os.path.join(node3.get_path(), "saved_caches")],
+ [os.path.join(node3.get_path(), "metadata")],
node3.data_directories()):
if os.path.exists(d):
rmtree(d)
@@ -469,7 +471,7 @@ class TestReplaceAddress(BaseReplaceAddressTest):
if os.path.exists(system_data):
rmtree(system_data)
-for d in ['commitlogs', 'saved_caches']:
+for d in ['commitlogs', 'saved_caches', 'metadata']:
p = os.path.join(self.replacement_node.get_path(), d)
if os.path.exists(p):
rmtree(p)
@@ -706,3 +708,7 @@ class TestReplaceAddress(BaseReplaceAddressTest):
logger.debug("Deleting {}".format(data_dir))
rmtree(data_dir)
rmtree(commitlog_dir)
+metadata_dir = os.path.join(node.get_path(), 'metadata')
+if os.path.exists(metadata_dir):
+rmtree(metadata_dir)
+
diff --git a/requirements.txt b/requirements.txt
index a2187d5a..df15c7d1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@
#
# In case you want to test a patch with your own CCM branch, further to
changing below CCM repo and branch name, you need to add -e flag at the
beginning
# Example: -e git+https://github.com/userb/ccm.git@cassandra-17182#egg=ccm
-git+https://github.com/riptano/ccm.git@cassandra-test#egg=ccm
+git+https://github.com/riptano/ccm.git@converged-cassandra#egg=ccm
click==8.0.4
decorator==5.1.1
docopt==0.6.2
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 07/43: STAR-14: Fix expectations to include memtable table parameter
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit c035bbd102821ff85c695dcf2e4741b0037d553f
Author: Branimir Lambov
AuthorDate: Mon Apr 12 11:56:25 2021 +0300
STAR-14: Fix expectations to include memtable table parameter
(cherry picked from commit 353b1f13362cf3081bf908f636b0c886100e98f1)
(cherry picked from commit 1cbc8d5b4a61c564a4c334b357cba3b48a44eac6)
(cherry picked from commit ee9b61242476135852e38df8cb18b1adf25dc73d)
(cherry picked from commit e3e226a78f4bcc4dd33aa10c099415f25994547e)
(cherry picked from commit b52785321ab06fcbe13ade67ed8f61c40ad75d19)
(cherry picked from commit 581f69b74beb04a61bf9b49414cedcec76eec7e3)
(cherry picked from commit d0482217c13d103c37794ead82fe721391b1708a)
(cherry picked from commit fe78fdb9783e9d867110bffaeb8e1a419fcc5d57)
(cherry picked from commit c3eaa831c00a806281c7dd20f9379ed730b762c7)
---
cqlsh_tests/test_cqlsh.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/cqlsh_tests/test_cqlsh.py b/cqlsh_tests/test_cqlsh.py
index 3619aa76..b7e3a16f 100644
--- a/cqlsh_tests/test_cqlsh.py
+++ b/cqlsh_tests/test_cqlsh.py
@@ -1234,6 +1234,7 @@ CREATE TYPE test.address_type (
AND comment = ''
AND compaction = {'class':
'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy',
'max_threshold': '32', 'min_threshold': '4'}
AND compression = {'chunk_length_in_kb': '16', 'class':
'org.apache.cassandra.io.compress.LZ4Compressor'}
+AND memtable = {}
AND crc_check_chance = 1.0
AND default_time_to_live = 0
AND extensions = {}
@@ -1375,6 +1376,7 @@ CREATE TYPE test.address_type (
AND comment = ''
AND compaction = {'class':
'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy',
'max_threshold': '32', 'min_threshold': '4'}
AND compression = {'chunk_length_in_kb': '16', 'class':
'org.apache.cassandra.io.compress.LZ4Compressor'}
+AND memtable = {}
AND crc_check_chance = 1.0
AND default_time_to_live = 0
AND extensions = {}
@@ -1539,6 +1541,7 @@ CREATE TYPE test.address_type (
AND comment = ''
AND compaction = {'class':
'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy',
'max_threshold': '32', 'min_threshold': '4'}
AND compression = {'chunk_length_in_kb': '16', 'class':
'org.apache.cassandra.io.compress.LZ4Compressor'}
+AND memtable = {}
AND crc_check_chance = 1.0
AND extensions = {}
AND gc_grace_seconds = 864000
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 02/43: Add pytest cache and vscode folders to gitignore (#21)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24 in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git commit 6e2e4b2aa745fba317c80636afc0f6c54b111cac Author: Ruslan Fomkin AuthorDate: Tue Jun 8 16:40:03 2021 +0200 Add pytest cache and vscode folders to gitignore (#21) (cherry picked from commit b3bd616201ef5c41ad088954077a8467148c8626) (cherry picked from commit f2c37011d7dc21016fa33103625529e85994e595) (cherry picked from commit ba91f9d5360a67a2eec3ae85940996a353e518f0) (cherry picked from commit cce73fba67ba80cedcb0abacbd813da111e41080) (cherry picked from commit bdf8a96c70ce8e2e53e980d49456761b736ac28b) (cherry picked from commit 12d429237463c7b0f1c31961cc58e8a636cc0846) (cherry picked from commit bb617406caf78dba9c7256bb4a0fdfa7b2af75af) (cherry picked from commit f64ad5bc5f0fbcc07dbbb7d0ec5862bb97e1d303) --- .gitignore| 1 + ...Add pytest cache and vscode folders to gitignore (#21) | 15 +++ 2 files changed, 16 insertions(+) diff --git a/.gitignore b/.gitignore index bfe340cb..13045e5b 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ bin/ lib/ pyvenv.cfg src/ +.vscode/ diff --git a/update-history/oss-4.0.11/31-bb617406 Add pytest cache and vscode folders to gitignore (#21) b/update-history/oss-4.0.11/31-bb617406 Add pytest cache and vscode folders to gitignore (#21) new file mode 100644 index ..324544e8 --- /dev/null +++ b/update-history/oss-4.0.11/31-bb617406 Add pytest cache and vscode folders to gitignore (#21) @@ -0,0 +1,15 @@ +--- a/.gitignore b/.gitignore +@@ -11,12 +11,9 @@ + html/ + doxygen/doxypy-0.4.2/ + .pytest_cache/ +-<<<<<<< + + bin/ + lib/ + pyvenv.cfg + src/ +-=== + .vscode/ +->>>>>>> - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 34/43: CNDB-9974: Fix tests for CASSANDRA-18252 - removal of scripted UDFs
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit 30240a9b5a21411103b0bddf43b0ebe594da45fe
Author: Ekaterina Dimitrova
AuthorDate: Thu Feb 9 20:05:23 2023 -0500
CNDB-9974: Fix tests for CASSANDRA-18252 - removal of scripted UDFs
The ticket also fixes STAR-1886. Backporting CASSANDRA-17190 required also
CASSANDRA-17383.
---
auth_test.py | 30 +-
cqlsh_tests/test_cqlsh.py | 2 +-
schema_metadata_test.py| 2 +-
upgrade_tests/upgrade_through_versions_test.py | 7 +++---
user_functions_test.py | 8 +++
5 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/auth_test.py b/auth_test.py
index a29e8be4..7d6198b8 100644
--- a/auth_test.py
+++ b/auth_test.py
@@ -1229,7 +1229,7 @@ class TestAuthRoles(AbstractTestAuth):
@jira_ticket CASSANDRA-7653
"""
dtest_setup_overrides = DTestSetupOverrides()
-if '3.0' <= dtest_config.cassandra_version_from_build < '4.2':
+if '3.0' <= dtest_config.cassandra_version_from_build < '4.0':
dtest_setup_overrides.cluster_options =
ImmutableMapping({'enable_user_defined_functions': 'true',
'enable_scripted_user_defined_functions': 'true'})
else:
@@ -1401,7 +1401,7 @@ class TestAuthRoles(AbstractTestAuth):
as_mike.execute("CREATE KEYSPACE ks WITH replication =
{'class':'SimpleStrategy', 'replication_factor':1}")
as_mike.execute("CREATE TABLE ks.cf (id int primary key, val int)")
as_mike.execute("CREATE ROLE role1 WITH PASSWORD = '1' AND
SUPERUSER = false AND LOGIN = true")
-if self.cluster.version() < LooseVersion('4.2'):
+if self.cluster.version() < LooseVersion('4.0'):
as_mike.execute("""CREATE FUNCTION ks.state_function_1(a int, b
int)
CALLED ON NULL INPUT
RETURNS int
@@ -1698,7 +1698,7 @@ class TestAuthRoles(AbstractTestAuth):
self.superuser.execute("CREATE TABLE ks.cf (id int primary key, val
int)")
self.superuser.execute("CREATE ROLE mike WITH PASSWORD = '12345' AND
SUPERUSER = false AND LOGIN = true")
self.superuser.execute("CREATE ROLE role1 WITH SUPERUSER = false AND
LOGIN = false")
-if self.cluster.version() < LooseVersion('4.2'):
+if self.cluster.version() < LooseVersion('4.0'):
self.superuser.execute("CREATE FUNCTION ks.state_func(a int, b
int) CALLED ON NULL INPUT RETURNS int LANGUAGE javascript AS 'a+b'")
else:
self.superuser.execute("CREATE FUNCTION ks.state_func(a int, b
int) CALLED ON NULL INPUT RETURNS int LANGUAGE java AS ' return a+b;'")
@@ -2180,7 +2180,7 @@ class TestAuthRoles(AbstractTestAuth):
"""
self.setup_table()
self.superuser.execute("CREATE ROLE mike WITH PASSWORD = '12345' AND
LOGIN = true")
-if self.cluster.version() < LooseVersion('4.2'):
+if self.cluster.version() < LooseVersion('4.0'):
self.superuser.execute("CREATE FUNCTION ks.plus_one ( input int )
CALLED ON NULL INPUT RETURNS int LANGUAGE javascript AS 'input + 1'")
self.superuser.execute("CREATE FUNCTION ks.\"plusOne\" ( input int
) CALLED ON NULL INPUT RETURNS int LANGUAGE javascript AS 'input + 1'")
else:
@@ -2229,7 +2229,7 @@ class TestAuthRoles(AbstractTestAuth):
"""
self.setup_table()
self.superuser.execute("CREATE ROLE mike")
-if self.cluster.version() < LooseVersion('4.2'):
+if self.cluster.version() < LooseVersion('4.0'):
self.superuser.execute("CREATE FUNCTION ks.plus_one ( input int )
CALLED ON NULL INPUT RETURNS int LANGUAGE javascript AS 'input + 1'")
else:
self.superuser.execute("CREATE FUNCTION ks.plus_one ( input int )
CALLED ON NULL INPUT RETURNS int LANGUAGE java AS 'return input + 1;'")
@@ -2260,7 +2260,7 @@ class TestAuthRoles(AbstractTestAuth):
self.superuser.execute("INSERT INTO ks.t1 (k,v) values (1,1)")
self.superuser.execute("CREATE ROLE mike WITH PASSWORD = '12345' AND
LOGIN = true")
self.supe
(cassandra-dtest) 36/43: CC5 fix support_guardrails()
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit 158621814905f3a04c1c93b9bded9ef543231ba3
Author: Brandon Williams
AuthorDate: Mon Jul 22 14:34:04 2024 -0500
CC5 fix support_guardrails()
---
compaction_test.py | 4 ++--
cqlsh_tests/test_cqlsh.py | 2 +-
cqlsh_tests/test_cqlsh_copy.py | 6 +++---
dtest_setup.py | 2 +-
paging_test.py | 4 ++--
pushed_notifications_test.py | 4 ++--
read_failures_test.py | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/compaction_test.py b/compaction_test.py
index a4e93eab..1fd5a97d 100644
--- a/compaction_test.py
+++ b/compaction_test.py
@@ -366,7 +366,7 @@ class TestCompaction(Tester):
Check that we log a warning when the partition size is bigger than
compaction_large_partition_warning_threshold_mb
"""
cluster = self.cluster
-if self.supports_guardrails:
+if self.supports_guardrails():
cluster.set_configuration_options({'guardrails':
{'partition_size_warn_threshold_in_mb': 1}})
else:
cluster.set_configuration_options({'compaction_large_partition_warning_threshold_mb':
1})
@@ -392,7 +392,7 @@ class TestCompaction(Tester):
verb = 'Writing' if self.cluster.version() > '2.2' else 'Compacting'
sizematcher = '\d+ bytes' if self.cluster.version() <
LooseVersion('3.6') else '\d+\.\d{3}(K|M|G)iB'
log_message = '{} large partition ks/large:user \({}'.format(verb,
sizematcher)
-if self.supports_guardrails:
+if self.supports_guardrails():
log_message = "Detected partition 'user' in ks.large of size 2MB
is greater than the maximum recommended size \(1MB\)"
node.watch_log_for(log_message, from_mark=mark, timeout=180)
diff --git a/cqlsh_tests/test_cqlsh.py b/cqlsh_tests/test_cqlsh.py
index cb032d00..bbe13357 100644
--- a/cqlsh_tests/test_cqlsh.py
+++ b/cqlsh_tests/test_cqlsh.py
@@ -2089,7 +2089,7 @@ Tracing session:""")
self.cluster.populate(3)
config_opts = {'unlogged_batch_across_partitions_warn_threshold':
str(max_partitions_per_batch)}
-if self.supports_guardrails:
+if self.supports_guardrails():
config_opts = {"guardrails": config_opts}
self.cluster.set_configuration_options(config_opts)
diff --git a/cqlsh_tests/test_cqlsh_copy.py b/cqlsh_tests/test_cqlsh_copy.py
index a2e69136..2f271b6d 100644
--- a/cqlsh_tests/test_cqlsh_copy.py
+++ b/cqlsh_tests/test_cqlsh_copy.py
@@ -2485,7 +2485,7 @@ class TestCqlshCopy(Tester):
@jira_ticket CASSANDRA-9302
"""
config_opts = {'batch_size_warn_threshold_in_kb': '10'}
-if self.supports_guardrails: # batch size thresholds moved to
guardrails in 4.0
+if self.supports_guardrails(): # batch size thresholds moved to
guardrails in 4.0
config_opts = {'guardrails': config_opts}
self._test_bulk_round_trip(nodes=3, partitioner="murmur3",
num_operations=1,
@@ -2504,7 +2504,7 @@ class TestCqlshCopy(Tester):
"""
batch_size_warn_threshold_in_kb = '10'
native_transport_max_concurrent_connections = '12'
-if self.supports_guardrails: # batch size thresholds moved to
guardrails in 4.0
+if self.supports_guardrails(): # batch size thresholds moved to
guardrails in 4.0
config_opts = {'guardrails': {'batch_size_warn_threshold_in_kb':
batch_size_warn_threshold_in_kb},
'native_transport_max_concurrent_connections':
native_transport_max_concurrent_connections}
else:
@@ -2846,7 +2846,7 @@ class TestCqlshCopy(Tester):
batch_size_fail_threshold_in_kb = '5' # with 5kb size batches
config_opts = {'batch_size_warn_threshold_in_kb':
batch_size_warn_threshold_in_kb,
'batch_size_fail_threshold_in_kb':
batch_size_fail_threshold_in_kb}
-if self.supports_guardrails: # batch size thresholds moved to
guardrails in 4.0
+if self.supports_guardrails(): # batch size thresholds moved to
guardrails in 4.0
config_opts = {'guardrails': config_opts}
self.prepare(nodes=1, configuration_options=config_opts)
diff --git a/dtest_setup.py b/dtest_setup.py
index f5a9e808..1d1a1a0b 100644
--- a/dtest_setup.py
+++ b/dtest_setup.py
@@ -379,7 +379,7 @@ class DTestSetup(object):
return cluster_version >= LooseVersion('4.0')
d
(cassandra-dtest) 30/43: STAR-1589: Fix typos in bootstrap_test.py (#62)
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit 02e67cdd1572755c976cf3f3e74d55aad9312719
Author: Jacek Lewandowski <6516951+jacek-lewandow...@users.noreply.github.com>
AuthorDate: Mon Sep 19 20:17:54 2022 +0200
STAR-1589: Fix typos in bootstrap_test.py (#62)
(cherry picked from commit 97fd564912480aa165d229b79e806f311c2ab20d)
(cherry picked from commit b97bc5d6d77cce0a0774f63f4bff8e6d80adc303)
(cherry picked from commit 662cd676ea8c377b199e46a31a376edca6b2c842)
---
bootstrap_test.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bootstrap_test.py b/bootstrap_test.py
index ceed5a22..9504e556 100644
--- a/bootstrap_test.py
+++ b/bootstrap_test.py
@@ -734,7 +734,7 @@ class BootstrapTester(Tester):
node2.stop(wait_other_notice=False)
# Wipe its data
-self_cleanup(node2)
+self._cleanup(node2)
# Now start it, it should be allowed to join
mark = node2.mark_log()
@@ -983,7 +983,7 @@ class BootstrapTester(Tester):
shutil.rmtree(commitlog_dir)
metadata_dir = os.path.join(node.get_path(), 'metadata')
if os.path.exists(metadata_dir):
-debug("Deleting {}".format(metadata_dir))
+logger.debug("Deleting {}".format(metadata_dir))
shutil.rmtree(metadata_dir)
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 25/43: STAR-1200: Better logging for dtests (#55)
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit 1056bd73004b7e7b1370abaac6882b182f9c099e
Author: Jacek Lewandowski <6516951+jacek-lewandow...@users.noreply.github.com>
AuthorDate: Mon Mar 21 14:02:55 2022 +0100
STAR-1200: Better logging for dtests (#55)
(cherry picked from commit d97c8298395b66e497bb80b344a078666d1a413d)
(cherry picked from commit fa2cd87d9423b67b728aadfb2455e6ab2a1843ec)
(cherry picked from commit f202687489a1080368b97d211d72b11e458358b6)
(cherry picked from commit 648a02e62f4f679fb297ca52ec94ba19cfa89fa5)
---
.gitignore | 2 ++
conftest.py | 7 +++
pytest.ini | 10 --
...26874 STAR-1200: Better logging for dtests (#55) | 21 +
4 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 13045e5b..2f759f0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,5 @@ lib/
pyvenv.cfg
src/
.vscode/
+
+pytest.ini
\ No newline at end of file
diff --git a/conftest.py b/conftest.py
index 1994d656..785eceda 100644
--- a/conftest.py
+++ b/conftest.py
@@ -185,6 +185,13 @@ def fixture_logging_setup(request):
if request.config.inicfg.get("log_format") is not None:
logging_format = request.config.inicfg.get("log_format")
+# ccm logger is configured to spit everything to console
+# we want it to use logging setup configured for tests
+# unless we do that, we get duplicated log records from ccm module
+ccmLogger = logging.getLogger("ccm")
+for handler in ccmLogger.handlers:
+logging.getLogger("ccm").removeHandler(handler)
+
logging.basicConfig(level=log_level,
format=logging_format)
diff --git a/pytest.ini b/pytest.ini
index 79d18eca..138dc62e 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -2,8 +2,14 @@
addopts = --show-capture=stdout --timeout=900
python_files = test_*.py *_test.py *_tests.py
junit_suite_name = Cassandra dtests
-log_level = INFO
-log_format = %(asctime)s,%(msecs)d %(name)s %(levelname)s %(message)s
+log_print = True
+log_cli = True
+log_cli_level = DEBUG
+log_cli_format = %(asctime)s,%(msecs)03d %(name)s %(levelname)s %(message)s
+log_cli_date_format = %Y-%m-%d %H:%M:%S
+log_file_level = DEBUG
+log_file_format = %(asctime)s,%(msecs)03d %(name)s %(levelname)s %(message)s
+log_file_date_format = %Y-%m-%d %H:%M:%S
markers =
since
vnodes
diff --git a/update-history/oss-4.0.11/7-f2026874 STAR-1200: Better logging for
dtests (#55) b/update-history/oss-4.0.11/7-f2026874 STAR-1200: Better logging
for dtests (#55)
new file mode 100644
index ..70806cff
--- /dev/null
+++ b/update-history/oss-4.0.11/7-f2026874 STAR-1200: Better logging for dtests
(#55)
@@ -0,0 +1,21 @@
+--- a/pytest.ini
b/pytest.ini
+@@ -2,10 +2,6 @@
+ addopts = --show-capture=stdout
+ python_files = test_*.py *_test.py *_tests.py
+ junit_suite_name = Cassandra dtests
+-<<<<<<<
+-log_level = INFO
+-log_format = %(asctime)s,%(msecs)d %(name)s %(levelname)s %(message)s
+-===
+ log_print = True
+ log_cli = True
+ log_cli_level = DEBUG
+@@ -14,7 +10,6 @@
+ log_file_level = DEBUG
+ log_file_format = %(asctime)s,%(msecs)03d %(name)s %(levelname)s %(message)s
+ log_file_date_format = %Y-%m-%d %H:%M:%S
+->>>>>>>
+ timeout = 900
+ markers =
+ since
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 17/43: STAR-386 Increase client timeout for test_simultaneous_bootstrap (#37)
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit 4948eddace06b1449a815825f8b027bc316fae79
Author: dan jatnieks
AuthorDate: Fri Jul 2 12:23:26 2021 -0700
STAR-386 Increase client timeout for test_simultaneous_bootstrap (#37)
Improve reliability for slow/loaded test systems by using larger client
timeout executing query.
(cherry picked from commit 18d05f6c8a84f5d3f8abb5519f07bedd198f1d97)
(cherry picked from commit 0bc8d67df1bc4811685bf7eafab415d2a228e336)
(cherry picked from commit fbea8a16fd61c4d46235993af49842d4f3af)
(cherry picked from commit bdb7d264501feabac9ca8496e9727c0e5c61b99d)
(cherry picked from commit e5f5b9f97dd5a7f7383be52e3bf41fd7cad02a31)
(cherry picked from commit dd195a1e48066a7d57ef8aa3b86536d98fabe170)
---
bootstrap_test.py | 5 ++---
tools/assertions.py | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/bootstrap_test.py b/bootstrap_test.py
index 64595661..a9b72094 100644
--- a/bootstrap_test.py
+++ b/bootstrap_test.py
@@ -928,10 +928,9 @@ class BootstrapTester(Tester):
# Repeat the select count(*) query, to help catch
# bugs like 9484, where count(*) fails at higher
# data loads.
-logger.error(node1.nodetool('status').stdout)
for _ in range(5):
-logger.error("Executing SELECT to node2")
-assert_one(session, "SELECT count(*) from keyspace1.standard1",
[50], cl=ConsistencyLevel.ONE)
+# Improve reliability for slower/loaded test systems by using
larger client timeout
+assert_one(session, "SELECT count(*) from keyspace1.standard1",
[50], cl=ConsistencyLevel.ONE, timeout=30)
def test_cleanup(self):
"""
diff --git a/tools/assertions.py b/tools/assertions.py
index 2ed8a50e..7d1b844f 100644
--- a/tools/assertions.py
+++ b/tools/assertions.py
@@ -114,7 +114,7 @@ def assert_unauthorized(session, query, message):
assert_exception(session, query, matching=message, expected=Unauthorized)
-def assert_one(session, query, expected, cl=None):
+def assert_one(session, query, expected, cl=None, timeout=None):
"""
Assert query returns one row.
@param session Session to use
@@ -127,7 +127,7 @@ def assert_one(session, query, expected, cl=None):
assert_one(session, query, [0, 0])
"""
simple_query = SimpleStatement(query, consistency_level=cl)
-res = session.execute(simple_query)
+res = session.execute(simple_query) if timeout is None else
session.execute(simple_query, timeout=timeout)
list_res = _rows_to_list(res)
assert list_res == [expected], "Expected {} from {}, but got
{}".format([expected], query, list_res)
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 13/43: STAR-543: Port guardrail tests and changes (#19)
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit 3aee7310c81f30a0b4d47ff00f669c343e4969e3
Author: dan jatnieks
AuthorDate: Tue Jun 8 07:17:08 2021 -0700
STAR-543: Port guardrail tests and changes (#19)
Co-authored-by: Aleksandr Sorokoumov
(cherry picked from commit fd2b1c3d96e78c1530befd8fce5a75d5f37a9894)
(cherry picked from commit 66e6b7210d92cc97dc27d30808e5f53e491c80d9)
(cherry picked from commit 70601302cbd4c0fddad58d183a96055ff3b8a87b)
(cherry picked from commit ac2f0f6be80f3839bc0435789f629c2e746b488c)
(cherry picked from commit 5d2ce35e9b2a594877829abe117a34f65a98dfca)
(cherry picked from commit e86263e8fab346406287885b9088afdc269ae62f)
(cherry picked from commit 47c0399e46152c74fe68cce79d5c39970215dafd)
---
byteman/guardrails/disk_usage_full.btm| 8 +++
byteman/guardrails/disk_usage_stuffed.btm | 8 +++
client_request_metrics_test.py| 3 +-
compaction_test.py| 10 +++-
cqlsh_tests/test_cqlsh.py | 7 ++-
cqlsh_tests/test_cqlsh_copy.py| 26 ++--
dtest_setup.py| 4 ++
guardrails_test.py| 99 +++
paging_test.py| 26 +---
pushed_notifications_test.py | 33 ++-
read_failures_test.py | 17 --
tools/misc.py | 11
12 files changed, 215 insertions(+), 37 deletions(-)
diff --git a/byteman/guardrails/disk_usage_full.btm
b/byteman/guardrails/disk_usage_full.btm
new file mode 100644
index ..bbdf8ddc
--- /dev/null
+++ b/byteman/guardrails/disk_usage_full.btm
@@ -0,0 +1,8 @@
+RULE return FULL disk usage
+CLASS org.apache.cassandra.service.disk.usage.DiskUsageMonitor
+METHOD getState
+AT EXIT
+IF TRUE
+DO
+return org.apache.cassandra.service.disk.usage.DiskUsageState.FULL;
+ENDRULE
\ No newline at end of file
diff --git a/byteman/guardrails/disk_usage_stuffed.btm
b/byteman/guardrails/disk_usage_stuffed.btm
new file mode 100644
index ..32562113
--- /dev/null
+++ b/byteman/guardrails/disk_usage_stuffed.btm
@@ -0,0 +1,8 @@
+RULE return STUFFED disk usage
+CLASS org.apache.cassandra.service.disk.usage.DiskUsageMonitor
+METHOD getState
+AT EXIT
+IF TRUE
+DO
+return org.apache.cassandra.service.disk.usage.DiskUsageState.STUFFED;
+ENDRULE
\ No newline at end of file
diff --git a/client_request_metrics_test.py b/client_request_metrics_test.py
index 7286ccbc..3fe26683 100644
--- a/client_request_metrics_test.py
+++ b/client_request_metrics_test.py
@@ -42,7 +42,7 @@ class TestClientRequestMetrics(Tester):
fixture_dtest_setup.ignore_log_patterns = (
'Testing write failures', # The error to simulate a write failure
'ERROR WRITE_FAILURE', # Logged in DEBUG mode for write failures
-f"Scanned over {TOMBSTONE_FAILURE_THRESHOLD + 1} tombstones during
query" # Caused by the read failure tests
+f"Scanned over {TOMBSTONE_FAILURE_THRESHOLD + 1}
(tombstones|tombstone rows) during query" # Caused by the read failure tests
)
def setup_once(self):
@@ -50,6 +50,7 @@ class TestClientRequestMetrics(Tester):
cluster.set_configuration_options({'read_request_timeout_in_ms': 3000,
'write_request_timeout_in_ms': 3000,
'phi_convict_threshold': 12,
+ 'tombstone_warn_threshold': -1,
'tombstone_failure_threshold':
TOMBSTONE_FAILURE_THRESHOLD,
'enable_materialized_views':
'true'})
cluster.populate(2, debug=True)
diff --git a/compaction_test.py b/compaction_test.py
index b37db3ec..5a0d69b0 100644
--- a/compaction_test.py
+++ b/compaction_test.py
@@ -355,7 +355,10 @@ class TestCompaction(Tester):
Check that we log a warning when the partition size is bigger than
compaction_large_partition_warning_threshold_mb
"""
cluster = self.cluster
-
cluster.set_configuration_options({'compaction_large_partition_warning_threshold_mb':
1})
+if self.supports_guardrails:
+cluster.set_configuration_options({'guardrails':
{'partition_size_warn_threshold_in_mb': 1}})
+else:
+
cluster.set_configuration_options({'compaction_large_partition_warning_threshold_mb':
1})
cluster.populate(1).start()
[node] = cluster.nodelist()
@@ -377,7 +380,10 @@ class TestCompaction(Tester):
node.nodetool('compact
(cassandra-dtest) 37/43: CC5 fix jmx_test.py::TestJMX::test_compaction
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit afa43a2840f7d1473defa13b89f5245d9ac068af
Author: Brandon Williams
AuthorDate: Mon Jul 22 15:52:38 2024 -0500
CC5 fix jmx_test.py::TestJMX::test_compaction
---
jmx_test.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/jmx_test.py b/jmx_test.py
index bc5f8b12..60ffb58e 100644
--- a/jmx_test.py
+++ b/jmx_test.py
@@ -201,7 +201,9 @@ class TestJMX(Tester):
# Run a major compaction. This will be the compaction whose
# progress we track.
node.nodetool_process('compact keyspace1')
-if self.cluster.version() >= LooseVersion('4.0'):
+if self.cluster.version() >= LooseVersion('5.0'):
+node.watch_log_for("Major compaction")
+elif self.cluster.version() >= LooseVersion('4.0'):
node.watch_log_for("Compacting")
elif self.cluster.version() >= LooseVersion('3.11'):
node.watch_log_for("Major compaction")
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 19/43: STAR-13 Run tests for UnifiedCompactionStrategy (#22)
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit f7320168137f1620d3b659c0171a71593c79fbdc
Author: Aleksandr Sorokoumov <918393+ger...@users.noreply.github.com>
AuthorDate: Thu Jul 15 15:33:03 2021 +0200
STAR-13 Run tests for UnifiedCompactionStrategy (#22)
(cherry picked from commit 47b978d8fb945dc283518f4906f758e08ae2de23)
(cherry picked from commit 4ecc81bcfedc4fe77f0cdcf0f356079779d53f18)
(cherry picked from commit a06131c5f1ea792ae2c88651ddab22031c81d58c)
(cherry picked from commit 106434260119fe7a75deae59a1aafe24f6531e24)
(cherry picked from commit ab2abb79822863b8ef93b1f63bb433ec90bc92d5)
(cherry picked from commit aae8a6bb6da9a3ca5888bc4e0c33cb8efbdeb758)
---
compaction_test.py | 7 ++--
disk_balance_test.py | 42 +++---
repair_tests/repair_test.py| 26 ++
replace_address_test.py| 16 ++---
schema_test.py | 11 --
...r_wide_rows.yaml => repair_wide_rows.yaml.tmpl} | 6 ++--
...3 Run tests for UnifiedCompactionStrategy (#22) | 38
7 files changed, 114 insertions(+), 32 deletions(-)
diff --git a/compaction_test.py b/compaction_test.py
index 5a0d69b0..3833ae32 100644
--- a/compaction_test.py
+++ b/compaction_test.py
@@ -16,7 +16,7 @@ since = pytest.mark.since
ported_to_in_jvm = pytest.mark.ported_to_in_jvm
logger = logging.getLogger(__name__)
-strategies = ['LeveledCompactionStrategy', 'SizeTieredCompactionStrategy',
'DateTieredCompactionStrategy']
+strategies = ['LeveledCompactionStrategy', 'SizeTieredCompactionStrategy',
'DateTieredCompactionStrategy', 'UnifiedCompactionStrategy']
class TestCompaction(Tester):
@@ -311,9 +311,9 @@ class TestCompaction(Tester):
self.skip_if_not_supported(strategy)
if self.cluster.version() >= '5.0':
-strategies = ['LeveledCompactionStrategy',
'SizeTieredCompactionStrategy']
+strategies = ['LeveledCompactionStrategy',
'SizeTieredCompactionStrategy', 'UnifiedCompactionStrategy']
else:
-strategies = ['LeveledCompactionStrategy',
'SizeTieredCompactionStrategy', 'DateTieredCompactionStrategy']
+strategies = ['LeveledCompactionStrategy',
'SizeTieredCompactionStrategy', 'DateTieredCompactionStrategy',
'UnifiedCompactionStrategy']
if strategy in strategies:
strategies.remove(strategy)
@@ -322,6 +322,7 @@ class TestCompaction(Tester):
[node1] = cluster.nodelist()
for strat in strategies:
+logger.debug("Switching to {}".format(strat))
session = self.patient_cql_connection(node1)
create_ks(session, 'ks', 1)
diff --git a/disk_balance_test.py b/disk_balance_test.py
index 1921f1aa..bcf666c8 100644
--- a/disk_balance_test.py
+++ b/disk_balance_test.py
@@ -24,6 +24,10 @@ class TestDiskBalance(Tester):
@jira_ticket CASSANDRA-6696
"""
+STCS_COMPACTION_OPTS = "SizeTieredCompactionStrategy"
+LCS_COMPACTION_OPTS = "LeveledCompactionStrategy,sstable_size_in_mb=1"
+UCS_COMPACTION_OPTS = "UnifiedCompactionStrategy"
+
@pytest.fixture(scope='function', autouse=True)
def fixture_set_cluster_settings(self, fixture_dtest_setup):
cluster = fixture_dtest_setup.cluster
@@ -191,16 +195,23 @@ class TestDiskBalance(Tester):
"""
@jira_ticket CASSANDRA-13948
"""
-self._disk_balance_after_boundary_change_test(lcs=False)
+
self._disk_balance_after_boundary_change_test(self.STCS_COMPACTION_OPTS)
@since('3.10')
def test_disk_balance_after_boundary_change_lcs(self):
"""
@jira_ticket CASSANDRA-13948
"""
-self._disk_balance_after_boundary_change_test(lcs=True)
+self._disk_balance_after_boundary_change_test(self.LCS_COMPACTION_OPTS)
+
+@since('4.0')
+def test_disk_balance_after_boundary_change_ucs(self):
+"""
+@jira_ticket CASSANDRA-13948
+"""
+self._disk_balance_after_boundary_change_test(self.UCS_COMPACTION_OPTS)
-def _disk_balance_after_boundary_change_test(self, lcs):
+def _disk_balance_after_boundary_change_test(self, compaction_opts):
"""
@jira_ticket CASSANDRA-13948
@@ -231,7 +242,6 @@ class
(cassandra-dtest) 03/43: STAR-582 fix repair error on one node cluster (#20)
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit cd7a724071cfb83e5931a348e2d70fd085aebccc
Author: Ruslan Fomkin
AuthorDate: Fri Jun 11 11:10:34 2021 +0200
STAR-582 fix repair error on one node cluster (#20)
Port of DB-1511, riptano/apollo-dtest#197
Co-authored-by: Zhao Yang
(cherry picked from commit c7beefcbc97cd288badc48c483a3821dc694da58)
(cherry picked from commit a02abc60c8f4a8fe70e6268a8103c62124d421c5)
(cherry picked from commit 387d68885e1bcb3330e4b6944a04f923ae59f0e0)
(cherry picked from commit d219834a7fda92aa9e1f1029c7e0e31963edb1ae)
(cherry picked from commit bf19a8da835c1415430b9589936c092a4976e8bf)
(cherry picked from commit 2ce061866e4c625603378a4a2f98887e843bdc18)
(cherry picked from commit 113022ac25e198a8a64de217d579cceed9997a3a)
(cherry picked from commit 4e9590c17f312cd9ba4505a583079bbe336a1522)
---
repair_tests/repair_test.py | 34 ++
1 file changed, 34 insertions(+)
diff --git a/repair_tests/repair_test.py b/repair_tests/repair_test.py
index 87e265a3..4f7ba5a4 100644
--- a/repair_tests/repair_test.py
+++ b/repair_tests/repair_test.py
@@ -1226,6 +1226,40 @@ class TestRepair(BaseRepairTest):
else:
node1.nodetool('repair keyspace1 standard1 -inc -par')
+@since('3.0')
+def test_repair_one_node_cluster(self):
+options = []
+fix_STAR582 = self.cluster.version() >= "4.0"
+if not fix_STAR582:
+options = ['--ignore-unreplicated-keyspaces'] + options
+self._repair_abort_test(options=options, nodes=1, rf=2)
+
+@since('3.0')
+def test_repair_one_node_in_local_dc(self):
+self._repair_abort_test(options=['--ignore-unreplicated-keyspaces',
'--in-local-dc'], nodes=[1, 1], rf={'dc1': 1, 'dc2': 1}, no_common_range=True)
+
+def _repair_abort_test(self, options=[], nodes=1, rf=1,
no_common_range=False):
+cluster = self.cluster
+logger.debug("Starting cluster..")
+cluster.populate(nodes).start(wait_for_binary_proto=True)
+
+node1 = self.cluster.nodelist()[0]
+session = self.patient_cql_connection(node1)
+create_ks(session, 'ks', rf=rf)
+
+support_preview = self.cluster.version() >= "4.0"
+if support_preview:
+logger.debug("Preview repair")
+out = node1.repair(["--preview"] + options)
+if no_common_range:
+assert "Nothing to repair for " in str(out), "Expect 'Nothing
to repair for '"
+
+logger.debug("Full repair")
+node1.repair(["--full"] + options)
+
+logger.debug("Incremental repair")
+node1.repair(options)
+
@since('2.2')
def test_dead_sync_initiator(self):
"""
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 43/43: update deps
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24 in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git commit 8bc66787f6d3c42ec012f36e7eb4ee7d13f777a3 Author: Jacek Lewandowski AuthorDate: Wed Jul 24 14:35:30 2024 +0200 update deps --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 9661664a..37af1c3d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ click==8.0.4 decorator==5.1.1 docopt==0.6.2 enum34==1.1.10 -exceptiongroup==0.0.0a0 +exceptiongroup>=0.0.0a0 flaky==3.8.1 geomet==0.2.1.post1 iniconfig==1.1.1 @@ -23,9 +23,9 @@ mock==5.1.0 netifaces==0.11.0 packaging==21.3 parse==1.20.1 -pluggy==1.0.0 +pluggy>=1.0.0 psutil==5.9.8 -py==1.11.0 +py>=1.11.0 pycodestyle==2.10.0 pyparsing==3.1.2 pytest>=8.2.2 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 11/43: STAR-431: Add more tests to make sure commands work without --no-file-io too
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit d7104e8461cc4237095f77c30951c741ded8f70a
Author: Matt Fleming
AuthorDate: Tue May 25 13:44:25 2021 +0100
STAR-431: Add more tests to make sure commands work without --no-file-io too
(cherry picked from commit 033a492608b2fcf54074a7b6e675379f76d0383a)
(cherry picked from commit 72eedea62574b486af25883f8d2b417c501b5024)
(cherry picked from commit cf7be8c79b20cc60ba70f836bf7eb09cd02b6b45)
(cherry picked from commit 4f6d0be680b7537e15dfeab1a97e41bd0189f087)
(cherry picked from commit e483a80fda4d1888f68eb942c9809f5d230813fa)
(cherry picked from commit 261c1ee473673f85def1d66876fa1681342c5bdc)
(cherry picked from commit f479675ec1de1b5dacf77097948f93a65f21de67)
(cherry picked from commit f011e369b5dd9ae18cbdef3512e89e012efa59e8)
---
cqlsh_tests/test_cqlsh.py | 19 ++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/cqlsh_tests/test_cqlsh.py b/cqlsh_tests/test_cqlsh.py
index e1036371..2f11504f 100644
--- a/cqlsh_tests/test_cqlsh.py
+++ b/cqlsh_tests/test_cqlsh.py
@@ -2822,23 +2822,40 @@ class TestCqlshSmoke(Tester, CqlshMixin):
"""
run_cqlsh will throw ToolError if cqlsh exits with a non-zero exit
code.
"""
+out = ""
+err = ""
try:
out, err, _ = self.node1.run_cqlsh(cmd, env)
except ToolError as e:
return e.stdout, e.stderr
+return out, err
-cqlsh_stdout, cqlsh_stderr, = run_cqlsh_catch_toolerror('COPY foo.bar
FROM \'blah\';', ['--no-file-io'])
+create_ks(self.session, 'foo', rf=1)
+create_cf(self.session, 'bar', key_type='int', columns={'name':
'text'})
+
+cqlsh_stdout, cqlsh_stderr, _ = self.node1.run_cqlsh('COPY foo.bar TO
\'/dev/null\';', [])
+assert '0 rows exported to 1 files' in cqlsh_stdout
+assert cqlsh_stderr == ''
+cqlsh_stdout, cqlsh_stderr = run_cqlsh_catch_toolerror('COPY foo.bar
TO \'/dev/null\';', ['--no-file-io'])
assert cqlsh_stdout == ''
assert 'No file I/O permitted' in cqlsh_stderr
+cqlsh_stdout, cqlsh_stderr = run_cqlsh_catch_toolerror('DEBUG', [])
+assert '(Pdb)' in cqlsh_stdout
cqlsh_stdout, cqlsh_stderr = run_cqlsh_catch_toolerror('DEBUG',
['--no-file-io'])
assert cqlsh_stdout == ''
assert 'No file I/O permitted' in cqlsh_stderr
+cqlsh_stdout, cqlsh_stderr = run_cqlsh_catch_toolerror('CAPTURE
\'nah\'', [])
+assert cqlsh_stdout == 'Now capturing query output to \'nah\'.\n'
+assert cqlsh_stderr == ''
cqlsh_stdout, cqlsh_stderr = run_cqlsh_catch_toolerror('CAPTURE
\'nah\'', ['--no-file-io'])
assert cqlsh_stdout == ''
assert 'No file I/O permitted' in cqlsh_stderr
+cqlsh_stdout, cqlsh_stderr = run_cqlsh_catch_toolerror('SOURCE
\'nah\'', [])
+assert cqlsh_stdout == ''
+assert cqlsh_stderr == ''
cqlsh_stdout, cqlsh_stderr = run_cqlsh_catch_toolerror('SOURCE
\'nah\'', ['--no-file-io'])
assert cqlsh_stdout == ''
assert 'No file I/O permitted' in cqlsh_stderr
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 04/43: STAR-247: Allow to easily run tests against big or bti sstable format
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit 453b2abf9b63799aee39b17106042f16cc42d6de
Author: jacek-lewandowski
AuthorDate: Fri Apr 2 13:51:45 2021 +0200
STAR-247: Allow to easily run tests against big or bti sstable format
(cherry picked from commit 8c9680112dc2ba92b04460e695b74fa0273b2791)
(cherry picked from commit 8f680140b5bc1ea1d42161832acee61f639e4a26)
(cherry picked from commit c204342acfd40a07518f8f67ffbf7ff1943d9c6e)
(cherry picked from commit fea5074cbb2211b9c6708f2f700cdd3b499659e8)
(cherry picked from commit f4f6f56a598e1629a48f8922bd5235e1f991a279)
(cherry picked from commit f98efec13b16f7ac8c17de340bf6d8d0391e6d1d)
(cherry picked from commit 626db148f0d65b5a3c1b69ed38c34dd18a84614c)
(cherry picked from commit ca0fb185ebe46474f3d8226904d9680149ee9cc7)
(cherry picked from commit 79db6a510a9e22c72b1ef64ae5b58610bd53a6f0)
---
conftest.py | 3 +++
dtest_config.py | 7 +++
run_dtests.py | 3 ++-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/conftest.py b/conftest.py
index be4f02c1..1994d656 100644
--- a/conftest.py
+++ b/conftest.py
@@ -46,6 +46,9 @@ def check_required_loopback_interfaces_available():
def pytest_addoption(parser):
+parser.addoption("--sstable-format", action="store", default="bti",
+ help="SSTable format to be used by default for all newly
created SSTables: "
+ "big or bti (default: bti)")
parser.addoption("--use-vnodes", action="store_true", default=False,
help="Determines wither or not to setup clusters using
vnodes for tests")
parser.addoption("--use-off-heap-memtables", action="store_true",
default=False,
diff --git a/dtest_config.py b/dtest_config.py
index f53cb378..bfae062a 100644
--- a/dtest_config.py
+++ b/dtest_config.py
@@ -11,6 +11,7 @@ logger = logging.getLogger(__name__)
class DTestConfig:
def __init__(self):
+self.sstable_format = "bti"
self.use_vnodes = True
self.configuration_yaml = None
self.use_off_heap_memtables = False
@@ -43,6 +44,12 @@ class DTestConfig:
self.cassandra_version_from_build = self.get_version_from_build()
return
+self.sstable_format = config.getoption("--sstable-format")
+if self.sstable_format:
+assert self.sstable_format in ['bti', 'big'], "SSTable format {}
is invalid - must be either bti or big".format(self.sstable_format)
+default_sstable_format_prop = "
-Dcassandra.sstable.format.default=" + self.sstable_format
+os.environ.update({"JVM_EXTRA_OPTS":
(os.environ.get("JVM_EXTRA_OPTS") or "") + default_sstable_format_prop})
+
self.use_vnodes = config.getoption("--use-vnodes")
self.configuration_yaml = config.getoption("--configuration-yaml")
self.use_off_heap_memtables =
config.getoption("--use-off-heap-memtables")
diff --git a/run_dtests.py b/run_dtests.py
index 0f24443d..d936e133 100755
--- a/run_dtests.py
+++ b/run_dtests.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
"""
-usage: run_dtests.py [-h] [--use-vnodes] [--use-off-heap-memtables]
[--num-tokens=NUM_TOKENS]
[--data-dir-count-per-instance=DATA_DIR_COUNT_PER_INSTANCE]
+usage: run_dtests.py [-h] [--sstable-format=FORMAT] [--use-vnodes]
[--use-off-heap-memtables] [--num-tokens=NUM_TOKENS]
[--data-dir-count-per-instance=DATA_DIR_COUNT_PER_INSTANCE]
[--force-resource-intensive-tests]
[--skip-resource-intensive-tests] [--cassandra-dir=CASSANDRA_DIR]
[--cassandra-version=CASSANDRA_VERSION]
[--delete-logs] [--execute-upgrade-tests]
[--execute-upgrade-tests-only] [--disable-active-log-watching] [--keep-test-dir]
[--enable-jacoco-code-coverage]
[--dtest-enable-debug-logging] [--dtest-print-tests-only]
[--dtest-print-tests-output=DTEST_PRINT_TESTS_OUTPUT]
@@ -8,6 +8,7 @@ usage: run_dtests.py [-h] [--use-vnodes]
[--use-off-heap-memtables] [--num-token
optional arguments:
-h, --help show this help
message and exit
+ --sstable-format SSTable format to
be used by default for all newly created SSTables: big or bti (default: bti)
--use-vnodes Determines wither
or not to setup clusters using vnodes for tests (default: False)
--use-off-heap-memtables Enable Off Heap
Me
(cassandra-dtest) 32/43: CNDB-10194 Fix dtests not running in jenkins Replace java_version with CURRENT_JAVA_VERSION in upgrade_through_versions_test.py Ignore JAVAxx_HOME in upgrade_manifest.jdk_comp
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit 63ebd01b8ca32eab859ba3964166619c7cc9a35b
Author: Daniel Jatnieks
AuthorDate: Tue Jul 16 13:19:48 2024 -0700
CNDB-10194 Fix dtests not running in jenkins
Replace java_version with CURRENT_JAVA_VERSION in
upgrade_through_versions_test.py
Ignore JAVAxx_HOME in upgrade_manifest.jdk_compatible_steps
Add additional debugging
---
run_dtests.py | 7 ++-
upgrade_tests/upgrade_manifest.py | 12 +++-
upgrade_tests/upgrade_through_versions_test.py | 6 +-
3 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/run_dtests.py b/run_dtests.py
index d936e133..2b2d861a 100755
--- a/run_dtests.py
+++ b/run_dtests.py
@@ -151,8 +151,10 @@ class RunDTests():
if args.dtest_print_tests_only:
stdout, stderr = sp.communicate()
+print("dtest_print_tests_only subprocess return code: %d" %
sp.returncode)
if sp.returncode != 0:
-print(stderr.decode("utf-8"))
+print("stdout: " + stdout.decode("utf-8"))
+print("stderr: " + stderr.decode("utf-8"))
result = sp.returncode
exit(result)
@@ -163,8 +165,10 @@ class RunDTests():
collected_tests_output_file =
open(args.dtest_print_tests_output, "w")
collected_tests_output_file.write(joined_test_modules)
collected_tests_output_file.close()
+print(joined_test_modules)
else:
+print("Printing stdout/stderr from subprocess")
while True:
stdout_output = sp.stdout.readline()
stdout_output_str = stdout_output.decode("utf-8")
@@ -180,6 +184,7 @@ class RunDTests():
if stderr_output_str:
print(stderr_output_str.strip())
+print("Subprocess return code: %d" % sp.returncode)
exit(sp.returncode)
diff --git a/upgrade_tests/upgrade_manifest.py
b/upgrade_tests/upgrade_manifest.py
index 66066c95..99feb009 100644
--- a/upgrade_tests/upgrade_manifest.py
+++ b/upgrade_tests/upgrade_manifest.py
@@ -231,6 +231,8 @@ CURRENT_JAVA_VERSION = current_env_java_version()
def jdk_compatible_steps(version_metas):
metas = []
+included_current_jdk_versions = []
+included_java_xx_home_versions = []
for version_meta in version_metas:
# if you want multi-step upgrades to work with versions that require
different jdks
# then define the JAVA_HOME vars (e.g. JAVA8_HOME)
@@ -239,12 +241,20 @@ def jdk_compatible_steps(version_metas):
javan_home_defined = False
for meta_java_version in version_meta.java_versions:
javan_home_defined |= 'JAVA{}_HOME'.format(meta_java_version) in
os.environ
-if CURRENT_JAVA_VERSION in version_meta.java_versions or
javan_home_defined:
+# FIXME CNDB-10194 temporary hack to skip C* 5.0 when JAVA_HOME is
JDK8 but JAVA11_HOME is also defined
+if CURRENT_JAVA_VERSION in version_meta.java_versions:
+# if CURRENT_JAVA_VERSION in version_meta.java_versions or
javan_home_defined:
metas.append(version_meta)
+if CURRENT_JAVA_VERSION in version_meta.java_versions:
+included_current_jdk_versions.append(version_meta.version)
+else:
+included_java_xx_home_versions.append(version_meta.version)
else:
logger.info("Skipping version {} because it requires JDK {}.
Current JDK is {} and none of {} env variables are defined."
.format(version_meta.version,
version_meta.java_versions, CURRENT_JAVA_VERSION, ["JAVA{}_HOME".format(v) for
v in version_meta.java_versions]))
+logger.info("JDK compatible steps for {} compatible with current JDK {} or
JAVAxx_HOME {}"
+.format([m.version for m in version_metas],
CURRENT_JAVA_VERSION, [v for v in included_current_jdk_versions +
included_java_xx_home_versions]))
return metas
def build_upgrade_pairs():
diff --git a/upgrade_tests/upgrade_through_versions_test.py
b/upgrade_tests/upgrade_through_versions_test.py
index b27a0a42..de4942ac 100644
--- a/upgrade_tests/upgrade_through_versions_test.py
+++ b/upgrade_tests/upgrade_through_versions_test.py
@@ -973,6 +973,7 @@ MULTI_UPGRADES = (
)
for upgrade in MULTI_UPGRADES:
+logger.info("Building upgrade {}".format(upgrade.name))
# if any version_metas are None, this means they are versions not to be
tested currently
if all(upgrade.version_metas):
# even for RUN_STATIC_UPGRADE_MATRIX w
(cassandra-dtest) 38/43: CC5 fix pushed_notifications
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit 92bd7ce887854a4a37d716e6871db300b2cbb522
Author: Brandon Williams
AuthorDate: Mon Jul 22 16:27:05 2024 -0500
CC5 fix pushed_notifications
---
pushed_notifications_test.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/pushed_notifications_test.py b/pushed_notifications_test.py
index a67599fb..a2df2920 100644
--- a/pushed_notifications_test.py
+++ b/pushed_notifications_test.py
@@ -395,6 +395,7 @@ class TestVariousNotifications(Tester):
'range_request_timeout_in_ms': 4}
else:
opts = {'tombstone_failure_threshold': 500,
+'tombstone_warn_threshold': 400,
'read_request_timeout_in_ms': 3, # 30 seconds
'range_request_timeout_in_ms': 4}
if self.cluster.version() >= LooseVersion('4.1'):
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 28/43: STAR-899 Fix class name used from SchemaManager to Schema (#58)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24 in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git commit 8f9f4d8d2cc6231c9dd41d076dab55b5b8c5afea Author: dan jatnieks AuthorDate: Mon May 23 09:32:58 2022 -0700 STAR-899 Fix class name used from SchemaManager to Schema (#58) (cherry picked from commit a99fecdf2db543f21b23aae06e065db9af959d75) (cherry picked from commit 79d684cde392d49c2f965e8c268c913073f67077) (cherry picked from commit c0e23637e5ede2d34f717c5bfbe54f7b58c8dce7) (cherry picked from commit 61fb2548ba0fe9c5964657b6fd1aba1d6f251503) --- byteman/merge_schema_failure_4x.btm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/byteman/merge_schema_failure_4x.btm b/byteman/merge_schema_failure_4x.btm index 8ac84a43..13e5715d 100644 --- a/byteman/merge_schema_failure_4x.btm +++ b/byteman/merge_schema_failure_4x.btm @@ -2,7 +2,7 @@ # Inject node failure on merge schema exit. # RULE inject node failure on merge schema exit -CLASS org.apache.cassandra.schema.SchemaManager +CLASS org.apache.cassandra.schema.Schema METHOD mergeAndUpdateVersion AT EXIT # set flag to only run this rule once. - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 12/43: STAR-432: Add tests for consistency level options (#18)
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit a28f01abe8fe03ed2773fd74ce256a0844d6dcbc
Author: Tomek Ĺasica
AuthorDate: Tue Jun 1 13:24:40 2021 +0200
STAR-432: Add tests for consistency level options (#18)
* STAR-432: Add tests for consistency level options
Co-authored-by: Robert Stupp sn...@snazy.de
(cherry picked from commit 21c18c599f89427b3f1c865bd577eb15f792d42d)
(cherry picked from commit e6ae1bf4b11f03d9c2ead7be5088d5408d47ad98)
(cherry picked from commit 05b7502c6027434a9d3f5f087ef737f59866a2f3)
(cherry picked from commit b694f0745734562f8ca2721028eb33b734d7397e)
(cherry picked from commit 5a57ef863ae7369f7362c85afa6f421700808e26)
(cherry picked from commit f0e5e55539166422aedbc56c4661dadeb3fc99fd)
(cherry picked from commit ff4f74c886e79c104e608552c4cbf559b2446e25)
(cherry picked from commit 8c9f07f769690d97073ef0a61033fd68c12cda4f)
---
cqlsh_tests/test_cqlsh.py | 46 ++
1 file changed, 46 insertions(+)
diff --git a/cqlsh_tests/test_cqlsh.py b/cqlsh_tests/test_cqlsh.py
index 2f11504f..92e6b30c 100644
--- a/cqlsh_tests/test_cqlsh.py
+++ b/cqlsh_tests/test_cqlsh.py
@@ -2137,6 +2137,52 @@ Tracing session:""")
stdout, stderr = self.run_cqlsh(node1, cmds='USE system',
cqlsh_options=['--debug', '--connect-timeout=10'])
assert "Using connect timeout: 10 seconds" in stderr
+@since('4.0')
+def test_consistency_level_options(self):
+"""
+Tests for new cmdline consistency options:
+- consistency-level
+- serial-consistency-level
+@jira_ticket STAR-432
+"""
+self.cluster.populate(1)
+self.cluster.start()
+
+node1, = self.cluster.nodelist()
+
+def expect_output_no_errors(cmd, options, output):
+stdout, stderr = self.run_cqlsh(node1, cmds=cmd,
cqlsh_options=options)
+assert output in stdout, stderr
+assert stderr == ''
+
+expect_output_no_errors('CONSISTENCY', [],
+'Current consistency level is ONE.')
+
+expect_output_no_errors('CONSISTENCY', ['--consistency-level',
'quorum'],
+'Current consistency level is QUORUM.')
+
+expect_output_no_errors('SERIAL CONSISTENCY', [],
+'Current serial consistency level is SERIAL.')
+
+expect_output_no_errors('SERIAL CONSISTENCY',
['--serial-consistency-level', 'local_serial'],
+'Current serial consistency level is
LOCAL_SERIAL.')
+
+def expect_error(cmd, options, error_msg):
+stdout, stderr = self.run_cqlsh(node1, cmds=cmd,
cqlsh_options=options)
+assert error_msg in stderr
+
+expect_error('CONSISTENCY', ['--consistency-level', 'foop'],
+ '"foop" is not a valid consistency level')
+
+expect_error('CONSISTENCY', ['--consistency-level', 'serial'],
+ '"serial" is not a valid consistency level')
+
+expect_error('SERIAL CONSISTENCY', ['--serial-consistency-level',
'foop'],
+ '"foop" is not a valid serial consistency level')
+
+expect_error('SERIAL CONSISTENCY', ['--serial-consistency-level',
'ONE'],
+ '"ONE" is not a valid serial consistency level')
+
@since('3.0.19')
def test_protocol_negotiation(self):
"""
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 01/43: STAR-564 Check only MODIFY on base when updating table with MV (#17)
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit c65e7ab5ee8a91af13e9e104f3f00ac6048c1dbc
Author: Jaroslaw Grabowski
AuthorDate: Tue Jun 1 10:32:40 2021 +0200
STAR-564 Check only MODIFY on base when updating table with MV (#17)
If a user has only MODIFY permission on a table and there is a
materialized view built on the same table an insert will fail
with the following error:
Unauthorized: Error from server: code=2100 [Unauthorized]
Only base MODIFY permission is required to update base with MV.
Co-authored-by: Zhao Yang
(cherry picked from commit 55dad391f3f98577d9b0b7e923a5a9b4eacfd2ab)
(cherry picked from commit f1e441e3eab61723f8290f09cc3053959601a57a)
(cherry picked from commit 4c7c22cce63d890cab70bad02c06394a6d9e9bef)
(cherry picked from commit 68417f7b6142858149ab018d4d3ee357c800da00)
(cherry picked from commit ada0915f5d521607cc8efbd124e03b21afab309b)
(cherry picked from commit 16f64c709a5870faff505f1945d4f93afa9a88ad)
(cherry picked from commit bdae9c6a3ec674850afbae61de4fb143262801db)
(cherry picked from commit c254d79160d9385f5f4ba109b98efa27d99a44f6)
---
auth_test.py | 42 --
1 file changed, 36 insertions(+), 6 deletions(-)
diff --git a/auth_test.py b/auth_test.py
index 1f0dec10..a29e8be4 100644
--- a/auth_test.py
+++ b/auth_test.py
@@ -578,10 +578,16 @@ class TestAuth(AbstractTestAuth):
* Create a new user, 'cathy', with no permissions
* Create a ks, table
* Connect as cathy
+*
* Try CREATE MV without ALTER permission on base table, assert throws
Unauthorized
* Grant cathy ALTER permissions, then CREATE MV successfully
+*
+* Try to MODIFY base without WRITE permission on base, assert throws
Unauthorized
+* Grant cathy WRITE permissions on base, and modify base successfully
+*
* Try to SELECT from the mv, assert throws Unauthorized
-* Grant cathy SELECT permissions, and read from the MV successfully
+* Grant cathy SELECT permissions on base, and read from the MV
successfully
+*
* Revoke cathy's ALTER permissions, assert DROP MV throws Unauthorized
* Restore cathy's ALTER permissions, DROP MV successfully
"""
@@ -602,12 +608,36 @@ class TestAuth(AbstractTestAuth):
cassandra.execute("GRANT ALTER ON ks.cf TO cathy")
cathy.execute(create_mv)
-# TRY SELECT MV without SELECT permission on base table
-assert_unauthorized(cathy, "SELECT * FROM ks.mv1", "User cathy has no
SELECT permission on or any of its parents")
+# Try MODIFY base without WRITE permission on base
+assert_unauthorized(cathy, "INSERT INTO ks.cf(id, value) VALUES(1,
'1')", "User cathy has no MODIFY permission on or any of its
parents")
-# Grant SELECT permission and CREATE MV
-cassandra.execute("GRANT SELECT ON ks.cf TO cathy")
-cathy.execute("SELECT * FROM ks.mv1")
+if self.cluster.version() >= LooseVersion('4.0'):
+# From 4.0 onward, only base MODIFY permission is required to
update base with MV
+# Grant WRITE permission on Base
+cassandra.execute("GRANT MODIFY ON ks.cf TO cathy")
+cathy.execute("INSERT INTO ks.cf(id, value) VALUES(1, '1')")
+
+# TRY SELECT MV without SELECT permission on base table
+assert_unauthorized(cathy, "SELECT * FROM ks.cf", "User cathy has
no SELECT permission on or any of its parents")
+assert_unauthorized(cathy, "SELECT * FROM ks.mv1", "User cathy has
no SELECT permission on or any of its parents")
+
+# Grant SELECT permission
+cassandra.execute("GRANT SELECT ON ks.cf TO cathy")
+assert_one(cathy, "SELECT * FROM ks.cf", [1, '1'])
+assert_one(cathy, "SELECT * FROM ks.mv1", ['1', 1])
+else:
+# Before 4.0, MODIFY on MV is required to insert to base
+# Grant WRITE permission on Base
+cassandra.execute("GRANT MODIFY ON ks.cf TO cathy")
+assert_unauthorized(cathy, "INSERT INTO ks.cf(id, value) VALUES(1,
'1')", "User cathy has no SELECT permission on or any of its
parents")
+cassandra.execute("GRANT SELECT ON ks.cf TO cathy")
+assert_unauthorized(cathy, "INSERT INTO ks.cf(id, value) VALUES(1,
'1')", "User cathy has no MODIFY permission on or any of its
(cassandra-dtest) 15/43: STAR-386: Add logging around failure to get timestamp info (#28)
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit b5856e9e52f5127e23326a3896509d9ad4bb2628
Author: dan jatnieks
AuthorDate: Thu Jun 24 14:34:22 2021 -0700
STAR-386: Add logging around failure to get timestamp info (#28)
(cherry picked from commit 09052110c8a07c236ed83dee875ad0670a32e43b)
(cherry picked from commit 3d6068a783fa56177fc63d0d3cbae43131465473)
(cherry picked from commit ac5f6b47cbd16447efe346e646038a695422e95e)
(cherry picked from commit 0766555087b18976442d81ac4d23c2d8c22c5cae)
(cherry picked from commit 6df6f8b3198fca71ec9f02fcc013eed638415a31)
(cherry picked from commit 843ff4a888ec44ba6fc4e27d4b75fb20a882e148)
(cherry picked from commit 61e1d98ca1224e66c68dfa631082584f000e1371)
---
bootstrap_test.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/bootstrap_test.py b/bootstrap_test.py
index 043a734a..64595661 100644
--- a/bootstrap_test.py
+++ b/bootstrap_test.py
@@ -928,7 +928,9 @@ class BootstrapTester(Tester):
# Repeat the select count(*) query, to help catch
# bugs like 9484, where count(*) fails at higher
# data loads.
+logger.error(node1.nodetool('status').stdout)
for _ in range(5):
+logger.error("Executing SELECT to node2")
assert_one(session, "SELECT count(*) from keyspace1.standard1",
[50], cl=ConsistencyLevel.ONE)
def test_cleanup(self):
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 10/43: STAR-431: Add option to prevent any file-I/O from cqlsh
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit 3f68e3aa5168d79870978fa8c93e5fd94ccb7853
Author: Matt Fleming
AuthorDate: Mon May 24 11:43:58 2021 +0100
STAR-431: Add option to prevent any file-I/O from cqlsh
Co-authored-by: Robert Stupp
(cherry picked from commit 33e486a19421f77f7091fc8b96a493429c34cacf)
(cherry picked from commit 9fbd1b3b816f7bd46dd4ad42a0e5d6e3748351bb)
(cherry picked from commit c479ab3055e5114ba01e467e3c149df9966b0f05)
(cherry picked from commit 6c74210d247fb4147d5cf8a3953be26a845813b3)
(cherry picked from commit ec68d4623490bc5e381628088cf93e001eaf5a91)
(cherry picked from commit 09a1eff60a7e4407c746fe62396550746508d835)
(cherry picked from commit de2579d14993bf2281358475da1cb8048bba5a7b)
(cherry picked from commit e8fed18751e47e2a282fc91737e65cebf3861266)
---
cqlsh_tests/test_cqlsh.py | 28
1 file changed, 28 insertions(+)
diff --git a/cqlsh_tests/test_cqlsh.py b/cqlsh_tests/test_cqlsh.py
index b7e3a16f..e1036371 100644
--- a/cqlsh_tests/test_cqlsh.py
+++ b/cqlsh_tests/test_cqlsh.py
@@ -24,6 +24,7 @@ from cassandra import InvalidRequest
from cassandra.concurrent import execute_concurrent_with_args
from cassandra.query import BatchStatement, BatchType
from ccmlib import common
+from ccmlib.node import ToolError
from .cqlsh_tools import monkeypatch_driver, unmonkeypatch_driver
from dtest import Tester, create_ks, create_cf
@@ -2815,6 +2816,33 @@ class TestCqlshSmoke(Tester, CqlshMixin):
"""
assert stdout_lines_sorted.find(expected) >= 0
+@since('4.0')
+def test_no_file_io(self):
+def run_cqlsh_catch_toolerror(cmd, env):
+"""
+run_cqlsh will throw ToolError if cqlsh exits with a non-zero exit
code.
+"""
+try:
+out, err, _ = self.node1.run_cqlsh(cmd, env)
+except ToolError as e:
+return e.stdout, e.stderr
+
+cqlsh_stdout, cqlsh_stderr, = run_cqlsh_catch_toolerror('COPY foo.bar
FROM \'blah\';', ['--no-file-io'])
+assert cqlsh_stdout == ''
+assert 'No file I/O permitted' in cqlsh_stderr
+
+cqlsh_stdout, cqlsh_stderr = run_cqlsh_catch_toolerror('DEBUG',
['--no-file-io'])
+assert cqlsh_stdout == ''
+assert 'No file I/O permitted' in cqlsh_stderr
+
+cqlsh_stdout, cqlsh_stderr = run_cqlsh_catch_toolerror('CAPTURE
\'nah\'', ['--no-file-io'])
+assert cqlsh_stdout == ''
+assert 'No file I/O permitted' in cqlsh_stderr
+
+cqlsh_stdout, cqlsh_stderr = run_cqlsh_catch_toolerror('SOURCE
\'nah\'', ['--no-file-io'])
+assert cqlsh_stdout == ''
+assert 'No file I/O permitted' in cqlsh_stderr
+
class TestCqlLogin(Tester, CqlshMixin):
"""
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 16/43: STAR-517. Skip as it is not possible to test it reliably. (#34)
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit 0e9ebad98dcf3a44670ead79c549b30bb7bf4c2d
Author: Tomek Ĺasica
AuthorDate: Fri Jul 2 08:58:39 2021 +0200
STAR-517. Skip as it is not possible to test it reliably. (#34)
The goal of the test is to "exercise the retry and back-off policies".
And test is trying to achieve it by:
- using arbitrary low write timeout
- and loading / exporting / importing / exporting the data
- assuming that retries and back-off will handle it.
Unfortunately it is very sensitive...
Because we need to find a perfect balance for the timeout and req/s, so
that:
- timeouts are indeed hit
- and default COPY util not abort after 90s without succ write
- and default COPY will not abort after 12 unsuccessull backoff attempts
This change disables this test because:
- there is no logic in the test that would check if indeed retries and
backoff are exercised, so
- it is perfectly possible that when it passes it just passes without any
value
- there are special tests for MAXATTEMPTS and for backoff policy
Final note:
mechanism of retries and backoff policy in COPY command could be improved
by providing some backpressure mechanism to slowdown writes rather than
doing retry or backoff exponentital (with random!).
But this would be a new feature and COPY util is not a place we would like
to invest.
(cherry picked from commit 897aab709d133b6733bbb525ee65505b220e7971)
(cherry picked from commit 602cf5329722d06cae68fe95325979d8fb8f47d0)
(cherry picked from commit cb701f71244bda4d349a80ae7d98e153ceed0cda)
(cherry picked from commit c04b7ded878a4e795fbe889a246888946fa7f13c)
(cherry picked from commit 3b5125734fc45ad6f64ca2f9f2be9be7cd32ef9a)
(cherry picked from commit 39fc3bd99bc655b3156c98a3bf62695903f3d628)
---
cqlsh_tests/test_cqlsh_copy.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/cqlsh_tests/test_cqlsh_copy.py b/cqlsh_tests/test_cqlsh_copy.py
index 458804c7..67ea0cdc 100644
--- a/cqlsh_tests/test_cqlsh_copy.py
+++ b/cqlsh_tests/test_cqlsh_copy.py
@@ -2514,6 +2514,7 @@ class TestCqlshCopy(Tester):
copy_to_options={'NUMPROCESSES': 5,
'MAXATTEMPTS': 20},
copy_from_options={'NUMPROCESSES': 2})
+@pytest.mark.skip(reason="test is not reliable and sensitive to vm power")
def test_bulk_round_trip_with_timeouts(self):
"""
Test bulk import with very short read and write timeout values, this
should exercise the
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 21/43: STAR-836 Fix TestCompaction_with_UnifiedCompactionStrategy.bloomfilter_size_test (#41)
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit 453027efeef7adfc9f5eadc8497b2e8f917f0501
Author: Aleksandr Sorokoumov <918393+ger...@users.noreply.github.com>
AuthorDate: Thu Aug 5 15:57:31 2021 +0200
STAR-836 Fix
TestCompaction_with_UnifiedCompactionStrategy.bloomfilter_size_test (#41)
Co-authored-by: Branimir Lambov
(cherry picked from commit fa9c7a478bb3795bc1c0e5602cbae2921faf)
(cherry picked from commit d06d4c68ca15076cd06fafaff9c9762d9bd532d1)
(cherry picked from commit 12f5fffcbb78b4ee51289c1c7e3a121475256628)
(cherry picked from commit a29f899fc4fa8d389fc26628f0749ee096b2a932)
(cherry picked from commit cfc58a3aed8a93f9a7f0a8660bb73bb3d38e9560)
(cherry picked from commit 2a2726a4962c0627f1277a5dbe04ee6e194db4ab)
---
compaction_test.py | 14 +++--
...dCompactionStrategy.bloomfilter_size_test (#41) | 36 ++
2 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/compaction_test.py b/compaction_test.py
index 3833ae32..d79f1326 100644
--- a/compaction_test.py
+++ b/compaction_test.py
@@ -118,6 +118,8 @@ class TestCompaction(Tester):
else:
if strategy == "DateTieredCompactionStrategy":
strategy_string =
"strategy=DateTieredCompactionStrategy,base_time_seconds=86400" # we want a
single sstable, so make sure we don't have a tiny first window
+elif self.strategy == "UnifiedCompactionStrategy":
+strategy_string =
"strategy=UnifiedCompactionStrategy,max_sstables_to_compact=4" # disable
layout-preserving compaction which can leave more than one sstable
else:
strategy_string = "strategy={}".format(strategy)
min_bf_size = 10
@@ -125,18 +127,21 @@ class TestCompaction(Tester):
cluster = self.cluster
cluster.populate(1).start()
[node1] = cluster.nodelist()
+logger.debug("Compaction: " + strategy_string)
for x in range(0, 5):
node1.stress(['write', 'n=100K', "no-warmup", "cl=ONE", "-rate",
"threads=300", "-schema", "replication(factor=1)",
"compaction({},enabled=false)".format(strategy_string)])
node1.flush()
+logger.debug(node1.nodetool('tablestats keyspace1.standard1').stdout)
node1.nodetool('enableautocompaction')
node1.wait_for_compactions()
table_name = 'standard1'
-output = node1.nodetool('tablestats').stdout
+output = node1.nodetool('tablestats keyspace1.standard1').stdout
+logger.debug(output)
output = output[output.find(table_name):]
output = output[output.find("Bloom filter space used"):]
bfSize = int(output[output.find(":") + 1:output.find("\n")].strip())
@@ -157,7 +162,12 @@ class TestCompaction(Tester):
logger.debug("bloom filter size is: {}".format(bfSize))
logger.debug("size factor = {}".format(size_factor))
-assert bfSize >= size_factor * min_bf_size
+# In the case where the number of sstables is greater than the number
of directories, it's possible this to be
+# both with unique keys (where the bf size will remain close to the
unadjusted limit) or with repetitions
+# of keys (where the bf size will be a multiple of the expected).
Permit both by only using the size factor on
+# the maximum size. Note that the test is designed to end up with
size_factor == 1 and most runs do so, thus
+# this is not a loosening of the test in the common case, only ensures
that we don't end up with flakes.
+assert bfSize >= min_bf_size
assert bfSize <= size_factor * max_bf_size
@pytest.mark.parametrize("strategy", strategies)
diff --git a/update-history/STAR-1892/11-2a2726a4 STAR-836 Fix
TestCompaction_with_UnifiedCompactionStrategy.bloomfilter_size_test (#41)
b/update-history/STAR-1892/11-2a2726a4 STAR-836 Fix
TestCompaction_with_UnifiedCompactionStrategy.bloomfilter_size_test (#41)
new file mode 100644
index ..c1e49627
--- /dev/null
+++ b/update-history/STAR-1892/11-2a2726a4 STAR-836 Fix
TestCompaction_with_UnifiedCompactionStrategy.bloomfilter_size_test (#41)
@@ -0,0 +1,36 @@
+--- a/compaction_test.py
b/compaction_test.py
+@@ -134,18 +134,14 @@
+ "threads=300", "-schema", "replication(factor=1)",
+
"comp
(cassandra-dtest) 06/43: STAR-247: Add allowed warning for running scrub test
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit c0802af0e8973f775b9e428446821b54957bc86a
Author: Jacek Lewandowski
AuthorDate: Wed Jun 23 13:53:06 2021 +0200
STAR-247: Add allowed warning for running scrub test
The message is expected since bloom filter is not recreated when there is
no index.
(cherry picked from commit f7684e4c78c9d0c669e9320b3313895079eba108)
(cherry picked from commit 8ebfd4e2c3a3f793309400541e7c93960b99e889)
(cherry picked from commit 4bb423636dd24390429d6faa06da6f34a4667712)
(cherry picked from commit aac2b4d24abc39caffa2b35fe43ef3bdb68e012d)
(cherry picked from commit 200a8daa6b5dab27ad3e49cb70dacad2a2981e86)
(cherry picked from commit 5e861854bd8caa2b7bf106494ea220745934a6b7)
(cherry picked from commit 3ecb300e4043dbdef16397c24babc0bdb4c74c15)
---
scrub_test.py | 10 ++--
tools/assertions.py| 22 +
...247: Add allowed warning for running scrub test | 56 ++
3 files changed, 74 insertions(+), 14 deletions(-)
diff --git a/scrub_test.py b/scrub_test.py
index 8633b511..077a1b0d 100644
--- a/scrub_test.py
+++ b/scrub_test.py
@@ -112,7 +112,7 @@ class TestHelper(Tester):
if not common.is_win(): # nodetool always prints out on windows
assert_length_equal(response, 0) # nodetool does not print
anything unless there is an error
-def launch_standalone_scrub(self, ks, cf, reinsert_overflowed_ttl=False,
no_validate=False):
+def launch_standalone_scrub(self, ks, cf, reinsert_overflowed_ttl=False,
no_validate=False, acceptable_errors=None):
"""
Launch the standalone scrub
"""
@@ -136,7 +136,7 @@ class TestHelper(Tester):
# if we have less than 64G free space, we get this warning - ignore it
if err and "Consider adding more capacity" not in err.decode("utf-8"):
logger.debug(err.decode("utf-8"))
-assert_stderr_clean(err.decode("utf-8"))
+assert_stderr_clean(err.decode("utf-8"), acceptable_errors)
def perform_node_tool_cmd(self, cmd, table, indexes):
"""
@@ -163,12 +163,12 @@ class TestHelper(Tester):
time.sleep(.1)
return self.get_sstables(table, indexes)
-def standalonescrub(self, table, *indexes):
+def standalonescrub(self, table, *indexes, acceptable_errors=None):
"""
Launch standalone scrub on table and indexes, and then return all
sstables
in a dict keyed by the table or index name.
"""
-self.launch_standalone_scrub(KEYSPACE, table)
+self.launch_standalone_scrub(ks=KEYSPACE, cf=table,
acceptable_errors=acceptable_errors)
for index in indexes:
self.launch_standalone_scrub(KEYSPACE, '{}.{}'.format(table,
index))
return self.get_sstables(table, indexes)
@@ -478,7 +478,7 @@ class TestScrub(TestHelper):
self.delete_non_essential_sstable_files('users')
-scrubbed_sstables = self.standalonescrub('users')
+scrubbed_sstables = self.standalonescrub(table='users',
acceptable_errors=["WARN.*Could not recreate or deserialize existing bloom
filter, continuing with a pass-through bloom filter but this will significantly
impact reads performance"])
if should_assert_sstables:
self.increase_sstable_generations(initial_sstables)
diff --git a/tools/assertions.py b/tools/assertions.py
index 80e18eae..2ed8a50e 100644
--- a/tools/assertions.py
+++ b/tools/assertions.py
@@ -293,16 +293,20 @@ def assert_stderr_clean(err, acceptable_errors=None):
@param acceptable_errors A list that if used, the user chooses what
messages are to be acceptable in stderr.
"""
+default_acceptable_errors = ["WARN.*JNA link failure.*unavailable.",
+ "objc.*Class JavaLaunchHelper.*?Which one is
undefined.",
+ # Stress tool JMX connection failure, see
CASSANDRA-12437
+ "Failed to connect over JMX; not collecting
these stats",
+ "Picked up JAVA_TOOL_OPTIONS:.*",
+ # Warnings for backward compatibility should
be logged CASSANDRA-15234
+ ".*parameters have been deprecated. They have
new names and/or value format; "
+ + "For more information, please refer to
NEWS.txt*",
+ ".*Error while compu
(cassandra-dtest) 18/43: STAR-385 Retry cluster stop after exception stopping 'gently' (#36)
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit 499af0a0b06488e082334f643e9e80613b27937c
Author: dan jatnieks
AuthorDate: Fri Jul 2 13:49:24 2021 -0700
STAR-385 Retry cluster stop after exception stopping 'gently' (#36)
Cluster stop requests in cleanup_cluster are made with "gently=True" when
Jacoco code coverage is enabled to allow the jacoco agent to record results;
however, some tests leave nodes in a state where this type of shutdown does not
succeed, resulting in the test being marked failed regardless of it's true
completion status.
This change will retry these stop requests with "gently=False" so that the
test completion status will not be altered due to shutdown not completing.
(cherry picked from commit f6fc3d39cb448eb886734a5a6ec692a557c07bc3)
(cherry picked from commit aff9d6e81b856671b4ef6e9c2f488c729b8a6427)
(cherry picked from commit fe272305d58c11616e1fdb901af1b338b3daceaf)
(cherry picked from commit f931d4385d1dba79913950cbdbedf17a488fc379)
(cherry picked from commit 88c022c1cb1b967674d89d60b2456ccc4e45a392)
(cherry picked from commit 56b468096bba12087c50426021d23160476c7933)
---
dtest_setup.py | 24 +---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/dtest_setup.py b/dtest_setup.py
index 863e7648..2aa7b0f4 100644
--- a/dtest_setup.py
+++ b/dtest_setup.py
@@ -17,7 +17,7 @@ from cassandra.cluster import NoHostAvailable
from cassandra.cluster import EXEC_PROFILE_DEFAULT
from cassandra.policies import WhiteListRoundRobinPolicy
from ccmlib.common import is_win
-from ccmlib.cluster import Cluster
+from ccmlib.cluster import Cluster, NodeError
from dtest import (get_ip_from_node, make_execution_profile,
get_auth_provider, get_port_from_node,
get_eager_protocol_version, hack_legacy_parsing)
@@ -394,17 +394,35 @@ class DTestSetup(object):
"""
self.log_watch_thread.join(timeout=60)
+def stop_cluster(self, gently=False):
+"""
+Stops the cluster; if 'gently' is requested and a NodeError occurs,
then
+try again without 'gently'.
+
+Some tests, by design, leave the cluster in a state which prevents it
from
+being stopped using 'gently'. Retrying without 'gently' will avoid
marking
+the test as a failure, but may prevent jacoco results from being
recorded.
+"""
+try:
+self.cluster.stop(gently)
+except NodeError as e:
+if gently:
+logger.debug("Exception stopping cluster with gently=True,
retrying with gently=False: {0}".format(e))
+self.cluster.stop(gently=False)
+else:
+raise e
+
def cleanup_cluster(self, request=None, failure=False):
with log_filter('cassandra'): # quiet noise from driver when nodes
start going down
test_failed = (request and hasattr(request.node, 'rep_call') and
request.node.rep_call.failed) or failure
if self.dtest_config.keep_test_dir or
(self.dtest_config.keep_failed_test_dir and test_failed):
-
self.cluster.stop(gently=self.dtest_config.enable_jacoco_code_coverage)
+
self.stop_cluster(gently=self.dtest_config.enable_jacoco_code_coverage)
else:
# when recording coverage the jvm has to exit normally
# or the coverage information is not written by the jacoco
agent
# otherwise we can just kill the process
if self.dtest_config.enable_jacoco_code_coverage:
-self.cluster.stop(gently=True)
+self.stop_cluster(gently=True)
# Cleanup everything:
try:
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) 05/43: STAR-247: Standalone scrubber should use the same default sstable format as specified for the test
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch ds-trunk-5.0--2024-07-24
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
commit 0a03225d93942985aa3ca2c57e9b2c3c794ec482
Author: Jacek Lewandowski
AuthorDate: Wed Jun 23 09:55:24 2021 +0200
STAR-247: Standalone scrubber should use the same default sstable format as
specified for the test
Also made a small refactoring of dtest_config.py
(cherry picked from commit 1253168f42c7cbe085ec7dd0f78f5ed509955406)
(cherry picked from commit 66b7cba8ea8351a0ca85c09f5d5e904f83156ac3)
(cherry picked from commit fb9042e3f00934c732c5504babe14a73abc7a456)
(cherry picked from commit 1369b315dfadb6273de3e1ac4e2109b1c6426e93)
(cherry picked from commit 8c34af17ea36dee25587350537012a48832db67a)
(cherry picked from commit 604884fd7372a260250af5fa37eb3201778333da)
(cherry picked from commit d5c8692706aec5fe820bb6bc17c66f4cc4c70ed8)
---
dtest_config.py | 13 +++--
scrub_test.py | 3 +++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/dtest_config.py b/dtest_config.py
index bfae062a..c8117525 100644
--- a/dtest_config.py
+++ b/dtest_config.py
@@ -47,8 +47,6 @@ class DTestConfig:
self.sstable_format = config.getoption("--sstable-format")
if self.sstable_format:
assert self.sstable_format in ['bti', 'big'], "SSTable format {}
is invalid - must be either bti or big".format(self.sstable_format)
-default_sstable_format_prop = "
-Dcassandra.sstable.format.default=" + self.sstable_format
-os.environ.update({"JVM_EXTRA_OPTS":
(os.environ.get("JVM_EXTRA_OPTS") or "") + default_sstable_format_prop})
self.use_vnodes = config.getoption("--use-vnodes")
self.configuration_yaml = config.getoption("--configuration-yaml")
@@ -102,6 +100,17 @@ class DTestConfig:
self.latest_config = False if self.configuration_yaml is None else
self.configuration_yaml.endswith("cassandra_latest.yaml")
+self.apply_to_env(os.environ, "JVM_EXTRA_OPTS")
+
+def apply_to_env(self, env, key="JVM_OPTS"):
+current = env.get(key) or ""
+if self.sstable_format:
+default_sstable_format_prop = "
-Dcassandra.sstable.format.default=" + self.sstable_format
+if not current.__contains__("-Dcassandra.sstable.format.default"):
+env.update({key: (env.get(key) or "") +
default_sstable_format_prop})
+else:
+logger.debug("Skipped adding {} because it is already in the
env key {}: {}".format(default_sstable_format_prop, key, current))
+
def get_version_from_build(self):
# There are times when we want to know the C* version we're testing
against
diff --git a/scrub_test.py b/scrub_test.py
index 19aa0956..8633b511 100644
--- a/scrub_test.py
+++ b/scrub_test.py
@@ -118,6 +118,9 @@ class TestHelper(Tester):
"""
node1 = self.cluster.nodelist()[0]
env = common.make_cassandra_env(node1.get_install_cassandra_root(),
node1.get_node_cassandra_root())
+
+self.dtest_config.apply_to_env(env, "JVM_OPTS")
+
scrub_bin = node1.get_tool('sstablescrub')
logger.debug(scrub_bin)
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit d9192745bc4c67f14445b5fea416736b5cec5a46 Merge: c33c8ebab4 82297b490e Author: Jacek Lewandowski AuthorDate: Thu Apr 18 12:33:56 2024 +0200 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Fix few types issues and implement types compatibility tests CHANGES.txt| 1 + .../db/marshal/AbstractCompositeType.java | 2 +- .../org/apache/cassandra/db/marshal/TupleType.java | 6 +- .../apache/cassandra/db/marshal/TypeParser.java| 2 +- .../org/apache/cassandra/db/marshal/UserType.java | 2 +- .../apache/cassandra/utils/CassandraVersion.java | 5 + test/data/types-compatibility/4.0.json.gz | Bin 0 -> 397346 bytes test/data/types-compatibility/4.1.json.gz | Bin 0 -> 396407 bytes test/data/types-compatibility/5.0.json.gz | Bin 0 -> 397761 bytes .../cassandra/db/marshal/AbstractTypeTest.java | 922 - .../cassandra/utils/AbstractTypeGenerators.java| 228 - .../utils/asserts/SoftAssertionsWithLimit.java | 42 + 12 files changed, 1200 insertions(+), 10 deletions(-) diff --cc CHANGES.txt index 6d9856ae5c,99f938c40b..4f07c455df --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -69,9 -36,10 +69,10 @@@ Merged from 4.1 * Fix hints delivery for a node going down repeatedly (CASSANDRA-19495) * Do not go to disk for reading hints file sizes (CASSANDRA-19477) * Fix system_views.settings to handle array types (CASSANDRA-19475) - * Memoize Cassandra verion and add a backoff interval for failed schema pulls (CASSANDRA-18902) * Fix StackOverflowError on ALTER after many previous schema changes (CASSANDRA-19166) + * Memoize Cassandra verion (CASSANDRA-18902) Merged from 4.0: + * Fix few types issues and implement types compatibility tests (CASSANDRA-19479) * Change logging to TRACE when failing to get peer certificate (CASSANDRA-19508) * Push LocalSessions info logs to debug (CASSANDRA-18335) * Filter remote DC replicas out when constructing the initial replica plan for the local read repair (CASSANDRA-19120) diff --cc test/unit/org/apache/cassandra/db/marshal/AbstractTypeTest.java index 22925d1e1f,499470904d..35ecfab60d --- a/test/unit/org/apache/cassandra/db/marshal/AbstractTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/AbstractTypeTest.java @@@ -42,11 -70,23 +70,23 @@@ import org.apache.cassandra.config.Data import org.apache.cassandra.cql3.AssignmentTestable; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.ColumnSpecification; -import org.apache.cassandra.cql3.Constants; +import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.Json; import org.apache.cassandra.cql3.QueryOptions; -import org.apache.cassandra.cql3.Term; +import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.cql3.VariableSpecifications; + import org.apache.cassandra.db.SerializationHeader; + import org.apache.cassandra.db.filter.ColumnFilter; + import org.apache.cassandra.db.rows.BTreeRow; + import org.apache.cassandra.db.rows.Cell; + import org.apache.cassandra.db.rows.CellPath; + import org.apache.cassandra.db.rows.ComplexColumnData; + import org.apache.cassandra.db.rows.DeserializationHelper; + import org.apache.cassandra.db.rows.EncodingStats; + import org.apache.cassandra.db.rows.Row; + import org.apache.cassandra.db.rows.Rows; + import org.apache.cassandra.db.rows.SerializationHelper; + import org.apache.cassandra.db.rows.UnfilteredSerializer; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputBuffer; - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (c33c8ebab4 -> d9192745bc)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from c33c8ebab4 Merge branch 'cassandra-5.0' into trunk add f92998190c Fix few types issues and implement types compatibility tests add 445ae1a4b1 Merge branch 'cassandra-4.0' into cassandra-4.1 add 82297b490e Merge branch 'cassandra-4.1' into cassandra-5.0 new d9192745bc Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.txt| 1 + .../db/marshal/AbstractCompositeType.java | 2 +- .../org/apache/cassandra/db/marshal/TupleType.java | 6 +- .../apache/cassandra/db/marshal/TypeParser.java| 2 +- .../org/apache/cassandra/db/marshal/UserType.java | 2 +- .../apache/cassandra/utils/CassandraVersion.java | 5 + test/data/types-compatibility/4.0.json.gz | Bin 0 -> 397346 bytes test/data/types-compatibility/4.1.json.gz | Bin 0 -> 396407 bytes test/data/types-compatibility/5.0.json.gz | Bin 0 -> 397761 bytes .../cassandra/db/marshal/AbstractTypeTest.java | 922 - .../cassandra/utils/AbstractTypeGenerators.java| 228 - .../utils/asserts/SoftAssertionsWithLimit.java | 25 +- 12 files changed, 1174 insertions(+), 19 deletions(-) create mode 100644 test/data/types-compatibility/4.0.json.gz create mode 100644 test/data/types-compatibility/4.1.json.gz create mode 100644 test/data/types-compatibility/5.0.json.gz copy src/java/org/apache/cassandra/gms/VersionGenerator.java => test/unit/org/apache/cassandra/utils/asserts/SoftAssertionsWithLimit.java (61%) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.1 updated (643d7f1751 -> 445ae1a4b1)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 643d7f1751 Merge branch 'cassandra-4.0' into cassandra-4.1 add f92998190c Fix few types issues and implement types compatibility tests add 445ae1a4b1 Merge branch 'cassandra-4.0' into cassandra-4.1 No new revisions were added by this update. Summary of changes: CHANGES.txt|1 + build.xml |4 +- .../db/marshal/AbstractCompositeType.java |2 +- .../cassandra/db/marshal/ByteArrayAccessor.java|7 + .../cassandra/db/marshal/ByteBufferAccessor.java |7 + .../apache/cassandra/db/marshal/CompositeType.java | 39 + .../cassandra/db/marshal/DynamicCompositeType.java | 47 +- .../cassandra/db/marshal/LexicalUUIDType.java |8 +- .../org/apache/cassandra/db/marshal/TupleType.java |6 +- .../apache/cassandra/db/marshal/TypeParser.java|2 +- .../org/apache/cassandra/db/marshal/UserType.java |2 +- .../apache/cassandra/db/marshal/ValueAccessor.java |6 + .../apache/cassandra/utils/CassandraVersion.java |5 + .../apache/cassandra/utils/FastByteOperations.java |5 + test/data/types-compatibility/4.0.json.gz | Bin 0 -> 397346 bytes test/data/types-compatibility/4.1.json.gz | Bin 0 -> 396407 bytes .../distributed/test/SSTableIdGenerationTest.java |2 +- .../distributed/util/QueryResultUtil.java |9 +- .../cql3/validation/entities/TupleTypeTest.java|5 +- .../cassandra/db/marshal/AbstractTypeTest.java | 1001 .../org/apache/cassandra/repair/RepairJobTest.java |9 +- .../cassandra/utils/AbstractTypeGenerators.java| 823 +++- .../cassandra/utils/CassandraGenerators.java | 21 + .../org/apache/cassandra/utils/Generators.java | 58 ++ .../utils/asserts/SoftAssertionsWithLimit.java | 27 +- test/unit/org/quicktheories/impl/JavaRandom.java | 112 +++ 26 files changed, 2136 insertions(+), 72 deletions(-) create mode 100644 test/data/types-compatibility/4.0.json.gz create mode 100644 test/data/types-compatibility/4.1.json.gz create mode 100644 test/unit/org/apache/cassandra/db/marshal/AbstractTypeTest.java copy src/java/org/apache/cassandra/gms/VersionGenerator.java => test/unit/org/apache/cassandra/utils/asserts/SoftAssertionsWithLimit.java (56%) create mode 100644 test/unit/org/quicktheories/impl/JavaRandom.java - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated (9bfaee91c4 -> 82297b490e)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 9bfaee91c4 Optionally fail writes when SAI refuses to index a term value exceeding a configured maximum size add f92998190c Fix few types issues and implement types compatibility tests add 445ae1a4b1 Merge branch 'cassandra-4.0' into cassandra-4.1 add 82297b490e Merge branch 'cassandra-4.1' into cassandra-5.0 No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../db/marshal/AbstractCompositeType.java | 2 +- .../org/apache/cassandra/db/marshal/TupleType.java | 6 +- .../apache/cassandra/db/marshal/TypeParser.java| 2 +- .../org/apache/cassandra/db/marshal/UserType.java | 2 +- .../apache/cassandra/utils/CassandraVersion.java | 6 + test/data/types-compatibility/4.0.json.gz | Bin 0 -> 397346 bytes test/data/types-compatibility/4.1.json.gz | Bin 0 -> 396407 bytes test/data/types-compatibility/5.0.json.gz | Bin 0 -> 397761 bytes .../cassandra/db/marshal/AbstractTypeTest.java | 922 - .../cassandra/utils/AbstractTypeGenerators.java| 228 - .../utils/asserts/SoftAssertionsWithLimit.java | 25 +- 12 files changed, 1175 insertions(+), 19 deletions(-) create mode 100644 test/data/types-compatibility/4.0.json.gz create mode 100644 test/data/types-compatibility/4.1.json.gz create mode 100644 test/data/types-compatibility/5.0.json.gz copy src/java/org/apache/cassandra/gms/VersionGenerator.java => test/unit/org/apache/cassandra/utils/asserts/SoftAssertionsWithLimit.java (61%) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.0 updated (0662094b84 -> f92998190c)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 0662094b84 Merge branch 'cassandra-3.11' into cassandra-4.0 add f92998190c Fix few types issues and implement types compatibility tests No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + build.xml | 4 +- .../db/marshal/AbstractCompositeType.java | 2 +- .../cassandra/db/marshal/ByteArrayAccessor.java| 7 + .../cassandra/db/marshal/ByteBufferAccessor.java | 7 + .../apache/cassandra/db/marshal/CompositeType.java | 39 + .../cassandra/db/marshal/DynamicCompositeType.java | 47 +- .../cassandra/db/marshal/LexicalUUIDType.java | 8 +- .../org/apache/cassandra/db/marshal/TupleType.java | 6 +- .../apache/cassandra/db/marshal/TypeParser.java| 2 +- .../org/apache/cassandra/db/marshal/UserType.java | 2 +- .../apache/cassandra/db/marshal/ValueAccessor.java | 6 + .../apache/cassandra/utils/CassandraVersion.java | 5 + .../apache/cassandra/utils/FastByteOperations.java | 5 + test/data/types-compatibility/4.0.json.gz | Bin 0 -> 397346 bytes .../cql3/validation/entities/TupleTypeTest.java| 5 +- .../cassandra/db/marshal/AbstractTypeTest.java | 998 + .../org/apache/cassandra/repair/RepairJobTest.java | 3 +- .../cassandra/utils/AbstractTypeGenerators.java| 823 - .../cassandra/utils/CassandraGenerators.java | 21 + .../org/apache/cassandra/utils/Generators.java | 59 ++ .../utils/asserts/SoftAssertionsWithLimit.java | 27 +- test/unit/org/quicktheories/impl/JavaRandom.java | 112 +++ 23 files changed, 2125 insertions(+), 64 deletions(-) create mode 100644 test/data/types-compatibility/4.0.json.gz create mode 100644 test/unit/org/apache/cassandra/db/marshal/AbstractTypeTest.java copy src/java/org/apache/cassandra/gms/VersionGenerator.java => test/unit/org/apache/cassandra/utils/asserts/SoftAssertionsWithLimit.java (56%) create mode 100644 test/unit/org/quicktheories/impl/JavaRandom.java - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.0 updated (1e450dbb1a -> 9613af24f3)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 1e450dbb1a Merge branch 'cassandra-3.11' into cassandra-4.0 add 5be57829b0 Backport CASSANDRA-16418 to 3.x add 2170825f0e Merge branch 'cassandra-3.0' into cassandra-3.11 add 9613af24f3 Merge branch 'cassandra-3.11' into cassandra-4.0 No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../cassandra/db/compaction/CompactionManager.java | 6 ++- .../apache/cassandra/locator/SimpleStrategy.java | 2 +- .../apache/cassandra/service/StorageService.java | 2 +- .../distributed/test/ring/CleanupFailureTest.java | 48 +- test/unit/org/apache/cassandra/db/CleanupTest.java | 45 6 files changed, 81 insertions(+), 23 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated (1086d10965 -> 78dca99973)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 1086d10965 In-jvm dtest RepairTest fails with storage_compatibility_mode: NONE add 5be57829b0 Backport CASSANDRA-16418 to 3.x add 2170825f0e Merge branch 'cassandra-3.0' into cassandra-3.11 add 9613af24f3 Merge branch 'cassandra-3.11' into cassandra-4.0 add d9dbd5e1d0 Merge branch 'cassandra-4.0' into cassandra-4.1 add 78dca99973 Merge branch 'cassandra-4.1' into cassandra-5.0 No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../cassandra/db/compaction/CompactionManager.java | 6 ++- .../apache/cassandra/locator/SimpleStrategy.java | 2 +- .../apache/cassandra/service/StorageService.java | 2 +- .../distributed/test/ring/CleanupFailureTest.java | 48 +++- test/unit/org/apache/cassandra/db/CleanupTest.java | 52 -- 6 files changed, 84 insertions(+), 27 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 097c1231e2466163fe3f8b36b12cdc5235eb1403
Merge: 1a971dab7e 78dca99973
Author: Jacek Lewandowski
AuthorDate: Wed Feb 7 15:12:04 2024 +0100
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
Backport CASSANDRA-16418 to 3.x
CHANGES.txt| 1 +
.../test/ring/CleanupDuringRangeMovementTest.java | 56 --
2 files changed, 32 insertions(+), 25 deletions(-)
diff --cc CHANGES.txt
index a6107c29a8,1549165f6c..367d65ecdb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -28,11 -15,15 +28,12 @@@ Merged from 5.0
* Fix resource cleanup after SAI query timeouts (CASSANDRA-19177)
* Suppress CVE-2023-6481 (CASSANDRA-19184)
Merged from 4.1:
- * Memoize Cassandra verion and add a backoff interval for failed schema
pulls (CASSANDRA-18902)
* Fix StackOverflowError on ALTER after many previous schema changes
(CASSANDRA-19166)
+ * Memoize Cassandra verion (CASSANDRA-18902)
Merged from 4.0:
- * Skip version check if an endpoint is dead state in
Gossiper#upgradeFromVersionSupplier (CASSANDRA-19187)
- * Fix Gossiper::hasMajorVersion3Nodes to return false during minor upgrade
(CASSANDRA-18999)
- * Revert unnecessary read lock acquisition when reading ring version in
TokenMetadata introduced in CASSANDRA-16286 (CASSANDRA-19107)
Merged from 3.11:
Merged from 3.0:
+ * Backport CASSANDRA-16418 to 3.x (CASSANDRA-18824)
5.0-beta1
diff --cc
test/distributed/org/apache/cassandra/distributed/test/ring/CleanupDuringRangeMovementTest.java
index bc46a1fe7b,00..8e80732400
mode 100644,00..100644
---
a/test/distributed/org/apache/cassandra/distributed/test/ring/CleanupDuringRangeMovementTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/test/ring/CleanupDuringRangeMovementTest.java
@@@ -1,145 -1,0 +1,151 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra.distributed.test.ring;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import org.junit.Test;
+
+import org.apache.cassandra.distributed.Cluster;
+import org.apache.cassandra.distributed.Constants;
+import org.apache.cassandra.distributed.api.ConsistencyLevel;
+import org.apache.cassandra.distributed.api.IInstanceConfig;
+import org.apache.cassandra.distributed.api.IInvokableInstance;
+import org.apache.cassandra.distributed.api.NodeToolResult;
+import org.apache.cassandra.distributed.shared.NetworkTopology;
+import org.apache.cassandra.distributed.test.TestBaseImpl;
+import org.apache.cassandra.tcm.transformations.PrepareJoin;
+import org.apache.cassandra.tcm.transformations.PrepareLeave;
+
++import static org.apache.cassandra.distributed.api.Feature.GOSSIP;
++import static org.apache.cassandra.distributed.api.Feature.NETWORK;
++import static
org.apache.cassandra.distributed.api.TokenSupplier.evenlyDistributedTokens;
+import static
org.apache.cassandra.distributed.shared.ClusterUtils.decommission;
+import static
org.apache.cassandra.distributed.shared.ClusterUtils.pauseBeforeCommit;
+import static
org.apache.cassandra.distributed.shared.ClusterUtils.unpauseCommits;
- import static
org.apache.cassandra.distributed.test.ring.BootstrapTest.populateExistingTable;
+import static org.junit.Assert.assertEquals;
- import static org.apache.cassandra.distributed.api.Feature.GOSSIP;
- import static org.apache.cassandra.distributed.api.Feature.NETWORK;
- import static
org.apache.cassandra.distributed.api.TokenSupplier.evenlyDistributedTokens;
+import static org.junit.Assert.assertTrue;
+
+public class CleanupDuringRangeMovementTest extends TestBaseImpl
+{
+@Test
+public void cleanupDuringDecommissionTest() throws Throwable
+{
+ExecutorService executor = Executors.newSingleThreadExecutor();
- try (Cluster c
(cassandra) branch trunk updated (1a971dab7e -> 097c1231e2)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 1a971dab7e Merge branch 'cassandra-5.0' into trunk add 5be57829b0 Backport CASSANDRA-16418 to 3.x add 2170825f0e Merge branch 'cassandra-3.0' into cassandra-3.11 add 9613af24f3 Merge branch 'cassandra-3.11' into cassandra-4.0 add d9dbd5e1d0 Merge branch 'cassandra-4.0' into cassandra-4.1 add 78dca99973 Merge branch 'cassandra-4.1' into cassandra-5.0 new 097c1231e2 Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.txt| 1 + .../test/ring/CleanupDuringRangeMovementTest.java | 56 -- 2 files changed, 32 insertions(+), 25 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-3.11 updated (653337ed06 -> 2170825f0e)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 653337ed06 Merge branch 'cassandra-3.0' into cassandra-3.11 add 5be57829b0 Backport CASSANDRA-16418 to 3.x add 2170825f0e Merge branch 'cassandra-3.0' into cassandra-3.11 No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../cassandra/db/compaction/CompactionManager.java | 4 +- .../apache/cassandra/service/StorageService.java | 3 + .../cassandra/distributed/action/GossipHelper.java | 16 +++ .../distributed/test/CleanupFailureTest.java | 118 + test/unit/org/apache/cassandra/db/CleanupTest.java | 48 - 6 files changed, 186 insertions(+), 4 deletions(-) create mode 100644 test/distributed/org/apache/cassandra/distributed/test/CleanupFailureTest.java - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-3.0 updated (0bc95bbebd -> 5be57829b0)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-3.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 0bc95bbebd Set log-cli-level to DEBUG in circle config add 5be57829b0 Backport CASSANDRA-16418 to 3.x No new revisions were added by this update. Summary of changes: CHANGES.txt| 18 ++-- .../cassandra/db/compaction/CompactionManager.java | 4 +- .../apache/cassandra/service/StorageService.java | 3 + .../cassandra/distributed/action/GossipHelper.java | 16 +++ .../distributed/test/CleanupFailureTest.java | 118 + test/unit/org/apache/cassandra/db/CleanupTest.java | 48 - 6 files changed, 197 insertions(+), 10 deletions(-) create mode 100644 test/distributed/org/apache/cassandra/distributed/test/CleanupFailureTest.java - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.1 updated (cd7ff04e72 -> d9dbd5e1d0)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from cd7ff04e72 Merge branch 'cassandra-4.0' into cassandra-4.1 add 5be57829b0 Backport CASSANDRA-16418 to 3.x add 2170825f0e Merge branch 'cassandra-3.0' into cassandra-3.11 add 9613af24f3 Merge branch 'cassandra-3.11' into cassandra-4.0 add d9dbd5e1d0 Merge branch 'cassandra-4.0' into cassandra-4.1 No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../cassandra/db/compaction/CompactionManager.java | 6 ++- .../apache/cassandra/locator/SimpleStrategy.java | 2 +- .../apache/cassandra/service/StorageService.java | 2 +- .../distributed/test/ring/CleanupFailureTest.java | 48 +++- test/unit/org/apache/cassandra/db/CleanupTest.java | 52 -- 6 files changed, 84 insertions(+), 27 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (5d46ff2796 -> ca067ca58a)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 5d46ff2796 Remove dependency on Sigar in favor of OSHI add d422eb1f35 Fix storage_compatibility_mode for streaming new ca067ca58a Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.txt| 1 + build.xml | 4 ++-- .../config/CassandraRelevantProperties.java| 16 ++--- src/java/org/apache/cassandra/config/Config.java | 2 +- .../cassandra/config/DatabaseDescriptor.java | 22 +- .../org/apache/cassandra/net/MessagingService.java | 26 +- .../cassandra/net/OutboundConnectionSettings.java | 2 +- .../cassandra/repair/messages/PrepareMessage.java | 4 +++- .../org/apache/cassandra/tools/BulkLoader.java | 2 +- .../org/apache/cassandra/repair/FuzzTestBase.java | 2 +- 10 files changed, 55 insertions(+), 26 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit ca067ca58aecf0308b0428b443b082cacc9f9883
Merge: 5d46ff2796 d422eb1f35
Author: Jacek Lewandowski
AuthorDate: Tue Jan 23 14:24:06 2024 +0100
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
Fix storage_compatibility_mode for streaming
CHANGES.txt| 1 +
build.xml | 4 ++--
.../config/CassandraRelevantProperties.java| 16 ++---
src/java/org/apache/cassandra/config/Config.java | 2 +-
.../cassandra/config/DatabaseDescriptor.java | 22 +-
.../org/apache/cassandra/net/MessagingService.java | 26 +-
.../cassandra/net/OutboundConnectionSettings.java | 2 +-
.../cassandra/repair/messages/PrepareMessage.java | 4 +++-
.../org/apache/cassandra/tools/BulkLoader.java | 2 +-
.../org/apache/cassandra/repair/FuzzTestBase.java | 2 +-
10 files changed, 55 insertions(+), 26 deletions(-)
diff --cc CHANGES.txt
index 108096a416,485b945791..1a06b877f4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
-5.0-beta2
+5.1
+ * Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565)
+ * Simplify the bind marker and Term logic (CASSANDRA-18813)
+ * Limit cassandra startup to supported JDKs, allow higher JDKs by setting
CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688)
+ * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104)
+ * Make nodetool tablestats use number of significant digits for time and
average values consistently (CASSANDRA-19015)
+ * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875)
+ * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330)
+ * Add ELAPSED command to cqlsh (CASSANDRA-18861)
+ * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781)
+ * Clean up obsolete functions and simplify cql_version handling in cqlsh
(CASSANDRA-18787)
+Merged from 5.0:
+ * Fix storage_compatibility_mode for streaming (CASSANDRA-19126)
* Add support of vector type to cqlsh COPY command (CASSANDRA-19118)
* Make CQLSSTableWriter to support building of SAI indexes (CASSANDRA-18714)
* Append additional JVM options when using JDK17+ (CASSANDRA-19001)
diff --cc src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
index ed92ee6a41,b3d0b52abe..5177fb09fb
--- a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
+++ b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
@@@ -588,6 -554,15 +580,14 @@@ public enum CassandraRelevantPropertie
TEST_SIMULATOR_PRINT_ASM_TYPES("cassandra.test.simulator.print_asm_types", ""),
TEST_SKIP_CRYPTO_PROVIDER_INSTALLATION("cassandra.test.security.skip.provider.installation",
"false"),
TEST_SSTABLE_FORMAT_DEVELOPMENT("cassandra.test.sstableformatdevelopment"),
+ /**
- * {@link StorageCompatibilityMode} mode sets how the node will behave,
sstable or messaging versions to use etc.
- * according to a yaml setting. But many tests don't load the config
hence we need to force it otherwise they would
- * run always under the default. Config is null for junits that don't
load the config. Get from env var that
- * CI/build.xml sets.
++ * {@link StorageCompatibilityMode} mode sets how the node will behave,
sstable or messaging versions to use etc according to a yaml setting.
++ * But many tests don't load the config hence we need to force it
otherwise they would run always under the default. Config is null for junits
++ * that don't load the config. Get from env var that CI/build.xml sets.
+ *
+ * This is a dev/CI only property. Do not use otherwise.
+ */
-
TEST_STORAGE_COMPATIBILITY_MODE("cassandra.test.storage_compatibility_mode",
StorageCompatibilityMode.CASSANDRA_4.toString()),
++
TEST_STORAGE_COMPATIBILITY_MODE("cassandra.test.storage_compatibility_mode",
StorageCompatibilityMode.NONE.toString()),
TEST_STRICT_LCS_CHECKS("cassandra.test.strict_lcs_checks"),
/** Turns some warnings into exceptions for testing. */
TEST_STRICT_RUNTIME_CHECKS("cassandra.strict.runtime.checks"),
diff --cc src/java/org/apache/cassandra/config/Config.java
index d62d836815,9c3c941c5e..4db252917d
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@@ -1279,21 -1269,5 +1279,21 @@@ public class Confi
public double severity_during_decommission = 0;
+// TODO Revisit MessagingService::current_version
- public StorageCompatibilityMode storage_compatibility_mode =
StorageCompatibilityMode.NONE;
+ public StorageCompatibilityMode storage_
(cassandra) branch cassandra-5.0 updated (c76b32492f -> d422eb1f35)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from c76b32492f Add support of vector type to cqlsh COPY command add d422eb1f35 Fix storage_compatibility_mode for streaming No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + build.xml | 4 ++-- .../config/CassandraRelevantProperties.java| 17 ++--- src/java/org/apache/cassandra/config/Config.java | 2 +- .../cassandra/config/DatabaseDescriptor.java | 22 - .../org/apache/cassandra/net/MessagingService.java | 28 -- .../cassandra/net/OutboundConnectionSettings.java | 2 +- .../cassandra/repair/messages/PrepareMessage.java | 4 +++- .../org/apache/cassandra/tools/BulkLoader.java | 2 +- .../org/apache/cassandra/repair/FuzzTestBase.java | 2 +- 10 files changed, 56 insertions(+), 28 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.1 updated (481d2fd51d -> 3edca0041c)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 481d2fd51d Merge branch 'cassandra-4.0' into cassandra-4.1 add 3edca0041c Memoize Cassandra verion and add a backoff interval for failed schema pulls No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../config/CassandraRelevantProperties.java| 8 +++ .../cassandra/schema/MigrationCoordinator.java | 27 ++ .../org/apache/cassandra/utils/FBUtilities.java| 15 .../cassandra/distributed/impl/Instance.java | 15 +--- .../distributed/test/MigrationCoordinatorTest.java | 23 -- .../cassandra/schema/MigrationCoordinatorTest.java | 5 7 files changed, 74 insertions(+), 20 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated (f0ea12c6d7 -> 977f245906)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from f0ea12c6d7 Add a startup check to fail startup when using invalid configuration with certain Kernel and FS type add 3edca0041c Memoize Cassandra verion and add a backoff interval for failed schema pulls add 977f245906 Merge branch 'cassandra-4.1' into cassandra-5.0 No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../cassandra/schema/MigrationCoordinator.java | 25 .../org/apache/cassandra/utils/FBUtilities.java| 11 - .../cassandra/distributed/impl/Instance.java | 14 --- .../distributed/test/MigrationCoordinatorTest.java | 27 ++ .../cassandra/schema/MigrationCoordinatorTest.java | 5 6 files changed, 60 insertions(+), 23 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (5321f88c40 -> a7c614d85f)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 5321f88c40 Merge branch 'cassandra-5.0' into trunk add 3edca0041c Memoize Cassandra verion and add a backoff interval for failed schema pulls add 977f245906 Merge branch 'cassandra-4.1' into cassandra-5.0 new a7c614d85f Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.txt | 1 + src/java/org/apache/cassandra/utils/FBUtilities.java | 11 --- 2 files changed, 5 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit a7c614d85f24c1161b34eddae518092270a700b4 Merge: 5321f88c40 977f245906 Author: Jacek Lewandowski AuthorDate: Fri Dec 22 11:49:21 2023 +0100 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Memoize Cassandra verion and add a backoff interval for failed schema pulls CHANGES.txt | 1 + src/java/org/apache/cassandra/utils/FBUtilities.java | 11 --- 2 files changed, 5 insertions(+), 7 deletions(-) diff --cc CHANGES.txt index 8956d8fabf,85ba4629e1..b84d7626b0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -12,7 -5,8 +12,8 @@@ Merged from 5.0 * Fix resource cleanup after SAI query timeouts (CASSANDRA-19177) * Suppress CVE-2023-6481 (CASSANDRA-19184) Merged from 4.1: - * Memoize Cassandra verion and add a backoff interval for failed schema pulls (CASSANDRA-18902) * Fix StackOverflowError on ALTER after many previous schema changes (CASSANDRA-19166) ++ * Memoize Cassandra verion (CASSANDRA-18902) Merged from 4.0: Merged from 3.11: Merged from 3.0: - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 5321f88c40cc9ad280a7fb7472194b93e93334c0
Merge: f76f328622 f0ea12c6d7
Author: Jacek Lewandowski
AuthorDate: Thu Dec 21 16:42:32 2023 +0100
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
Add a startup check to fail startup when using invalid configuration with
certain Kernel and FS type
.build/cassandra-deps-template.xml | 4 +
.build/parent-pom-template.xml | 5 +
CHANGES.txt| 1 +
.../config/CassandraRelevantProperties.java| 4 +-
src/java/org/apache/cassandra/config/Config.java | 7 +-
.../apache/cassandra/io/util/DataOutputBuffer.java | 15 +++
.../apache/cassandra/service/StartupChecks.java| 64 -
.../org/apache/cassandra/utils/FBUtilities.java| 124 -
.../cassandra/service/StartupChecksTest.java | 147 -
.../apache/cassandra/utils/FBUtilitiesTest.java| 49 +--
10 files changed, 401 insertions(+), 19 deletions(-)
diff --cc CHANGES.txt
index 08a630ca18,d90ee5de25..8956d8fabf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
-5.0-beta2
+5.1
+ * Make nodetool tablestats use number of significant digits for time and
average values consistently (CASSANDRA-19015)
+ * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875)
+ * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330)
+ * Add ELAPSED command to cqlsh (CASSANDRA-18861)
+ * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781)
+ * Clean up obsolete functions and simplify cql_version handling in cqlsh
(CASSANDRA-18787)
+Merged from 5.0:
+ * Add a startup check to fail startup when using invalid configuration with
certain Kernel and FS type (CASSANDRA-19196)
* UCS min_sstable_size should not be lower than target_sstable_size lower
bound (CASSANDRA-19112)
* Fix the correspondingMessagingVersion of SSTable format and improve TTL
overflow tests coverage (CASSANDRA-19197)
* Fix resource cleanup after SAI query timeouts (CASSANDRA-19177)
diff --cc src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
index b28bf2c4f6,16a24fd2f0..db18c45eb8
--- a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
+++ b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
@@@ -616,10 -592,8 +619,9 @@@ public enum CassandraRelevantPropertie
USE_NIX_RECURSIVE_DELETE("cassandra.use_nix_recursive_delete"),
/** Gossiper compute expiration timeout. Default value 3 days. */
VERY_LONG_TIME_MS("cassandra.very_long_time_ms", "25920"),
-
WAIT_FOR_TRACING_EVENTS_TIMEOUT_SECS("cassandra.wait_for_tracing_events_timeout_secs",
"0");
+
WAIT_FOR_TRACING_EVENTS_TIMEOUT_SECS("cassandra.wait_for_tracing_events_timeout_secs",
"0"),
+;
-
static
{
CassandraRelevantProperties[] values =
CassandraRelevantProperties.values();
diff --cc test/unit/org/apache/cassandra/service/StartupChecksTest.java
index 6a26899beb,6fb063987a..6916f35424
--- a/test/unit/org/apache/cassandra/service/StartupChecksTest.java
+++ b/test/unit/org/apache/cassandra/service/StartupChecksTest.java
@@@ -21,20 -23,39 +23,40 @@@ import java.nio.file.FileSystem
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+ import java.nio.file.spi.FileSystemProvider;
import java.time.Instant;
import java.util.List;
-
- import org.apache.cassandra.config.StartupChecksOptions;
- import org.apache.cassandra.io.util.File;
- import org.junit.*;
-
+ import java.util.Map;
+ import java.util.Set;
+ import java.util.concurrent.Callable;
+ import java.util.stream.Collectors;
+
+ import org.junit.After;
+ import org.junit.AfterClass;
+ import org.junit.Assert;
+ import org.junit.Assume;
+ import org.junit.Before;
+ import org.junit.BeforeClass;
+ import org.junit.Test;
+
+ import com.vdurmont.semver4j.Semver;
import org.apache.cassandra.SchemaLoader;
++import org.apache.cassandra.config.CassandraRelevantProperties;
+ import org.apache.cassandra.config.Config.DiskAccessMode;
import org.apache.cassandra.config.DatabaseDescriptor;
- import org.apache.cassandra.schema.SchemaConstants;
- import org.apache.cassandra.db.*;
+ import org.apache.cassandra.config.StartupChecksOptions;
+ import org.apache.cassandra.db.ColumnFamilyStore;
+ import org.apache.cassandra.db.Directories;
+ import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.exceptions.StartupException;
+ import org.apache.cassandra.io.filesystem.ForwardingFileSystem;
+ import org.apache.cassandra.io.filesystem.ForwardingFileSystemProvider;
+ import org.apache.cassandra.io
(cassandra) branch trunk updated (f76f328622 -> 5321f88c40)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from f76f328622 Merge branch 'cassandra-5.0' into trunk add f0ea12c6d7 Add a startup check to fail startup when using invalid configuration with certain Kernel and FS type new 5321f88c40 Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .build/cassandra-deps-template.xml | 4 + .build/parent-pom-template.xml | 5 + CHANGES.txt| 1 + .../config/CassandraRelevantProperties.java| 4 +- src/java/org/apache/cassandra/config/Config.java | 7 +- .../apache/cassandra/io/util/DataOutputBuffer.java | 15 +++ .../apache/cassandra/service/StartupChecks.java| 64 - .../org/apache/cassandra/utils/FBUtilities.java| 124 - .../cassandra/service/StartupChecksTest.java | 147 - .../apache/cassandra/utils/FBUtilitiesTest.java| 49 +-- 10 files changed, 401 insertions(+), 19 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated (3b05051f86 -> f0ea12c6d7)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 3b05051f86 Simplify segment building in SAI to use single in-memory structure This removes the RAMStringIndexer for literal indexes and replaces it with a SegmentTrieBuffer that replaces BlockBalancedTreeRamBuffer for literal and numeric indexes. add f0ea12c6d7 Add a startup check to fail startup when using invalid configuration with certain Kernel and FS type No new revisions were added by this update. Summary of changes: .build/cassandra-deps-template.xml | 4 + .build/parent-pom-template.xml | 5 + CHANGES.txt| 1 + .../config/CassandraRelevantProperties.java| 3 + src/java/org/apache/cassandra/config/Config.java | 7 +- .../apache/cassandra/io/util/DataOutputBuffer.java | 15 +++ .../apache/cassandra/service/StartupChecks.java| 64 +- .../org/apache/cassandra/utils/FBUtilities.java| 124 +++ .../cassandra/service/StartupChecksTest.java | 137 +++-- .../apache/cassandra/utils/FBUtilitiesTest.java| 49 ++-- 10 files changed, 392 insertions(+), 17 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-3.11 updated (2e3d7e76f5 -> 09c46750f6)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 2e3d7e76f5 Merge branch 'cassandra-3.0' into cassandra-3.11 add 4c3b96e4cd Updated the OWASP plugin to 9.0.5 and refactored dependency checks add 09c46750f6 Merge branch 'cassandra-3.0' into cassandra-3.11 No new revisions were added by this update. Summary of changes: .build/build-owasp.xml | 82 +--- .build/dependency-check-suppressions.xml | 19 +--- build.xml| 1 + 3 files changed, 55 insertions(+), 47 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-3.0 updated (a1421ec324 -> 4c3b96e4cd)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-3.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from a1421ec324 Suppress CVE-2023-6378 add 4c3b96e4cd Updated the OWASP plugin to 9.0.5 and refactored dependency checks No new revisions were added by this update. Summary of changes: .build/build-owasp.xml | 83 +--- .build/dependency-check-suppressions.xml | 26 +- build.xml| 1 + 3 files changed, 56 insertions(+), 54 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (bfcb21fbeb -> 6fb2de3c95)
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from bfcb21fbeb Set right client auth for creating SSL context in mTLS
optional mode
add 4c3b96e4cd Updated the OWASP plugin to 9.0.5 and refactored dependency
checks
add 09c46750f6 Merge branch 'cassandra-3.0' into cassandra-3.11
add 891f1119a0 Merge branch 'cassandra-3.11' into cassandra-4.0
add 481d2fd51d Merge branch 'cassandra-4.0' into cassandra-4.1
add 790798dea0 Merge branch 'cassandra-4.1' into cassandra-5.0
new 6fb2de3c95 Merge branch 'cassandra-5.0' into trunk
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.build/build-owasp.xml | 88 ++
.../{ => owasp}/dependency-check-suppressions.xml | 18 -
2 files changed, 55 insertions(+), 51 deletions(-)
rename .build/{ => owasp}/dependency-check-suppressions.xml (76%)
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.1 updated (a443990bfa -> 481d2fd51d)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from a443990bfa Fix StackOverflowError on ALTER after many previous schema changes add 4c3b96e4cd Updated the OWASP plugin to 9.0.5 and refactored dependency checks add 09c46750f6 Merge branch 'cassandra-3.0' into cassandra-3.11 add 891f1119a0 Merge branch 'cassandra-3.11' into cassandra-4.0 add 481d2fd51d Merge branch 'cassandra-4.0' into cassandra-4.1 No new revisions were added by this update. Summary of changes: .build/build-owasp.xml | 82 +--- .build/dependency-check-suppressions.xml | 7 +-- build.xml| 1 + 3 files changed, 55 insertions(+), 35 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated (e6ffd8b4f7 -> 790798dea0)
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a change to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from e6ffd8b4f7 UCS min_sstable_size should not be lower than
target_sstable_size lower bound
add 4c3b96e4cd Updated the OWASP plugin to 9.0.5 and refactored dependency
checks
add 09c46750f6 Merge branch 'cassandra-3.0' into cassandra-3.11
add 891f1119a0 Merge branch 'cassandra-3.11' into cassandra-4.0
add 481d2fd51d Merge branch 'cassandra-4.0' into cassandra-4.1
add 790798dea0 Merge branch 'cassandra-4.1' into cassandra-5.0
No new revisions were added by this update.
Summary of changes:
.build/build-owasp.xml | 88 ++
.../{ => owasp}/dependency-check-suppressions.xml | 6 +-
2 files changed, 56 insertions(+), 38 deletions(-)
rename .build/{ => owasp}/dependency-check-suppressions.xml (94%)
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 6fb2de3c952367257bc6cd4d79557a19c2bca8e4
Merge: bfcb21fbeb 790798dea0
Author: Jacek Lewandowski
AuthorDate: Wed Dec 20 12:59:56 2023 +0100
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
Updated the OWASP plugin to 9.0.5 and refactored dependency checks
.build/build-owasp.xml | 88 ++
.../{ => owasp}/dependency-check-suppressions.xml | 18 -
2 files changed, 55 insertions(+), 51 deletions(-)
diff --cc .build/owasp/dependency-check-suppressions.xml
index a4d9bd28c7,3f2233d324..6defa63cbe
--- a/.build/owasp/dependency-check-suppressions.xml
+++ b/.build/owasp/dependency-check-suppressions.xml
@@@ -20,22 -20,18 +20,6 @@@
https://jeremylong.github.io/DependencyCheck/general/suppression.html
-->
https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd";>
--
--
--^pkg:maven/org\.yaml/snakeyaml@.*$
- CVE-2023-2251
-CVE-2022-1471
--CVE-2022-25857
--CVE-2022-38749
--CVE-2022-38750
--CVE-2022-38751
--CVE-2022-38752
--CVE-2022-41854
- CVE-2022-1471
- CVE-2022-3064
- CVE-2021-4235
- CVE-2017-18640
--
--
^pkg:maven/io\.netty/netty\-.*@.*$
@@@ -45,8 -41,8 +29,6 @@@
^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$
--CVE-2022-42003
--CVE-2022-42004
CVE-2023-35116
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.0 updated (8e5fc74c9a -> 891f1119a0)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 8e5fc74c9a Merge branch 'cassandra-3.11' into cassandra-4.0 add 4c3b96e4cd Updated the OWASP plugin to 9.0.5 and refactored dependency checks add 09c46750f6 Merge branch 'cassandra-3.0' into cassandra-3.11 add 891f1119a0 Merge branch 'cassandra-3.11' into cassandra-4.0 No new revisions were added by this update. Summary of changes: .build/build-owasp.xml | 82 +--- .build/dependency-check-suppressions.xml | 7 +-- build.xml| 1 + 3 files changed, 55 insertions(+), 35 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 08c46d09634ed4639246036b84caf817d14fa188 Merge: 85a0b9b5dc 2fc2be54ca Author: Jacek Lewandowski AuthorDate: Fri Dec 15 09:40:37 2023 +0100 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Fix the correspondingMessagingVersion of SSTable format and improve TTL overflow tests coverage CHANGES.txt| 2 + build.xml | 7 + conf/cassandra.yaml| 32 +-- ide/idea/workspace.xml | 3 +- .../cassandra/io/sstable/format/big/BigFormat.java | 4 +- .../cassandra/io/sstable/format/bti/BtiFormat.java | 2 +- .../MixedModeTTLOverflowAfterUpgradeTest.java | 44 ++-- .../MixedModeTTLOverflowDuringUpgradeTest.java | 61 ++ .../upgrade/MixedModeTTLOverflowUpgradeTest.java | 131 .../MixedModeTTLOverflowUpgradeTestBase.java | 223 + .../cql3/validation/operations/TTLTest.java| 106 +- 11 files changed, 391 insertions(+), 224 deletions(-) diff --cc CHANGES.txt index 3b14a53880,3ea5a79229..1255f10100 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,5 +1,12 @@@ -5.0-beta2 +5.1 + * Make nodetool tablestats use number of significant digits for time and average values consistently (CASSANDRA-19015) + * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875) + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * Add ELAPSED command to cqlsh (CASSANDRA-18861) + * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781) + * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787) +Merged from 5.0: + * Fix the correspondingMessagingVersion of SSTable format and improve TTL overflow tests coverage (CASSANDRA-19197) * Fix resource cleanup after SAI query timeouts (CASSANDRA-19177) * Suppress CVE-2023-6481 (CASSANDRA-19184) Merged from 4.1: diff --cc conf/cassandra.yaml index 508a177fe1,3f9dfc577e..5c5019962e --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@@ -2127,10 -2128,12 +2125,12 @@@ drop_compact_storage_enabled: fals # - NONE:Start with all the new features and formats enabled. # # A typical upgrade would be: - # - Do a rolling upgrade starting all nodes in CASSANDRA_Y compatibility mode. - # - Once the new binary is rendered stable do a rolling restart with UPGRADING. The cluster will enable new features in a safe way - # until all nodes are started in UPGRADING, then all new features are enabled. - # - Do a rolling restart with all nodes starting with NONE. This sheds the extra cost of checking nodes versions and ensures - # a stable cluster. If a node from a previous version was started by accident we won't any longer toggle behaviors as when UPGRADING. + # - Do a rolling upgrade, starting all nodes in CASSANDRA_X compatibility mode. + # - Once the new binary is rendered stable, do a rolling restart with the UPGRADING mode. The cluster will keep new + # features disabled until all nodes are started in the UPGRADING mode; when that happens, new features controlled by + # the storage compatibility mode are enabled. + # - Do a rolling restart with all nodes starting with the NONE mode. This eliminates the cost of checking node versions + # and ensures stability. If Cassandra was started at the previous version by accident, a node with disabled + # compatibility mode would no longer toggle behaviors as when it was running in the UPGRADING mode. # -storage_compatibility_mode: CASSANDRA_4 +storage_compatibility_mode: NONE diff --cc test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeTTLOverflowUpgradeTestBase.java index 00,e64dca295d..c0a4b5b747 mode 00,100644..100644 --- a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeTTLOverflowUpgradeTestBase.java +++ b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeTTLOverflowUpgradeTestBase.java @@@ -1,0 -1,219 +1,223 @@@ + /* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or im
(cassandra) branch trunk updated (85a0b9b5dc -> 08c46d0963)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 85a0b9b5dc Merge branch 'cassandra-5.0' into trunk add 2fc2be54ca Fix the correspondingMessagingVersion of SSTable format and improve TTL overflow tests coverage new 08c46d0963 Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.txt| 2 + build.xml | 7 + conf/cassandra.yaml| 32 +-- ide/idea/workspace.xml | 3 +- .../cassandra/io/sstable/format/big/BigFormat.java | 4 +- .../cassandra/io/sstable/format/bti/BtiFormat.java | 2 +- .../MixedModeTTLOverflowAfterUpgradeTest.java | 44 ++-- .../MixedModeTTLOverflowDuringUpgradeTest.java | 61 ++ .../upgrade/MixedModeTTLOverflowUpgradeTest.java | 131 .../MixedModeTTLOverflowUpgradeTestBase.java | 223 + .../cql3/validation/operations/TTLTest.java| 106 +- 11 files changed, 391 insertions(+), 224 deletions(-) create mode 100644 test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeTTLOverflowDuringUpgradeTest.java delete mode 100644 test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeTTLOverflowUpgradeTest.java create mode 100644 test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeTTLOverflowUpgradeTestBase.java - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated (f9ebec98a2 -> 2fc2be54ca)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from f9ebec98a2 Fix cqlshlib cython test by definining DIST_DIR add 2fc2be54ca Fix the correspondingMessagingVersion of SSTable format and improve TTL overflow tests coverage No new revisions were added by this update. Summary of changes: CHANGES.txt| 2 + build.xml | 7 + conf/cassandra.yaml| 32 +-- ide/idea/workspace.xml | 3 +- .../cassandra/io/sstable/format/big/BigFormat.java | 4 +- .../cassandra/io/sstable/format/bti/BtiFormat.java | 2 +- .../MixedModeTTLOverflowAfterUpgradeTest.java | 60 ++ .../MixedModeTTLOverflowDuringUpgradeTest.java | 61 ++ .../upgrade/MixedModeTTLOverflowUpgradeTest.java | 161 --- .../MixedModeTTLOverflowUpgradeTestBase.java | 219 + .../cql3/validation/operations/TTLTest.java| 106 +- 11 files changed, 432 insertions(+), 225 deletions(-) create mode 100644 test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeTTLOverflowAfterUpgradeTest.java create mode 100644 test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeTTLOverflowDuringUpgradeTest.java delete mode 100644 test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeTTLOverflowUpgradeTest.java create mode 100644 test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeTTLOverflowUpgradeTestBase.java - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.1 updated (13e5956285 -> a443990bfa)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 13e5956285 Merge branch 'cassandra-4.0' into cassandra-4.1 add a443990bfa Fix StackOverflowError on ALTER after many previous schema changes No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + .../cassandra/schema/TableMetadataRefCache.java | 20 +--- 2 files changed, 14 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated (fdfc5e614d -> 676f7ee751)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from fdfc5e614d Merge branch 'cassandra-4.1' into cassandra-5.0 add a443990bfa Fix StackOverflowError on ALTER after many previous schema changes add 676f7ee751 Merge branch 'cassandra-4.1' into cassandra-5.0 No new revisions were added by this update. Summary of changes: CHANGES.txt | 2 ++ .../cassandra/schema/TableMetadataRefCache.java | 20 +--- 2 files changed, 15 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit ea1f9e4504cec1849a96c4b8eac962783662fcd8 Merge: ad86c9d201 676f7ee751 Author: Jacek Lewandowski AuthorDate: Wed Dec 6 18:05:49 2023 +0100 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Fix StackOverflowError on ALTER after many previous schema changes CHANGES.txt | 1 + 1 file changed, 1 insertion(+) diff --cc CHANGES.txt index 6fcb72dcf1,c69b0e1234..60879f9d64 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -302,6 -291,6 +302,7 @@@ Merged from 3.0 4.1.4 ++ * Fix StackOverflowError on ALTER after many previous schema changes (CASSANDRA-19166) Merged from 4.0: * Fix NTS log message when an unrecognized strategy option is passed (CASSANDRA-18679) * Fix BulkLoader ignoring cipher suites options (CASSANDRA-18582) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (ad86c9d201 -> ea1f9e4504)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from ad86c9d201 Merge branch 'cassandra-5.0' into trunk add a443990bfa Fix StackOverflowError on ALTER after many previous schema changes add 676f7ee751 Merge branch 'cassandra-4.1' into cassandra-5.0 new ea1f9e4504 Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.txt | 1 + 1 file changed, 1 insertion(+) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.1 updated (350e968565 -> 4059faf5b9)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 350e968565 Merge branch 'cassandra-4.0' into cassandra-4.1 add e1b0b44f9e Fix repeated tests on CircleCI and long-testsome/burn-testsome targets add 4059faf5b9 Merge branch 'cassandra-4.0' into cassandra-4.1 No new revisions were added by this update. Summary of changes: build.xml | 27 +++ 1 file changed, 23 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit d91997cb042ef3821d057082fa7d9c8005a473dc Merge: 8cd0690c0b b48fdc7cf2 Author: Jacek Lewandowski AuthorDate: Fri Dec 1 19:40:47 2023 +0100 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Fix repeated tests on CircleCI and long-testsome/burn-testsome targets .circleci/config.yml | 48 +-- .circleci/config.yml.FREE | 48 +-- .circleci/config.yml.PAID | 48 +-- .circleci/config_template.yml | 6 +++--- build.xml | 45 5 files changed, 98 insertions(+), 97 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (8cd0690c0b -> d91997cb04)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 8cd0690c0b Revert "Upgrade jackson to 2.15.3 and snakeyaml to 2.1" add e1b0b44f9e Fix repeated tests on CircleCI and long-testsome/burn-testsome targets add 4059faf5b9 Merge branch 'cassandra-4.0' into cassandra-4.1 add b48fdc7cf2 Merge branch 'cassandra-4.1' into cassandra-5.0 new d91997cb04 Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .circleci/config.yml | 48 +-- .circleci/config.yml.FREE | 48 +-- .circleci/config.yml.PAID | 48 +-- .circleci/config_template.yml | 6 +++--- build.xml | 45 5 files changed, 98 insertions(+), 97 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.0 updated (50273d98e4 -> e1b0b44f9e)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 50273d98e4 Support max SSTable size in sorted CQLSSTableWriter add e1b0b44f9e Fix repeated tests on CircleCI and long-testsome/burn-testsome targets No new revisions were added by this update. Summary of changes: build.xml | 27 +++ 1 file changed, 23 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated (87fd1fa88a -> b48fdc7cf2)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 87fd1fa88a Prepare debian changelog for 5.0-beta1 add e1b0b44f9e Fix repeated tests on CircleCI and long-testsome/burn-testsome targets add 4059faf5b9 Merge branch 'cassandra-4.0' into cassandra-4.1 add b48fdc7cf2 Merge branch 'cassandra-4.1' into cassandra-5.0 No new revisions were added by this update. Summary of changes: .circleci/config.yml | 48 +-- .circleci/config.yml.FREE | 48 +-- .circleci/config.yml.PAID | 48 +-- .circleci/config_template.yml | 6 +++--- build.xml | 45 5 files changed, 98 insertions(+), 97 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 008c1b397beff073944f4b9353f73de5eabe4a14 Merge: 3b47b5e473 3259bea533 Author: Jacek Lewandowski AuthorDate: Wed Nov 29 11:29:23 2023 +0100 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Enable Direct-IO feature for CommitLog files using Java native API's. CHANGES.txt| 1 + NEWS.txt | 3 + conf/cassandra.yaml| 10 + src/java/org/apache/cassandra/config/Config.java | 3 + .../cassandra/config/DatabaseDescriptor.java | 111 -- .../commitlog/AbstractCommitLogSegmentManager.java | 70 +-- .../apache/cassandra/db/commitlog/CommitLog.java | 40 +++- .../cassandra/db/commitlog/CommitLogSegment.java | 73 --- .../db/commitlog/CommitLogSegmentManagerCDC.java | 3 +- .../commitlog/CommitLogSegmentManagerStandard.java | 4 +- .../cassandra/db/commitlog/CompressedSegment.java | 41 +++- .../cassandra/db/commitlog/DirectIOSegment.java| 228 + .../cassandra/db/commitlog/EncryptedSegment.java | 47 - .../cassandra/db/commitlog/FileDirectSegment.java | 7 +- .../db/commitlog/MemoryMappedSegment.java | 37 +++- .../org/apache/cassandra/io/util/FileUtils.java| 19 ++ .../org/apache/cassandra/io/util/PathUtils.java| 17 +- .../apache/cassandra/service/StorageService.java | 9 + test/conf/cassandra.yaml | 1 + .../cassandra/distributed/impl/InstanceConfig.java | 3 +- .../db/commitlog/BatchCommitLogStressTest.java | 4 +- .../db/commitlog/CommitLogStressTest.java | 37 +++- .../db/commitlog/GroupCommitLogStressTest.java | 4 +- .../db/commitlog/PeriodicCommitLogStressTest.java | 4 +- .../cassandra/config/DatabaseDescriptorTest.java | 109 +- .../cassandra/db/RecoveryManagerFlushedTest.java | 1 + .../db/RecoveryManagerMissingHeaderTest.java | 1 + .../apache/cassandra/db/RecoveryManagerTest.java | 1 + .../cassandra/db/RecoveryManagerTruncateTest.java | 1 + .../db/commitlog/CommitLogChainedMarkersTest.java | 7 +- .../CommitLogSegmentBackpressureTest.java | 1 + .../cassandra/db/commitlog/CommitLogTest.java | 1 + .../db/commitlog/CommitlogShutdownTest.java| 1 + .../db/commitlog/DirectIOSegmentTest.java | 173 .../org/apache/cassandra/utils/Generators.java | 8 + 35 files changed, 945 insertions(+), 135 deletions(-) diff --cc CHANGES.txt index 5a4f693998,4a21998453..06a4e36f18 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,5 +1,10 @@@ -5.0-beta1 +5.1 + * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330) + * Add ELAPSED command to cqlsh (CASSANDRA-18861) + * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781) + * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787) +Merged from 5.0: + * Enable Direct-IO feature for CommitLog files using Java native API's. (CASSANDRA-18464) * SAI fixes for composite partitions, and static and non-static rows intersections (CASSANDRA-19034) * Improve SAI IndexContext handling of indexed and non-indexed columns in queries (CASSANDRA-18166) * Fixed bug where UnifiedCompactionTask constructor was calling the wrong base constructor of CompactionTask (CASSANDRA-18757) diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 9d0cdc61e8,e0cbde171d..b304100957 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@@ -139,7 -136,6 +140,12 @@@ import static org.apache.cassandra.conf import static org.apache.cassandra.config.DataRateSpec.DataRateUnit.BYTES_PER_SECOND; import static org.apache.cassandra.config.DataRateSpec.DataRateUnit.MEBIBYTES_PER_SECOND; import static org.apache.cassandra.config.DataStorageSpec.DataStorageUnit.MEBIBYTES; - import static org.apache.cassandra.db.ConsistencyLevel.*; ++import static org.apache.cassandra.db.ConsistencyLevel.ALL; ++import static org.apache.cassandra.db.ConsistencyLevel.EACH_QUORUM; ++import static org.apache.cassandra.db.ConsistencyLevel.LOCAL_QUORUM; ++import static org.apache.cassandra.db.ConsistencyLevel.NODE_LOCAL; ++import static org.apache.cassandra.db.ConsistencyLevel.ONE; ++import static org.apache.cassandra.db.ConsistencyLevel.QUORUM; import static org.apache.cassandra.io.util.FileUtils.ONE_GIB; import static org.apache.cassandra.io.util.FileUtils.ONE_MIB; import static org.apache.cassandra.utils.Clock.Global.logInitializationOutcome; diff --cc src/java/org/apache/cassandra/service/StorageService.java index 865ecb14b2,66a3db055d..e491cf0777 --- a/src/java/
(cassandra) branch trunk updated (3b47b5e473 -> 008c1b397b)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 3b47b5e473 Merge branch 'cassandra-5.0' into trunk add 3259bea533 Enable Direct-IO feature for CommitLog files using Java native API's. new 008c1b397b Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.txt| 1 + NEWS.txt | 3 + conf/cassandra.yaml| 10 + src/java/org/apache/cassandra/config/Config.java | 3 + .../cassandra/config/DatabaseDescriptor.java | 111 -- .../commitlog/AbstractCommitLogSegmentManager.java | 70 +-- .../apache/cassandra/db/commitlog/CommitLog.java | 40 +++- .../cassandra/db/commitlog/CommitLogSegment.java | 73 --- .../db/commitlog/CommitLogSegmentManagerCDC.java | 3 +- .../commitlog/CommitLogSegmentManagerStandard.java | 4 +- .../cassandra/db/commitlog/CompressedSegment.java | 41 +++- .../cassandra/db/commitlog/DirectIOSegment.java| 228 + .../cassandra/db/commitlog/EncryptedSegment.java | 47 - .../cassandra/db/commitlog/FileDirectSegment.java | 7 +- .../db/commitlog/MemoryMappedSegment.java | 37 +++- .../org/apache/cassandra/io/util/FileUtils.java| 19 ++ .../org/apache/cassandra/io/util/PathUtils.java| 17 +- .../apache/cassandra/service/StorageService.java | 9 + test/conf/cassandra.yaml | 1 + .../cassandra/distributed/impl/InstanceConfig.java | 3 +- .../db/commitlog/BatchCommitLogStressTest.java | 4 +- .../db/commitlog/CommitLogStressTest.java | 37 +++- .../db/commitlog/GroupCommitLogStressTest.java | 4 +- .../db/commitlog/PeriodicCommitLogStressTest.java | 4 +- .../cassandra/config/DatabaseDescriptorTest.java | 109 +- .../cassandra/db/RecoveryManagerFlushedTest.java | 1 + .../db/RecoveryManagerMissingHeaderTest.java | 1 + .../apache/cassandra/db/RecoveryManagerTest.java | 1 + .../cassandra/db/RecoveryManagerTruncateTest.java | 1 + .../db/commitlog/CommitLogChainedMarkersTest.java | 7 +- .../CommitLogSegmentBackpressureTest.java | 1 + .../cassandra/db/commitlog/CommitLogTest.java | 1 + .../db/commitlog/CommitlogShutdownTest.java| 1 + .../db/commitlog/DirectIOSegmentTest.java | 173 .../org/apache/cassandra/utils/Generators.java | 8 + 35 files changed, 945 insertions(+), 135 deletions(-) create mode 100644 src/java/org/apache/cassandra/db/commitlog/DirectIOSegment.java create mode 100644 test/unit/org/apache/cassandra/db/commitlog/DirectIOSegmentTest.java - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated (3cdf71defe -> 3259bea533)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 3cdf71defe Merge branch 'cassandra-4.1' into cassandra-5.0 add 3259bea533 Enable Direct-IO feature for CommitLog files using Java native API's. No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + NEWS.txt | 3 + conf/cassandra.yaml| 10 + src/java/org/apache/cassandra/config/Config.java | 3 + .../cassandra/config/DatabaseDescriptor.java | 104 -- .../commitlog/AbstractCommitLogSegmentManager.java | 70 +-- .../apache/cassandra/db/commitlog/CommitLog.java | 40 +++- .../cassandra/db/commitlog/CommitLogSegment.java | 73 --- .../db/commitlog/CommitLogSegmentManagerCDC.java | 3 +- .../commitlog/CommitLogSegmentManagerStandard.java | 4 +- .../cassandra/db/commitlog/CompressedSegment.java | 41 +++- .../cassandra/db/commitlog/DirectIOSegment.java| 228 + .../cassandra/db/commitlog/EncryptedSegment.java | 47 - .../cassandra/db/commitlog/FileDirectSegment.java | 7 +- .../db/commitlog/MemoryMappedSegment.java | 37 +++- .../org/apache/cassandra/io/util/FileUtils.java| 19 ++ .../org/apache/cassandra/io/util/PathUtils.java| 17 +- .../apache/cassandra/service/StorageService.java | 9 + test/conf/cassandra.yaml | 1 + .../cassandra/distributed/impl/InstanceConfig.java | 3 +- .../db/commitlog/BatchCommitLogStressTest.java | 4 +- .../db/commitlog/CommitLogStressTest.java | 37 +++- .../db/commitlog/GroupCommitLogStressTest.java | 4 +- .../db/commitlog/PeriodicCommitLogStressTest.java | 4 +- .../cassandra/config/DatabaseDescriptorTest.java | 109 +- .../cassandra/db/RecoveryManagerFlushedTest.java | 1 + .../db/RecoveryManagerMissingHeaderTest.java | 1 + .../apache/cassandra/db/RecoveryManagerTest.java | 1 + .../cassandra/db/RecoveryManagerTruncateTest.java | 1 + .../db/commitlog/CommitLogChainedMarkersTest.java | 7 +- .../CommitLogSegmentBackpressureTest.java | 1 + .../cassandra/db/commitlog/CommitLogTest.java | 1 + .../db/commitlog/CommitlogShutdownTest.java| 1 + .../db/commitlog/DirectIOSegmentTest.java | 173 .../org/apache/cassandra/utils/Generators.java | 8 + 35 files changed, 939 insertions(+), 134 deletions(-) create mode 100644 src/java/org/apache/cassandra/db/commitlog/DirectIOSegment.java create mode 100644 test/unit/org/apache/cassandra/db/commitlog/DirectIOSegmentTest.java - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated (e0c0c31c7f -> 3cdf71defe)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from e0c0c31c7f Prepare debian changelog for 5.0-beta1 add dece96f21d Fix filtering system ks sstables for relocation on startup add 78dd963481 Merge branch 'cassandra-4.0' into cassandra-4.1 add 3cdf71defe Merge branch 'cassandra-4.1' into cassandra-5.0 No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../apache/cassandra/service/CassandraDaemon.java | 9 +-- .../test/SystemKeyspacesDataLocationTest.java | 88 ++ 3 files changed, 91 insertions(+), 7 deletions(-) create mode 100644 test/distributed/org/apache/cassandra/distributed/test/SystemKeyspacesDataLocationTest.java - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (9167d599f3 -> 3b47b5e473)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 9167d599f3 Test Failure: org.apache.cassandra.db.compaction.writers.CompactionAwareWriterTest.test*CompactionWriter-trie add dece96f21d Fix filtering system ks sstables for relocation on startup add 78dd963481 Merge branch 'cassandra-4.0' into cassandra-4.1 add 3cdf71defe Merge branch 'cassandra-4.1' into cassandra-5.0 new 3b47b5e473 Merge branch 'cassandra-5.0' into trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.txt| 1 + .../apache/cassandra/service/CassandraDaemon.java | 4 +- .../test/SystemKeyspacesDataLocationTest.java | 88 ++ 3 files changed, 90 insertions(+), 3 deletions(-) create mode 100644 test/distributed/org/apache/cassandra/distributed/test/SystemKeyspacesDataLocationTest.java - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 3b47b5e473f3bda807ca6eef362f203cdafab962 Merge: 9167d599f3 3cdf71defe Author: Jacek Lewandowski AuthorDate: Tue Nov 28 18:50:29 2023 +0100 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Fix filtering system ks sstables for relocation on startup CHANGES.txt| 1 + .../apache/cassandra/service/CassandraDaemon.java | 4 +- .../test/SystemKeyspacesDataLocationTest.java | 88 ++ 3 files changed, 90 insertions(+), 3 deletions(-) diff --cc CHANGES.txt index bb30b15519,c4ed2cbdb6..5a4f693998 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -48,7 -48,8 +48,8 @@@ Merged from 4.1 * Internode legacy SSL storage port certificate is not hot reloaded on update (CASSANDRA-18681) * Nodetool paxos-only repair is no longer incremental (CASSANDRA-18466) Merged from 4.0: - * Retrieve keyspaces metadata and schema version concistently in DescribeStatement (CASSANDRA-18921) ++ * Fix filtering system ks sstables for relocation on startup (CASSANDRA-18963) + * Remove completed coordinator sessions (CASSANDRA-18903) * Gossip NPE due to shutdown event corrupting empty statuses (CASSANDRA-18913) * Update hdrhistogram to 2.1.12 (CASSANDRA-18893) * Improve performance of compactions when table does not have an index (CASSANDRA-18773) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.1 updated (08d9b70b4d -> 78dd963481)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 08d9b70b4d Merge branch 'cassandra-4.0' into cassandra-4.1 add dece96f21d Fix filtering system ks sstables for relocation on startup add 78dd963481 Merge branch 'cassandra-4.0' into cassandra-4.1 No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../apache/cassandra/service/CassandraDaemon.java | 9 +-- .../test/SystemKeyspacesDataLocationTest.java | 88 ++ 3 files changed, 91 insertions(+), 7 deletions(-) create mode 100644 test/distributed/org/apache/cassandra/distributed/test/SystemKeyspacesDataLocationTest.java - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.0 updated (55fecfb65e -> dece96f21d)
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 55fecfb65e Fix BulkLoaderTest.testBulkLoader_WithArgs2 add dece96f21d Fix filtering system ks sstables for relocation on startup No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../apache/cassandra/service/CassandraDaemon.java | 6 +- .../test/SystemKeyspacesDataLocationTest.java | 88 ++ 3 files changed, 90 insertions(+), 5 deletions(-) create mode 100644 test/distributed/org/apache/cassandra/distributed/test/SystemKeyspacesDataLocationTest.java - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit ed5a22428355765df5da94151413fc59538afef5 Merge: ac0347bfa0 b7b2aa5de5 Author: Jacek Lewandowski AuthorDate: Fri Nov 17 12:50:05 2023 +0100 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Fix DiskSpaceMetricsTest.testFlushSize .../org/apache/cassandra/io/DiskSpaceMetricsTest.java | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
