from:"azotcsit"

[cassandra-builds] branch cassandra-16630_ant_version created (now 7df0b89)

2022-02-20 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch cassandra-16630_ant_version
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git.


  at 7df0b89  Updated ant to 1.10.12 for cassandra-artifacts build

No new revisions were added by this update.

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra-builds] branch trunk updated: Revert "Updated ant to 1.10.12 for cassandra-artifacts build"

2022-02-20 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 80e8db5  Revert "Updated ant to 1.10.12 for cassandra-artifacts build"
80e8db5 is described below

commit 80e8db5a5cca5e3eee5273edd311cb8f684e2eb8
Author: Aleksei Zotov 
AuthorDate: Sun Feb 20 21:07:44 2022 +0400

Revert "Updated ant to 1.10.12 for cassandra-artifacts build"

This reverts commit aabc8465be2cda24268f1dc93b2c35bd018160c2.
---
 jenkins-dsl/cassandra_job_dsl_seed.groovy | 34 ---
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy 
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 256e9ef..94197d0 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -392,15 +392,11 @@ cassandraBranches.each {
 node / scm / branches / 'hudson.plugins.git.BranchSpec' / 
name(branchName)
 }
 steps {
-// cassandra-artifacts.sh script is the only place where ant is 
called directly. In all other places ant is
-// called inside a docker container, so there is no need to 
specify version in the pipeline script.
-withAnt (installation: 'ant_1.10.12') {
-shell("""
-
./cassandra-builds/build-scripts/cassandra-artifacts.sh ;
-wget --retry-connrefused --waitretry=1 
"\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - > 
console.log || echo wget failed ;
-xz console.log
-""")
-}
+shell("""
+./cassandra-builds/build-scripts/cassandra-artifacts.sh ;
+wget --retry-connrefused --waitretry=1 
"\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - > 
console.log || echo wget failed ;
+xz console.log
+  """)
 }
 publishers {
 publishOverSsh {
@@ -832,18 +828,14 @@ matrixJob('Cassandra-devbranch-artifacts') {
 }
 steps {
 buildDescription('', buildDescStr)
-// cassandra-artifacts.sh script is the only place where ant is called 
directly. In all other places ant is
-// called inside a docker container, so there is no need to specify 
version in the pipeline script.
-withAnt (installation: 'ant_1.10.12') {
-shell("""
-git clean -xdff ;
-git clone --depth 1 --single-branch -b ${buildsBranch} 
${buildsRepo} ;
-echo "cassandra-builds at: `git -C cassandra-builds log -1 
--pretty=format:'%h %an %ad %s'`" ;
-./cassandra-builds/build-scripts/cassandra-artifacts.sh ;
-wget --retry-connrefused --waitretry=1 
"\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - > 
console.log || echo wget failed ;
-xz console.log
-""")
-}
+shell("""
+git clean -xdff ;
+git clone --depth 1 --single-branch -b ${buildsBranch} 
${buildsRepo} ;
+echo "cassandra-builds at: `git -C cassandra-builds log -1 
--pretty=format:'%h %an %ad %s'`" ;
+./cassandra-builds/build-scripts/cassandra-artifacts.sh ;
+wget --retry-connrefused --waitretry=1 
"\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - > 
console.log || echo wget failed ;
+xz console.log
+""")
 }
 publishers {
 publishOverSsh {

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra-builds] branch revert-63-cassandra-16630_ant_version created (now 6425517)

2022-02-20 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch revert-63-cassandra-16630_ant_version
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git.


  at 6425517  Revert "Updated ant to 1.10.12 for cassandra-artifacts build"

This branch includes the following new commits:

 new 6425517  Revert "Updated ant to 1.10.12 for cassandra-artifacts build"

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.


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra-builds] 01/01: Revert "Updated ant to 1.10.12 for cassandra-artifacts build"

2022-02-20 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a commit to branch revert-63-cassandra-16630_ant_version
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git

commit 6425517cd03597bae8500a7679658900dacd7dff
Author: Aleksei Zotov 
AuthorDate: Sun Feb 20 21:07:44 2022 +0400

Revert "Updated ant to 1.10.12 for cassandra-artifacts build"

This reverts commit aabc8465be2cda24268f1dc93b2c35bd018160c2.
---
 jenkins-dsl/cassandra_job_dsl_seed.groovy | 34 ---
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy 
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 256e9ef..94197d0 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -392,15 +392,11 @@ cassandraBranches.each {
 node / scm / branches / 'hudson.plugins.git.BranchSpec' / 
name(branchName)
 }
 steps {
-// cassandra-artifacts.sh script is the only place where ant is 
called directly. In all other places ant is
-// called inside a docker container, so there is no need to 
specify version in the pipeline script.
-withAnt (installation: 'ant_1.10.12') {
-shell("""
-
./cassandra-builds/build-scripts/cassandra-artifacts.sh ;
-wget --retry-connrefused --waitretry=1 
"\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - > 
console.log || echo wget failed ;
-xz console.log
-""")
-}
+shell("""
+./cassandra-builds/build-scripts/cassandra-artifacts.sh ;
+wget --retry-connrefused --waitretry=1 
"\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - > 
console.log || echo wget failed ;
+xz console.log
+  """)
 }
 publishers {
 publishOverSsh {
@@ -832,18 +828,14 @@ matrixJob('Cassandra-devbranch-artifacts') {
 }
 steps {
 buildDescription('', buildDescStr)
-// cassandra-artifacts.sh script is the only place where ant is called 
directly. In all other places ant is
-// called inside a docker container, so there is no need to specify 
version in the pipeline script.
-withAnt (installation: 'ant_1.10.12') {
-shell("""
-git clean -xdff ;
-git clone --depth 1 --single-branch -b ${buildsBranch} 
${buildsRepo} ;
-echo "cassandra-builds at: `git -C cassandra-builds log -1 
--pretty=format:'%h %an %ad %s'`" ;
-./cassandra-builds/build-scripts/cassandra-artifacts.sh ;
-wget --retry-connrefused --waitretry=1 
"\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - > 
console.log || echo wget failed ;
-xz console.log
-""")
-}
+shell("""
+git clean -xdff ;
+git clone --depth 1 --single-branch -b ${buildsBranch} 
${buildsRepo} ;
+echo "cassandra-builds at: `git -C cassandra-builds log -1 
--pretty=format:'%h %an %ad %s'`" ;
+./cassandra-builds/build-scripts/cassandra-artifacts.sh ;
+wget --retry-connrefused --waitretry=1 
"\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - > 
console.log || echo wget failed ;
+xz console.log
+""")
 }
 publishers {
 publishOverSsh {

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra-builds] branch trunk updated: Updated ant to 1.10.12 for cassandra-artifacts build

2022-02-20 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git


The following commit(s) were added to refs/heads/trunk by this push:
 new aabc846  Updated ant to 1.10.12 for cassandra-artifacts build
aabc846 is described below

commit aabc8465be2cda24268f1dc93b2c35bd018160c2
Author: Aleksei Zotov 
AuthorDate: Thu Feb 17 22:31:32 2022 +0400

Updated ant to 1.10.12 for cassandra-artifacts build

patch by Aleksei Zotov; reviewed by Mick Semb Wever for CASSANDRA-16630
---
 jenkins-dsl/cassandra_job_dsl_seed.groovy | 34 +++
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy 
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 94197d0..256e9ef 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -392,11 +392,15 @@ cassandraBranches.each {
 node / scm / branches / 'hudson.plugins.git.BranchSpec' / 
name(branchName)
 }
 steps {
-shell("""
-./cassandra-builds/build-scripts/cassandra-artifacts.sh ;
-wget --retry-connrefused --waitretry=1 
"\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - > 
console.log || echo wget failed ;
-xz console.log
-  """)
+// cassandra-artifacts.sh script is the only place where ant is 
called directly. In all other places ant is
+// called inside a docker container, so there is no need to 
specify version in the pipeline script.
+withAnt (installation: 'ant_1.10.12') {
+shell("""
+
./cassandra-builds/build-scripts/cassandra-artifacts.sh ;
+wget --retry-connrefused --waitretry=1 
"\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - > 
console.log || echo wget failed ;
+xz console.log
+""")
+}
 }
 publishers {
 publishOverSsh {
@@ -828,14 +832,18 @@ matrixJob('Cassandra-devbranch-artifacts') {
 }
 steps {
 buildDescription('', buildDescStr)
-shell("""
-git clean -xdff ;
-git clone --depth 1 --single-branch -b ${buildsBranch} 
${buildsRepo} ;
-echo "cassandra-builds at: `git -C cassandra-builds log -1 
--pretty=format:'%h %an %ad %s'`" ;
-./cassandra-builds/build-scripts/cassandra-artifacts.sh ;
-wget --retry-connrefused --waitretry=1 
"\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - > 
console.log || echo wget failed ;
-xz console.log
-""")
+// cassandra-artifacts.sh script is the only place where ant is called 
directly. In all other places ant is
+// called inside a docker container, so there is no need to specify 
version in the pipeline script.
+withAnt (installation: 'ant_1.10.12') {
+shell("""
+git clean -xdff ;
+git clone --depth 1 --single-branch -b ${buildsBranch} 
${buildsRepo} ;
+echo "cassandra-builds at: `git -C cassandra-builds log -1 
--pretty=format:'%h %an %ad %s'`" ;
+./cassandra-builds/build-scripts/cassandra-artifacts.sh ;
+wget --retry-connrefused --waitretry=1 
"\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - > 
console.log || echo wget failed ;
+xz console.log
+""")
+}
 }
 publishers {
 publishOverSsh {

-
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 (679740f -> d17b16c)

2022-02-19 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


from 679740f  Added CVE-2021-44521 to CHANGES.txt, NEWS.txt
 add d17b16c  Fix flaky test - test_cqlsh_completion.TestCqlshCompletion

No new revisions were added by this update.

Summary of changes:
 CHANGES.txt  |  1 +
 pylib/cqlshlib/test/run_cqlsh.py |  4 ++--
 pylib/cqlshlib/test/test_cqlsh_completion.py | 19 ---
 3 files changed, 19 insertions(+), 5 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 (85fd49f -> 5bc9f7c)

2022-02-19 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


from 85fd49f  Merge branch 'cassandra-3.11' into cassandra-4.0
 add d17b16c  Fix flaky test - test_cqlsh_completion.TestCqlshCompletion
 add c3d51a8  Merge branch 'cassandra-3.0' into cassandra-3.11
 add 5bc9f7c  Merge branch 'cassandra-3.11' into cassandra-4.0

No new revisions were added by this update.

Summary of changes:
 CHANGES.txt | 8 +---
 1 file changed, 5 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-3.11 updated (593872c -> c3d51a8)

2022-02-19 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


from 593872c  Merge branch 'cassandra-3.0' into cassandra-3.11
 add d17b16c  Fix flaky test - test_cqlsh_completion.TestCqlshCompletion
 add c3d51a8  Merge branch 'cassandra-3.0' into cassandra-3.11

No new revisions were added by this update.

Summary of changes:
 CHANGES.txt  |  3 ++-
 pylib/cqlshlib/test/run_cqlsh.py |  4 ++--
 pylib/cqlshlib/test/test_cqlsh_completion.py | 19 ---
 3 files changed, 20 insertions(+), 6 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-4.0' into trunk

2022-02-19 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit d96c32b0b36d732df898f1d1a732c9398c2d775b
Merge: c08baf2 5bc9f7c
Author: Aleksei Zotov 
AuthorDate: Sat Feb 19 13:39:52 2022 +0400

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --cc CHANGES.txt
index 9bbb57e,9378003..ab0ff4d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -138,17 -46,7 +138,18 @@@ Merged from 3.11
   * Add key validation to ssstablescrub (CASSANDRA-16969)
   * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851)
   * Make assassinate more resilient to missing tokens (CASSANDRA-16847)
 + * Validate SASI tokenizer options before adding index to schema 
(CASSANDRA-15135)
 + * Fixup scrub output when no data post-scrub and clear up old use of row, 
which really means partition (CASSANDRA-16835)
 + * Reduce thread contention in CommitLogSegment and HintsBuffer 
(CASSANDRA-16072)
 + * Make cqlsh use the same set of reserved keywords than the server uses 
(CASSANDRA-15663)
 + * Optimize bytes skipping when reading SSTable files (CASSANDRA-14415)
 + * Enable tombstone compactions when unchecked_tombstone_compaction is set in 
TWCS (CASSANDRA-14496)
 + * Read only the required SSTables for single partition queries 
(CASSANDRA-16737)
  Merged from 3.0:
++ * Fix flaky test - test_cqlsh_completion.TestCqlshCompletion 
(CASSANDRA-17338)
 + * Fixed TestCqlshOutput failing tests (CASSANDRA-17386)
 + * Lazy transaction log replica creation allows incorrect replica content 
divergence during anticompaction (CASSANDRA-17273)
 + * LeveledCompactionStrategy disk space check improvements (CASSANDRA-17272)
   * Fix conversion from megabits to bytes in streaming rate limiter 
(CASSANDRA-17243)
   * Upgrade logback to 1.2.9 (CASSANDRA-17204)
   * Avoid race in AbstractReplicationStrategy endpoint caching 
(CASSANDRA-16673)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] branch trunk updated (c08baf2 -> d96c32b)

2022-02-19 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


from c08baf2  ninja-fix CHANGES.txt so >4.0.0 entries are "Merged in …" 
entries
 add d17b16c  Fix flaky test - test_cqlsh_completion.TestCqlshCompletion
 add c3d51a8  Merge branch 'cassandra-3.0' into cassandra-3.11
 add 5bc9f7c  Merge branch 'cassandra-3.11' into cassandra-4.0
 new d96c32b  Merge branch 'cassandra-4.0' into trunk

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra-builds] 01/01: Updated ant to 1.10.12 for Docker images

2022-02-18 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a commit to branch cassandra-16630_ant_version_dockers
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git

commit 5e861c3a5168fea9a59dd44e974e80671334a7bb
Author: Aleksei Zotov 
AuthorDate: Fri Feb 18 13:23:56 2022 +0400

Updated ant to 1.10.12 for Docker images

patch by Aleksei Zotov; reviewed by Mick Semb Wever for CASSANDRA-16630
---
 docker/almalinux-image.docker| 15 +--
 docker/buster-image.docker   |  9 -
 docker/centos8-image.docker  | 15 +--
 docker/jessie-image.docker   |  9 -
 docker/testing/ubuntu1910_j11.docker | 12 ++--
 docker/testing/ubuntu2004_j11.docker | 12 ++--
 6 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/docker/almalinux-image.docker b/docker/almalinux-image.docker
index 30493e0..453f731 100644
--- a/docker/almalinux-image.docker
+++ b/docker/almalinux-image.docker
@@ -11,7 +11,6 @@ VOLUME ${RPM_DIST_DIR}
 
 # install deps
 RUN yum -y install \
-   ant \
git \
java-1.8.0-openjdk-devel \
java-11-openjdk-devel \
@@ -20,10 +19,6 @@ RUN yum -y install \
sudo \
python3-pip
 
-RUN until curl -S -s --retry 9 --retry-connrefused --retry-delay 1 
http://mirror.centos.org/centos/7/os/x86_64/Packages/ant-junit-1.9.4-2.el7.noarch.rpm
 -o ant-junit-1.9.4-2.el7.noarch.rpm ; do echo "curl failed… trying again… " ; 
done
-
-RUN rpm -i --nodeps ant-junit-1.9.4-2.el7.noarch.rpm
-
 RUN pip3 install --upgrade pip
 
 # install Sphinx to generate docs
@@ -31,6 +26,14 @@ RUN pip3 install \
Sphinx \
sphinx_rtd_theme
 
+# install ant
+RUN mkdir /usr/share/ant && \
+wget --tries 9 
https://dlcdn.apache.org/ant/binaries/apache-ant-1.10.12-bin.tar.gz && \
+tar --strip-components 1 -xf apache-ant-1.10.12-bin.tar.gz -C 
/usr/share/ant && \
+rm -f apache-ant-1.10.12-bin.tar.gz
+ENV ANT_HOME=/usr/share/ant
+ENV PATH="${ANT_HOME}/bin:${PATH}"
+
 # create and change to build user
 RUN adduser build
 RUN echo "build ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/build && \
@@ -40,7 +43,7 @@ USER build
 
 RUN mkdir -p $RPM_BUILD_DIR/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
 
-# Clone Cassandra and cache maven artifacts
+# clone Cassandra and cache maven artifacts
 ARG CASSANDRA_GIT_URL=https://github.com/apache/cassandra.git
 RUN git clone ${CASSANDRA_GIT_URL} ${CASSANDRA_DIR}
 WORKDIR $CASSANDRA_DIR
diff --git a/docker/buster-image.docker b/docker/buster-image.docker
index 4f554cd..a3e2930 100644
--- a/docker/buster-image.docker
+++ b/docker/buster-image.docker
@@ -13,7 +13,6 @@ RUN echo 'APT::Acquire::Retries "9";' > 
/etc/apt/apt.conf.d/80-retries
 
 # install deps
 RUN apt-get update && apt-get -y install \
-   ant \
build-essential \
curl \
devscripts \
@@ -29,6 +28,14 @@ RUN echo 'deb http://ftp.debian.org/debian stretch main' >> 
/etc/apt/sources.lis
 && apt-get update \
 && update-java-alternatives --set java-1.8.0-openjdk-$(dpkg 
--print-architecture)
 
+# install ant
+RUN mkdir /usr/share/ant && \
+wget --tries 9 
https://dlcdn.apache.org/ant/binaries/apache-ant-1.10.12-bin.tar.gz && \
+tar --strip-components 1 -xf apache-ant-1.10.12-bin.tar.gz -C 
/usr/share/ant && \
+rm -f apache-ant-1.10.12-bin.tar.gz
+ENV ANT_HOME=/usr/share/ant
+ENV PATH="${ANT_HOME}/bin:${PATH}"
+
 # create and change to build user
 RUN adduser --disabled-login --gecos build build && gpasswd -a build sudo
 RUN echo "build ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/build && \
diff --git a/docker/centos8-image.docker b/docker/centos8-image.docker
index 0d55d10..2b999b1 100644
--- a/docker/centos8-image.docker
+++ b/docker/centos8-image.docker
@@ -11,7 +11,6 @@ VOLUME ${RPM_DIST_DIR}
 
 # install deps
 RUN yum -y install \
-   ant \
git \
java-1.8.0-openjdk-devel \
java-11-openjdk-devel \
@@ -20,10 +19,6 @@ RUN yum -y install \
sudo \
python3-pip
 
-RUN until curl -S -s --retry 9 --retry-connrefused --retry-delay 1 
http://mirror.centos.org/centos/7/os/x86_64/Packages/ant-junit-1.9.4-2.el7.noarch.rpm
 -o ant-junit-1.9.4-2.el7.noarch.rpm ; do echo "curl failed… trying again… " ; 
done
-
-RUN rpm -i --nodeps ant-junit-1.9.4-2.el7.noarch.rpm
-
 RUN pip3 install --upgrade pip
 
 # install Sphinx to generate docs
@@ -31,6 +26,14 @@ RUN pip3 install \
Sphinx \
sphinx_rtd_theme
 
+# install ant
+RUN mkdir /usr/share/ant && \
+wget --tries 9 
https://dlcdn.apache.org/ant/binaries/apache-ant-1.10.12-bin.tar.gz && \
+tar --strip-components 1 -xf apache-ant-1.10.12-bin.tar.gz -C 
/usr/share/ant && \
+rm -f apache-ant-1.10.12-bin.tar.gz
+ENV ANT_HOME=/usr/share/ant
+ENV PATH="${ANT_HOME}/bin:${PATH

[cassandra-builds] branch cassandra-16630_ant_version_dockers created (now 5e861c3)

2022-02-18 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch cassandra-16630_ant_version_dockers
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git.


  at 5e861c3  Updated ant to 1.10.12 for Docker images

This branch includes the following new commits:

 new 5e861c3  Updated ant to 1.10.12 for Docker images

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.


-
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 (702824a -> f8b3f60)

2022-02-17 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


from 702824a  Merge branch 'cassandra-3.11' into cassandra-4.0
 add 6378866  Fixed TestCqlshOutput failing tests
 add e77738f  Merge branch 'cassandra-3.0' into cassandra-3.11
 add f8b3f60  Merge branch 'cassandra-3.11' into cassandra-4.0

No new revisions were added by this update.

Summary of changes:
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] branch cassandra-3.0 updated (b58a5c8 -> 6378866)

2022-02-17 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


from b58a5c8  LeveledCompactionStrategy disk space check improvements
 add 6378866  Fixed TestCqlshOutput failing tests

No new revisions were added by this update.

Summary of changes:
 CHANGES.txt  |  1 +
 pylib/cqlshlib/test/test_cqlsh_output.py | 59 ++--
 2 files changed, 42 insertions(+), 18 deletions(-)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] branch trunk updated (c69e37e -> adf2f4c)

2022-02-17 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


from c69e37e  Merge branch 'cassandra-4.0' into trunk
 add 6378866  Fixed TestCqlshOutput failing tests
 add e77738f  Merge branch 'cassandra-3.0' into cassandra-3.11
 add f8b3f60  Merge branch 'cassandra-3.11' into cassandra-4.0
 new adf2f4c  Merge branch 'cassandra-4.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 | 3 +--
 1 file changed, 1 insertion(+), 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-4.0' into trunk

2022-02-17 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit adf2f4c83a2766ef8ebd20b35b49df50957bdf5e
Merge: c69e37e f8b3f60
Author: Aleksei Zotov 
AuthorDate: Thu Feb 17 23:03:03 2022 +0400

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --cc CHANGES.txt
index 85204fc,92efa8d..1be1d0a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,98 -1,6 +1,97 @@@
 -4.0.4
 +4.1
 + * Fix improper CDC commit log segments deletion in non-blocking mode 
(CASSANDRA-17233)
 + * Add support for string concatenations through the + operator 
(CASSANDRA-17190)
 + * Limit the maximum hints size per host (CASSANDRA-17142)
 + * Add a virtual table for exposing batch metrics (CASSANDRA-17225)
 + * Flatten guardrails config (CASSANDRA-17353)
 + * Instance failed to start up due to NPE in 
StartupClusterConnectivityChecker (CASSANDRA-17347)
 + * add the shorter version of version flag (-v) in cqlsh (CASSANDRA-17236)
 + * Make vtables accessible via internode messaging (CASSANDRA-17295)
 + * Add support for PEM based key material for SSL (CASSANDRA-17031)
 + * Standardize storage configuration parameters' names. Support unit 
suffixes. (CASSANDRA-15234)
 + * Remove support for Windows (CASSANDRA-16956)
 + * Runtime-configurable YAML option to prohibit USE statements 
(CASSANDRA-17318)
 + * When streaming sees a ClosedChannelException this triggers the disk 
failure policy (CASSANDRA-17116)
 + * Add a virtual table for exposing prepared statements metrics 
(CASSANDRA-17224)
 + * Remove python 2.x support from cqlsh (CASSANDRA-17242)
 + * Prewarm role and credential caches to avoid timeouts at startup 
(CASSANDRA-16958)
 + * Make capacity/validity/updateinterval/activeupdate for Auth Caches 
configurable via nodetool (CASSANDRA-17063)
 + * Added startup check for read_ahead_kb setting (CASSANDRA-16436)
 + * Avoid unecessary array allocations and initializations when performing 
query checks (CASSANDRA-17209)
 + * Add guardrail for list operations that require read before write 
(CASSANDRA-17154)
 + * Migrate thresholds for number of keyspaces and tables to guardrails 
(CASSANDRA-17195)
 + * Remove self-reference in SSTableTidier (CASSANDRA-17205)
 + * Add guardrail for query page size (CASSANDRA-17189)
 + * Allow column_index_size_in_kb to be configurable through nodetool 
(CASSANDRA-17121)
 + * Emit a metric for number of local read and write calls
 + * Add non-blocking mode for CDC writes (CASSANDRA-17001)
 + * Add guardrails framework (CASSANDRA-17147)
 + * Harden resource management on SSTable components to prevent future leaks 
(CASSANDRA-17174)
 + * Make nodes more resilient to local unrelated files during startup 
(CASSANDRA-17082)
 + * repair prepare message would produce a wrong error message if network 
timeout happened rather than reply wait timeout (CASSANDRA-16992)
 + * Log queries that fail on timeout or unavailable errors up to once per 
minute by default (CASSANDRA-17159)
 + * Refactor normal/preview/IR repair to standardize repair cleanup and error 
handling of failed RepairJobs (CASSANDRA-17069)
 + * Log missing peers in StartupClusterConnectivityChecker (CASSANDRA-17130)
 + * Introduce separate rate limiting settings for entire SSTable streaming 
(CASSANDRA-17065)
 + * Implement Virtual Tables for Auth Caches (CASSANDRA-16914)
 + * Actively update auth cache in the background (CASSANDRA-16957)
 + * Add unix time conversion functions (CASSANDRA-17029)
 + * JVMStabilityInspector.forceHeapSpaceOomMaybe should handle all non-heap 
OOMs rather than only supporting direct only (CASSANDRA-17128)
 + * Forbid other Future implementations with checkstyle (CASSANDRA-17055)
 + * commit log was switched from non-daemon to daemon threads, which causes 
the JVM to exit in some case as no non-daemon threads are active 
(CASSANDRA-17085)
 + * Add a Denylist to block reads and writes on specific partition keys 
(CASSANDRA-12106)
 + * v4+ protocol did not clean up client warnings, which caused leaking the 
state (CASSANDRA-17054)
 + * Remove duplicate toCQLString in ReadCommand (CASSANDRA-17023)
 + * Ensure hint window is persistent across restarts of a node 
(CASSANDRA-14309)
 + * Allow to GRANT or REVOKE multiple permissions in a single statement 
(CASSANDRA-17030)
 + * Allow to grant permission for all tables in a keyspace (CASSANDRA-17027)
 + * Log time spent writing keys during compaction (CASSANDRA-17037)
 + * Make nodetool compactionstats and sstable_tasks consistent 
(CASSANDRA-16976)
 + * Add metrics and logging around index summary redistribution 
(CASSANDRA-17036)
 + * Add configuration options for minimum allowable replication factor and 
default replication factor (CASSANDRA-14557)
 + * Expose information about stored hints via a nodetool command and a virtual 
table (CASSANDRA-14795)
 + * Add broadcast_rpc_address

[cassandra] branch cassandra-3.11 updated (e53ad64 -> e77738f)

2022-02-17 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


from e53ad64  Merge branch 'cassandra-3.0' into cassandra-3.11
 add 6378866  Fixed TestCqlshOutput failing tests
 add e77738f  Merge branch 'cassandra-3.0' into cassandra-3.11

No new revisions were added by this update.

Summary of changes:
 CHANGES.txt  |  1 +
 pylib/cqlshlib/test/test_cqlsh_output.py | 59 ++--
 2 files changed, 42 insertions(+), 18 deletions(-)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra-builds] 01/01: Updated ant to 1.10.12 for cassandra-artifacts build

2022-02-17 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a commit to branch cassandra-16630_ant_version
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git

commit 7df0b897c3b874887a7041d616dc007f74831a13
Author: Aleksei Zotov 
AuthorDate: Thu Feb 17 22:31:32 2022 +0400

Updated ant to 1.10.12 for cassandra-artifacts build

patch by Aleksei Zotov; reviewed by Mick Semb Wever for CASSANDRA-16630
---
 jenkins-dsl/cassandra_job_dsl_seed.groovy | 34 +++
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy 
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 94197d0..256e9ef 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -392,11 +392,15 @@ cassandraBranches.each {
 node / scm / branches / 'hudson.plugins.git.BranchSpec' / 
name(branchName)
 }
 steps {
-shell("""
-./cassandra-builds/build-scripts/cassandra-artifacts.sh ;
-wget --retry-connrefused --waitretry=1 
"\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - > 
console.log || echo wget failed ;
-xz console.log
-  """)
+// cassandra-artifacts.sh script is the only place where ant is 
called directly. In all other places ant is
+// called inside a docker container, so there is no need to 
specify version in the pipeline script.
+withAnt (installation: 'ant_1.10.12') {
+shell("""
+
./cassandra-builds/build-scripts/cassandra-artifacts.sh ;
+wget --retry-connrefused --waitretry=1 
"\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - > 
console.log || echo wget failed ;
+xz console.log
+""")
+}
 }
 publishers {
 publishOverSsh {
@@ -828,14 +832,18 @@ matrixJob('Cassandra-devbranch-artifacts') {
 }
 steps {
 buildDescription('', buildDescStr)
-shell("""
-git clean -xdff ;
-git clone --depth 1 --single-branch -b ${buildsBranch} 
${buildsRepo} ;
-echo "cassandra-builds at: `git -C cassandra-builds log -1 
--pretty=format:'%h %an %ad %s'`" ;
-./cassandra-builds/build-scripts/cassandra-artifacts.sh ;
-wget --retry-connrefused --waitretry=1 
"\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - > 
console.log || echo wget failed ;
-xz console.log
-""")
+// cassandra-artifacts.sh script is the only place where ant is called 
directly. In all other places ant is
+// called inside a docker container, so there is no need to specify 
version in the pipeline script.
+withAnt (installation: 'ant_1.10.12') {
+shell("""
+git clean -xdff ;
+git clone --depth 1 --single-branch -b ${buildsBranch} 
${buildsRepo} ;
+echo "cassandra-builds at: `git -C cassandra-builds log -1 
--pretty=format:'%h %an %ad %s'`" ;
+./cassandra-builds/build-scripts/cassandra-artifacts.sh ;
+wget --retry-connrefused --waitretry=1 
"\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - > 
console.log || echo wget failed ;
+xz console.log
+""")
+}
 }
 publishers {
 publishOverSsh {

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra-builds] branch cassandra-16630_ant_version created (now 7df0b89)

2022-02-17 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch cassandra-16630_ant_version
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git.


  at 7df0b89  Updated ant to 1.10.12 for cassandra-artifacts build

This branch includes the following new commits:

 new 7df0b89  Updated ant to 1.10.12 for cassandra-artifacts build

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.


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra-builds] branch trunk updated: Add versions logging for build tools

2022-02-05 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 51a654f  Add versions logging for build tools
51a654f is described below

commit 51a654f0bddc6d8a0db03132698dd5229f425752
Author: Aleksei Zotov 
AuthorDate: Wed Feb 2 21:08:24 2022 +0400

Add versions logging for build tools

patch by Aleksei Zotov; reviewed by Mick Semb Wever for CASSANDRA-16630
---
 build-scripts/cassandra-artifacts.sh   |  5 +
 build-scripts/cassandra-dtest-pytest-docker.sh |  6 ++
 build-scripts/cassandra-dtest-pytest.sh| 10 ++
 build-scripts/cassandra-test-docker.sh |  3 +++
 build-scripts/cassandra-test.sh|  4 
 5 files changed, 28 insertions(+)

diff --git a/build-scripts/cassandra-artifacts.sh 
b/build-scripts/cassandra-artifacts.sh
index 80185f9..07dd620 100755
--- a/build-scripts/cassandra-artifacts.sh
+++ b/build-scripts/cassandra-artifacts.sh
@@ -18,6 +18,11 @@ command -v docker >/dev/null 2>&1 || { echo >&2 "docker 
needs to be installed";
 [ -f "build.xml" ] || { echo >&2 "build.xml must exist"; exit 1; }
 [ -d "${cassandra_builds_dir}" ] || { echo >&2 "cassandra-builds directory 
must exist"; exit 1; }
 
+# print debug information on versions
+ant -version
+pip --version
+virtualenv --version
+docker --version
 
 # Sphinx is needed for the gen-doc target
 virtualenv venv
diff --git a/build-scripts/cassandra-dtest-pytest-docker.sh 
b/build-scripts/cassandra-dtest-pytest-docker.sh
index d931961..5ff3cc1 100755
--- a/build-scripts/cassandra-dtest-pytest-docker.sh
+++ b/build-scripts/cassandra-dtest-pytest-docker.sh
@@ -43,6 +43,12 @@ DTEST_REPO=$3
 DTEST_BRANCH=$4
 EOF
 
+# pre-conditions
+command -v docker >/dev/null 2>&1 || { echo >&2 "docker needs to be 
installed"; exit 1; }
+
+# print debug information on versions
+docker --version
+
 set -x # debug, sometimes ${docker_cpus} is not evaluated
 # Jenkins agents run multiple executors per machine. `jenkins_executors=1` 
is used for anything non-jenkins.
 jenkins_executors=1
diff --git a/build-scripts/cassandra-dtest-pytest.sh 
b/build-scripts/cassandra-dtest-pytest.sh
index 89eb59b..448b50c 100755
--- a/build-scripts/cassandra-dtest-pytest.sh
+++ b/build-scripts/cassandra-dtest-pytest.sh
@@ -31,6 +31,16 @@ if [ $? -eq 0 -a -n "$JAVA8_HOME" -a -n "$JAVA11_HOME" ]; 
then
export JAVA_HOME="$JAVA11_HOME"
 fi
 
+# pre-conditions
+command -v ant >/dev/null 2>&1 || { echo >&2 "ant needs to be installed"; exit 
1; }
+command -v pip3 >/dev/null 2>&1 || { echo >&2 "pip3 needs to be installed"; 
exit 1; }
+command -v virtualenv >/dev/null 2>&1 || { echo >&2 "virtualenv needs to be 
installed"; exit 1; }
+
+# print debug information on versions
+ant -version
+pip3 --version
+virtualenv --version
+
 # Loop to prevent failure due to maven-ant-tasks not downloading a jar..
 for x in $(seq 1 3); do
 ant clean jar
diff --git a/build-scripts/cassandra-test-docker.sh 
b/build-scripts/cassandra-test-docker.sh
index 254c1a9..2693881 100755
--- a/build-scripts/cassandra-test-docker.sh
+++ b/build-scripts/cassandra-test-docker.sh
@@ -35,6 +35,9 @@ else
 command -v docker >/dev/null 2>&1 || { echo >&2 "docker needs to be 
installed"; exit 1; }
 (docker info >/dev/null 2>&1) || { echo >&2 "docker needs to running"; 
exit 1; }
 
+# print debug information on versions
+docker --version
+
 # start the docker container
 if [ "$#" -lt 5 ]; then
echo "Usage: cassandra-test-docker.sh REPO BRANCH BUILDS_REPO_URL 
BUILDS_BRANCH DOCKER_IMAGE [target] [split_chunk]"
diff --git a/build-scripts/cassandra-test.sh b/build-scripts/cassandra-test.sh
index d783d86..2605b08 100755
--- a/build-scripts/cassandra-test.sh
+++ b/build-scripts/cassandra-test.sh
@@ -10,6 +10,10 @@ command -v ant >/dev/null 2>&1 || { echo >&2 "ant needs to 
be installed"; exit 1
 command -v git >/dev/null 2>&1 || { echo >&2 "git needs to be installed"; exit 
1; }
 [ -f "build.xml" ] || { echo >&2 "build.xml must exist"; exit 1; }
 
+# print debug information on versions
+ant -version
+git --version
+
 # lists all tests for the specific test type
 _list_tests() {
   local -r classlistprefix="$1"

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] branch trunk updated: Make capacity/validity/updateinterval/activeupdate for Auth Caches configurable via nodetool

2022-01-10 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit 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 bc20bdd  Make capacity/validity/updateinterval/activeupdate for Auth 
Caches configurable via nodetool
bc20bdd is described below

commit bc20bddcebd6a37b14cfbdd50c359be4c9743f73
Author: Aleksei Zotov 
AuthorDate: Mon Dec 20 21:26:41 2021 +0400

Make capacity/validity/updateinterval/activeupdate for Auth Caches 
configurable via nodetool

patch by Aleksei Zotov; reviewed by Josh McKenzie for CASSANDRA-17063
---
 CHANGES.txt|   1 +
 NEWS.txt   |   1 +
 src/java/org/apache/cassandra/tools/NodeProbe.java |  20 +++
 src/java/org/apache/cassandra/tools/NodeTool.java  |   2 +
 .../tools/nodetool/GetAuthCacheConfig.java |  47 +
 .../tools/nodetool/InvalidatePermissionsCache.java |   2 +-
 .../tools/nodetool/SetAuthCacheConfig.java | 114 +
 .../tools/nodetool/GetAuthCacheConfigTest.java | 141 +++
 .../nodetool/InvalidateCredentialsCacheTest.java   |  14 +-
 .../InvalidateJmxPermissionsCacheTest.java |  21 ++-
 .../InvalidateNetworkPermissionsCacheTest.java |  12 +-
 .../nodetool/InvalidatePermissionsCacheTest.java   |  16 +-
 .../tools/nodetool/InvalidateRolesCacheTest.java   |  12 +-
 .../tools/nodetool/SetAuthCacheConfigTest.java | 189 +
 14 files changed, 549 insertions(+), 43 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9cf76fd..2ef9307 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.1
+ * Make capacity/validity/updateinterval/activeupdate for Auth Caches 
configurable via nodetool (CASSANDRA-17063)
  * Added startup check for read_ahead_kb setting (CASSANDRA-16436)
  * Avoid unecessary array allocations and initializations when performing 
query checks (CASSANDRA-17209)
  * Add guardrail for list operations that require read before write 
(CASSANDRA-17154)
diff --git a/NEWS.txt b/NEWS.txt
index b46fb56..ffa909d 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -38,6 +38,7 @@ using the provided 'sstableupgrade' tool.
 
 New features
 
+- Added ability to configure auth caches through corresponding `nodetool` 
commands.
 - CDC data flushing now can be configured to be non-blocking with the 
configuration cdc_block_writes. Setting to true,
   any writes to the CDC-enabled tables will be blocked when reaching to 
the limit for CDC data on disk, which is the
   existing and the default behavior. Setting to false, the writes to the 
CDC-enabled tables will be accepted and
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java 
b/src/java/org/apache/cassandra/tools/NodeProbe.java
index 1347aa0..73d2cbf 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -61,6 +61,7 @@ import org.apache.cassandra.audit.AuditLogOptions;
 import org.apache.cassandra.audit.AuditLogOptionsCompositeData;
 import com.google.common.collect.ImmutableMap;
 import org.apache.cassandra.auth.AuthCache;
+import org.apache.cassandra.auth.AuthCacheMBean;
 import org.apache.cassandra.auth.NetworkPermissionsCache;
 import org.apache.cassandra.auth.NetworkPermissionsCacheMBean;
 import org.apache.cassandra.auth.PasswordAuthenticator;
@@ -569,6 +570,25 @@ public class NodeProbe implements AutoCloseable
 cacheService.invalidateRowCache();
 }
 
+public AuthCacheMBean getAuthCacheMBean(String cacheName)
+{
+switch (cacheName)
+{
+case PasswordAuthenticator.CredentialsCacheMBean.CACHE_NAME:
+return ccProxy;
+case AuthorizationProxy.JmxPermissionsCacheMBean.CACHE_NAME:
+return jpcProxy;
+case NetworkPermissionsCacheMBean.CACHE_NAME:
+return npcProxy;
+case PermissionsCacheMBean.CACHE_NAME:
+return pcProxy;
+case RolesCacheMBean.CACHE_NAME:
+return rcProxy;
+default:
+throw new IllegalArgumentException("Unknown cache name: " + 
cacheName);
+}
+}
+
 public void drain() throws IOException, InterruptedException, 
ExecutionException
 {
 ssProxy.drain();
diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java 
b/src/java/org/apache/cassandra/tools/NodeTool.java
index dd85f10..f9422bd 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -129,6 +129,7 @@ public class NodeTool
 GarbageCollect.class,
 GcStats.class,
 GetAuditLog.class,
+GetAuthCacheConfig.class,
 GetBatchlogReplayTrottle.class,
 GetC

[cassandra] branch cassandra-16630_junit5 deleted (was 8b04e68)

2021-11-22 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch cassandra-16630_junit5
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


 was 8b04e68  CASSANDRA-16630. Updated Cassandra test formatters.

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] branch cassandra-17062_auth_caches_metrics deleted (was adadded)

2021-11-22 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch cassandra-17062_auth_caches_metrics
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


 was adadded  Expose Auth Caches metrics

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] 04/04: CASSANDRA-16630. Updated Cassandra test formatters.

2021-11-15 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a commit to branch cassandra-16630_junit5
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 8b04e685195d0a9a5f8eb1afa676200af14da689
Author: Aleksei Zotov 
AuthorDate: Tue Nov 16 00:56:30 2021 +0400

CASSANDRA-16630. Updated Cassandra test formatters.
---
 build.xml  | 155 ---
 .../CassandraBriefJUnitResultFormatter.java| 309 ++---
 .../CassandraXMLJUnitResultFormatter.java  | 477 ++---
 .../org/apache/cassandra/Junit4SampleTest.java |   2 +
 .../org/apache/cassandra/Junit5SampleTest.java |   2 +
 5 files changed, 257 insertions(+), 688 deletions(-)

diff --git a/build.xml b/build.xml
index 6b6d71b..46d20d9 100644
--- a/build.xml
+++ b/build.xml
@@ -1340,6 +1340,10 @@
  else="">
 
   
+  
+  
+
+  
   
 
   
@@ -1348,43 +1352,17 @@
   
   
   
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 

-
-
-
-
-
-
-
+
+  
+
+
+
+
+
+  
+
+  
+  
 
   
   
@@ -1399,11 +1377,48 @@
   
   
 
-
-
-
-
-  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 

+
+
+
+
+
+
+
+
+
+  
 
   
   
@@ -2091,26 +2106,27 @@
 
 
 
-   
-
-   
-   
-   
-   
-
-   
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
   
 
   
@@ -2130,13 +2146,14 @@
 
   
   
-  
-  
-  
-  
-  
+
+
+
+
+
+
+
+
   
 
 
diff --git 
a/test/unit/org/apache/cassandra/CassandraBriefJUnitResultFormatter.java 
b/test/unit/org/apache/cassandra/CassandraBriefJUnitResultFormatter.java
index 88dbc52..8080d81 100644
--- a/test/unit/org/apache/cassandra/CassandraBriefJUnitResultFormatter.java
+++ b/test/unit/org/apache/cassandra/CassandraBriefJUnitResultFormatter.java
@@ -18,302 +18,45 @@
 
 package org.apache.cassandra;
 
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.StringWriter;
-import java.text.NumberFormat;
+import org.junit.platform.launcher.TestIdentifier;
 
-import junit.framework.AssertionFailedError;
-import junit.framework.Test;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.taskdefs.optional.junit.IgnoredTestListener;
-import org.apache.tools.ant.taskdefs.optional.junit.JUnitResultFormatter;
-import org.apache.tools.ant.taskdefs.optional.junit.JUnitTest;
-import org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner;
-import org.apache.tools.ant.taskdefs.optional.junit.JUnitVersionHelper;
-import org.apache.tools.ant.util.FileUtils;
-import org.apache.tools.ant.util.StringUtils;
+import 
org.apache.tools.ant.taskdefs.optional.junitlauncher2.LegacyBriefResultFormatter;
 
 /**
  * Prints plain text output of the test to a specified Writer.
- * Inspired by the PlainJUnitResultFormatter.
- *
- * @see FormatterElement
- * @see PlainJUnitResultFormatter
  */
-public class CassandraBriefJUnitResultFormatter implements 
JUnitResultFormatter, IgnoredTestListener {
-
-private static final double ONE_SECOND = 1000.0;
-
+public class CassandraBriefJUnitResultFormatter extends 
LegacyBriefResultFormatter
+{
 private static final String tag = System.getProperty("cassandra.testtag", 
"");
-
 private static final Boolean keepBriefBrief = 
Boolean.getBoolean("cassandra.keepBriefBrief");
 
-/**
- * Where to write the log to.
- */
-private OutputStream out;
-
-/**
- * Used for writing the results.
- */
-private BufferedWriter output;
-
-/**
- * Used as part of formatting the results.
- */
-private StringWriter results;
-
-/**
- * Used for writing formatted results to.
- */
-private BufferedWriter resultWriter;
-
-/**
- * Formatter for

[cassandra] 02/04: CASSANDRA-16630. Copied Ant JUnit classes.

2021-11-15 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a commit to branch cassandra-16630_junit5
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 56a32b87b9d91b50d3a228dff6369ea751714435
Author: Aleksei Zotov 
AuthorDate: Sun Nov 14 20:07:36 2021 +0400

CASSANDRA-16630. Copied Ant JUnit classes.
---
 .../AbstractJUnitResultFormatter.java  | 308 +++
 .../junitlauncher/LegacyBriefResultFormatter.java  |  34 ++
 .../junitlauncher/LegacyPlainResultFormatter.java  | 290 ++
 .../junitlauncher/LegacyXmlResultFormatter.java| 424 +
 4 files changed, 1056 insertions(+)

diff --git 
a/test/unit/org/apache/tools/ant/taskdefs/optional/junitlauncher/AbstractJUnitResultFormatter.java
 
b/test/unit/org/apache/tools/ant/taskdefs/optional/junitlauncher/AbstractJUnitResultFormatter.java
new file mode 100644
index 000..221aadb
--- /dev/null
+++ 
b/test/unit/org/apache/tools/ant/taskdefs/optional/junitlauncher/AbstractJUnitResultFormatter.java
@@ -0,0 +1,308 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+package org.apache.tools.ant.taskdefs.optional.junitlauncher;
+
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.util.FileUtils;
+import org.junit.platform.engine.TestSource;
+import org.junit.platform.engine.support.descriptor.ClassSource;
+import org.junit.platform.launcher.TestIdentifier;
+import org.junit.platform.launcher.TestPlan;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.Closeable;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+import java.nio.BufferOverflowException;
+import java.nio.ByteBuffer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ * Contains some common behaviour that's used by our internal {@link 
TestResultFormatter}s
+ */
+abstract class AbstractJUnitResultFormatter implements TestResultFormatter {
+
+protected TestExecutionContext context;
+
+private SysOutErrContentStore sysOutStore;
+private SysOutErrContentStore sysErrStore;
+
+@Override
+public void sysOutAvailable(final byte[] data) {
+if (this.sysOutStore == null) {
+this.sysOutStore = new SysOutErrContentStore(context, true);
+}
+try {
+this.sysOutStore.store(data);
+} catch (IOException e) {
+handleException(e);
+}
+}
+
+@Override
+public void sysErrAvailable(final byte[] data) {
+if (this.sysErrStore == null) {
+this.sysErrStore = new SysOutErrContentStore(context, false);
+}
+try {
+this.sysErrStore.store(data);
+} catch (IOException e) {
+handleException(e);
+}
+}
+
+@Override
+public void setContext(final TestExecutionContext context) {
+this.context = context;
+}
+
+/**
+ * @return Returns true if there's any stdout data, that was generated 
during the
+ * tests, is available for use. Else returns false.
+ */
+boolean hasSysOut() {
+return this.sysOutStore != null && this.sysOutStore.hasData();
+}
+
+/**
+ * @return Returns true if there's any stderr data, that was generated 
during the
+ * tests, is available for use. Else returns false.
+ */
+boolean hasSysErr() {
+return this.sysErrStore != null && this.sysErrStore.hasData();
+}
+
+/**
+ * @return Returns a {@link Reader} for reading any stdout data that was 
generated
+ * during the test execution. It is expected that the {@link #hasSysOut()} 
be first
+ * called to see if any such data is available and only if there is, then 
this method
+ * be called
+ * @throws IOException If there's any I/O problem while creating the 
{@link Reader}
+ */
+Reader getSysOutReader() throws IOException {
+return this.sysOutStore.getReader();
+}
+
+/**
+ * @return Retur

[cassandra] branch cassandra-16630_junit5 created (now 8b04e68)

2021-11-15 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch cassandra-16630_junit5
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


  at 8b04e68  CASSANDRA-16630. Updated Cassandra test formatters.

This branch includes the following new commits:

 new 667a894  CASSANDRA-16630. Updated dependencies.
 new 56a32b8  CASSANDRA-16630. Copied Ant JUnit classes.
 new 31d8eea  CASSANDRA-16630. Updated Ant JUnit classes.
 new 8b04e68  CASSANDRA-16630. Updated Cassandra test formatters.

The 4 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] 03/04: CASSANDRA-16630. Updated Ant JUnit classes.

2021-11-15 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a commit to branch cassandra-16630_junit5
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 31d8eea6bb9a5cb3829ccfc3de632c989e900409
Author: Aleksei Zotov 
AuthorDate: Tue Nov 16 00:55:45 2021 +0400

CASSANDRA-16630. Updated Ant JUnit classes.
---
 .../unit/org/apache/cassandra/JStackJUnitTask.java |  25 +---
 .../junitlauncher/LegacyBriefResultFormatter.java  |  34 --
 .../AbstractJUnitResultFormatter.java  |  90 +++---
 .../junitlauncher2/LegacyBriefResultFormatter.java |  36 ++
 .../LegacyPlainResultFormatter.java|  52 
 .../LegacyXmlResultFormatter.java  | 135 -
 6 files changed, 185 insertions(+), 187 deletions(-)

diff --git a/test/unit/org/apache/cassandra/JStackJUnitTask.java 
b/test/unit/org/apache/cassandra/JStackJUnitTask.java
index 69480a6..f8f806c 100644
--- a/test/unit/org/apache/cassandra/JStackJUnitTask.java
+++ b/test/unit/org/apache/cassandra/JStackJUnitTask.java
@@ -22,28 +22,14 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.lang.reflect.Field;
 
-import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.taskdefs.ExecuteWatchdog;
-import org.apache.tools.ant.taskdefs.optional.junit.JUnitTask;
+import 
org.apache.tools.ant.taskdefs.optional.junitlauncher.confined.JUnitLauncherTask;
 import org.apache.tools.ant.util.Watchdog;
 
-public class JStackJUnitTask extends JUnitTask
+public class JStackJUnitTask extends JUnitLauncherTask
 {
-private Integer timeout;
-
-public JStackJUnitTask() throws Exception
-{
-}
-
-@Override
-public void setTimeout(Integer timeout)
-{
-this.timeout = timeout;
-super.setTimeout(timeout);
-}
-
 @Override
-public ExecuteWatchdog createWatchdog() throws BuildException
+protected ExecuteWatchdog createExecuteWatchdog(long timeout)
 {
 return new JStackWatchDog(timeout);
 }
@@ -57,11 +43,6 @@ public class JStackJUnitTask extends JUnitTask
 super(timeout);
 }
 
-public JStackWatchDog(int timeout)
-{
-super(timeout);
-}
-
 @Override
 public synchronized void start(Process process)
 {
diff --git 
a/test/unit/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyBriefResultFormatter.java
 
b/test/unit/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyBriefResultFormatter.java
deleted file mode 100644
index 7debbf0..000
--- 
a/test/unit/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyBriefResultFormatter.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *  https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-package org.apache.tools.ant.taskdefs.optional.junitlauncher;
-
-import org.junit.platform.engine.TestExecutionResult;
-import org.junit.platform.launcher.TestIdentifier;
-
-/**
- * A {@link TestResultFormatter} which prints a brief statistic for tests that 
have
- * failed, aborted or skipped
- */
-class LegacyBriefResultFormatter extends LegacyPlainResultFormatter implements 
TestResultFormatter {
-
-@Override
-protected boolean shouldReportExecutionFinished(final TestIdentifier 
testIdentifier, final TestExecutionResult testExecutionResult) {
-final TestExecutionResult.Status resultStatus = 
testExecutionResult.getStatus();
-return resultStatus == TestExecutionResult.Status.ABORTED || 
resultStatus == TestExecutionResult.Status.FAILED;
-}
-}
diff --git 
a/test/unit/org/apache/tools/ant/taskdefs/optional/junitlauncher/AbstractJUnitResultFormatter.java
 
b/test/unit/org/apache/tools/ant/taskdefs/optional/junitlauncher2/AbstractJUnitResultFormatter.java
similarity index 78%
rename from 
test/unit/org/apache/tools/ant/taskdefs/optional/junitlauncher/AbstractJUnitResultFormatter.java
rename to 
test/unit/org/apache/tools/ant/taskdefs/optional/junitlauncher2/AbstractJUnitResultFormatter.java
index 221aadb..456a2cd 100644
--- 
a/test/unit/org/apache/tools/ant/taskdefs/optional/junitlauncher/AbstractJUnitResultFormatter.java
+++ 
b/test/unit/

[cassandra] 01/04: CASSANDRA-16630. Updated dependencies.

2021-11-15 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a commit to branch cassandra-16630_junit5
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 667a8946a01b128b61b06e96f5f09f5c11973c2a
Author: Aleksei Zotov 
AuthorDate: Sat Nov 13 23:47:47 2021 +0400

CASSANDRA-16630. Updated dependencies.
---
 build.xml  | 27 +++
 .../org/apache/cassandra/Junit4SampleTest.java | 39 +
 .../org/apache/cassandra/Junit5SampleTest.java | 40 ++
 3 files changed, 91 insertions(+), 15 deletions(-)

diff --git a/build.xml b/build.xml
index 085211a..6b6d71b 100644
--- a/build.xml
+++ b/build.xml
@@ -120,6 +120,7 @@
 
 
 
+
 
 
 
@@ -524,10 +525,6 @@
   
   
   
-  
-
-  
-  
   
   
 
@@ -565,8 +562,6 @@
   
   
 
-  
-
   
   
   
@@ -650,11 +645,15 @@
   
   
   
-  
-  
-  
+
+  
+  
+  
+
+  
+  
   
+  
   
 
   
@@ -716,7 +715,6 @@
 artifactId="cassandra-parent"
 version="${version}"
 relativePath="${final.name}-parent.pom"/>
-
 
 
 
@@ -727,10 +725,9 @@
 
 
 
-
-
-
+
+
+
 
 
 
diff --git a/test/unit/org/apache/cassandra/Junit4SampleTest.java 
b/test/unit/org/apache/cassandra/Junit4SampleTest.java
new file mode 100644
index 000..7eb27a5
--- /dev/null
+++ b/test/unit/org/apache/cassandra/Junit4SampleTest.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class Junit4SampleTest
+{
+@Test
+public void testSuccess()
+{
+assertTrue(true);
+}
+
+@Test
+public void testFailure()
+{
+fail("Expected failure");
+}
+}
diff --git a/test/unit/org/apache/cassandra/Junit5SampleTest.java 
b/test/unit/org/apache/cassandra/Junit5SampleTest.java
new file mode 100644
index 000..0388d3c
--- /dev/null
+++ b/test/unit/org/apache/cassandra/Junit5SampleTest.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra;
+
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class Junit5SampleTest
+{
+@Test
+public void testSuccess()
+{
+assertTrue(true);
+}
+
+@Test
+public void testFailure()
+{
+fail("Expected failure");
+}
+}

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] branch cassandra-17062_auth_caches_metrics updated (9df7ddc -> adadded)

2021-11-13 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch cassandra-17062_auth_caches_metrics
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


 discard 9df7ddc  Expose Auth Caches metrics
 add adadded  Expose Auth Caches metrics

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   (9df7ddc)
\
 N -- N -- N   refs/heads/cassandra-17062_auth_caches_metrics 
(adadded)

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:
 .../org/apache/cassandra/tools/nodetool/Info.java  | 116 -
 1 file changed, 67 insertions(+), 49 deletions(-)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] 01/01: Expose Auth Caches metrics

2021-11-13 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a commit to branch cassandra-17062_auth_caches_metrics
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 9df7ddc0a33188ec8bc5f617bc87cd69ca105edc
Author: Aleksei Zotov 
AuthorDate: Sat Nov 13 21:04:22 2021 +0400

Expose Auth Caches metrics

patch by Aleksei Zotov; reviewed by XXX for CASSANDRA-17062
---
 doc/source/new/virtualtables.rst   | 27 --
 doc/source/operating/metrics.rst   |  9 +-
 src/java/org/apache/cassandra/auth/AuthCache.java  | 53 ++--
 src/java/org/apache/cassandra/cache/CacheSize.java | 15 
 .../org/apache/cassandra/cache/ChunkCache.java |  2 +-
 .../apache/cassandra/db/virtual/CachesTable.java   | 37 ++---
 .../org/apache/cassandra/auth/AuthCacheTest.java   | 38 +
 .../cassandra/db/virtual/CachesTableTest.java  | 95 ++
 8 files changed, 247 insertions(+), 29 deletions(-)

diff --git a/doc/source/new/virtualtables.rst b/doc/source/new/virtualtables.rst
index 50a37c2..5cf50e9 100644
--- a/doc/source/new/virtualtables.rst
+++ b/doc/source/new/virtualtables.rst
@@ -203,19 +203,28 @@ The virtual tables may be described with ``DESCRIBE`` 
statement. The DDL listed
 
 Caches Virtual Table
 
-The ``caches`` virtual table lists information about the caches. The four 
caches presently created are chunks, counters, keys and rows. A query on the 
``caches`` virtual table returns the following details:
+The ``caches`` virtual table lists information about the caches. A query on 
the ``caches`` virtual table returns the following details:
 
 ::
 
  cqlsh:system_views> SELECT * FROM system_views.caches;
- name | capacity_bytes | entry_count | hit_count | hit_ratio | 
recent_hit_rate_per_second | recent_request_rate_per_second | request_count | 
size_bytes
- 
-++-+---+---+++---+
-   chunks |  229638144 |  29 |   166 |  0.83 | 
 5 |  6 |   200 | 475136
- counters |   26214400 |   0 | 0 |   NaN | 
 0 |  0 | 0 |  0
- keys |   52428800 |  14 |   124 |  0.873239 | 
 4 |  4 |   142 |   1248
- rows |  0 |   0 | 0 |   NaN | 
 0 |  0 | 0 |  0
-
- (4 rows)
+ name| capacity_bytes | entry_count | hit_count | hit_ratio | 
recent_hit_rate_per_second | recent_request_rate_per_second | request_count | 
size_bytes
+ 
++-+---+---+++---+
+  chunks |  229638144 |  29 |   166 |  0.83 |  
5 |  6 |   200 |
 475136
+counters |   26214400 |   0 | 0 |   NaN |  
0 |  0 | 0 |
  0
+ credentials |   1000 |   1 | 2 | 1 |  
0 |  0 | 2 |
  1
+ jmx_permissions |   1000 |   0 | 0 |   NaN |  
0 |  0 | 0 |
  0
+keys |   52428800 |  14 |   124 |  0.873239 |  
4 |  4 |   142 |
   1248
+ network_permissions |   1000 |   1 |18 | 1 |  
2 |  2 |18 |
  1
+ permissions |   1000 |   1 | 1 | 1 |  
0 |  0 | 1 |
  1
+   roles |   1000 |   1 | 9 | 1 |  
0 |  0 | 9 |
  1
+rows |  0 |   0 | 0 |   NaN |  
0 |  0 | 0 |
  0
+
+ (8 rows)
+
+.. NOTE::
+   * chunk cache is only available if it is enabled.
+   * auth caches are only available if corresponding authorizers and 
authenticators are used.
 
 Settings Virtual Table
 **
diff --git a/doc/source/operating/metrics.rst b/doc/source/operating/metrics.rst
index e3af955..7f7e851 100644
--- a/doc/source/operating/metrics.rst
+++ b/doc/source/operat

[cassandra] branch cassandra-17062_auth_caches_metrics created (now 9df7ddc)

2021-11-13 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch cassandra-17062_auth_caches_metrics
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


  at 9df7ddc  Expose Auth Caches metrics

This branch includes the following new commits:

 new 9df7ddc  Expose Auth Caches metrics

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.


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] branch trunk updated (eae7b9c -> 6329229)

2021-11-10 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


from eae7b9c  Actively update auth caches in the background
 add 6329229  Implement Virtual Tables for Auth Caches

No new revisions were added by this update.

Summary of changes:
 CHANGES.txt|   1 +
 NEWS.txt   |   5 +-
 doc/source/new/virtualtables.rst   | 155 -
 src/java/org/apache/cassandra/auth/AuthCache.java  |  15 +-
 .../apache/cassandra/auth/AuthenticatedUser.java   |   4 +-
 .../cassandra/auth/PasswordAuthenticator.java  |   7 +-
 .../apache/cassandra/auth/PermissionsCache.java|   4 +-
 .../cassandra/auth/PermissionsCacheMBean.java  |   2 +-
 src/java/org/apache/cassandra/auth/Role.java   |   2 +-
 src/java/org/apache/cassandra/auth/Roles.java  |  25 +--
 .../cassandra/auth/jmx/AuthorizationProxy.java |   6 +-
 .../db/virtual/AbstractMutableVirtualTable.java|   4 +-
 .../db/virtual/CredentialsCacheKeysTable.java  |  78 +
 .../db/virtual/JmxPermissionsCacheKeysTable.java   |  63 +++
 .../virtual/NetworkPermissionsCacheKeysTable.java  |  63 +++
 .../db/virtual/PermissionsCacheKeysTable.java  |  84 +
 .../cassandra/db/virtual/RolesCacheKeysTable.java  |  63 +++
 .../cassandra/db/virtual/SystemViewsKeyspace.java  |   5 +
 src/java/org/apache/cassandra/tools/NodeProbe.java |   4 +-
 .../tools/nodetool/InvalidatePermissionsCache.java |  30 +++-
 .../org/apache/cassandra/auth/AuthCacheTest.java   |  39 +
 .../org/apache/cassandra/auth/AuthTestUtils.java   |  10 ++
 .../auth/CassandraNetworkAuthorizerTest.java   |  16 +-
 .../cassandra/auth/CassandraRoleManagerTest.java   |   2 +-
 .../org/apache/cassandra/auth/ResourcesTest.java   |   3 +
 test/unit/org/apache/cassandra/auth/RolesTest.java |  24 +--
 .../db/virtual/CredentialsCacheKeysTableTest.java  | 168 ++
 .../virtual/JmxPermissionsCacheKeysTableTest.java  | 188 +
 .../NetworkPermissionsCacheKeysTableTest.java  | 165 ++
 .../db/virtual/PermissionsCacheKeysTableTest.java  | 185 
 .../db/virtual/RolesCacheKeysTableTest.java| 165 ++
 .../apache/cassandra/service/ClientStateTest.java  |  11 +-
 .../nodetool/InvalidateCredentialsCacheTest.java   |  12 +-
 .../InvalidateJmxPermissionsCacheTest.java |  16 +-
 .../InvalidateNetworkPermissionsCacheTest.java |   6 +-
 .../nodetool/InvalidatePermissionsCacheTest.java   |  46 +++--
 .../tools/nodetool/InvalidateRolesCacheTest.java   |   6 +-
 37 files changed, 1523 insertions(+), 159 deletions(-)
 create mode 100644 
src/java/org/apache/cassandra/db/virtual/CredentialsCacheKeysTable.java
 create mode 100644 
src/java/org/apache/cassandra/db/virtual/JmxPermissionsCacheKeysTable.java
 create mode 100644 
src/java/org/apache/cassandra/db/virtual/NetworkPermissionsCacheKeysTable.java
 create mode 100644 
src/java/org/apache/cassandra/db/virtual/PermissionsCacheKeysTable.java
 create mode 100644 
src/java/org/apache/cassandra/db/virtual/RolesCacheKeysTable.java
 create mode 100644 
test/unit/org/apache/cassandra/db/virtual/CredentialsCacheKeysTableTest.java
 create mode 100644 
test/unit/org/apache/cassandra/db/virtual/JmxPermissionsCacheKeysTableTest.java
 create mode 100644 
test/unit/org/apache/cassandra/db/virtual/NetworkPermissionsCacheKeysTableTest.java
 create mode 100644 
test/unit/org/apache/cassandra/db/virtual/PermissionsCacheKeysTableTest.java
 create mode 100644 
test/unit/org/apache/cassandra/db/virtual/RolesCacheKeysTableTest.java

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] branch trunk updated (2ce9b13 -> 460ae34)

2021-10-14 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


from 2ce9b13  Add logging and metrics for index summary redistribution
 add 460ae34  Make nodetool compactionstats and sstable_tasks consistent

No new revisions were added by this update.

Summary of changes:
 CHANGES.txt|   1 +
 doc/source/new/virtualtables.rst   |   9 +-
 .../cassandra/db/virtual/SSTableTasksTable.java|   4 +
 .../cassandra/tools/nodetool/CompactionStats.java  |   6 +-
 .../db/virtual/SSTableTasksTableTest.java  |  96 +++
 .../tools/nodetool/CompactionStatsTest.java| 179 +
 6 files changed, 287 insertions(+), 8 deletions(-)
 create mode 100644 
test/unit/org/apache/cassandra/db/virtual/SSTableTasksTableTest.java
 create mode 100644 
test/unit/org/apache/cassandra/tools/nodetool/CompactionStatsTest.java

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] branch trunk updated: Expose information about stored hints via a nodetool command and a virtual table

2021-10-12 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit 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 fc27042  Expose information about stored hints via a nodetool command 
and a virtual table
fc27042 is described below

commit fc27042f61a6d78ec998a0186a5e97def90fd50a
Author: Aleksandr Sorokoumov 
AuthorDate: Fri Aug 6 15:46:50 2021 +0200

Expose information about stored hints via a nodetool command and a virtual 
table

Patch by Aleksandr Sorokoumov; reviewed by Ekaterina Dimitrova, Stefan 
Miklosovic and Aleksei Zotov for CASSANDRA-14795
---
 CHANGES.txt|   1 +
 NEWS.txt   |   2 +
 .../cassandra/db/virtual/PendingHintsTable.java| 115 
 .../cassandra/db/virtual/SystemViewsKeyspace.java  |   1 +
 .../cassandra/hints/HintsDispatchExecutor.java |  36 +--
 .../org/apache/cassandra/hints/HintsService.java   |  26 +
 .../apache/cassandra/hints/HintsServiceMBean.java  |  10 ++
 .../org/apache/cassandra/hints/HintsStore.java |  23 
 .../apache/cassandra/hints/PendingHintsInfo.java   |  87 +++
 src/java/org/apache/cassandra/tools/NodeProbe.java |  15 +++
 src/java/org/apache/cassandra/tools/NodeTool.java  |   1 +
 .../cassandra/tools/nodetool/ListPendingHints.java |  98 +
 .../cassandra/hints/HintServiceBytemanTest.java| 117 +
 .../apache/cassandra/hints/HintsServiceTest.java   |  98 ++---
 .../org/apache/cassandra/hints/HintsStoreTest.java |  23 +++-
 .../org/apache/cassandra/hints/HintsTestUtil.java  |  86 +++
 16 files changed, 639 insertions(+), 100 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 424781c..d910c80 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.1
+ * Expose information about stored hints via a nodetool command and a virtual 
table (CASSANDRA-14795)
  * Add broadcast_rpc_address to system.local (CASSANDRA-11181)
  * Add support for type casting in WHERE clause components and in the values 
of INSERT/UPDATE statements (CASSANDRA-14337)
  * add credentials file support to CQLSH (CASSANDRA-16983)
diff --git a/NEWS.txt b/NEWS.txt
index 6121525..0bec628 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -56,6 +56,8 @@ Upgrading
   confirm it is set to value lower than 31 otherwise Cassandra will fail 
to start. See CASSANDRA-9384
   for further details. You also need to regenerate passwords for users for 
who the password
   was created while the above property was set to be more than 30 
otherwise they will not be able to log in.
+- Information about pending hints is now available through `nodetool 
listpendinghints` and `pending_hints` virtual
+  table.
 
 Deprecation
 ---
diff --git a/src/java/org/apache/cassandra/db/virtual/PendingHintsTable.java 
b/src/java/org/apache/cassandra/db/virtual/PendingHintsTable.java
new file mode 100644
index 000..55d648c
--- /dev/null
+++ b/src/java/org/apache/cassandra/db/virtual/PendingHintsTable.java
@@ -0,0 +1,115 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra.db.virtual;
+
+import java.net.InetAddress;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.db.marshal.InetAddressType;
+import org.apache.cassandra.db.marshal.Int32Type;
+import org.apache.cassandra.db.marshal.TimestampType;
+import org.apache.cassandra.db.marshal.UTF8Type;
+import org.apache.cassandra.db.marshal.UUIDType;
+import org.apache.cassandra.dht.LocalPartitioner;
+import org.apache.cassandra.gms.FailureDetector;
+import org.apache.cassandra.gms.FailureDetectorMBean;
+import org.apache.cassandra.hints.HintsService;
+import org.apache.cassandra.hints.PendingHintsInfo;
+import org.apache.cassandra.locator.IEndpointSnitch;
+import org.apache.cassandra.locator.InetAddressAndPort;
+import org.apache.cassandra.schema.Ta

[cassandra-builds] branch ssh-publisher-verbose-output created (now 42e66ca)

2021-09-30 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch ssh-publisher-verbose-output
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git.


  at 42e66ca  Update cassandra_pipeline.groovy

No new revisions were added by this update.

-
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 (095475b -> 25d2a87)

2021-09-29 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


from 095475b  Merge branch 'cassandra-3.0' into cassandra-3.11
 add 660dace  Add tests for Resource fromName/getName
 add 25d2a87  Merge branch 'cassandra-3.0' into cassandra-3.11

No new revisions were added by this update.

Summary of changes:
 CHANGES.txt|  1 +
 .../org/apache/cassandra/auth/ResourcesTest.java   | 91 ++
 2 files changed, 92 insertions(+)
 create mode 100644 test/unit/org/apache/cassandra/auth/ResourcesTest.java

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] branch cassandra-4.0 updated (e365908 -> 5d457bc)

2021-09-29 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


from e365908  Merge branch 'cassandra-3.11' into cassandra-4.0
 add 660dace  Add tests for Resource fromName/getName
 add 25d2a87  Merge branch 'cassandra-3.0' into cassandra-3.11
 add 5d457bc  Merge branch 'cassandra-3.11' into cassandra-4.0

No new revisions were added by this update.

Summary of changes:
 CHANGES.txt|  1 +
 .../org/apache/cassandra/auth/ResourcesTest.java   | 91 ++
 2 files changed, 92 insertions(+)
 create mode 100644 test/unit/org/apache/cassandra/auth/ResourcesTest.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-4.0' into trunk

2021-09-29 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 643b9b776f374929128aec66d086eee7e6154e03
Merge: e0777ff 5d457bc
Author: Aleksei Zotov 
AuthorDate: Wed Sep 29 13:21:10 2021 +0400

Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt|  1 +
 .../org/apache/cassandra/auth/ResourcesTest.java   | 91 ++
 2 files changed, 92 insertions(+)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] branch trunk updated (e0777ff -> 643b9b7)

2021-09-29 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


from e0777ff  Merge branch 'cassandra-4.0' into trunk
 add 660dace  Add tests for Resource fromName/getName
 add 25d2a87  Merge branch 'cassandra-3.0' into cassandra-3.11
 add 5d457bc  Merge branch 'cassandra-3.11' into cassandra-4.0
 new 643b9b7  Merge branch 'cassandra-4.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/auth/ResourcesTest.java   | 91 ++
 2 files changed, 92 insertions(+)
 create mode 100644 test/unit/org/apache/cassandra/auth/ResourcesTest.java

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[cassandra] branch cassandra-3.0 updated (6b16b67 -> 660dace)

2021-09-29 Thread azotcsit

This is an automated email from the ASF dual-hosted git repository.

azotcsit pushed a change to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


from 6b16b67  update jBCrypt dependency to version 0.4
 add 660dace  Add tests for Resource fromName/getName

No new revisions were added by this update.

Summary of changes:
 CHANGES.txt|   1 +
 .../apache/cassandra/auth/FunctionResource.java|   5 +-
 .../cassandra/auth/FunctionResourceTest.java   | 115 +
 .../org/apache/cassandra/auth/ResourcesTest.java   |  79 ++
 4 files changed, 199 insertions(+), 1 deletion(-)
 create mode 100644 
test/unit/org/apache/cassandra/auth/FunctionResourceTest.java
 create mode 100644 test/unit/org/apache/cassandra/auth/ResourcesTest.java

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

40 matches

Mail list logo