(cassandra) branch trunk updated (7fe30fc313 -> 67bbbb0125)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 7fe30fc313 Expand DDL statements on coordinator before submission to the CMS add 670125 Fix hygiene issues for cqlshlib No new revisions were added by this update. Summary of changes: pylib/cqlshlib/cqlshmain.py | 3 +- pylib/cqlshlib/test/run_cqlsh.py | 10 +-- pylib/cqlshlib/test/test_authproviderhandling.py | 79 pylib/cqlshlib/test/test_copyutil.py | 2 +- pylib/cqlshlib/test/test_cqlsh_completion.py | 56 - pylib/cqlshlib/test/test_cqlsh_output.py | 20 +++--- 6 files changed, 84 insertions(+), 86 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated: Assume StartupChecksTest#testKernelBug1057843 test runs on Linux
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new df78296dcb Assume StartupChecksTest#testKernelBug1057843 test runs on
Linux
df78296dcb is described below
commit df78296dcbc67c1d6dd1e0412fcd71f0a8f8fa7c
Author: maoling
AuthorDate: Mon May 20 23:00:00 2024 +0800
Assume StartupChecksTest#testKernelBug1057843 test runs on Linux
patch by Ling Mao; reviewed by Stefan Miklosovic and Brandon Williams for
CASSANDRA-19648
---
test/unit/org/apache/cassandra/service/StartupChecksTest.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/test/unit/org/apache/cassandra/service/StartupChecksTest.java
b/test/unit/org/apache/cassandra/service/StartupChecksTest.java
index d5ed25a89f..41c16b9065 100644
--- a/test/unit/org/apache/cassandra/service/StartupChecksTest.java
+++ b/test/unit/org/apache/cassandra/service/StartupChecksTest.java
@@ -244,6 +244,7 @@ public class StartupChecksTest
public void testKernelBug1057843Check() throws Exception
{
Assume.assumeTrue(DatabaseDescriptor.getCommitLogCompression() ==
null); // we would not be able to enable direct io otherwise
+Assume.assumeTrue("Skipping this test on non-Linux OS",
FBUtilities.isLinux);
testKernelBug1057843Check("ext4", DiskAccessMode.direct, new
Semver("6.1.63.1-generic"), false);
testKernelBug1057843Check("ext4", DiskAccessMode.direct, new
Semver("6.1.64.1-generic"), true);
testKernelBug1057843Check("ext4", DiskAccessMode.direct, new
Semver("6.1.65.1-generic"), true);
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (a15b137b7c -> dc89df7da1)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from a15b137b7c Remove unused fields from config add dc89df7da1 Fix number of arguments of String.format() in various classes No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java| 2 +- src/java/org/apache/cassandra/tcm/compatibility/GossipHelper.java| 4 ++-- test/harry/main/org/apache/cassandra/harry/ddl/SchemaGenerators.java | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (6bae4f76fb -> 7579454057)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 6bae4f76fb Merge branch 'cassandra-5.0' into trunk add d1f2936ccb Support legacy plain_text_auth section in credentials file removed unintentionally add 59a5c6477d Merge branch 'cassandra-4.1' into cassandra-5.0 new 7579454057 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 + conf/credentials.sample | 13 - doc/modules/cassandra/pages/managing/tools/cqlsh.adoc | 10 ++ pylib/cqlshlib/cqlshmain.py | 3 +-- 4 files changed, 24 insertions(+), 3 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. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 75794540573b6f0c39094b5448fe73326e14e058 Merge: 6bae4f76fb 59a5c6477d Author: Stefan Miklosovic AuthorDate: Tue May 14 11:33:05 2024 +0200 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + conf/credentials.sample | 13 - doc/modules/cassandra/pages/managing/tools/cqlsh.adoc | 10 ++ pylib/cqlshlib/cqlshmain.py | 3 +-- 4 files changed, 24 insertions(+), 3 deletions(-) diff --cc CHANGES.txt index 7ddd707989,d320b77349..b0ba04f3e2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -77,7 -36,9 +77,8 @@@ Merged from 5.0 * Fix resource cleanup after SAI query timeouts (CASSANDRA-19177) * Suppress CVE-2023-6481 (CASSANDRA-19184) Merged from 4.1: + * Support legacy plain_text_auth section in credentials file removed unintentionally (CASSANDRA-19498) * Make queries visible to the "system_views.queries" virtual table at the coordinator level (CASSANDRA-19577) - * Concurrent equivalent schema updates lead to unresolved disagreement (CASSANDRA-19578) * 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) - 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 (ccdeb12419 -> 59a5c6477d)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from ccdeb12419 Enforce metric naming contract if scope is used in a metric name add d1f2936ccb Support legacy plain_text_auth section in credentials file removed unintentionally add 59a5c6477d Merge branch 'cassandra-4.1' into cassandra-5.0 No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + conf/credentials.sample | 13 - doc/modules/cassandra/pages/managing/tools/cqlsh.adoc | 10 ++ pylib/cqlshlib/cqlshmain.py | 3 +-- 4 files changed, 24 insertions(+), 3 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 (c6017aca77 -> d1f2936ccb)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from c6017aca77 Merge branch 'cassandra-4.0' into cassandra-4.1 add d1f2936ccb Support legacy plain_text_auth section in credentials file removed unintentionally No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + bin/cqlsh.py | 3 +-- conf/credentials.sample | 13 - doc/modules/cassandra/pages/tools/cqlsh.adoc | 10 ++ 4 files changed, 24 insertions(+), 3 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 (e22f67a2f7 -> 326bf4b3f5)
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a change to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from e22f67a2f7 Make sure
IntersectFilteringQueryTest#shouldNotWarnOrFailOnIndexQuery waits for indexes
to be available before making queries
add 326bf4b3f5 Resolve the oldest hints just from descriptors and current
writer if available
No new revisions were added by this update.
Summary of changes:
CHANGES.txt| 1 +
.../org/apache/cassandra/hints/HintsBuffer.java| 38 ++---
.../apache/cassandra/hints/HintsBufferPool.java| 26 --
.../cassandra/hints/HintsDispatchTrigger.java | 2 -
.../org/apache/cassandra/hints/HintsService.java | 24 ++
.../org/apache/cassandra/hints/HintsStore.java | 27 --
.../apache/cassandra/hints/HintsWriteExecutor.java | 32 ---
.../org/apache/cassandra/service/StorageProxy.java | 6 +-
...WindowTest.java => AbstractHintWindowTest.java} | 96 -
.../distributed/test/HintsMaxWindowTest.java | 88 +--
.../test/HintsPersistentWindowTest.java| 99 ++
.../apache/cassandra/hints/HintsBufferTest.java| 47 --
.../apache/cassandra/hints/HintsServiceTest.java | 48 ---
13 files changed, 171 insertions(+), 363 deletions(-)
copy
test/distributed/org/apache/cassandra/distributed/test/{HintsMaxWindowTest.java
=> AbstractHintWindowTest.java} (51%)
create mode 100644
test/distributed/org/apache/cassandra/distributed/test/HintsPersistentWindowTest.java
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (1d04457a24 -> 41a4a26651)
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 1d04457a24 Merge branch 'cassandra-5.0' into trunk
add 326bf4b3f5 Resolve the oldest hints just from descriptors and current
writer if available
new 41a4a26651 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 +
.../org/apache/cassandra/hints/HintsBuffer.java| 38 ++---
.../apache/cassandra/hints/HintsBufferPool.java| 26 --
.../cassandra/hints/HintsDispatchTrigger.java | 2 -
.../org/apache/cassandra/hints/HintsService.java | 24 ++
.../org/apache/cassandra/hints/HintsStore.java | 27 --
.../apache/cassandra/hints/HintsWriteExecutor.java | 32 ---
.../org/apache/cassandra/service/StorageProxy.java | 6 +-
...WindowTest.java => AbstractHintWindowTest.java} | 96 -
.../distributed/test/HintsMaxWindowTest.java | 88 +--
.../test/HintsPersistentWindowTest.java| 99 ++
.../apache/cassandra/hints/HintsBufferTest.java| 47 --
.../apache/cassandra/hints/HintsServiceTest.java | 48 ---
13 files changed, 171 insertions(+), 363 deletions(-)
copy
test/distributed/org/apache/cassandra/distributed/test/{HintsMaxWindowTest.java
=> AbstractHintWindowTest.java} (51%)
create mode 100644
test/distributed/org/apache/cassandra/distributed/test/HintsPersistentWindowTest.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. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 41a4a266515f9462c28dd1c28f5791506f7653b6 Merge: 1d04457a24 326bf4b3f5 Author: Stefan Miklosovic AuthorDate: Thu May 2 23:32:29 2024 +0200 Merge branch 'cassandra-5.0' into trunk CHANGES.txt| 1 + .../org/apache/cassandra/hints/HintsBuffer.java| 38 ++--- .../apache/cassandra/hints/HintsBufferPool.java| 26 -- .../cassandra/hints/HintsDispatchTrigger.java | 2 - .../org/apache/cassandra/hints/HintsService.java | 24 ++ .../org/apache/cassandra/hints/HintsStore.java | 27 -- .../apache/cassandra/hints/HintsWriteExecutor.java | 32 --- .../org/apache/cassandra/service/StorageProxy.java | 6 +- ...WindowTest.java => AbstractHintWindowTest.java} | 96 - .../distributed/test/HintsMaxWindowTest.java | 88 +-- .../test/HintsPersistentWindowTest.java| 99 ++ .../apache/cassandra/hints/HintsBufferTest.java| 47 -- .../apache/cassandra/hints/HintsServiceTest.java | 48 --- 13 files changed, 171 insertions(+), 363 deletions(-) diff --cc CHANGES.txt index 40a5161ff5,5a53faf257..168f40d224 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,41 -1,5 +1,42 @@@ -5.0-beta2 +5.1 + * Reduce heap usage occupied by the metrics (CASSANDRA-19567) + * Improve handling of transient replicas during range movements (CASSANDRA-19344) + * Enable debounced internode log requests to be cancelled at shutdown (CASSANDRA-19514) + * Correctly set last modified epoch when combining multistep operations into a single step (CASSANDRA-19538) + * Add new TriggersPolicy configuration to allow operators to disable triggers (CASSANDRA-19532) + * Use Transformation.Kind.id in local and distributed log tables (CASSANDRA-19516) + * Remove period field from ClusterMetadata and metadata log tables (CASSANDRA-19482) + * Enrich system_views.pending_hints vtable with hints sizes (CASSANDRA-19486) + * Expose all dropwizard metrics in virtual tables (CASSANDRA-14572) + * Ensured that PropertyFileSnitchTest do not overwrite cassandra-toploogy.properties (CASSANDRA-19502) + * Add option for MutualTlsAuthenticator to restrict the certificate validity period (CASSANDRA-18951) + * Fix StorageService::constructRangeToEndpointMap for non-distributed keyspaces (CASSANDRA-19255) + * Group nodetool cms commands into single command group (CASSANDRA-19393) + * Register the measurements of the bootstrap process as Dropwizard metrics (CASSANDRA-19447) + * Add LIST SUPERUSERS CQL statement (CASSANDRA-19417) + * Modernize CQLSH datetime conversions (CASSANDRA-18879) + * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * 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: + * Resolve the oldest hints just from descriptors and current writer if available (CASSANDRA-19600) * Optionally fail writes when SAI refuses to index a term value exceeding configured term max size (CASSANDRA-19493) * Vector search can restrict on clustering keys when filtering isn't required (CASSANDRA-19544) * Fix FBUtilities' parsing of gcp cos_containerd kernel versions (CASSANDRA-18594) diff --cc src/j
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 48f6a318796c02ba8e2f22b078958200ba37c9a6
Merge: dd4e3fa6df d1101eeccc
Author: Stefan Miklosovic
AuthorDate: Thu May 2 10:48:01 2024 +0200
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt| 1 +
src/java/org/apache/cassandra/db/Directories.java | 55 ++
.../org/apache/cassandra/db/SSTableImporter.java | 4 +-
test/unit/org/apache/cassandra/db/ImportTest.java | 66 --
4 files changed, 109 insertions(+), 17 deletions(-)
diff --cc CHANGES.txt
index 19eb240b42,87fb75b057..40a5161ff5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -74,9 -37,11 +74,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:
+ * Make nodetool import congruent with the documentation by not relying on
the folder structure of the imported SSTable files (CASSANDRA-19401)
* IR may leak SSTables with pending repair when coming from streaming
(CASSANDRA-19182)
* Streaming exception race creates corrupt transaction log files that
prevent restart (CASSANDRA-18736)
* Fix CQL tojson timestamp output on negative timestamp values before
Gregorian calendar reform in 1582 (CASSANDRA-19566)
diff --cc test/unit/org/apache/cassandra/db/ImportTest.java
index f6383b5ef8,b5e6355106..4d7a9efe31
--- a/test/unit/org/apache/cassandra/db/ImportTest.java
+++ b/test/unit/org/apache/cassandra/db/ImportTest.java
@@@ -71,7 -70,12 +71,14 @@@ import static org.junit.Assert.assertTr
public class ImportTest extends CQLTester
{
-@After
-public void afterTest()
+
++@Override
++public void afterTest() throws Throwable
+ {
++super.afterTest();
+ SSTableReader.resetTidying();
+ }
+
@Test
public void basicImportByMovingTest() throws Throwable
{
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (dd4e3fa6df -> 48f6a31879)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from dd4e3fa6df Merge branch 'cassandra-5.0' into trunk add 334ca05730 Make nodetool import congruent with the documentation by not relying on the folder structure of the imported SSTable files add 85039aa8c5 Merge branch 'cassandra-4.0' into cassandra-4.1 add d1101eeccc Merge branch 'cassandra-4.1' into cassandra-5.0 new 48f6a31879 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/db/Directories.java | 55 ++ .../org/apache/cassandra/db/SSTableImporter.java | 4 +- test/unit/org/apache/cassandra/db/ImportTest.java | 66 -- 4 files changed, 109 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-4.1 updated (7c79d91b6f -> 85039aa8c5)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 7c79d91b6f Merge branch 'cassandra-4.0' into cassandra-4.1 add 334ca05730 Make nodetool import congruent with the documentation by not relying on the folder structure of the imported SSTable files add 85039aa8c5 Merge branch 'cassandra-4.0' into cassandra-4.1 No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + src/java/org/apache/cassandra/db/Directories.java | 55 ++--- .../org/apache/cassandra/db/SSTableImporter.java | 4 +- test/unit/org/apache/cassandra/db/ImportTest.java | 71 +++--- 4 files changed, 111 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-4.0 updated (c14abb40b2 -> 334ca05730)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from c14abb40b2 IR may leak SSTables with pending repair when coming from streaming add 334ca05730 Make nodetool import congruent with the documentation by not relying on the folder structure of the imported SSTable files No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + src/java/org/apache/cassandra/db/Directories.java | 55 + .../org/apache/cassandra/db/SSTableImporter.java | 4 +- test/unit/org/apache/cassandra/db/ImportTest.java | 69 +++--- 4 files changed, 110 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 (1b1f88e38a -> d1101eeccc)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 1b1f88e38a Merge branch 'cassandra-4.1' into cassandra-5.0 add 334ca05730 Make nodetool import congruent with the documentation by not relying on the folder structure of the imported SSTable files add 85039aa8c5 Merge branch 'cassandra-4.0' into cassandra-4.1 add d1101eeccc Merge branch 'cassandra-4.1' into cassandra-5.0 No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + src/java/org/apache/cassandra/db/Directories.java | 55 ++--- .../org/apache/cassandra/db/SSTableImporter.java | 4 +- test/unit/org/apache/cassandra/db/ImportTest.java | 71 +++--- 4 files changed, 111 insertions(+), 20 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (3b0b52d0f9 -> ad3c1ce97c)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 3b0b52d0f9 Merge branch 'cassandra-5.0' into trunk add fda12b25d2 ninja: remove unused import in StreamFailedWhileReceivingTest which fails the build new ad3c1ce97c 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: .../distributed/test/streaming/StreamFailedWhileReceivingTest.java | 1 - 1 file changed, 1 deletion(-) - 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. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit ad3c1ce97c18b77f2f521ffa391dc029466b0482 Merge: 3b0b52d0f9 fda12b25d2 Author: Stefan Miklosovic AuthorDate: Fri Apr 26 08:53:56 2024 +0200 Merge branch 'cassandra-5.0' into trunk .../distributed/test/streaming/StreamFailedWhileReceivingTest.java | 1 - 1 file changed, 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 (6559983d6c -> fda12b25d2)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 6559983d6c Merge branch 'cassandra-4.1' into cassandra-5.0 add fda12b25d2 ninja: remove unused import in StreamFailedWhileReceivingTest which fails the build No new revisions were added by this update. Summary of changes: .../distributed/test/streaming/StreamFailedWhileReceivingTest.java | 1 - 1 file changed, 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 (445ae1a4b1 -> e471a57dc2)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 445ae1a4b1 Merge branch 'cassandra-4.0' into cassandra-4.1 add fba4a85b97 Fix CQL tojson timestamp output on negative timestamp values before Gregorian calendar reform in 1582 add e471a57dc2 Merge branch 'cassandra-4.0' into cassandra-4.1 No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../org/apache/cassandra/db/marshal/DateType.java | 2 +- .../apache/cassandra/db/marshal/TimestampType.java | 2 +- .../cassandra/serializers/TimestampSerializer.java | 35 -- 4 files changed, 23 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-5.0 updated (82297b490e -> 93692a4b17)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 82297b490e Merge branch 'cassandra-4.1' into cassandra-5.0 add fba4a85b97 Fix CQL tojson timestamp output on negative timestamp values before Gregorian calendar reform in 1582 add e471a57dc2 Merge branch 'cassandra-4.0' into cassandra-4.1 add 93692a4b17 Merge branch 'cassandra-4.1' into cassandra-5.0 No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../org/apache/cassandra/db/marshal/DateType.java | 2 +- .../apache/cassandra/db/marshal/TimestampType.java | 2 +- .../cassandra/serializers/TimestampSerializer.java | 35 -- 4 files changed, 23 insertions(+), 17 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (c5c4cd4e57 -> 607d6d0361)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from c5c4cd4e57 Update use of transition plan in PrepareReplace add fba4a85b97 Fix CQL tojson timestamp output on negative timestamp values before Gregorian calendar reform in 1582 add e471a57dc2 Merge branch 'cassandra-4.0' into cassandra-4.1 add 93692a4b17 Merge branch 'cassandra-4.1' into cassandra-5.0 new 607d6d0361 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 + .../org/apache/cassandra/db/marshal/DateType.java | 2 +- .../apache/cassandra/db/marshal/TimestampType.java | 2 +- .../cassandra/serializers/TimestampSerializer.java | 35 -- 4 files changed, 23 insertions(+), 17 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. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 607d6d0361184e478fcc1cd00be89c864a3a7455 Merge: c5c4cd4e57 93692a4b17 Author: Stefan Miklosovic AuthorDate: Tue Apr 23 01:14:31 2024 +0200 Merge branch 'cassandra-5.0' into trunk CHANGES.txt| 1 + .../org/apache/cassandra/db/marshal/DateType.java | 2 +- .../apache/cassandra/db/marshal/TimestampType.java | 2 +- .../cassandra/serializers/TimestampSerializer.java | 35 -- 4 files changed, 23 insertions(+), 17 deletions(-) diff --cc CHANGES.txt index 3e2fa40c1e,1d51d2d27d..cf55f7b91c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -72,9 -36,10 +72,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 CQL tojson timestamp output on negative timestamp values before Gregorian calendar reform in 1582 (CASSANDRA-19566) * 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) - 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 (f92998190c -> fba4a85b97)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from f92998190c Fix few types issues and implement types compatibility tests add fba4a85b97 Fix CQL tojson timestamp output on negative timestamp values before Gregorian calendar reform in 1582 No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../org/apache/cassandra/db/marshal/DateType.java | 2 +- .../apache/cassandra/db/marshal/TimestampType.java | 2 +- .../cassandra/serializers/TimestampSerializer.java | 35 -- 4 files changed, 23 insertions(+), 17 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated: Add new TriggersPolicy configuration to allow operators to disable triggers
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 8d705b31e9 Add new TriggersPolicy configuration to allow operators to
disable triggers
8d705b31e9 is described below
commit 8d705b31e9a3f213e5eb296d4308e5b22b0e996c
Author: Abe Ratnofsky
AuthorDate: Thu Apr 4 17:00:08 2024 -0400
Add new TriggersPolicy configuration to allow operators to disable triggers
patch by Abe Ratnofsky; reviewed by Stefan Miklosovic and Sam Tunnicliffe
for CASSANDRA-19532
---
CHANGES.txt| 1 +
conf/cassandra.yaml| 6 ++
conf/cassandra_latest.yaml | 6 ++
.../cassandra/pages/developing/cql/triggers.adoc | 4 +
src/java/org/apache/cassandra/config/Config.java | 12 +++
.../cassandra/config/DatabaseDescriptor.java | 12 +++
.../statements/schema/CreateTriggerStatement.java | 7 +-
.../triggers/TriggerDisabledException.java | 29 +++
.../apache/cassandra/triggers/TriggerExecutor.java | 35
.../config/DatabaseDescriptorRefTest.java | 1 +
.../apache/cassandra/triggers/TriggersTest.java| 98 --
11 files changed, 202 insertions(+), 9 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index cfbbc651ef..ab257c3baf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
5.1
+ * Add new TriggersPolicy configuration to allow operators to disable triggers
(CASSANDRA-19532)
* Use Transformation.Kind.id in local and distributed log tables
(CASSANDRA-19516)
* Remove period field from ClusterMetadata and metadata log tables
(CASSANDRA-19482)
* Enrich system_views.pending_hints vtable with hints sizes (CASSANDRA-19486)
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 42f311b0eb..bfc28162d5 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -1691,6 +1691,12 @@ trace_type_repair_ttl: 7d
# As of Cassandra 3.0 there is a sandbox in place that should prevent
execution of evil code.
user_defined_functions_enabled: false
+# Triggers are enabled by default.
+# `enabled` executes queries and their triggers.
+# `disabled` executes queries but skips trigger execution, and logs a warning.
+# `forbidden` fails queries that would execute triggers with
TriggerDisabledException.
+triggers_policy: enabled
+
# Enables encrypting data at-rest (on disk). Different key providers can be
plugged in, but the default reads from
# a JCE-style keystore. A single keystore can hold multiple keys, but the one
referenced by
# the "key_alias" is the only key that will be used for encrypt opertaions;
previously used keys
diff --git a/conf/cassandra_latest.yaml b/conf/cassandra_latest.yaml
index 585e70f598..2e996d9468 100644
--- a/conf/cassandra_latest.yaml
+++ b/conf/cassandra_latest.yaml
@@ -1655,6 +1655,12 @@ trace_type_repair_ttl: 7d
# As of Cassandra 3.0 there is a sandbox in place that should prevent
execution of evil code.
user_defined_functions_enabled: false
+# Triggers are enabled by default.
+# `enabled` executes queries and their triggers.
+# `disabled` executes queries but skips trigger execution, and logs a warning.
+# `forbidden` fails queries that would execute triggers with
TriggerDisabledException.
+triggers_policy: enabled
+
# Enables encrypting data at-rest (on disk). Different key providers can be
plugged in, but the default reads from
# a JCE-style keystore. A single keystore can hold multiple keys, but the one
referenced by
# the "key_alias" is the only key that will be used for encrypt opertaions;
previously used keys
diff --git a/doc/modules/cassandra/pages/developing/cql/triggers.adoc
b/doc/modules/cassandra/pages/developing/cql/triggers.adoc
index 89247206a5..45497ca78d 100644
--- a/doc/modules/cassandra/pages/developing/cql/triggers.adoc
+++ b/doc/modules/cassandra/pages/developing/cql/triggers.adoc
@@ -48,3 +48,7 @@ For instance:
include::cassandra:example$CQL/drop_trigger.cql[]
+
+Triggers can be disabled in two steps. `triggers_policy` is `enabled` by
default, which runs all created triggers as
+mutations are executed. `disabled` skips trigger execution but otherwise
executes query operations as normal (and logs a
+warning). `forbidden` will fail queries that would execute triggers.
\ No newline at end of file
diff --git a/src/java/org/apache/cassandra/config/Config.java
b/src/java/org/apache/cassandra/config/Config.java
index feadbc21bd..47f879eb07 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -1300,4 +1300,16 @@ public class Config
public volatile DurationSpec.LongMillisecondsBound
progress_barrier_backoff = new DurationSpec.LongMillisecondsBound("1000ms");
public volatile
(cassandra) branch trunk updated (cddfd7f17a -> 5b23692a90)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from cddfd7f17a Merge branch 'cassandra-5.0' into trunk add 5b23692a90 Enrich system_views.pending_hints vtable with hints sizes No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../cassandra/config/DatabaseDescriptor.java | 5 + .../cassandra/db/virtual/PendingHintsTable.java| 14 +- .../org/apache/cassandra/hints/HintsService.java | 1 + .../org/apache/cassandra/hints/HintsStore.java | 39 - .../apache/cassandra/hints/PendingHintsInfo.java | 24 ++- .../cassandra/hints/HintsPendingTableTest.java | 163 + .../org/apache/cassandra/hints/HintsStoreTest.java | 12 +- 8 files changed, 246 insertions(+), 13 deletions(-) create mode 100644 test/unit/org/apache/cassandra/hints/HintsPendingTableTest.java - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (310d790ce4 -> da8ab7e20a)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 310d790ce4 Merge branch 'cassandra-5.0' into trunk add 5fb562d7ef Fix hints delivery for a node going down repeatedly add 9752ceb439 Merge branch 'cassandra-4.1' into cassandra-5.0 new da8ab7e20a 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/hints/HintsBufferPool.java| 9 + .../cassandra/hints/HintsDispatchTrigger.java | 2 + .../org/apache/cassandra/hints/HintsService.java | 7 + .../apache/cassandra/hints/HintsWriteExecutor.java | 32 +--- .../distributed/test/HintsMaxWindowTest.java | 188 + 6 files changed, 214 insertions(+), 25 deletions(-) create mode 100644 test/distributed/org/apache/cassandra/distributed/test/HintsMaxWindowTest.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. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit da8ab7e20addfd7c088fe39de3513e002aa7146e Merge: 310d790ce4 9752ceb439 Author: Stefan Miklosovic AuthorDate: Fri Apr 5 11:28:52 2024 +0200 Merge branch 'cassandra-5.0' into trunk CHANGES.txt| 1 + .../apache/cassandra/hints/HintsBufferPool.java| 9 + .../cassandra/hints/HintsDispatchTrigger.java | 2 + .../org/apache/cassandra/hints/HintsService.java | 7 + .../apache/cassandra/hints/HintsWriteExecutor.java | 32 +--- .../distributed/test/HintsMaxWindowTest.java | 188 + 6 files changed, 214 insertions(+), 25 deletions(-) diff --cc CHANGES.txt index 4be9b7d42d,eaf27a314c..07ff7de532 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -60,10 -31,11 +60,11 @@@ Merged from 5.0 * Fix resource cleanup after SAI query timeouts (CASSANDRA-19177) * Suppress CVE-2023-6481 (CASSANDRA-19184) 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: * Change logging to TRACE when failing to get peer certificate (CASSANDRA-19508) * Push LocalSessions info logs to debug (CASSANDRA-18335) - 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 (00dccf25ab -> 9752ceb439)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 00dccf25ab Merge branch 'cassandra-4.1' into cassandra-5.0 add 5fb562d7ef Fix hints delivery for a node going down repeatedly add 9752ceb439 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/hints/HintsBufferPool.java| 9 + .../cassandra/hints/HintsDispatchTrigger.java | 2 + .../org/apache/cassandra/hints/HintsService.java | 7 + .../apache/cassandra/hints/HintsWriteExecutor.java | 32 +--- .../distributed/test/HintsMaxWindowTest.java | 188 + 6 files changed, 214 insertions(+), 25 deletions(-) create mode 100644 test/distributed/org/apache/cassandra/distributed/test/HintsMaxWindowTest.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 (659e41db9a -> 5fb562d7ef)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 659e41db9a Merge branch 'cassandra-4.0' into cassandra-4.1 add 5fb562d7ef Fix hints delivery for a node going down repeatedly No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../apache/cassandra/hints/HintsBufferPool.java| 9 + .../cassandra/hints/HintsDispatchTrigger.java | 2 + .../org/apache/cassandra/hints/HintsService.java | 7 + .../apache/cassandra/hints/HintsWriteExecutor.java | 32 +--- .../distributed/test/HintsMaxWindowTest.java | 188 + 6 files changed, 214 insertions(+), 25 deletions(-) create mode 100644 test/distributed/org/apache/cassandra/distributed/test/HintsMaxWindowTest.java - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated: ninja: add entry to CHANGES.txt for CASSANDRA-18951
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git The following commit(s) were added to refs/heads/trunk by this push: new c2a78639de ninja: add entry to CHANGES.txt for CASSANDRA-18951 c2a78639de is described below commit c2a78639de72c02c75278334cc8f26ac2f9a8cbd Author: Stefan Miklosovic AuthorDate: Tue Mar 26 10:01:23 2024 +0100 ninja: add entry to CHANGES.txt for CASSANDRA-18951 --- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.txt b/CHANGES.txt index 5a0ce4117d..0fc03686aa 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 5.1 + * Add option for MutualTlsAuthenticator to restrict the certificate validity period (CASSANDRA-18951) * Fix StorageService::constructRangeToEndpointMap for non-distributed keyspaces (CASSANDRA-19255) * Group nodetool cms commands into single command group (CASSANDRA-19393) * Register the measurements of the bootstrap process as Dropwizard metrics (CASSANDRA-19447) - 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.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit e6a937c934bf9aa738dfa8d6daa4ced48daf8859
Merge: 8d8c6fbc37 35d6e6ce9c
Author: Stefan Miklosovic
AuthorDate: Mon Mar 25 14:21:25 2024 +0100
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt| 1 +
.../apache/cassandra/hints/HintsDescriptor.java| 24 +++-
.../org/apache/cassandra/hints/HintsStore.java | 12 +-
.../org/apache/cassandra/hints/HintsWriter.java| 13 ++-
.../org/apache/cassandra/service/StorageProxy.java | 14 ++-
.../distributed/test/HintsMaxSizeTest.java | 128 +
.../org/apache/cassandra/hints/AlteredHints.java | 3 +
.../apache/cassandra/hints/HintsCatalogTest.java | 17 +--
.../apache/cassandra/hints/HintsReaderTest.java| 5 +
.../org/apache/cassandra/hints/HintsStoreTest.java | 3 +
.../apache/cassandra/hints/HintsUpgradeTest.java | 3 +
11 files changed, 197 insertions(+), 26 deletions(-)
diff --cc CHANGES.txt
index e92cd81496,e879141be7..5a0ce4117d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -54,9 -28,10 +54,10 @@@ Merged from 5.0
* Fix resource cleanup after SAI query timeouts (CASSANDRA-19177)
* Suppress CVE-2023-6481 (CASSANDRA-19184)
Merged from 4.1:
+ * 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:
* 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/hints/HintsReaderTest.java
index 77c45c6a12,56154fd950..94be7b2b8e
--- a/test/unit/org/apache/cassandra/hints/HintsReaderTest.java
+++ b/test/unit/org/apache/cassandra/hints/HintsReaderTest.java
@@@ -28,9 -28,9 +28,11 @@@ import java.util.concurrent.TimeUnit
import java.util.function.Function;
import com.google.common.collect.Iterables;
+
+import org.apache.cassandra.exceptions.CoordinatorBehindException;
import org.apache.cassandra.io.util.File;
+
+ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --cc test/unit/org/apache/cassandra/hints/HintsUpgradeTest.java
index 3d8c443121,78b8f56b50..fd44a96317
--- a/test/unit/org/apache/cassandra/hints/HintsUpgradeTest.java
+++ b/test/unit/org/apache/cassandra/hints/HintsUpgradeTest.java
@@@ -44,11 -43,12 +44,13 @@@ import org.apache.cassandra.schema.Sche
import org.apache.cassandra.schema.TableId;
import org.apache.cassandra.schema.TableMetadata;
+ import static org.hamcrest.Matchers.greaterThan;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+ import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
+@Ignore("TODO: TCM")
public class HintsUpgradeTest
{
static
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (8d8c6fbc37 -> e6a937c934)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 8d8c6fbc37 Override the correct method to avoid retries in ConsistentBootstrapTest.coordinatorIsBehindTest add 38408938cc Do not go to disk for reading hints file sizes add 35d6e6ce9c Merge branch 'cassandra-4.1' into cassandra-5.0 new e6a937c934 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/hints/HintsDescriptor.java| 24 +++- .../org/apache/cassandra/hints/HintsStore.java | 12 +- .../org/apache/cassandra/hints/HintsWriter.java| 13 ++- .../org/apache/cassandra/service/StorageProxy.java | 14 ++- .../distributed/test/HintsMaxSizeTest.java | 128 + .../org/apache/cassandra/hints/AlteredHints.java | 3 + .../apache/cassandra/hints/HintsCatalogTest.java | 17 +-- .../apache/cassandra/hints/HintsReaderTest.java| 5 + .../org/apache/cassandra/hints/HintsStoreTest.java | 3 + .../apache/cassandra/hints/HintsUpgradeTest.java | 3 + 11 files changed, 197 insertions(+), 26 deletions(-) create mode 100644 test/distributed/org/apache/cassandra/distributed/test/HintsMaxSizeTest.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 (389479c9a2 -> 35d6e6ce9c)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 389479c9a2 Align buffer with commitlog segment size add 38408938cc Do not go to disk for reading hints file sizes add 35d6e6ce9c 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/hints/HintsDescriptor.java| 24 +++- .../org/apache/cassandra/hints/HintsStore.java | 12 +- .../org/apache/cassandra/hints/HintsWriter.java| 13 ++- .../org/apache/cassandra/service/StorageProxy.java | 14 ++- .../distributed/test/HintsMaxSizeTest.java | 128 + .../org/apache/cassandra/hints/AlteredHints.java | 3 + .../apache/cassandra/hints/HintsCatalogTest.java | 17 +-- .../apache/cassandra/hints/HintsReaderTest.java| 5 + .../org/apache/cassandra/hints/HintsStoreTest.java | 3 + .../apache/cassandra/hints/HintsUpgradeTest.java | 3 + 11 files changed, 197 insertions(+), 26 deletions(-) create mode 100644 test/distributed/org/apache/cassandra/distributed/test/HintsMaxSizeTest.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 (96692d7206 -> 38408938cc)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 96692d7206 Merge branch 'cassandra-4.0' into cassandra-4.1 add 38408938cc Do not go to disk for reading hints file sizes No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../apache/cassandra/hints/HintsDescriptor.java| 24 +++- .../org/apache/cassandra/hints/HintsStore.java | 13 ++- .../org/apache/cassandra/hints/HintsWriter.java| 11 +- .../org/apache/cassandra/service/StorageProxy.java | 14 ++- .../distributed/test/HintsMaxSizeTest.java | 128 + .../org/apache/cassandra/hints/AlteredHints.java | 3 + .../apache/cassandra/hints/HintsCatalogTest.java | 17 +-- .../apache/cassandra/hints/HintsReaderTest.java| 5 + .../org/apache/cassandra/hints/HintsStoreTest.java | 3 + 10 files changed, 194 insertions(+), 25 deletions(-) create mode 100644 test/distributed/org/apache/cassandra/distributed/test/HintsMaxSizeTest.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 (8502da494c -> e4ae1f3a4f)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 8502da494c Merge branch 'cassandra-4.0' into cassandra-4.1 add e4ae1f3a4f Fix system_views.settings to handle array types No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + .../apache/cassandra/db/virtual/SettingsTable.java | 14 -- .../cassandra/db/virtual/SettingsTableTest.java | 20 ++-- 3 files changed, 23 insertions(+), 12 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. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 40319901e9fb67eeff1c0a89297db2021200f0ba Merge: 061cb88b3c 36a1ca5e48 Author: Stefan Miklosovic AuthorDate: Tue Mar 19 14:57:58 2024 +0100 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + .../apache/cassandra/db/virtual/SettingsTable.java | 14 -- .../cassandra/db/virtual/SettingsTableTest.java | 20 ++-- 3 files changed, 23 insertions(+), 12 deletions(-) diff --cc CHANGES.txt index 7bd2710ddf,a56ec17d01..c1b07e384f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -50,8 -25,9 +50,9 @@@ Merged from 5.0 * Fix resource cleanup after SAI query timeouts (CASSANDRA-19177) * Suppress CVE-2023-6481 (CASSANDRA-19184) Merged from 4.1: + * 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: * 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) - 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 (bd2803307e -> 36a1ca5e48)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from bd2803307e Merge branch 'cassandra-4.1' into cassandra-5.0 add e4ae1f3a4f Fix system_views.settings to handle array types add 36a1ca5e48 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/db/virtual/SettingsTable.java | 14 -- .../cassandra/db/virtual/SettingsTableTest.java | 20 ++-- 3 files changed, 23 insertions(+), 12 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (061cb88b3c -> 40319901e9)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 061cb88b3c Improve logging for retries in TCM add e4ae1f3a4f Fix system_views.settings to handle array types add 36a1ca5e48 Merge branch 'cassandra-4.1' into cassandra-5.0 new 40319901e9 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/db/virtual/SettingsTable.java | 14 -- .../cassandra/db/virtual/SettingsTableTest.java | 20 ++-- 3 files changed, 23 insertions(+), 12 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch CASSANDRA-19477-trunk deleted (was c1db7004a8)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch CASSANDRA-19477-trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git was c1db7004a8 DO NOT COMMIT This change permanently discards the following revisions: discard c1db7004a8 DO NOT COMMIT discard a79679ebf1 CASSANDRA-19477 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch CASSANDRA-19477-trunk created (now c1db7004a8)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch CASSANDRA-19477-trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git at c1db7004a8 DO NOT COMMIT This branch includes the following new commits: new a79679ebf1 CASSANDRA-19477 new c1db7004a8 DO NOT COMMIT The 2 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) 01/02: CASSANDRA-19477
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch CASSANDRA-19477-trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit a79679ebf1bd3e07e1ddb2fd2f512f8cfb800387
Author: Stefan Miklosovic
AuthorDate: Sun Mar 17 02:24:12 2024 +0100
CASSANDRA-19477
---
.../apache/cassandra/hints/HintsDescriptor.java| 8 --
.../org/apache/cassandra/hints/HintsStore.java | 29 ++
.../apache/cassandra/hints/HintsWriteExecutor.java | 25 +++
.../org/apache/cassandra/service/StorageProxy.java | 14 ++-
.../apache/cassandra/hints/HintsCatalogTest.java | 6 ++---
5 files changed, 60 insertions(+), 22 deletions(-)
diff --git a/src/java/org/apache/cassandra/hints/HintsDescriptor.java
b/src/java/org/apache/cassandra/hints/HintsDescriptor.java
index 3079c0b80c..e28ebd53b0 100644
--- a/src/java/org/apache/cassandra/hints/HintsDescriptor.java
+++ b/src/java/org/apache/cassandra/hints/HintsDescriptor.java
@@ -81,6 +81,8 @@ final class HintsDescriptor
final UUID hostId;
final int version;
final long timestamp;
+final String hintsFileName;
+final String crc32FileName;
final ImmutableMap parameters;
final ParameterizedClass compressionConfig;
@@ -93,6 +95,8 @@ final class HintsDescriptor
this.hostId = hostId;
this.version = version;
this.timestamp = timestamp;
+this.hintsFileName = hostId + "-" + timestamp + "-" + version +
".hints";
+this.crc32FileName = hostId + "-" + timestamp + "-" + version +
".crc32";
compressionConfig = createCompressionConfig(parameters);
EncryptionData encryption = createEncryption(parameters);
@@ -205,12 +209,12 @@ final class HintsDescriptor
String fileName()
{
-return String.format("%s-%s-%s.hints", hostId, timestamp, version);
+return hintsFileName;
}
String checksumFileName()
{
-return String.format("%s-%s-%s.crc32", hostId, timestamp, version);
+return crc32FileName;
}
File file(File hintsDirectory)
diff --git a/src/java/org/apache/cassandra/hints/HintsStore.java
b/src/java/org/apache/cassandra/hints/HintsStore.java
index b7850ee2b4..ed06474427 100644
--- a/src/java/org/apache/cassandra/hints/HintsStore.java
+++ b/src/java/org/apache/cassandra/hints/HintsStore.java
@@ -61,6 +61,7 @@ final class HintsStore
private final Deque dispatchDequeue;
private final Queue corruptedFiles;
private final Map hintsExpirations;
+private final Map hintsSizes;
// last timestamp used in a descriptor; make sure to not reuse the same
timestamp for new descriptors.
private volatile long lastUsedTimestamp;
@@ -76,9 +77,13 @@ final class HintsStore
dispatchDequeue = new ConcurrentLinkedDeque<>(descriptors);
corruptedFiles = new ConcurrentLinkedQueue<>();
hintsExpirations = new ConcurrentHashMap<>();
+hintsSizes = new ConcurrentHashMap<>();
//noinspection resource
lastUsedTimestamp = descriptors.stream().mapToLong(d ->
d.timestamp).max().orElse(0L);
+
+for (HintsDescriptor descriptor : Iterables.concat(dispatchDequeue,
corruptedFiles))
+hintsSizes.put(descriptor.hintsFileName,
descriptor.file(hintsDirectory).length());
}
static HintsStore create(UUID hostId, File hintsDirectory,
ImmutableMap writerParams, List descriptors)
@@ -87,6 +92,11 @@ final class HintsStore
return new HintsStore(hostId, hintsDirectory, writerParams,
descriptors);
}
+Map getHintsSizes()
+{
+return hintsSizes;
+}
+
@VisibleForTesting
int getDispatchQueueSize()
{
@@ -203,6 +213,9 @@ final class HintsStore
{
dispatchDequeue.removeAll(removeSet);
corruptedFiles.removeAll(removeSet);
+// if delete(descriptor) throws, hence
+for (HintsDescriptor descriptor : removeSet)
+hintsSizes.remove(descriptor.fileName());
}
}
@@ -210,7 +223,11 @@ final class HintsStore
{
File hintsFile = descriptor.file(hintsDirectory);
if (hintsFile.tryDelete())
+{
+// this method is also called standalone (without deleteHints)
+hintsSizes.remove(descriptor.fileName());
logger.info("Deleted hint file {}", descriptor.fileName());
+}
else if (hintsFile.exists())
logger.error("Failed to delete hint file {}",
descriptor.fileName());
else
@@ -235,17 +252,15 @@ final class HintsStore
dispatchPositions.put(descriptor, inputPosition);
}
-
/**
* @return the total size of all files belonging to the hints store, in
bytes.
*/
long getTotalFileSize
(cassandra) 02/02: DO NOT COMMIT
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch CASSANDRA-19477-trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit c1db7004a834e988123d02b76ba622fd016db03f Author: Stefan Miklosovic AuthorDate: Sun Mar 17 02:24:31 2024 +0100 DO NOT COMMIT --- .circleci/config.yml | 222 +-- 1 file changed, 111 insertions(+), 111 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index af052dc6f6..ffe6cfbeff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,7 +24,7 @@ jobs: resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l -parallelism: 4 +parallelism: 25 steps: - attach_workspace: at: /home/cassandra @@ -111,10 +111,10 @@ jobs: j17_dtests: docker: - image: apache/cassandra-testing-ubuntu2004-java11:latest -resource_class: medium +resource_class: large working_directory: ~/ shell: /bin/bash -eo pipefail -l -parallelism: 4 +parallelism: 25 steps: - attach_workspace: at: /home/cassandra @@ -220,7 +220,7 @@ jobs: resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l -parallelism: 1 +parallelism: 25 steps: - attach_workspace: at: /home/cassandra @@ -402,7 +402,7 @@ jobs: resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l -parallelism: 4 +parallelism: 25 steps: - attach_workspace: at: /home/cassandra @@ -489,10 +489,10 @@ jobs: j11_dtests_latest_repeat: docker: - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest -resource_class: medium +resource_class: large working_directory: ~/ shell: /bin/bash -eo pipefail -l -parallelism: 4 +parallelism: 25 steps: - attach_workspace: at: /home/cassandra @@ -690,7 +690,7 @@ jobs: resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l -parallelism: 4 +parallelism: 25 steps: - attach_workspace: at: /home/cassandra @@ -804,10 +804,10 @@ jobs: j17_cqlsh_dtests_py38_vnode: docker: - image: apache/cassandra-testing-ubuntu2004-java11:latest -resource_class: medium +resource_class: large working_directory: ~/ shell: /bin/bash -eo pipefail -l -parallelism: 4 +parallelism: 25 steps: - attach_workspace: at: /home/cassandra @@ -912,10 +912,10 @@ jobs: j17_dtests_vnode_repeat: docker: - image: apache/cassandra-testing-ubuntu2004-java11:latest -resource_class: medium +resource_class: large working_directory: ~/ shell: /bin/bash -eo pipefail -l -parallelism: 4 +parallelism: 25 steps: - attach_workspace: at: /home/cassandra @@ -1066,10 +1066,10 @@ jobs: j11_dtests_vnode_repeat: docker: - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest -resource_class: medium +resource_class: large working_directory: ~/ shell: /bin/bash -eo pipefail -l -parallelism: 4 +parallelism: 25 steps: - attach_workspace: at: /home/cassandra @@ -1199,10 +1199,10 @@ jobs: j17_cqlsh_dtests_py311_latest: docker: - image: apache/cassandra-testing-ubuntu2004-java11:latest -resource_class: medium +resource_class: large working_directory: ~/ shell: /bin/bash -eo pipefail -l -parallelism: 4 +parallelism: 25 steps: - attach_workspace: at: /home/cassandra @@ -1310,7 +1310,7 @@ jobs: resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l -parallelism: 4 +parallelism: 25 steps: - attach_workspace: at: /home/cassandra @@ -1428,7 +1428,7 @@ jobs: resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l -parallelism: 4 +parallelism: 25 steps: - attach_workspace: at: /home/cassandra @@ -1518,7 +1518,7 @@ jobs: resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l -parallelism: 4 +parallelism: 25 steps: - attach_workspace: at: /home/cassandra @@ -1632,10 +1632,10 @@ jobs: j11_cqlsh_dtests_py38_latest: docker: - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest -resource_class: medium +resource_class: large working_directory: ~/ shell: /bin/bash -eo pipefail -l -parallelism: 4 +parallelism: 25 steps: - attach_workspace: at: /home/cassandra @@ -1744,7 +1744,7 @@ jobs: resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l -parallelism: 4 +parallelism: 25 steps: - attach_workspace: at: /home
(cassandra-dtest) branch trunk updated: fix cqlsh_tests/test_cqlsh.py to cope with cassandra_latest.yaml
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
The following commit(s) were added to refs/heads/trunk by this push:
new e377ac12 fix cqlsh_tests/test_cqlsh.py to cope with
cassandra_latest.yaml
e377ac12 is described below
commit e377ac1239f0461ef25dcbafedbc931accfe563c
Author: Stefan Miklosovic
AuthorDate: Fri Mar 15 12:48:45 2024 +0100
fix cqlsh_tests/test_cqlsh.py to cope with cassandra_latest.yaml
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-19474
---
cqlsh_tests/test_cqlsh.py | 26 +++---
dtest_config.py | 4
2 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/cqlsh_tests/test_cqlsh.py b/cqlsh_tests/test_cqlsh.py
index 4452f153..012f3442 100644
--- a/cqlsh_tests/test_cqlsh.py
+++ b/cqlsh_tests/test_cqlsh.py
@@ -127,6 +127,13 @@ class TestCqlsh(Tester, CqlshMixin):
os.unlink(self.tempfile.name)
super(TestCqlsh, self).tearDown()
+
+def get_compaction(self):
+stcs = "AND compaction = {'class':
'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy',
'max_threshold': '32', 'min_threshold': '4'}"
+ucs = "AND compaction = {'class':
'org.apache.cassandra.db.compaction.UnifiedCompactionStrategy',
'max_sstables_to_compact': '64', 'min_sstable_size': '100MiB',
'scaling_parameters': 'T4', 'sstable_growth': '0.',
'target_sstable_size': '1GiB'}"
+return ucs if self.dtest_config.latest_config else stcs
+
+
@pytest.mark.depends_cqlshlib
@since('2.1.9')
def test_pycodestyle_compliance(self):
@@ -1147,6 +1154,7 @@ CREATE TYPE test.address_type (
self.execute(cql='USE test; DESCRIBE MATERIALIZED VIEW
"users_by_state"', expected_output=self.get_users_by_state_mv_output())
self.execute(cql='USE test; DESCRIBE "users_by_state"',
expected_output=self.get_users_by_state_mv_output())
+
def get_keyspace_output(self):
return ["CREATE KEYSPACE test WITH replication = {'class':
'SimpleStrategy', 'replication_factor': '1'} AND durable_writes = true;",
self.get_test_table_output(),
@@ -1179,7 +1187,7 @@ CREATE TYPE test.address_type (
AND caching = {'keys': 'ALL', 'rows_per_partition': 'NONE'}
AND cdc = false
AND comment = ''
-AND compaction = {'class':
'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy',
'max_threshold': '32', 'min_threshold': '4'}
+%s
AND compression = {'chunk_length_in_kb': '16', 'class':
'org.apache.cassandra.io.compress.LZ4Compressor'}
AND memtable = 'default'
AND crc_check_chance = 1.0
@@ -1192,7 +1200,7 @@ CREATE TYPE test.address_type (
AND min_index_interval = 128
AND read_repair = 'BLOCKING'
AND speculative_retry = '99p';
-"""
+""" % self.get_compaction()
elif self.cluster.version() >= LooseVersion('4.1'):
create_table += """
) WITH CLUSTERING ORDER BY (col ASC)
@@ -1312,7 +1320,7 @@ CREATE TYPE test.address_type (
AND caching = {'keys': 'ALL', 'rows_per_partition': 'NONE'}
AND cdc = false
AND comment = ''
-AND compaction = {'class':
'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy',
'max_threshold': '32', 'min_threshold': '4'}
+%s
AND compression = {'chunk_length_in_kb': '16', 'class':
'org.apache.cassandra.io.compress.LZ4Compressor'}
AND memtable = 'default'
AND crc_check_chance = 1.0
@@ -1325,7 +1333,7 @@ CREATE TYPE test.address_type (
AND min_index_interval = 128
AND read_repair = 'BLOCKING'
AND speculative_retry = '99p';
-"""
+""" % self.get_compaction()
elif self.cluster.version() >= LooseVersion('4.1'):
create_table = """
CREATE TABLE test.users (
@@ -1453,7 +1461,11 @@ CREATE TYPE test.address_type (
pass
else:
index = index[1:-1]
-return "CREATE INDEX {} ON {}.{} ({});".format(index, ks, table, col)
+
+if self.dtest_config.latest_config:
+return "CREATE CUSTOM INDEX {} ON {}.{} ({}) USING
'sai';".format(index, ks, table, col)
+else:
+return "CREATE INDEX {} ON {}.{} ({});".format(index, ks, table,
col)
def get_users_by_state_mv_output(self):
@@ -1471,7 +1483,7 @@ CREATE TYPE test.address_type (
AND caching = {'keys': 'ALL', 'rows_per_partition': 'NONE'}
AND cdc = false
(cassandra) branch trunk updated: Group nodetool cms commands into single command group
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git The following commit(s) were added to refs/heads/trunk by this push: new 98ca5f8f1a Group nodetool cms commands into single command group 98ca5f8f1a is described below commit 98ca5f8f1aab6659fdfd084bef38495bf50d35d6 Author: nvharikrishna AuthorDate: Wed Feb 14 15:09:06 2024 +0530 Group nodetool cms commands into single command group patch by N. V. Harikrishna; reviewed by Stefan Miklosovic and Marcus Eriksson for CASSANDRA-19393 --- CHANGES.txt| 1 + .../cassandra/tcm/TransactionalClusterMetadata.md | 4 +- src/java/org/apache/cassandra/tools/NodeTool.java | 10 +- .../apache/cassandra/tools/nodetool/CMSAdmin.java | 163 + .../cassandra/tools/nodetool/DescribeCMS.java | 44 -- .../cassandra/tools/nodetool/InitializeCMS.java| 39 - .../cassandra/tools/nodetool/ReconfigureCMS.java | 128 .../cassandra/distributed/test/TestBaseImpl.java | 2 +- .../distributed/test/log/ReconfigureCMSTest.java | 17 ++- .../test/log/TriggeredReconfigureCMSTest.java | 6 +- .../ClusterMetadataSingleNodeUpgradeTest.java | 2 +- .../upgrade/ClusterMetadataUpgradeHarryTest.java | 4 +- .../upgrade/ClusterMetadataUpgradeHostIdTest.java | 2 +- .../ClusterMetadataUpgradeIgnoreHostTest.java | 6 +- .../ClusterMetadataUpgradeIgnoreHostsTest.java | 6 +- .../upgrade/ClusterMetadataUpgradeTest.java| 4 +- .../upgrade/DropCompactStorageTest.java| 2 +- 17 files changed, 199 insertions(+), 241 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index f7ac26859f..7bd2710ddf 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 5.1 + * Group nodetool cms commands into single command group (CASSANDRA-19393) * Register the measurements of the bootstrap process as Dropwizard metrics (CASSANDRA-19447) * Add LIST SUPERUSERS CQL statement (CASSANDRA-19417) * Modernize CQLSH datetime conversions (CASSANDRA-18879) diff --git a/src/java/org/apache/cassandra/tcm/TransactionalClusterMetadata.md b/src/java/org/apache/cassandra/tcm/TransactionalClusterMetadata.md index 75fada86ae..1b691bba8c 100644 --- a/src/java/org/apache/cassandra/tcm/TransactionalClusterMetadata.md +++ b/src/java/org/apache/cassandra/tcm/TransactionalClusterMetadata.md @@ -71,7 +71,7 @@ Nodes provide each other with missing log entries in the form of a `LogState`, w Following an upgrade, nodes in an existing cluster will enter a minimal modification mode. In this state, the set of allowed cluster metadata modifications is constrained to include only the addition, removal and replacement of nodes, to allow failed hosts to be replaced during the upgrade. In this mode the CMS has no members and each peer maintains its own `ClusterMetadata` instance independently. This metadata is intitialised at startup from system tables and gossip is used to propagate the permitted subset of metadata changes. -When the operator is ready, one node is chosen for promotion to the initial CMS, which is done manually via nodetool `initializecms`. At this point, the candidate node will propose itself as the initial CMS and attempt to gain consensus from the rest of the cluster. If successful, it verifies that all peers have an identical view of cluster metadata and initialises the distributed log with a snapshot of that metadata. +When the operator is ready, one node is chosen for promotion to the initial CMS, which is done manually via nodetool `cms initialize`. At this point, the candidate node will propose itself as the initial CMS and attempt to gain consensus from the rest of the cluster. If successful, it verifies that all peers have an identical view of cluster metadata and initialises the distributed log with a snapshot of that metadata. -Once this process is complete all future cluster metadata updates are performed via the CMS using the global log and reverting to the previous method of metadata management is not supported. Further members can and should be added to the CMS using nodetool's `reconfigurecms` command. +Once this process is complete all future cluster metadata updates are performed via the CMS using the global log and reverting to the previous method of metadata management is not supported. Further members can and should be added to the CMS using nodetool's `cms reconfigure` command. diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java index 8e2c6f45cd..e653e7e2b5 100644 --- a/src/java/org/apache/cassandra/tools/NodeTool.java +++ b/src/java/org/apache/cassandra/tools/NodeTool.java @@ -107,7 +107,6 @@ public class NodeTool DataPaths.class, Decommission.class
(cassandra-dtest) branch trunk updated: align tests with CASSANDRA-19393
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
The following commit(s) were added to refs/heads/trunk by this push:
new f3ca59c7 align tests with CASSANDRA-19393
f3ca59c7 is described below
commit f3ca59c76dc946e75b3b9dbc90f22dc51bf1c73a
Author: Stefan Miklosovic
AuthorDate: Thu Mar 14 11:10:22 2024 +0100
align tests with CASSANDRA-19393
---
upgrade_tests/storage_engine_upgrade_test.py | 2 +-
upgrade_tests/upgrade_through_versions_test.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/upgrade_tests/storage_engine_upgrade_test.py
b/upgrade_tests/storage_engine_upgrade_test.py
index d791f2a7..5992e7e7 100644
--- a/upgrade_tests/storage_engine_upgrade_test.py
+++ b/upgrade_tests/storage_engine_upgrade_test.py
@@ -70,7 +70,7 @@ class TestStorageEngineUpgrade(Tester):
self.install_legacy_parsing(node1)
node1.start(wait_for_binary_proto=True)
if node1.get_cassandra_version() >= '5.1':
-node1.nodetool("initializecms")
+node1.nodetool("cms initialize")
if self.fixture_dtest_setup.bootstrap:
cluster.set_install_dir(install_dir=self.fixture_dtest_setup.default_install_dir)
self.install_nodetool_legacy_parsing()
diff --git a/upgrade_tests/upgrade_through_versions_test.py
b/upgrade_tests/upgrade_through_versions_test.py
index cbd8c720..b27a0a42 100644
--- a/upgrade_tests/upgrade_through_versions_test.py
+++ b/upgrade_tests/upgrade_through_versions_test.py
@@ -500,7 +500,7 @@ class TestUpgrade(Tester):
self._check_select_count()
if self.cluster.version() >= '5.1':
-self.cluster.nodelist()[0].nodetool("initializecms")
+self.cluster.nodelist()[0].nodetool("cms initialize")
# run custom post-upgrade callables
for call in after_upgrade_call:
call()
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated: Add LIST SUPERUSERS CQL statement
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git The following commit(s) were added to refs/heads/trunk by this push: new b35ad427c5 Add LIST SUPERUSERS CQL statement b35ad427c5 is described below commit b35ad427c5e9282730682553b6dcf5d70b603e22 Author: Shailaja Koppu AuthorDate: Tue Mar 12 12:27:58 2024 + Add LIST SUPERUSERS CQL statement patch by Shailaja Koppu; reviewed by Stefan Miklosovic and Benjamin Lerer for CASSANDRA-19417 --- CHANGES.txt| 1 + doc/cql3/CQL.textile | 16 ++- .../examples/BNF/list_superusers_statement.bnf | 1 + .../cassandra/pages/developing/cql/security.adoc | 12 ++ .../pages/reference/cql-commands/commands-toc.adoc | 3 + pylib/cqlshlib/cql3handling.py | 4 + pylib/cqlshlib/test/test_cqlsh_completion.py | 2 +- src/antlr/Lexer.g | 1 + src/antlr/Parser.g | 11 ++ .../apache/cassandra/audit/AuditLogEntryType.java | 3 +- src/java/org/apache/cassandra/auth/Roles.java | 14 +++ .../cql3/statements/ListSuperUsersStatement.java | 102 .../cassandra/audit/AuditLoggerAuthTest.java | 10 ++ test/unit/org/apache/cassandra/auth/RolesTest.java | 22 .../statements/ListSuperUsersStatementTest.java| 131 + 15 files changed, 330 insertions(+), 3 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 296d4cb2d9..b6b9ab86ba 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 5.1 + * Add LIST SUPERUSERS CQL statement (CASSANDRA-19417) * Modernize CQLSH datetime conversions (CASSANDRA-18879) * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) * Refactor cqlshmain global constants (CASSANDRA-19201) diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile index 959533f771..c85fef5ab5 100644 --- a/doc/cql3/CQL.textile +++ b/doc/cql3/CQL.textile @@ -1414,7 +1414,7 @@ REVOKE report_writer FROM alice; This statement revokes the @report_writer@ role from @alice@. Any permissions that @alice@ has acquired via the @report_writer@ role are also revoked. -h4(#listRolesStmt). LIST ROLES +h3(#listRolesStmt). LIST ROLES __Syntax:__ @@ -1438,6 +1438,20 @@ LIST ROLES OF @bob@ NORECURSIVE List all roles directly granted to @bob@. +h3(#listSuperusersStmt). LIST SUPERUSERS + +__Syntax:__ + +bc(syntax). + ::= LIST SUPERUSERS; + +__Sample:__ + +bc(sample). +LIST SUPERUSERS; + +Returns roles with the superuser privilege (this includes roles with transitively acquired superuser privilege), this command requires `DESCRIBE` permission on all roles of the database. + h3(#createUserStmt). CREATE USER Prior to the introduction of roles in Cassandra 2.2, authentication and authorization were based around the concept of a @USER@. For backward compatibility, the legacy syntax has been preserved with @USER@ centric statments becoming synonyms for the @ROLE@ based equivalents. diff --git a/doc/modules/cassandra/examples/BNF/list_superusers_statement.bnf b/doc/modules/cassandra/examples/BNF/list_superusers_statement.bnf new file mode 100644 index 00..ae21466e19 --- /dev/null +++ b/doc/modules/cassandra/examples/BNF/list_superusers_statement.bnf @@ -0,0 +1 @@ +list_superusers_statement ::= LIST SUPERUSERS diff --git a/doc/modules/cassandra/pages/developing/cql/security.adoc b/doc/modules/cassandra/pages/developing/cql/security.adoc index f751a1658d..2d438b9815 100644 --- a/doc/modules/cassandra/pages/developing/cql/security.adoc +++ b/doc/modules/cassandra/pages/developing/cql/security.adoc @@ -261,6 +261,18 @@ transitively acquired ones: include::cassandra:example$CQL/list_roles_nonrecursive.cql[] +[[list-superusers-statement]] +== LIST SUPERUSERS + +All the known roles (including transitively acquired) with superuser privilege can be listed using the `LIST SUPERUSERS` statement: + +[source, bnf] + +include::cassandra:example$BNF/list_superusers_statement.bnf[] + + +This command requires `DESCRIBE` permission on all roles of the database. + == Users Prior to the introduction of roles in Cassandra 2.2, authentication and diff --git a/doc/modules/cassandra/pages/reference/cql-commands/commands-toc.adoc b/doc/modules/cassandra/pages/reference/cql-commands/commands-toc.adoc index e1fe0fe0fd..0924e63ac7 100644 --- a/doc/modules/cassandra/pages/reference/cql-commands/commands-toc.adoc +++ b/doc/modules/cassandra/pages/reference/cql-commands/commands-toc.adoc @@ -95,6 +95,9 @@ Lists permissions on resources. xref:reference:cql-commands/list-roles.adoc[LIST ROLES] :: Lists roles and shows superuser and login status. +xref:reference:cql-commands/list-superusers.adoc[LIST SUPERUSERS] :: +Lists roles with the superuser
(cassandra-dtest) branch trunk updated: align tests with CASSANDRA-19460
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
The following commit(s) were added to refs/heads/trunk by this push:
new 44596eec align tests with CASSANDRA-19460
44596eec is described below
commit 44596eec78f7ac796684312a616b77be4e7175dd
Author: Stefan Miklosovic
AuthorDate: Thu Mar 7 18:32:27 2024 +0100
align tests with CASSANDRA-19460
patch by Stefan Miklosovic; reviewed by Branimir Lambov for CASSANDRA-19460
---
scrub_test.py | 59 +--
1 file changed, 41 insertions(+), 18 deletions(-)
diff --git a/scrub_test.py b/scrub_test.py
index 69e77bde..19aa0956 100644
--- a/scrub_test.py
+++ b/scrub_test.py
@@ -187,6 +187,9 @@ class TestHelper(Tester):
logger.debug('sstables after increment {}'.format(str(sstables)))
+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]
+
@since('2.2')
class TestScrubIndexes(TestHelper):
@@ -239,6 +242,7 @@ class TestScrubIndexes(TestHelper):
node1 = cluster.nodelist()[0]
session = self.patient_cql_connection(node1)
+should_assert_sstables = cluster.version() < '5.0' or
(cluster.version() >= '5.0' and not
self.uuid_sstable_identifiers_enabled(session))
create_ks(session, KEYSPACE, 1)
self.create_users(session)
@@ -248,16 +252,19 @@ class TestScrubIndexes(TestHelper):
initial_sstables = self.flush('users', 'gender_idx', 'state_idx',
'birth_year_idx')
scrubbed_sstables = self.scrub('users', 'gender_idx', 'state_idx',
'birth_year_idx')
-self.increase_sstable_generations(initial_sstables)
-assert initial_sstables == scrubbed_sstables
+if should_assert_sstables:
+self.increase_sstable_generations(initial_sstables)
+assert initial_sstables == scrubbed_sstables
users = self.query_users(session)
assert initial_users == users
# Scrub and check sstables and data again
scrubbed_sstables = self.scrub('users', 'gender_idx', 'state_idx',
'birth_year_idx')
-self.increase_sstable_generations(initial_sstables)
-assert initial_sstables == scrubbed_sstables
+
+if should_assert_sstables:
+self.increase_sstable_generations(initial_sstables)
+assert initial_sstables == scrubbed_sstables
users = self.query_users(session)
assert initial_users == users
@@ -278,6 +285,7 @@ class TestScrubIndexes(TestHelper):
node1 = cluster.nodelist()[0]
session = self.patient_cql_connection(node1)
+should_assert_sstables = cluster.version() < '5.0' or
(cluster.version() >= '5.0' and not
self.uuid_sstable_identifiers_enabled(session))
create_ks(session, KEYSPACE, 1)
self.create_users(session)
@@ -289,8 +297,10 @@ class TestScrubIndexes(TestHelper):
cluster.stop()
scrubbed_sstables = self.standalonescrub('users', 'gender_idx',
'state_idx', 'birth_year_idx')
-self.increase_sstable_generations(initial_sstables)
-assert initial_sstables == scrubbed_sstables
+
+if should_assert_sstables:
+self.increase_sstable_generations(initial_sstables)
+assert initial_sstables == scrubbed_sstables
cluster.start()
session = self.patient_cql_connection(node1)
@@ -305,6 +315,7 @@ class TestScrubIndexes(TestHelper):
node1 = cluster.nodelist()[0]
session = self.patient_cql_connection(node1)
+should_assert_sstables = cluster.version() < '5.0' or
(cluster.version() >= '5.0' and not
self.uuid_sstable_identifiers_enabled(session))
create_ks(session, KEYSPACE, 1)
session.execute("CREATE TABLE users (user_id uuid PRIMARY KEY, email
text, uuids list)")
@@ -323,16 +334,18 @@ class TestScrubIndexes(TestHelper):
initial_sstables = self.flush('users', 'user_uuids_idx')
scrubbed_sstables = self.scrub('users', 'user_uuids_idx')
-self.increase_sstable_generations(initial_sstables)
-assert initial_sstables == scrubbed_sstables
+if should_assert_sstables:
+self.increase_sstable_generations(initial_sstables)
+assert initial_sstables == scrubbed_sstables
users = list(session.execute(("SELECT * from users where uuids
contains {some_uuid}").format(some_uuid=_id)))
assert initial_users == users
scrubbed_sstables = self.scrub('users', 'user_uuids_idx')
-self.increase_sstable_generations(initial_sstables)
-assert initial_sstables == scrubbed_sstables
+if should_assert_sstables:
+self.increase_sstable_g
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit da86cba2e2482ee6461142b1428bf131fbb8 Merge: 06558a8f56 2f836fa596 Author: Stefan Miklosovic AuthorDate: Tue Mar 12 13:40:01 2024 +0100 Merge branch 'cassandra-5.0' into trunk CHANGES.txt| 1 + conf/cassandra_latest.yaml | 2 +- src/java/org/apache/cassandra/db/Directories.java | 70 +- test/conf/latest_diff.yaml | 2 + .../cassandra/distributed/impl/InstanceConfig.java | 2 + .../test/TableLevelIncrementalBackupsTest.java | 20 +-- .../apache/cassandra/index/CustomIndexTest.java| 2 +- 7 files changed, 90 insertions(+), 9 deletions(-) diff --cc CHANGES.txt index 9fc8dc5c45,2e543f1120..296d4cb2d9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,26 -1,5 +1,27 @@@ -5.0-beta2 +5.1 + * Modernize CQLSH datetime conversions (CASSANDRA-18879) + * Harry model and in-JVM tests for partition-restricted 2i queries (CASSANDRA-18275) + * Refactor cqlshmain global constants (CASSANDRA-19201) + * Remove native_transport_port_ssl (CASSANDRA-19397) + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * 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: + * Set uuid_sstable_identifiers_enabled to true in cassandra-latest.yaml (CASSANDRA-19460) * Revert switching to approxTime in Dispatcher (CASSANDRA-19454) * Add an optimized default configuration to tests and make it available for new users (CASSANDRA-18753) * Fix remote JMX under Java17 (CASSANDRA-19453) - 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 (451b0c010f -> 2f836fa596)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 451b0c010f Test failure: org.apache.cassandra.distributed.test.UpgradeSSTablesTest add 2f836fa596 Set uuid_sstable_identifiers_enabled to true for cassandra-latest.yaml No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + conf/cassandra_latest.yaml | 2 +- src/java/org/apache/cassandra/db/Directories.java | 70 +- test/conf/latest_diff.yaml | 2 + .../cassandra/distributed/impl/InstanceConfig.java | 2 + .../test/TableLevelIncrementalBackupsTest.java | 20 +-- .../apache/cassandra/index/CustomIndexTest.java| 2 +- 7 files changed, 90 insertions(+), 9 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (06558a8f56 -> da86cddddb)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 06558a8f56 Test fixes for CASSANDRA-18753 add 2f836fa596 Set uuid_sstable_identifiers_enabled to true for cassandra-latest.yaml new da86cb 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 + conf/cassandra_latest.yaml | 2 +- src/java/org/apache/cassandra/db/Directories.java | 70 +- test/conf/latest_diff.yaml | 2 + .../cassandra/distributed/impl/InstanceConfig.java | 2 + .../test/TableLevelIncrementalBackupsTest.java | 20 +-- .../apache/cassandra/index/CustomIndexTest.java| 2 +- 7 files changed, 90 insertions(+), 9 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-dtest) branch trunk updated (f4de30a9 -> 1f562e26)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git from f4de30a9 Extend timeout for parallel_upgrade and parallel_upgrade_with_internode_ssl upgrade tests (fix 2 for CASSANDRA-19409) add 1f562e26 temporarily pin down pytest to >=6.5.0,<=8.0.2 until CASSANDRA-16464 is resolved No new revisions were added by this update. Summary of changes: requirements.txt | 2 +- 1 file changed, 1 insertion(+), 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 (612c9638dc -> e120088d44)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 612c9638dc Merge branch 'cassandra-4.0' into cassandra-4.1 add 099fdf2673 Move ClientWarn.State#warnings to a thread-safe list add a124cfce85 Merge branch 'cassandra-3.11' into cassandra-4.0 add e120088d44 Merge branch 'cassandra-4.0' into cassandra-4.1 No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + src/java/org/apache/cassandra/service/ClientWarn.java | 6 -- 2 files changed, 5 insertions(+), 2 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 (ab25cae4c5 -> 106be29feb)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from ab25cae4c5 Skinny dev circle workflow add 099fdf2673 Move ClientWarn.State#warnings to a thread-safe list add a124cfce85 Merge branch 'cassandra-3.11' into cassandra-4.0 add e120088d44 Merge branch 'cassandra-4.0' into cassandra-4.1 add 106be29feb Merge branch 'cassandra-4.1' into cassandra-5.0 No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + src/java/org/apache/cassandra/service/ClientWarn.java | 6 -- 2 files changed, 5 insertions(+), 2 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 (af5733124d -> 099fdf2673)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git from af5733124d Merge branch 'cassandra-3.0' into cassandra-3.11 add 099fdf2673 Move ClientWarn.State#warnings to a thread-safe list No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + src/java/org/apache/cassandra/service/ClientWarn.java | 6 -- 2 files changed, 5 insertions(+), 2 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 (dee7947422 -> a124cfce85)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from dee7947422 Bug in generate.sh removal of jobs add 099fdf2673 Move ClientWarn.State#warnings to a thread-safe list add a124cfce85 Merge branch 'cassandra-3.11' into cassandra-4.0 No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + src/java/org/apache/cassandra/service/ClientWarn.java | 6 -- 2 files changed, 5 insertions(+), 2 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.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit bf124a30da5c50f5d1cf0c195cc7750098d9460d
Merge: c26be50107 106be29feb
Author: Stefan Miklosovic
AuthorDate: Thu Feb 29 12:01:55 2024 +0100
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/ClientWarn.java | 6 --
2 files changed, 5 insertions(+), 2 deletions(-)
diff --cc CHANGES.txt
index f9f28ba23d,db78d5a5cb..884a94a59a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -46,7 -26,11 +46,8 @@@ Merged from 4.0
* Remove redundant code in StorageProxy#sendToHintedReplicas
(CASSANDRA-19412)
* Remove bashisms for mx4j tool in cassandra-env.sh (CASSANDRA-19416)
* Add new concurrent_merkle_tree_requests config property to prevent OOM
during multi-range and/or multi-table repairs (CASSANDRA-19336)
- * 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:
+ * Move ClientWarn.State#warnings to a thread-safe list (CASSANDRA-19427)
Merged from 3.0:
* Fix SCM URL link (CASSANDRA-19422)
* Backport CASSANDRA-16418 to 3.x (CASSANDRA-18824)
diff --cc src/java/org/apache/cassandra/service/ClientWarn.java
index 56aa421b19,7f67a1168a..13cb21d6b2
--- a/src/java/org/apache/cassandra/service/ClientWarn.java
+++ b/src/java/org/apache/cassandra/service/ClientWarn.java
@@@ -89,8 -70,9 +89,10 @@@ public class ClientWarn extends Executo
public static class State
{
+private boolean collecting = true;
- private final List warnings = new ArrayList<>();
+ // This must be a thread-safe list. Even though it's wrapped in a
ThreadLocal, it's propagated to each thread
+ // from shared state, so multiple threads can reference the same
State.
+ private final List warnings = new CopyOnWriteArrayList<>();
private void add(String warning)
{
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (c26be50107 -> bf124a30da)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from c26be50107 Merge branch 'cassandra-5.0' into trunk add 099fdf2673 Move ClientWarn.State#warnings to a thread-safe list add a124cfce85 Merge branch 'cassandra-3.11' into cassandra-4.0 add e120088d44 Merge branch 'cassandra-4.0' into cassandra-4.1 add 106be29feb Merge branch 'cassandra-4.1' into cassandra-5.0 new bf124a30da 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/service/ClientWarn.java | 6 -- 2 files changed, 5 insertions(+), 2 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 (2170825f0e -> af5733124d)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 2170825f0e Merge branch 'cassandra-3.0' into cassandra-3.11 add 98eea87aa5 Fix SCM URL links add af5733124d Merge branch 'cassandra-3.0' into cassandra-3.11 No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + build.xml | 2 +- 2 files changed, 2 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 (b6b291e3bb -> 95fcefede2)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from b6b291e3bb Merge branch 'cassandra-4.0' into cassandra-4.1 add 98eea87aa5 Fix SCM URL links add af5733124d Merge branch 'cassandra-3.0' into cassandra-3.11 add 5430e69e77 Merge branch 'cassandra-3.11' into cassandra-4.0 add 95fcefede2 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 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) - 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. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit cf71b602e61519477a60e4f0f4fac98bdb0af190 Merge: 2c0371a311 2482c8a936 Author: Stefan Miklosovic AuthorDate: Fri Feb 23 14:52:57 2024 +0100 Merge branch 'cassandra-5.0' into trunk .build/cassandra-deps-template.xml | 2 +- .build/parent-pom-template.xml | 2 +- CHANGES.txt| 1 + build.xml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --cc CHANGES.txt index 03c3fd2840,d02922f756..8460e99058 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -44,8 -24,12 +44,9 @@@ Merged from 4.0 * Remove redundant code in StorageProxy#sendToHintedReplicas (CASSANDRA-19412) * Remove bashisms for mx4j tool in cassandra-env.sh (CASSANDRA-19416) * Add new concurrent_merkle_tree_requests config property to prevent OOM during multi-range and/or multi-table repairs (CASSANDRA-19336) - * 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: + * Fix SCM URL link (CASSANDRA-19422) * Backport CASSANDRA-16418 to 3.x (CASSANDRA-18824) diff --cc build.xml index a4395d4ff5,bb4355b413..11b7254a14 --- a/build.xml +++ b/build.xml @@@ -33,10 -33,10 +33,10 @@@ - + https://gitbox.apache.org/repos/asf/cassandra.git"/> https://gitbox.apache.org/repos/asf/cassandra.git"/> - https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree"/> + https://gitbox.apache.org/repos/asf?p=cassandra.git"/>
(cassandra) branch cassandra-5.0 updated (bfc6e1241d -> 2482c8a936)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from bfc6e1241d Merge branch 'cassandra-4.1' into cassandra-5.0 add 98eea87aa5 Fix SCM URL links add af5733124d Merge branch 'cassandra-3.0' into cassandra-3.11 add 5430e69e77 Merge branch 'cassandra-3.11' into cassandra-4.0 add 95fcefede2 Merge branch 'cassandra-4.0' into cassandra-4.1 add 2482c8a936 Merge branch 'cassandra-4.1' into cassandra-5.0 No new revisions were added by this update. Summary of changes: .build/cassandra-deps-template.xml | 2 +- .build/parent-pom-template.xml | 2 +- CHANGES.txt| 1 + build.xml | 2 +- 4 files changed, 4 insertions(+), 3 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 (c2041ba45b -> 5430e69e77)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from c2041ba45b Filter remote DC replicas out when constructing the initial replica plan for the local read repair add 98eea87aa5 Fix SCM URL links add af5733124d Merge branch 'cassandra-3.0' into cassandra-3.11 add 5430e69e77 Merge branch 'cassandra-3.11' into cassandra-4.0 No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + build.xml | 2 +- 2 files changed, 2 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-3.0 updated (5be57829b0 -> 98eea87aa5)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-3.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 5be57829b0 Backport CASSANDRA-16418 to 3.x add 98eea87aa5 Fix SCM URL links No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + build.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (2c0371a311 -> cf71b602e6)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 2c0371a311 Merge branch 'cassandra-5.0' into trunk add 98eea87aa5 Fix SCM URL links add af5733124d Merge branch 'cassandra-3.0' into cassandra-3.11 add 5430e69e77 Merge branch 'cassandra-3.11' into cassandra-4.0 add 95fcefede2 Merge branch 'cassandra-4.0' into cassandra-4.1 add 2482c8a936 Merge branch 'cassandra-4.1' into cassandra-5.0 new cf71b602e6 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 | 2 +- .build/parent-pom-template.xml | 2 +- CHANGES.txt| 1 + build.xml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-website) branch asf-site updated (95d5d1e87 -> 882f7cb19)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/cassandra-website.git discard 95d5d1e87 generate docs for c4b35db1 add a29c61a33 link fix for mathematical functions on 5.0 landing page add fd550e9c5 ninja: remove ^ from the link pointing to the web itself add 882f7cb19 generate docs for fd550e9c This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (95d5d1e87) \ N -- N -- N refs/heads/asf-site (882f7cb19) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: ...ndra-5.0-Moving-Toward-an-AI-Driven-Future.html | 2 +- content/doc/5.0/cassandra/architecture/dynamo.html | 5 + .../doc/5.0/cassandra/architecture/guarantees.html | 5 + content/doc/5.0/cassandra/architecture/index.html | 5 + .../doc/5.0/cassandra/architecture/messaging.html | 5 + .../doc/5.0/cassandra/architecture/overview.html | 5 + .../5.0/cassandra/architecture/storage-engine.html | 5 + .../doc/5.0/cassandra/architecture/streaming.html | 5 + content/doc/5.0/cassandra/developing/cql/SASI.html | 5 + .../5.0/cassandra/developing/cql/appendices.html | 5 + .../developing/cql/batch/batch-good-example.html | 5 + .../doc/5.0/cassandra/developing/cql/changes.html | 5 + .../cql/collections/collection-create.html | 5 + .../cql/collections/collections-overview.html | 5 + .../cassandra/developing/cql/collections/list.html | 5 + .../cassandra/developing/cql/collections/map.html | 5 + .../cassandra/developing/cql/collections/set.html | 5 + .../cassandra/developing/cql/counter-column.html | 5 + .../cassandra/developing/cql/cql_singlefile.html | 9 +- .../developing/cql/create-custom-index.html| 35 ++-- .../5.0/cassandra/developing/cql/create-index.html | 5 + content/doc/5.0/cassandra/developing/cql/ddl.html | 5 + .../5.0/cassandra/developing/cql/definitions.html | 5 + content/doc/5.0/cassandra/developing/cql/dml.html | 5 + .../5.0/cassandra/developing/cql/drop-index.html | 5 + .../developing/cql/dynamic-data-masking.html} | 172 + .../5.0/cassandra/developing/cql/functions.html| 27 ++- .../doc/5.0/cassandra/developing/cql/index.html| 11 +- .../doc/5.0/cassandra/developing/cql/indexes.html | 5 + .../developing/cql/indexing/2i/2i-concepts.html| 5 + .../developing/cql/indexing/2i/2i-overview.html| 5 + .../developing/cql/indexing/2i/2i-when-to-use.html | 5 + .../cql/indexing/2i/2i-working-with.html | 5 + .../cql/indexing/2i/operations/2i-build.html | 5 + .../developing/cql/indexing/indexing-concepts.html | 5 + .../developing/cql/indexing/sai/collections.html | 13 +- .../cql/indexing/sai/operations/configuring.html | 5 + .../cql/indexing/sai/operations/monitoring.html| 5 + .../indexing/sai/operations/sai-operations.html| 5 + .../developing/cql/indexing/sai/sai-concepts.html | 5 + .../developing/cql/indexing/sai/sai-faq.html | 23 ++- .../developing/cql/indexing/sai/sai-overview.html | 5 + .../developing/cql/indexing/sai/sai-query.html | 94 ++ .../cql/indexing/sai/sai-read-write-paths.html | 5 + .../cql/indexing/sai/sai-working-with.html | 136 -- content/doc/5.0/cassandra/developing/cql/json.html | 5 + content/doc/5.0/cassandra/developing/cql/mvs.html | 5 + .../5.0/cassandra/developing/cql/operators.html| 5 + .../doc/5.0/cassandra/developing/cql/security.html | 5 + .../doc/5.0/cassandra/developing/cql/triggers.html | 5 + .../doc/5.0/cassandra/developing/cql/types.html| 5 + .../data-modeling/data-modeling_conceptual.html| 5 + .../data-modeling/data-modeling_logical.html | 5 + .../data-modeling/data-modeling_physical.html | 5 + .../data-modeling/data-modeling_queries.html | 5 + .../data-modeling/data-modeling_rdbms.html | 5 + .../data-modeling/data-modeling_refining.html | 5 + .../data-modeling/data-modeling_schema.html| 5 + .../data-modeling/data-modeling_tools.html | 5 + .../cassandra/developing/data-modeling/index.html | 5 + .../cassandra/developing/data-modeling/intro.html | 5 + content/doc/5.0/cassandra/developing/index.html| 5 + .../getti
(cassandra-website) branch trunk updated: ninja: remove ^ from the link pointing to the web itself
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-website.git The following commit(s) were added to refs/heads/trunk by this push: new fd550e9c5 ninja: remove ^ from the link pointing to the web itself fd550e9c5 is described below commit fd550e9c5ab0a333717ddd96e059b3a73ea4f76b Author: Stefan Miklosovic AuthorDate: Fri Feb 23 12:00:56 2024 +0100 ninja: remove ^ from the link pointing to the web itself --- .../pages/Apache-Cassandra-5.0-Moving-Toward-an-AI-Driven-Future.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site-content/source/modules/ROOT/pages/Apache-Cassandra-5.0-Moving-Toward-an-AI-Driven-Future.adoc b/site-content/source/modules/ROOT/pages/Apache-Cassandra-5.0-Moving-Toward-an-AI-Driven-Future.adoc index f7cb79a1e..fa11e8323 100644 --- a/site-content/source/modules/ROOT/pages/Apache-Cassandra-5.0-Moving-Toward-an-AI-Driven-Future.adoc +++ b/site-content/source/modules/ROOT/pages/Apache-Cassandra-5.0-Moving-Toward-an-AI-Driven-Future.adoc @@ -18,7 +18,7 @@ Our new Storage Attached Indexes provide lightning-fast data retrieval, allowing Cassandra 5.0 includes Trie-based Memtables and SSTables, optimizing memory and storage usage, and ultimately improving the performance of your database. __https://www.youtube.com/watch?v=eKxj6s4vzmI=PLqcm6qE9lgKKls90MlpejceYUU_0qVnWa=13[Watch this video about Trie Memtables^]__. -=== xref:blog/Apache-Cassandra-5.0-Features-Mathematical-CQL-Functions.adoc[New Mathematical CQL Functions^] +=== xref:blog/Apache-Cassandra-5.0-Features-Mathematical-CQL-Functions.adoc[New Mathematical CQL Functions] Take advantage of new mathematical CQL functions, including abs, exp, log, log10, and round, to perform complex calculations within your queries. @@ -49,4 +49,4 @@ Here are some of the best ways to join the discussion: * Contributor Meetings: Join the https://cwiki.apache.org/confluence/x/qo7JC[monthly Contributor Meetings^] to dive deeper into the powerful new features of Apache Cassandra 5.0. You can watch recordings of previous meetings https://www.youtube.com/playlist?list=PLqcm6qE9lgKKls90MlpejceYUU_0qVnWa[here^]. * Mailing List: Ask how to get help or receive announcements. * https://s.apache.org/slack-invite[Apache Cassandra Slack Channel^]: Whether you are an end user or a developer, Slack is a great forum for community. -* https://www.youtube.com/c/PlanetCassandra[Planet Cassandra YouTube^]: Find videos on all things Apache Cassandra. \ No newline at end of file +* https://www.youtube.com/c/PlanetCassandra[Planet Cassandra YouTube^]: Find videos on all things Apache Cassandra. - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-website) branch trunk updated: link fix for mathematical functions on 5.0 landing page
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-website.git The following commit(s) were added to refs/heads/trunk by this push: new a29c61a33 link fix for mathematical functions on 5.0 landing page a29c61a33 is described below commit a29c61a33011db44ee50874d65d6644dbb76ff5e Author: Diogenese Topper <83248625+nonstopd...@users.noreply.github.com> AuthorDate: Wed Feb 21 16:28:07 2024 -0800 link fix for mathematical functions on 5.0 landing page patch by Diogenese Topper; reviewed by Stefan Miklosovic for CASSANDRA-19420 --- .../pages/Apache-Cassandra-5.0-Moving-Toward-an-AI-Driven-Future.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site-content/source/modules/ROOT/pages/Apache-Cassandra-5.0-Moving-Toward-an-AI-Driven-Future.adoc b/site-content/source/modules/ROOT/pages/Apache-Cassandra-5.0-Moving-Toward-an-AI-Driven-Future.adoc index 77637e6ec..f7cb79a1e 100644 --- a/site-content/source/modules/ROOT/pages/Apache-Cassandra-5.0-Moving-Toward-an-AI-Driven-Future.adoc +++ b/site-content/source/modules/ROOT/pages/Apache-Cassandra-5.0-Moving-Toward-an-AI-Driven-Future.adoc @@ -18,7 +18,7 @@ Our new Storage Attached Indexes provide lightning-fast data retrieval, allowing Cassandra 5.0 includes Trie-based Memtables and SSTables, optimizing memory and storage usage, and ultimately improving the performance of your database. __https://www.youtube.com/watch?v=eKxj6s4vzmI=PLqcm6qE9lgKKls90MlpejceYUU_0qVnWa=13[Watch this video about Trie Memtables^]__. -=== https://cwiki.apache.org/confluence/x/HAsNDw[New Mathematical CQL Functions^] +=== xref:blog/Apache-Cassandra-5.0-Features-Mathematical-CQL-Functions.adoc[New Mathematical CQL Functions^] Take advantage of new mathematical CQL functions, including abs, exp, log, log10, and round, to perform complex calculations within your queries. - 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 (5aefc95fbe -> bfc6e1241d)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 5aefc95fbe Merge branch 'cassandra-4.1' into cassandra-5.0 add c2041ba45b Filter remote DC replicas out when constructing the initial replica plan for the local read repair add b6b291e3bb Merge branch 'cassandra-4.0' into cassandra-4.1 add bfc6e1241d Merge branch 'cassandra-4.1' into cassandra-5.0 No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../org/apache/cassandra/locator/ReplicaPlans.java | 4 +- .../reads/repair/BlockingPartitionRepair.java | 34 +++ .../reads/repair/AbstractReadRepairTest.java | 100 +++-- .../reads/repair/BlockingReadRepairTest.java | 41 +++-- .../repair/DiagEventsBlockingReadRepairTest.java | 2 +- .../service/reads/repair/ReadRepairTest.java | 25 ++ 7 files changed, 109 insertions(+), 98 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (77a3e0e818 -> 2c0371a311)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 77a3e0e818 Merge branch 'cassandra-5.0' into trunk add c2041ba45b Filter remote DC replicas out when constructing the initial replica plan for the local read repair add b6b291e3bb Merge branch 'cassandra-4.0' into cassandra-4.1 add bfc6e1241d Merge branch 'cassandra-4.1' into cassandra-5.0 new 2c0371a311 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 + .../org/apache/cassandra/locator/ReplicaPlans.java | 4 +- .../reads/repair/BlockingPartitionRepair.java | 39 .../reads/repair/AbstractReadRepairTest.java | 100 +++-- .../reads/repair/BlockingReadRepairTest.java | 41 +++-- .../repair/DiagEventsBlockingReadRepairTest.java | 2 +- .../service/reads/repair/ReadRepairTest.java | 25 ++ 7 files changed, 112 insertions(+), 100 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.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 2c0371a3116254931271531866de6b03e2142473
Merge: 77a3e0e818 bfc6e1241d
Author: Stefan Miklosovic
AuthorDate: Fri Feb 23 00:04:56 2024 +0100
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt| 1 +
.../org/apache/cassandra/locator/ReplicaPlans.java | 4 +-
.../reads/repair/BlockingPartitionRepair.java | 39
.../reads/repair/AbstractReadRepairTest.java | 100 +++--
.../reads/repair/BlockingReadRepairTest.java | 41 +++--
.../repair/DiagEventsBlockingReadRepairTest.java | 2 +-
.../service/reads/repair/ReadRepairTest.java | 25 ++
7 files changed, 112 insertions(+), 100 deletions(-)
diff --cc CHANGES.txt
index b6ed3bc3e0,00d61ea3b9..03c3fd2840
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -37,9 -17,10 +37,10 @@@ 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:
+ * Filter remote DC replicas out when constructing the initial replica plan
for the local read repair (CASSANDRA-19120)
* Remove redundant code in StorageProxy#sendToHintedReplicas
(CASSANDRA-19412)
* Remove bashisms for mx4j tool in cassandra-env.sh (CASSANDRA-19416)
* Add new concurrent_merkle_tree_requests config property to prevent OOM
during multi-range and/or multi-table repairs (CASSANDRA-19336)
diff --cc
src/java/org/apache/cassandra/service/reads/repair/BlockingPartitionRepair.java
index 0d2ac069d5,f2b519081d..61b529ca00
---
a/src/java/org/apache/cassandra/service/reads/repair/BlockingPartitionRepair.java
+++
b/src/java/org/apache/cassandra/service/reads/repair/BlockingPartitionRepair.java
@@@ -61,36 -60,34 +60,36 @@@ public class BlockingPartitionRepai
extends AsyncFuture implements RequestCallback
{
private final DecoratedKey key;
-private final ReplicaPlan.ForWrite writePlan;
+private final ReplicaPlan.ForWrite repairPlan;
private final Map pendingRepairs;
private final CountDownLatch latch;
- private final Predicate shouldBlockOn;
-
+private final int blockFor;
private volatile long mutationsSentTime;
-public BlockingPartitionRepair(DecoratedKey key, Map
repairs, ReplicaPlan.ForWrite writePlan)
+public BlockingPartitionRepair(DecoratedKey key, Map
repairs, ReplicaPlan.ForWrite repairPlan)
- {
- this(key, repairs, repairPlan,
- repairPlan.consistencyLevel().isDatacenterLocal() ?
InOurDc.endpoints() : Predicates.alwaysTrue());
- }
-
- @VisibleForTesting
- public BlockingPartitionRepair(DecoratedKey key, Map
repairs, ReplicaPlan.ForWrite repairPlan, Predicate
shouldBlockOn)
{
this.key = key;
this.pendingRepairs = new ConcurrentHashMap<>(repairs);
-this.writePlan = writePlan;
++this.repairPlan = repairPlan;
+
+ // make sure all the read repair targets are contact of the repair
write plan
-Preconditions.checkState(all(repairs.keySet(), (r) ->
writePlan.contacts().contains(r)),
++Preconditions.checkState(all(repairs.keySet(), (r) ->
repairPlan.contacts().contains(r)),
+ "All repair targets should be part of
contacts of read repair write plan.");
+
-int blockFor = writePlan.writeQuorum();
-// here we remove empty repair mutations from the block for total,
since
-// we're not sending them mutations
-for (Replica participant : writePlan.contacts())
+// Remove empty repair mutations from the block for total, since
we're not sending them.
+// Besides, remote dcs can sometimes get involved in dc-local reads.
We want to repair them if they do, but we
+// they shouldn't block for them.
+int adjustedBlockFor = repairPlan.writeQuorum();
+for (Replica participant : repairPlan.contacts())
{
- if (!repairs.containsKey(participant) &&
shouldBlockOn.test(participant.endpoint()))
+ if (!repairs.containsKey(participant))
-blockFor--;
+adjustedBlockFor--;
+
+ // make sure for local consistency, all contacts are local
replicas
-
Preconditions.checkState(!writePlan.consistencyLevel().isDatacenterLocal() ||
InOurDc.replicas().test(participant),
++
Preconditions.checkState(!repairPlan.consistencyLevel().isDatacenterLocal() ||
InOur
(cassandra) branch cassandra-4.1 updated (5f63b0ade1 -> b6b291e3bb)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 5f63b0ade1 Merge branch 'cassandra-4.0' into cassandra-4.1 add c2041ba45b Filter remote DC replicas out when constructing the initial replica plan for the local read repair add b6b291e3bb Merge branch 'cassandra-4.0' into cassandra-4.1 No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../org/apache/cassandra/locator/ReplicaPlans.java | 4 +- .../reads/repair/BlockingPartitionRepair.java | 34 +++ .../reads/repair/AbstractReadRepairTest.java | 100 +++-- .../reads/repair/BlockingReadRepairTest.java | 41 +++-- .../repair/DiagEventsBlockingReadRepairTest.java | 2 +- .../service/reads/repair/ReadRepairTest.java | 25 ++ 7 files changed, 109 insertions(+), 98 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 (8c4a58f035 -> c2041ba45b)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 8c4a58f035 Remove redundant code in StorageProxy#sendToHintedReplicas add c2041ba45b Filter remote DC replicas out when constructing the initial replica plan for the local read repair No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../org/apache/cassandra/locator/ReplicaPlans.java | 5 +- .../reads/repair/BlockingPartitionRepair.java | 38 +++- .../repair/PartitionIteratorMergeListener.java | 1 - .../reads/repair/AbstractReadRepairTest.java | 108 - .../reads/repair/BlockingReadRepairTest.java | 41 +++- .../repair/DiagEventsBlockingReadRepairTest.java | 2 +- .../reads/repair/InstrumentedReadRepair.java | 1 - .../reads/repair/ReadOnlyReadRepairTest.java | 1 - .../service/reads/repair/ReadRepairTest.java | 25 + .../service/reads/repair/TestableReadRepair.java | 2 - 11 files changed, 119 insertions(+), 106 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. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 77a3e0e818df3cce45a974ecc977ad61bdcace47 Merge: 9cc688e978 5aefc95fbe Author: Stefan Miklosovic AuthorDate: Thu Feb 22 10:03:30 2024 +0100 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageProxy.java | 7 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --cc CHANGES.txt index 1e31dcdc0d,4876e6ace0..b6ed3bc3e0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -37,11 -17,15 +37,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: + * Remove redundant code in StorageProxy#sendToHintedReplicas (CASSANDRA-19412) * Remove bashisms for mx4j tool in cassandra-env.sh (CASSANDRA-19416) * Add new concurrent_merkle_tree_requests config property to prevent OOM during multi-range and/or multi-table repairs (CASSANDRA-19336) - * 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) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (9cc688e978 -> 77a3e0e818)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 9cc688e978 Merge branch 'cassandra-5.0' into trunk add 8c4a58f035 Remove redundant code in StorageProxy#sendToHintedReplicas add 5f63b0ade1 Merge branch 'cassandra-4.0' into cassandra-4.1 add 5aefc95fbe Merge branch 'cassandra-4.1' into cassandra-5.0 new 77a3e0e818 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/service/StorageProxy.java | 7 --- 2 files changed, 1 insertion(+), 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 (5ae1294cb1 -> 5aefc95fbe)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 5ae1294cb1 Merge branch 'cassandra-4.1' into cassandra-5.0 add 8c4a58f035 Remove redundant code in StorageProxy#sendToHintedReplicas add 5f63b0ade1 Merge branch 'cassandra-4.0' into cassandra-4.1 add 5aefc95fbe Merge branch 'cassandra-4.1' into cassandra-5.0 No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageProxy.java | 7 --- 2 files changed, 1 insertion(+), 7 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 (6250ba7929 -> 5f63b0ade1)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 6250ba7929 Merge branch 'cassandra-4.0' into cassandra-4.1 add 8c4a58f035 Remove redundant code in StorageProxy#sendToHintedReplicas add 5f63b0ade1 Merge branch 'cassandra-4.0' into cassandra-4.1 No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageProxy.java | 7 --- 2 files changed, 1 insertion(+), 7 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 (98d0e181d5 -> 8c4a58f035)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 98d0e181d5 Remove bashisms for mx4j tool in cassandra-env.sh add 8c4a58f035 Remove redundant code in StorageProxy#sendToHintedReplicas No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageProxy.java | 7 --- 2 files changed, 1 insertion(+), 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 (2aa2b59d37 -> 5ae1294cb1)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 2aa2b59d37 Minor adds and fixes in the documentation add 98d0e181d5 Remove bashisms for mx4j tool in cassandra-env.sh add 6250ba7929 Merge branch 'cassandra-4.0' into cassandra-4.1 add 5ae1294cb1 Merge branch 'cassandra-4.1' into cassandra-5.0 No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + conf/cassandra-env.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 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 (505f5af645 -> 98d0e181d5)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 505f5af645 Ensure that repair doesn't exceed repair_session_space by running limiting validation parallelism add 98d0e181d5 Remove bashisms for mx4j tool in cassandra-env.sh No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + conf/cassandra-env.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 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 (a9a7dd0caf -> 6250ba7929)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from a9a7dd0caf increment version to 4.1.5 add 98d0e181d5 Remove bashisms for mx4j tool in cassandra-env.sh add 6250ba7929 Merge branch 'cassandra-4.0' into cassandra-4.1 No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + conf/cassandra-env.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (1163dd9a08 -> 9cc688e978)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 1163dd9a08 Refactor cqlshmain global constants add 98d0e181d5 Remove bashisms for mx4j tool in cassandra-env.sh add 6250ba7929 Merge branch 'cassandra-4.0' into cassandra-4.1 add 5ae1294cb1 Merge branch 'cassandra-4.1' into cassandra-5.0 new 9cc688e978 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 + conf/cassandra-env.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 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. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 9cc688e978826baa8e44a78b3a46cea3a2aa1c5a Merge: 1163dd9a08 5ae1294cb1 Author: Stefan Miklosovic AuthorDate: Wed Feb 21 09:15:27 2024 +0100 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + conf/cassandra-env.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --cc CHANGES.txt index d2f959ee48,bb93d9d802..1e31dcdc0d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -37,10 -17,14 +37,11 @@@ 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: + * Remove bashisms for mx4j tool in cassandra-env.sh (CASSANDRA-19416) * Add new concurrent_merkle_tree_requests config property to prevent OOM during multi-range and/or multi-table repairs (CASSANDRA-19336) - * 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) diff --cc conf/cassandra-env.sh index 0b1dec45ed,ba9f9d4596..4e28e687f9 --- a/conf/cassandra-env.sh +++ b/conf/cassandra-env.sh @@@ -271,8 -271,13 +271,8 @@@ JVM_OPTS="$JVM_OPTS -Dcom.sun.managemen #MX4J_ADDRESS="127.0.0.1" #MX4J_PORT="8081" -# Cassandra uses SIGAR to capture OS metrics CASSANDRA-7838 -# for SIGAR we have to set the java.library.path -# to the location of the native libraries. -JVM_OPTS="$JVM_OPTS -Djava.library.path=$CASSANDRA_HOME/lib/sigar-bin" - if [ "x$MX4J_ADDRESS" != "x" ]; then - if [[ "$MX4J_ADDRESS" == \-Dmx4jaddress* ]]; then + if [ "$(echo "$MX4J_ADDRESS" | grep -c "\-Dmx4jaddress")" = "1" ]; then # Backward compatible with the older style #13578 JVM_OPTS="$JVM_OPTS $MX4J_ADDRESS" else - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated: Refactor cqlshmain global constants
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1163dd9a08 Refactor cqlshmain global constants
1163dd9a08 is described below
commit 1163dd9a084c7887059b34268bb01377825a1ed4
Author: Brad Schoening
AuthorDate: Mon Dec 18 19:59:55 2023 -0500
Refactor cqlshmain global constants
patch by Brad Schoening; reviewed by Stefan Miklosovic and Brandon Williams
for CASSANDRA-19201
---
CHANGES.txt | 1 +
pylib/cqlshlib/cqlshhandling.py | 14 +-
pylib/cqlshlib/cqlshmain.py | 282 +++-
3 files changed, 146 insertions(+), 151 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 06520d16dc..d2f959ee48 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
5.1
+ * Refactor cqlshmain global constants (CASSANDRA-19201)
* Remove native_transport_port_ssl (CASSANDRA-19397)
* Make nodetool reconfigurecms sync by default and add --cancel to be able to
cancel ongoing reconfigurations (CASSANDRA-19216)
* Expose auth mode in system_views.clients, nodetool clientstats, metrics
(CASSANDRA-19366)
diff --git a/pylib/cqlshlib/cqlshhandling.py b/pylib/cqlshlib/cqlshhandling.py
index ad515e63c0..ef6ad28725 100644
--- a/pylib/cqlshlib/cqlshhandling.py
+++ b/pylib/cqlshlib/cqlshhandling.py
@@ -16,7 +16,7 @@
import os
-from cqlshlib import cqlhandling
+from cqlshlib import cqlhandling, cql3handling
# we want the cql parser to understand our cqlsh-specific commands too
my_commands_ending_with_newline = (
@@ -251,6 +251,18 @@ cqlsh_extra_syntax_rules = cqlsh_cmd_syntax_rules + \
cqlsh_question_mark
+def get_cqlshruleset():
+cqlruleset = cql3handling.CqlRuleSet
+cqlruleset.append_rules(cqlsh_extra_syntax_rules)
+for rulename, termname, func in cqlsh_syntax_completers:
+cqlruleset.completer_for(rulename, termname)(func)
+
cqlruleset.commands_end_with_newline.update(my_commands_ending_with_newline)
+return cqlruleset
+
+
+cqlshruleset = get_cqlshruleset()
+
+
def complete_source_quoted_filename(ctxt, cqlsh):
partial_path = ctxt.get_binding('partial', '')
head, tail = os.path.split(partial_path)
diff --git a/pylib/cqlshlib/cqlshmain.py b/pylib/cqlshlib/cqlshmain.py
index e515ff3c6a..57cb16bb46 100755
--- a/pylib/cqlshlib/cqlshmain.py
+++ b/pylib/cqlshlib/cqlshmain.py
@@ -52,14 +52,15 @@ from cqlshlib.formatting import (DEFAULT_DATE_FORMAT,
DEFAULT_NANOTIME_FORMAT,
from cqlshlib.helptopics import get_html_anchor, get_html_topics
from cqlshlib.tracing import print_trace, print_trace_session
from cqlshlib.util import get_file_encoding_bomsize, is_file_secure
+
+from cqlshlib.cqlshhandling import cqlshruleset as ruleset
+
try:
from cqlshlib.serverversion import version as build_version
except ImportError:
build_version = 'UNKNOWN'
UTF8 = 'utf-8'
-
-description = "CQL Shell for Apache Cassandra"
version = "6.2.0"
readline = None
@@ -85,83 +86,11 @@ if webbrowser._tryorder and webbrowser._tryorder[0] ==
'xdg-open' and os.environ
webbrowser._tryorder.remove('xdg-open')
webbrowser._tryorder.append('xdg-open')
-warnings.filterwarnings("ignore", r".*blist.*")
-
-DEFAULT_HOST = '127.0.0.1'
-DEFAULT_PORT = 9042
-DEFAULT_SSL = False
-DEFAULT_CONNECT_TIMEOUT_SECONDS = 5
-DEFAULT_REQUEST_TIMEOUT_SECONDS = 10
-
-DEFAULT_FLOAT_PRECISION = 5
-DEFAULT_DOUBLE_PRECISION = 5
-DEFAULT_MAX_TRACE_WAIT = 10
-
if readline is not None and readline.__doc__ is not None and 'libedit' in
readline.__doc__:
DEFAULT_COMPLETEKEY = '\t'
else:
DEFAULT_COMPLETEKEY = 'tab'
-cqldocs = None
-cqlruleset = None
-CASSANDRA_CQL_HTML = None
-
-epilog = """Connects to %(DEFAULT_HOST)s:%(DEFAULT_PORT)d by default. These
-defaults can be changed by setting $CQLSH_HOST and/or $CQLSH_PORT. When a
-host (and optional port number) are given on the command line, they take
-precedence over any defaults.""" % globals()
-
-
-parser = argparse.ArgumentParser(description=description, epilog=epilog,
- usage="Usage: %(prog)s [options] [host
[port]]",
- prog='cqlsh')
-parser.add_argument('-v', '--version', action='version', version='cqlsh ' +
version)
-parser.add_argument("-C", "--color", action='store_true', dest='color',
-help='Always use color output')
-parser.add_argument("--no-color", action='store_false', dest='color',
help='Never use color output')
-parser.add_argument("--browser", dest='browser', help="""The browser to use to
display CQL help, where BROWSER can be:
-- one of the supported
brow
(cassandra) branch trunk updated: Remove native_transport_port_ssl
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git The following commit(s) were added to refs/heads/trunk by this push: new 087a4474d8 Remove native_transport_port_ssl 087a4474d8 is described below commit 087a4474d8f6a8a962751e81d84d0f0cb880d947 Author: Stefan Miklosovic AuthorDate: Wed Feb 14 17:41:21 2024 +0100 Remove native_transport_port_ssl patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-19397 --- CHANGES.txt| 1 + NEWS.txt | 5 + conf/cassandra.yaml| 9 -- .../pages/managing/operating/security.adoc | 5 + src/java/org/apache/cassandra/config/Config.java | 3 - .../cassandra/config/DatabaseDescriptor.java | 28 .../apache/cassandra/metrics/ClientMetrics.java| 38 ++--- .../cassandra/service/NativeTransportService.java | 65 ++--- .../org/apache/cassandra/tools/LoaderOptions.java | 9 +- .../cassandra/transport/SimpleClientBurnTest.java | 2 +- .../cassandra/transport/SimpleClientPerfTest.java | 2 +- test/conf/unit-test-conf/test-native-port.yaml | 2 +- .../test/NativeTransportEncryptionOptionsTest.java | 159 - .../cassandra/config/ConfigCompatibilityTest.java | 12 +- test/unit/org/apache/cassandra/cql3/CQLTester.java | 2 +- .../service/NativeTransportServiceTest.java| 104 +- .../cassandra/transport/CQLConnectionTest.java | 2 +- .../cassandra/transport/MessageDispatcherTest.java | 3 +- 18 files changed, 125 insertions(+), 326 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index d470d8f813..06520d16dc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 5.1 + * Remove native_transport_port_ssl (CASSANDRA-19397) * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) diff --git a/NEWS.txt b/NEWS.txt index d5a3805968..8dcb8a630f 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -141,6 +141,11 @@ Upgrading which come up during or after an election will learn of the elected first CMS node and direct metadata updates to it. It is important to remember that at the completion of the election, the CMS still only comprises a single member. Just as in the upgrade case, operators should add further members as soon as possible. +- native_transport_port_ssl property was removed. Please transition to using one port only. Encrypted communication +may be optional by setting `optional` flag in `client_encryption_options` to `true` and it should be set only +while in unencrypted or transitional operation. Please consult `client_encryption_options` in cassandra.yaml +for more information. + Deprecation --- diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index 2bb561396d..ecdea7b89d 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -933,15 +933,6 @@ start_native_transport: true # port for the CQL native transport to listen for clients on # For security reasons, you should not expose this port to the internet. Firewall it if needed. native_transport_port: 9042 -# Enabling native transport encryption in client_encryption_options allows you to either use -# encryption for the standard port or to use a dedicated, additional port along with the unencrypted -# standard native_transport_port. -# Enabling client encryption and keeping native_transport_port_ssl disabled will use encryption -# for native_transport_port. Setting native_transport_port_ssl to a different value -# from native_transport_port will use encryption for native_transport_port_ssl while -# keeping native_transport_port unencrypted. -# This feature is deprecated since Cassandra 5.0 and will be removed. Please consult deprecation section in NEWS.txt. -# native_transport_port_ssl: 9142 # The maximum threads for handling requests (note that idle threads are stopped # after 30 seconds so there is not corresponding minimum setting). # native_transport_max_threads: 128 diff --git a/doc/modules/cassandra/pages/managing/operating/security.adoc b/doc/modules/cassandra/pages/managing/operating/security.adoc index 4613932578..a425cab8d0 100644 --- a/doc/modules/cassandra/pages/managing/operating/security.adoc +++ b/doc/modules/cassandra/pages/managing/operating/security.adoc @@ -162,6 +162,11 @@ requirements demand it. To do so, set `optional` to false and use the `native_transport_port_ssl` setting in `cassandra.yaml` to specify the port to be used for secure client communication. +[NOTE] + +`native_transport_port_ssl` property
(cassandra-dtest) branch trunk updated (26b939dc -> 238cf5e7)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git from 26b939dc Stop trying to snapshot removed tables in snapshot_test.py add 238cf5e7 align native_transport_ssl_test with CASSANDRA-19397 No new revisions were added by this update. Summary of changes: native_transport_ssl_test.py | 15 +++ 1 file changed, 11 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 (0f2da96c6c -> 2aa2b59d37)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 0f2da96c6c Dynamic Data Masking cleanup language, rearrange code examples. add 2aa2b59d37 Minor adds and fixes in the documentation No new revisions were added by this update. Summary of changes: NEWS.txt | 2 +- doc/cql3/CQL.textile | 4 +- .../CQL/sai/create-vector-index-cycling.cql| 4 +- .../examples/CQL/sai/create-vector-index.cql | 4 +- .../CQL/sai/cyclist_semi_pro_sai_indices.cql | 16 +-- .../examples/CQL/sai/index-sai-case-sensitive.cql | 4 +- ...dex-sai-composite-partition-key-index-match.cql | 8 +- .../examples/CQL/sai/index-sai-from-list-match.cql | 4 +- .../examples/CQL/sai/index-sai-from-set-match.cql | 4 +- .../index-sai-multiple-index-match-with-and.cql| 12 +-- .../CQL/sai/index-sai-similarity-function.cql | 4 +- .../CQL/sai/index-sai-single-index-match.cql | 4 +- .../examples/CQL/sai/index-sai-udt-match.cql | 4 +- .../cassandra/examples/CQL/sai/sai-error.cql | 4 +- .../RESULTS/sai/cyclist_semi_pro_describe.result | 8 +- .../pages/developing/cql/cql_singlefile.adoc | 4 +- .../pages/developing/cql/create-custom-index.adoc | 14 +-- .../developing/cql/indexing/sai/_sai-create.adoc | 2 +- .../pages/developing/cql/indexing/sai/sai-faq.adoc | 18 ++-- .../cassandra/pages/managing/operating/repair.adoc | 11 +- .../cql-commands/create-custom-index.adoc | 18 ++-- .../pages/reference/cql-commands/create-index.adoc | 118 + .../pages/reference/vector-data-type.adoc | 2 + .../cassandra/pages/vector-search/concepts.adoc| 1 + .../pages/vector-search/data-modeling.adoc | 35 +- .../cassandra/partials/table-properties.adoc | 2 +- pylib/cqlshlib/cqlshmain.py| 2 +- 27 files changed, 213 insertions(+), 100 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (3483fc0683 -> 3c76ae2a45)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 3483fc0683 Merge branch 'cassandra-5.0' into trunk add 2aa2b59d37 Minor adds and fixes in the documentation new 3c76ae2a45 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: NEWS.txt | 2 +- doc/cql3/CQL.textile | 4 +- .../CQL/sai/create-vector-index-cycling.cql| 4 +- .../examples/CQL/sai/create-vector-index.cql | 4 +- .../CQL/sai/cyclist_semi_pro_sai_indices.cql | 16 +-- .../examples/CQL/sai/index-sai-case-sensitive.cql | 4 +- ...dex-sai-composite-partition-key-index-match.cql | 8 +- .../examples/CQL/sai/index-sai-from-list-match.cql | 4 +- .../examples/CQL/sai/index-sai-from-set-match.cql | 4 +- .../index-sai-multiple-index-match-with-and.cql| 12 +-- .../CQL/sai/index-sai-similarity-function.cql | 4 +- .../CQL/sai/index-sai-single-index-match.cql | 4 +- .../examples/CQL/sai/index-sai-udt-match.cql | 4 +- .../cassandra/examples/CQL/sai/sai-error.cql | 4 +- .../RESULTS/sai/cyclist_semi_pro_describe.result | 8 +- .../pages/developing/cql/cql_singlefile.adoc | 4 +- .../pages/developing/cql/create-custom-index.adoc | 14 +-- .../developing/cql/indexing/sai/_sai-create.adoc | 2 +- .../pages/developing/cql/indexing/sai/sai-faq.adoc | 18 ++-- .../cassandra/pages/managing/operating/repair.adoc | 11 +- .../cql-commands/create-custom-index.adoc | 18 ++-- .../pages/reference/cql-commands/create-index.adoc | 118 + .../pages/reference/vector-data-type.adoc | 2 + .../cassandra/pages/vector-search/concepts.adoc| 1 + .../pages/vector-search/data-modeling.adoc | 35 +- .../cassandra/partials/table-properties.adoc | 2 +- pylib/cqlshlib/cqlshmain.py| 2 +- 27 files changed, 213 insertions(+), 100 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. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 3c76ae2a45138222b0a797c63def82d3bfa4dc6a Merge: 3483fc0683 2aa2b59d37 Author: Stefan Miklosovic AuthorDate: Fri Feb 16 13:36:15 2024 +0100 Merge branch 'cassandra-5.0' into trunk NEWS.txt | 2 +- doc/cql3/CQL.textile | 4 +- .../CQL/sai/create-vector-index-cycling.cql| 4 +- .../examples/CQL/sai/create-vector-index.cql | 4 +- .../CQL/sai/cyclist_semi_pro_sai_indices.cql | 16 +-- .../examples/CQL/sai/index-sai-case-sensitive.cql | 4 +- ...dex-sai-composite-partition-key-index-match.cql | 8 +- .../examples/CQL/sai/index-sai-from-list-match.cql | 4 +- .../examples/CQL/sai/index-sai-from-set-match.cql | 4 +- .../index-sai-multiple-index-match-with-and.cql| 12 +-- .../CQL/sai/index-sai-similarity-function.cql | 4 +- .../CQL/sai/index-sai-single-index-match.cql | 4 +- .../examples/CQL/sai/index-sai-udt-match.cql | 4 +- .../cassandra/examples/CQL/sai/sai-error.cql | 4 +- .../RESULTS/sai/cyclist_semi_pro_describe.result | 8 +- .../pages/developing/cql/cql_singlefile.adoc | 4 +- .../pages/developing/cql/create-custom-index.adoc | 14 +-- .../developing/cql/indexing/sai/_sai-create.adoc | 2 +- .../pages/developing/cql/indexing/sai/sai-faq.adoc | 18 ++-- .../cassandra/pages/managing/operating/repair.adoc | 11 +- .../cql-commands/create-custom-index.adoc | 18 ++-- .../pages/reference/cql-commands/create-index.adoc | 118 + .../pages/reference/vector-data-type.adoc | 2 + .../cassandra/pages/vector-search/concepts.adoc| 1 + .../pages/vector-search/data-modeling.adoc | 35 +- .../cassandra/partials/table-properties.adoc | 2 +- pylib/cqlshlib/cqlshmain.py| 2 +- 27 files changed, 213 insertions(+), 100 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (48607b8395 -> 3483fc0683)
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 48607b8395 Merge branch 'cassandra-5.0' into trunk
add 0f2da96c6c Dynamic Data Masking cleanup language, rearrange code
examples.
new 3483fc0683 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:
.../cassandra/examples/CQL/ddm_alter_mask.cql | 1 -
.../cassandra/examples/CQL/ddm_create_table.cql| 5 -
.../examples/CQL/ddm_create_table_with_udf.cql | 11 --
.../cassandra/examples/CQL/ddm_create_users.cql| 6 -
.../cassandra/examples/CQL/ddm_drop_mask.cql | 1 -
.../cassandra/examples/CQL/ddm_insert_data.cql | 2 -
.../cassandra/examples/CQL/ddm_revoke_unmask.cql | 1 -
.../CQL/ddm_select_with_masked_columns.cql | 6 -
.../examples/CQL/ddm_select_with_select_masked.cql | 8 -
.../CQL/ddm_select_with_unmask_permission.cql | 7 -
.../CQL/ddm_select_without_select_masked.cql | 6 -
.../CQL/ddm_select_without_unmask_permission.cql | 7 -
.../examples/CQL/dynamic-data-masking.cql | 99
...unctions.cql => select-with-mask-functions.cql} | 0
doc/modules/cassandra/nav.adoc | 1 +
.../pages/developing/cql/dynamic-data-masking.adoc | 179 +
.../pages/developing/cql/dynamic_data_masking.adoc | 179 -
.../cassandra/pages/developing/cql/index.adoc | 2 +-
.../developing/cql/indexing/sai/sai-query.adoc | 2 +-
doc/modules/cassandra/pages/new/index.adoc | 6 +-
.../cassandra/partials/masking_functions.adoc | 30 +++-
21 files changed, 306 insertions(+), 253 deletions(-)
delete mode 100644 doc/modules/cassandra/examples/CQL/ddm_alter_mask.cql
delete mode 100644 doc/modules/cassandra/examples/CQL/ddm_create_table.cql
delete mode 100644
doc/modules/cassandra/examples/CQL/ddm_create_table_with_udf.cql
delete mode 100644 doc/modules/cassandra/examples/CQL/ddm_create_users.cql
delete mode 100644 doc/modules/cassandra/examples/CQL/ddm_drop_mask.cql
delete mode 100644 doc/modules/cassandra/examples/CQL/ddm_insert_data.cql
delete mode 100644 doc/modules/cassandra/examples/CQL/ddm_revoke_unmask.cql
delete mode 100644
doc/modules/cassandra/examples/CQL/ddm_select_with_masked_columns.cql
delete mode 100644
doc/modules/cassandra/examples/CQL/ddm_select_with_select_masked.cql
delete mode 100644
doc/modules/cassandra/examples/CQL/ddm_select_with_unmask_permission.cql
delete mode 100644
doc/modules/cassandra/examples/CQL/ddm_select_without_select_masked.cql
delete mode 100644
doc/modules/cassandra/examples/CQL/ddm_select_without_unmask_permission.cql
create mode 100644 doc/modules/cassandra/examples/CQL/dynamic-data-masking.cql
rename doc/modules/cassandra/examples/CQL/{select_with_mask_functions.cql =>
select-with-mask-functions.cql} (100%)
create mode 100644
doc/modules/cassandra/pages/developing/cql/dynamic-data-masking.adoc
delete mode 100644
doc/modules/cassandra/pages/developing/cql/dynamic_data_masking.adoc
-
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 (a04dc83cfc -> 0f2da96c6c)
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a change to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from a04dc83cfc Merge branch 'cassandra-4.1' into cassandra-5.0
add 0f2da96c6c Dynamic Data Masking cleanup language, rearrange code
examples.
No new revisions were added by this update.
Summary of changes:
.../cassandra/examples/CQL/ddm_alter_mask.cql | 1 -
.../cassandra/examples/CQL/ddm_create_table.cql| 5 -
.../examples/CQL/ddm_create_table_with_udf.cql | 11 --
.../cassandra/examples/CQL/ddm_create_users.cql| 6 -
.../cassandra/examples/CQL/ddm_drop_mask.cql | 1 -
.../cassandra/examples/CQL/ddm_insert_data.cql | 2 -
.../cassandra/examples/CQL/ddm_revoke_unmask.cql | 1 -
.../CQL/ddm_select_with_masked_columns.cql | 6 -
.../examples/CQL/ddm_select_with_select_masked.cql | 8 -
.../CQL/ddm_select_with_unmask_permission.cql | 7 -
.../CQL/ddm_select_without_select_masked.cql | 6 -
.../CQL/ddm_select_without_unmask_permission.cql | 7 -
.../examples/CQL/dynamic-data-masking.cql | 99
...unctions.cql => select-with-mask-functions.cql} | 0
doc/modules/cassandra/nav.adoc | 1 +
.../pages/developing/cql/dynamic-data-masking.adoc | 179 +
.../pages/developing/cql/dynamic_data_masking.adoc | 179 -
.../cassandra/pages/developing/cql/index.adoc | 2 +-
.../developing/cql/indexing/sai/sai-query.adoc | 2 +-
doc/modules/cassandra/pages/new/index.adoc | 6 +-
.../cassandra/partials/masking_functions.adoc | 30 +++-
21 files changed, 306 insertions(+), 253 deletions(-)
delete mode 100644 doc/modules/cassandra/examples/CQL/ddm_alter_mask.cql
delete mode 100644 doc/modules/cassandra/examples/CQL/ddm_create_table.cql
delete mode 100644
doc/modules/cassandra/examples/CQL/ddm_create_table_with_udf.cql
delete mode 100644 doc/modules/cassandra/examples/CQL/ddm_create_users.cql
delete mode 100644 doc/modules/cassandra/examples/CQL/ddm_drop_mask.cql
delete mode 100644 doc/modules/cassandra/examples/CQL/ddm_insert_data.cql
delete mode 100644 doc/modules/cassandra/examples/CQL/ddm_revoke_unmask.cql
delete mode 100644
doc/modules/cassandra/examples/CQL/ddm_select_with_masked_columns.cql
delete mode 100644
doc/modules/cassandra/examples/CQL/ddm_select_with_select_masked.cql
delete mode 100644
doc/modules/cassandra/examples/CQL/ddm_select_with_unmask_permission.cql
delete mode 100644
doc/modules/cassandra/examples/CQL/ddm_select_without_select_masked.cql
delete mode 100644
doc/modules/cassandra/examples/CQL/ddm_select_without_unmask_permission.cql
create mode 100644 doc/modules/cassandra/examples/CQL/dynamic-data-masking.cql
rename doc/modules/cassandra/examples/CQL/{select_with_mask_functions.cql =>
select-with-mask-functions.cql} (100%)
create mode 100644
doc/modules/cassandra/pages/developing/cql/dynamic-data-masking.adoc
delete mode 100644
doc/modules/cassandra/pages/developing/cql/dynamic_data_masking.adoc
-
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. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 3483fc06833f86c7250f998dbd5ccbf464ef1c48 Merge: 48607b8395 0f2da96c6c Author: Stefan Miklosovic AuthorDate: Fri Feb 16 10:08:08 2024 +0100 Merge branch 'cassandra-5.0' into trunk .../cassandra/examples/CQL/ddm_alter_mask.cql | 1 - .../cassandra/examples/CQL/ddm_create_table.cql| 5 - .../examples/CQL/ddm_create_table_with_udf.cql | 11 -- .../cassandra/examples/CQL/ddm_create_users.cql| 6 - .../cassandra/examples/CQL/ddm_drop_mask.cql | 1 - .../cassandra/examples/CQL/ddm_insert_data.cql | 2 - .../cassandra/examples/CQL/ddm_revoke_unmask.cql | 1 - .../CQL/ddm_select_with_masked_columns.cql | 6 - .../examples/CQL/ddm_select_with_select_masked.cql | 8 - .../CQL/ddm_select_with_unmask_permission.cql | 7 - .../CQL/ddm_select_without_select_masked.cql | 6 - .../CQL/ddm_select_without_unmask_permission.cql | 7 - .../examples/CQL/dynamic-data-masking.cql | 99 ...unctions.cql => select-with-mask-functions.cql} | 0 doc/modules/cassandra/nav.adoc | 1 + .../pages/developing/cql/dynamic-data-masking.adoc | 179 + .../pages/developing/cql/dynamic_data_masking.adoc | 179 - .../cassandra/pages/developing/cql/index.adoc | 2 +- .../developing/cql/indexing/sai/sai-query.adoc | 2 +- doc/modules/cassandra/pages/new/index.adoc | 6 +- .../cassandra/partials/masking_functions.adoc | 30 +++- 21 files changed, 306 insertions(+), 253 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. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 48607b83952ab923c401fd7886d76a5a5a5b3c78 Merge: 8bdf2615bc a04dc83cfc Author: Stefan Miklosovic AuthorDate: Wed Feb 14 21:19:10 2024 +0100 Merge branch 'cassandra-5.0' into trunk - 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 (8b037a6c84 -> a04dc83cfc)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 8b037a6c84 Deprecate native_transport_port_ssl add a9a7dd0caf increment version to 4.1.5 add a04dc83cfc Merge branch 'cassandra-4.1' into cassandra-5.0 No new revisions were added by this update. Summary of changes: - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (8bdf2615bc -> 48607b8395)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 8bdf2615bc Merge branch 'cassandra-5.0' into trunk add a9a7dd0caf increment version to 4.1.5 add a04dc83cfc Merge branch 'cassandra-4.1' into cassandra-5.0 new 48607b8395 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: - 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 (89a8155916 -> a9a7dd0caf)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 89a8155916 Merge branch 'cassandra-4.0' into cassandra-4.1 add a9a7dd0caf increment version to 4.1.5 No new revisions were added by this update. Summary of changes: CHANGES.txt | 6 ++ build.xml| 2 +- debian/changelog | 6 ++ 3 files changed, 13 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 (69f735d61f -> 8b037a6c84)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 69f735d61f Update packaging shell includes for j17 add 8b037a6c84 Deprecate native_transport_port_ssl No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + NEWS.txt | 4 conf/cassandra.yaml | 1 + src/java/org/apache/cassandra/config/Config.java | 2 ++ .../org/apache/cassandra/config/DatabaseDescriptor.java | 16 5 files changed, 20 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. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 8bdf2615bcca6eacc7fd9debc7a68a917048df83 Merge: 3acec3c28e 8b037a6c84 Author: Stefan Miklosovic AuthorDate: Wed Feb 14 15:53:38 2024 +0100 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + NEWS.txt | 6 ++ conf/cassandra.yaml | 1 + src/java/org/apache/cassandra/config/Config.java | 2 ++ .../org/apache/cassandra/config/DatabaseDescriptor.java | 16 5 files changed, 22 insertions(+), 4 deletions(-) diff --cc CHANGES.txt index d73539808e,30413804a5..d470d8f813 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,22 -1,5 +1,23 @@@ -5.0-beta2 +5.1 + * Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations (CASSANDRA-19216) + * Expose auth mode in system_views.clients, nodetool clientstats, metrics (CASSANDRA-19366) + * Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189) + * Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271) + * Refactor structure of caching metrics and expose auth cache metrics via JMX (CASSANDRA-17062) + * Allow CQL client certificate authentication to work without sending an AUTHENTICATE request (CASSANDRA-18857) + * Extend nodetool tpstats and system_views.thread_pools with detailed pool parameters (CASSANDRA-19289) + * 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: + * Deprecate native_transport_port_ssl (CASSANDRA-19392) * Update packaging shell includes (CASSANDRA-19283) * Fix data corruption in VectorCodec when using heap buffers (CASSANDRA-19167) * Avoid over-skipping of key iterators from static column indexes during mixed intersections (CASSANDRA-19278) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated (3acec3c28e -> 8bdf2615bc)
This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 3acec3c28e Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations add 8b037a6c84 Deprecate native_transport_port_ssl new 8bdf2615bc 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 | 6 ++ conf/cassandra.yaml | 1 + src/java/org/apache/cassandra/config/Config.java | 2 ++ .../org/apache/cassandra/config/DatabaseDescriptor.java | 16 5 files changed, 22 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch trunk updated: Make nodetool reconfigurecms sync by default and add --cancel to be able to cancel ongoing reconfigurations
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3acec3c28e Make nodetool reconfigurecms sync by default and add
--cancel to be able to cancel ongoing reconfigurations
3acec3c28e is described below
commit 3acec3c28e56239147d9fb4bd821a49f4b86a77a
Author: Marcus Eriksson
AuthorDate: Thu Dec 21 12:22:59 2023 +0100
Make nodetool reconfigurecms sync by default and add --cancel to be able to
cancel ongoing reconfigurations
patch by Marcus Eriksson; reviewed by Stefan Miklosovic, Sam Tunnicliffe
for CASSANDRA-19216
Co-authored-by: Sam Tunnicliffe
---
CHANGES.txt| 1 +
.../org/apache/cassandra/tcm/CMSOperations.java| 50 +--
.../apache/cassandra/tcm/CMSOperationsMBean.java | 5 +-
.../cassandra/tcm/ownership/DataPlacements.java| 6 +++
.../tcm/sequences/CancelCMSReconfiguration.java| 56 ++
.../cassandra/tcm/sequences/ReconfigureCMS.java| 16 +++
.../cassandra/tools/nodetool/ReconfigureCMS.java | 18 ---
.../distributed/test/log/ReconfigureCMSTest.java | 25 +-
.../test/log/TriggeredReconfigureCMSTest.java | 6 +--
.../upgrade/ClusterMetadataUpgradeHarryTest.java | 2 +-
.../upgrade/ClusterMetadataUpgradeTest.java| 2 +-
11 files changed, 129 insertions(+), 58 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index f36529a350..d73539808e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
5.1
+ * Make nodetool reconfigurecms sync by default and add --cancel to be able to
cancel ongoing reconfigurations (CASSANDRA-19216)
* Expose auth mode in system_views.clients, nodetool clientstats, metrics
(CASSANDRA-19366)
* Remove sealed_periods and last_sealed_period tables (CASSANDRA-19189)
* Improve setup and initialisation of LocalLog/LogSpec (CASSANDRA-19271)
diff --git a/src/java/org/apache/cassandra/tcm/CMSOperations.java
b/src/java/org/apache/cassandra/tcm/CMSOperations.java
index 6aaccf7f83..8eacd53873 100644
--- a/src/java/org/apache/cassandra/tcm/CMSOperations.java
+++ b/src/java/org/apache/cassandra/tcm/CMSOperations.java
@@ -29,10 +29,10 @@ import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.cassandra.concurrent.ScheduledExecutors;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.schema.ReplicationParams;
import org.apache.cassandra.tcm.membership.NodeVersion;
+import org.apache.cassandra.tcm.sequences.CancelCMSReconfiguration;
import org.apache.cassandra.tcm.sequences.InProgressSequences;
import org.apache.cassandra.tcm.sequences.ReconfigureCMS;
import org.apache.cassandra.tcm.serialization.Version;
@@ -73,23 +73,21 @@ public class CMSOperations implements CMSOperationsMBean
@Override
-public void reconfigureCMS(int rf, boolean sync)
+public void reconfigureCMS(int rf)
{
-Runnable r = () -> cms.reconfigureCMS(ReplicationParams.simpleMeta(rf,
ClusterMetadata.current().directory.knownDatacenters()));
-if (sync)
-r.run();
-else
-ScheduledExecutors.nonPeriodicTasks.submit(r);
+cms.reconfigureCMS(ReplicationParams.simpleMeta(rf,
ClusterMetadata.current().directory.knownDatacenters()));
}
@Override
-public void reconfigureCMS(Map rf, boolean sync)
+public void reconfigureCMS(Map rf)
{
-Runnable r = () ->
ClusterMetadataService.instance().reconfigureCMS(ReplicationParams.ntsMeta(rf));
-if (sync)
-r.run();
-else
-ScheduledExecutors.nonPeriodicTasks.submit(r);
+cms.reconfigureCMS(ReplicationParams.ntsMeta(rf));
+}
+
+@Override
+public void cancelReconfigureCms()
+{
+cms.commit(CancelCMSReconfiguration.instance);
}
@Override
@@ -117,6 +115,9 @@ public class CMSOperations implements CMSOperationsMBean
.map(Object::toString)
.collect(Collectors.toList()));
+if (advance.diff.removals.isEmpty() &&
advance.diff.additions.isEmpty())
+status.put("INCOMPLETE", Collections.singletonList("All operations
have finished but metadata keyspace ranges are still locked"));
+
return status;
}
@@ -125,15 +126,14 @@ public class CMSOperations implements CMSOperationsMBean
{
Map info = new HashMap<>();
ClusterMetadata metadata = ClusterMetadata.current();
-ClusterMetadataService service = ClusterMetadataService.instance();
String members =
metadata.fullCMSMembers().stream().sorted().map(Object::toString).collect(Collectors.j
(cassandra) branch trunk updated: Refactor structure of caching metrics and expose auth cache metrics via JMX
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 64e2a4e9a3 Refactor structure of caching metrics and expose auth cache
metrics via JMX
64e2a4e9a3 is described below
commit 64e2a4e9a3e209cc6153c0e348ba7f3d56a7016f
Author: Aleksei Zotov
AuthorDate: Thu Jan 25 17:27:08 2024 +0100
Refactor structure of caching metrics and expose auth cache metrics via JMX
patch by Aleksei Zotov; reviewed by Stefan Miklosovic, Maxim Muzafarov for
CASSANDRA-17062
Co-authored-by: Sam Tunnicliffe
Co-authored-by: Stefan Miklosovic
---
CHANGES.txt| 1 +
.../pages/managing/operating/metrics.adoc | 64 +-
src/java/org/apache/cassandra/auth/AuthCache.java | 67 ++-
src/java/org/apache/cassandra/cache/CacheSize.java | 20 +++-
.../org/apache/cassandra/cache/ChunkCache.java | 5 +-
.../{CacheSize.java => UnweightedCacheSize.java} | 27 +++--
...CacheMetrics.java => AbstractCacheMetrics.java} | 83 +++--
.../org/apache/cassandra/metrics/CacheMetrics.java | 76 ++--
.../cassandra/metrics/UnweightedCacheMetrics.java | 53 +
.../org/apache/cassandra/auth/AuthCacheTest.java | 131 -
10 files changed, 393 insertions(+), 134 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 367d65ecdb..9b8da81077 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
5.1
+ * Refactor structure of caching metrics and expose auth cache metrics via JMX
(CASSANDRA-17062)
* Allow CQL client certificate authentication to work without sending an
AUTHENTICATE request (CASSANDRA-18857)
* Extend nodetool tpstats and system_views.thread_pools with detailed pool
parameters (CASSANDRA-19289)
* Remove dependency on Sigar in favor of OSHI (CASSANDRA-16565)
diff --git a/doc/modules/cassandra/pages/managing/operating/metrics.adoc
b/doc/modules/cassandra/pages/managing/operating/metrics.adoc
index 3edfe54478..2c709b9d16 100644
--- a/doc/modules/cassandra/pages/managing/operating/metrics.adoc
+++ b/doc/modules/cassandra/pages/managing/operating/metrics.adoc
@@ -528,9 +528,16 @@ ViewReplicasSuccess.
base table and when CL.ONE is achieved on view.
|===
-== Cache Metrics
+== Weighted Cache Metrics
-Cassandra caches have metrics to track the effectivness of the caches.
+[NOTE]
+
+The non-auth caches are weighted (they do care about weight of a single entry)
whereas the auth caches are
+non-weighted. Particularly it affects Capacity and Size attributes of the
MBeans.
+For weighted caches they represent size of entries in bytes, for non-weighted
caches they represent number of entries.
+
+
+Cassandra caches have metrics to track the effectivness of the weighted caches.
Though the `Table Metrics` might be more useful.
Reported name format:
@@ -538,7 +545,7 @@ Reported name format:
*Metric Name*::
`org.apache.cassandra.metrics.Cache..`
*JMX MBean*::
- `org.apache.cassandra.metrics:type=Cache scope= name=`
+ `org.apache.cassandra.metrics:type=Cache,scope=,name=`
[cols=",,",options="header",]
|===
@@ -569,8 +576,57 @@ The following caches are covered:
[NOTE]
-Misses and MissLatency are only defined for the ChunkCache
+* Misses and MissLatency are only defined for the ChunkCache
+* ChunkCache MBean is only available if the cache is enabled
+
+
+== Unweighted Cache Metrics
+
+Cassandra caches have metrics to track the effectivness of the unweighted
caches.
+
+Reported name format:
+
+*Metric Name*::
+`org.apache.cassandra.metrics.UnweightedCache..`
+
+*JMX MBean*::
+`org.apache.cassandra.metrics:type=UnweightedCache,scope=,name=`
+
+[cols=",,",options="header",]
+|===
+|Name |Type |Description
+|MaxEntries |Gauge |Maximum number of entries.
+|Entries |Gauge |Total number of cache entries.
+|FifteenMinuteCacheHitRate |Gauge |15m cache hit rate.
+|FiveMinuteCacheHitRate |Gauge |5m cache hit rate.
+|OneMinuteCacheHitRate |Gauge |1m cache hit rate.
+|HitRate |Gauge |All time cache hit rate.
+|Hits |Meter |Total number of cache hits.
+|Misses |Meter |Total number of cache misses.
+|MissLatency |Timer |Latency of misses.
+|Requests |Gauge |Total number of cache requests.
+|===
+
+The following caches are covered:
+
+[cols=",",options="header",]
+|===
+|Name |Description
+|CredentialsCache |Auth cache for credentials.
+|JmxPermissionsCache |Auth cache for JMX permissions.
+|CIDRPermissionsCache | Auth cache for CIDR permissions.
+|IdentityCache| Auth cache for `MutualTlsAuthenticator`.
+|NetworkPermissionsCache |Auth cache for network permissions.
+|PermissionsCache |Auth cache for permissions.
+|RolesCache |Auth cache for roles.
+|===
+
+[NOTE]
+.Note
+
+AuthCache metrics MBeans are only avai
