[kafka] branch 1.0 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 1.0 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/1.0 by this push: new 8051eef MINOR: Upgrade ducktape to 0.7.8 (#8879) 8051eef is described below commit 8051eef0f1629f9018b8ed0e889ad82f94463f3b Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index ca146dc..0944232 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -33,7 +33,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev && apt-get -y clean -RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index 5e23a66..41bb720 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 1.0 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 1.0 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/1.0 by this push: new 8051eef MINOR: Upgrade ducktape to 0.7.8 (#8879) 8051eef is described below commit 8051eef0f1629f9018b8ed0e889ad82f94463f3b Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index ca146dc..0944232 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -33,7 +33,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev && apt-get -y clean -RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index 5e23a66..41bb720 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 1.1 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 1.1 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/1.1 by this push: new 452dbde MINOR: Upgrade ducktape to 0.7.8 (#8879) 452dbde is described below commit 452dbde3ca3a02521f16d23ece1ec6afd7a33101 Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index c243465..3cb3425 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -32,7 +32,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev && apt-get -y clean -RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index 5e23a66..41bb720 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 1.0 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 1.0 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/1.0 by this push: new 8051eef MINOR: Upgrade ducktape to 0.7.8 (#8879) 8051eef is described below commit 8051eef0f1629f9018b8ed0e889ad82f94463f3b Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index ca146dc..0944232 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -33,7 +33,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev && apt-get -y clean -RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index 5e23a66..41bb720 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 2.0 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 2.0 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/2.0 by this push: new 8c4d78e MINOR: Upgrade ducktape to 0.7.8 (#8879) 8c4d78e is described below commit 8c4d78ee2a85760fc73062b590c732a346d80502 Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index 1912666..bf84162 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -32,7 +32,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev && apt-get -y clean -RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index fb63934..ec20dd3 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 1.1 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 1.1 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/1.1 by this push: new 452dbde MINOR: Upgrade ducktape to 0.7.8 (#8879) 452dbde is described below commit 452dbde3ca3a02521f16d23ece1ec6afd7a33101 Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index c243465..3cb3425 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -32,7 +32,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev && apt-get -y clean -RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index 5e23a66..41bb720 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 2.0 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 2.0 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/2.0 by this push: new 8c4d78e MINOR: Upgrade ducktape to 0.7.8 (#8879) 8c4d78e is described below commit 8c4d78ee2a85760fc73062b590c732a346d80502 Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index 1912666..bf84162 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -32,7 +32,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev && apt-get -y clean -RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index fb63934..ec20dd3 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 1.1 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 1.1 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/1.1 by this push: new 452dbde MINOR: Upgrade ducktape to 0.7.8 (#8879) 452dbde is described below commit 452dbde3ca3a02521f16d23ece1ec6afd7a33101 Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index c243465..3cb3425 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -32,7 +32,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev && apt-get -y clean -RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index 5e23a66..41bb720 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 1.0 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 1.0 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/1.0 by this push: new 8051eef MINOR: Upgrade ducktape to 0.7.8 (#8879) 8051eef is described below commit 8051eef0f1629f9018b8ed0e889ad82f94463f3b Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index ca146dc..0944232 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -33,7 +33,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev && apt-get -y clean -RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index 5e23a66..41bb720 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 2.1 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 2.1 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/2.1 by this push: new 4f1d4ff MINOR: Upgrade ducktape to 0.7.8 (#8879) 4f1d4ff is described below commit 4f1d4ffe9c97e03051bd77fb09bd957a1d496bc1 Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index 1fa8dd6..98206ac 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -34,7 +34,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev && apt-get -y clean RUN python -m pip install -U pip==9.0.3; -RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index fb63934..ec20dd3 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 2.1 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 2.1 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/2.1 by this push: new 4f1d4ff MINOR: Upgrade ducktape to 0.7.8 (#8879) 4f1d4ff is described below commit 4f1d4ffe9c97e03051bd77fb09bd957a1d496bc1 Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index 1fa8dd6..98206ac 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -34,7 +34,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev && apt-get -y clean RUN python -m pip install -U pip==9.0.3; -RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index fb63934..ec20dd3 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 2.2 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 2.2 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/2.2 by this push: new b2052fa MINOR: Upgrade ducktape to 0.7.8 (#8879) b2052fa is described below commit b2052faf75126f3ab419dc925d58a18af7a6e928 Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index bddbbfa..0734542 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -34,7 +34,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev && apt-get -y clean RUN python -m pip install -U pip==9.0.3; -RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index fb63934..ec20dd3 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 2.3 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 2.3 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/2.3 by this push: new 7be5300 MINOR: Upgrade ducktape to 0.7.8 (#8879) 7be5300 is described below commit 7be5300b96b4e22a936850533573f852d2b94cb2 Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index e19ec77..f616448 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -34,7 +34,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev && apt-get -y clean RUN python -m pip install -U pip==9.0.3; -RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index fb63934..ec20dd3 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 1.1 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 1.1 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/1.1 by this push: new 452dbde MINOR: Upgrade ducktape to 0.7.8 (#8879) 452dbde is described below commit 452dbde3ca3a02521f16d23ece1ec6afd7a33101 Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index c243465..3cb3425 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -32,7 +32,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev && apt-get -y clean -RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index 5e23a66..41bb720 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 1.0 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 1.0 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/1.0 by this push: new 8051eef MINOR: Upgrade ducktape to 0.7.8 (#8879) 8051eef is described below commit 8051eef0f1629f9018b8ed0e889ad82f94463f3b Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index ca146dc..0944232 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -33,7 +33,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev && apt-get -y clean -RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index 5e23a66..41bb720 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 2.1 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 2.1 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/2.1 by this push: new 4f1d4ff MINOR: Upgrade ducktape to 0.7.8 (#8879) 4f1d4ff is described below commit 4f1d4ffe9c97e03051bd77fb09bd957a1d496bc1 Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index 1fa8dd6..98206ac 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -34,7 +34,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev && apt-get -y clean RUN python -m pip install -U pip==9.0.3; -RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index fb63934..ec20dd3 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 2.0 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 2.0 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/2.0 by this push: new 8c4d78e MINOR: Upgrade ducktape to 0.7.8 (#8879) 8c4d78e is described below commit 8c4d78ee2a85760fc73062b590c732a346d80502 Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index 1912666..bf84162 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -32,7 +32,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev && apt-get -y clean -RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index fb63934..ec20dd3 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 2.2 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 2.2 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/2.2 by this push: new b2052fa MINOR: Upgrade ducktape to 0.7.8 (#8879) b2052fa is described below commit b2052faf75126f3ab419dc925d58a18af7a6e928 Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index bddbbfa..0734542 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -34,7 +34,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev && apt-get -y clean RUN python -m pip install -U pip==9.0.3; -RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index fb63934..ec20dd3 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 2.3 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 2.3 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/2.3 by this push: new 7be5300 MINOR: Upgrade ducktape to 0.7.8 (#8879) 7be5300 is described below commit 7be5300b96b4e22a936850533573f852d2b94cb2 Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index e19ec77..f616448 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -34,7 +34,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev && apt-get -y clean RUN python -m pip install -U pip==9.0.3; -RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index fb63934..ec20dd3 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 2.6 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 2.6 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/2.6 by this push: new 1938c96 MINOR: Upgrade ducktape to 0.7.8 (#8879) 1938c96 is described below commit 1938c96293ebdd79857221efc12d3c00a89cf3ae Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index 3405b5a..e433878 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -34,7 +34,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev iperf traceroute && apt-get -y clean RUN python -m pip install -U pip==9.0.3; -RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index fb63934..ec20dd3 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 2.4 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 2.4 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/2.4 by this push: new 5f23a92 MINOR: Upgrade ducktape to 0.7.8 (#8879) 5f23a92 is described below commit 5f23a92f1b145f7b9c5a137ede0aa20210279605 Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index 63bac30..b036d58 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -34,7 +34,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev iperf traceroute && apt-get -y clean RUN python -m pip install -U pip==9.0.3; -RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index fb63934..ec20dd3 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 2.6 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 2.6 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/2.6 by this push: new 1938c96 MINOR: Upgrade ducktape to 0.7.8 (#8879) 1938c96 is described below commit 1938c96293ebdd79857221efc12d3c00a89cf3ae Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index 3405b5a..e433878 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -34,7 +34,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev iperf traceroute && apt-get -y clean RUN python -m pip install -U pip==9.0.3; -RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index fb63934..ec20dd3 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 2.3 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 2.3 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/2.3 by this push: new 7be5300 MINOR: Upgrade ducktape to 0.7.8 (#8879) 7be5300 is described below commit 7be5300b96b4e22a936850533573f852d2b94cb2 Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index e19ec77..f616448 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -34,7 +34,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev && apt-get -y clean RUN python -m pip install -U pip==9.0.3; -RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index fb63934..ec20dd3 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 2.4 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 2.4 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/2.4 by this push: new 5f23a92 MINOR: Upgrade ducktape to 0.7.8 (#8879) 5f23a92 is described below commit 5f23a92f1b145f7b9c5a137ede0aa20210279605 Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index 63bac30..b036d58 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -34,7 +34,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev iperf traceroute && apt-get -y clean RUN python -m pip install -U pip==9.0.3; -RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index fb63934..ec20dd3 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch 2.5 updated: MINOR: Upgrade ducktape to 0.7.8 (#8879)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a commit to branch 2.5 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/2.5 by this push: new 6b79514 MINOR: Upgrade ducktape to 0.7.8 (#8879) 6b79514 is described below commit 6b7951434b062f1fe460175ddfb98b9f6be99939 Author: Ego AuthorDate: Wed Jun 17 21:53:22 2020 -0700 MINOR: Upgrade ducktape to 0.7.8 (#8879) Newer version of ducktape that updates some dependencies and adds some features. You can see that diff here: https://github.com/confluentinc/ducktape/compare/v0.7.7...v0.7.8 Reviewer: Konstantine Karantasis --- tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index aee804b..9c37608 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -34,7 +34,7 @@ LABEL ducker.creator=$ducker_creator # Update Linux and install necessary utilities. RUN apt update && apt install -y sudo netcat iptables rsync unzip wget curl jq coreutils openssh-server net-tools vim python-pip python-dev libffi-dev libssl-dev cmake pkg-config libfuse-dev iperf traceroute && apt-get -y clean RUN python -m pip install -U pip==9.0.3; -RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.7 +RUN pip install --upgrade cffi virtualenv pyasn1 boto3 pycrypto pywinrm ipaddress enum34 && pip install --upgrade ducktape==0.7.8 # Set up ssh COPY ./ssh-config /root/.ssh/config diff --git a/tests/setup.py b/tests/setup.py index fb63934..ec20dd3 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -51,7 +51,7 @@ setup(name="kafkatest", license="apache2.0", packages=find_packages(), include_package_data=True, - install_requires=["ducktape==0.7.7", "requests==2.20.0"], + install_requires=["ducktape==0.7.8", "requests==2.22.0"], tests_require=["pytest", "mock"], cmdclass={'test': PyTest}, )
[kafka] branch trunk updated (446196d -> d3d65dd)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/kafka.git. from 446196d KAFKA-10123; Fix incorrect value for AWAIT_RESET#hasPosition (#8841) add d3d65dd MINOR: Upgrade ducktape to 0.7.8 (#8879) No new revisions were added by this update. Summary of changes: tests/docker/Dockerfile | 2 +- tests/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[kafka] branch 2.5 updated: KAFKA-10123; Fix incorrect value for AWAIT_RESET#hasPosition (#8841)
This is an automated email from the ASF dual-hosted git repository. jgus pushed a commit to branch 2.5 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/2.5 by this push: new 8202acc KAFKA-10123; Fix incorrect value for AWAIT_RESET#hasPosition (#8841) 8202acc is described below commit 8202acc0e8c0951bb567264bbc89bc2a4e601435 Author: David Arthur AuthorDate: Wed Jun 17 23:23:45 2020 -0400 KAFKA-10123; Fix incorrect value for AWAIT_RESET#hasPosition (#8841) When a partition subscription is initialized it has a `null` position and is in the INITIALIZING state. Depending on the consumer, it will then transition to one of the other states. Typically a consumer will either reset the offset to earliest/latest, or it will provide an offset (with or without offset metadata). For the reset case, we still have no position to act on so fetches should not occur. Recently we made changes for KAFKA-9724 (#8376) to prevent clients from entering the AWAIT_VALIDATION state when targeting older brokers. New logic to bypass offset validation as part of this change exposed this new issue. In the partition subscriptions, the AWAIT_RESET state was incorrectly reporting that it had a position. In some cases a position might actually exist (e.g., if we were resetting offsets during a fetch after a truncation), but in the initialization case no position had been set. We saw this issue in system tests where there is a race between the offset reset completing and the first fetch request being issued. Since AWAIT_RESET#hasPosition was incorrectly returning `true`, the new logic to bypass offset validation was transitioning the subscription to FETCHING (even though no position existed). The fix was simply to have AWAIT_RESET#hasPosition to return `false` which should have been the case from the start. Additionally, this fix includes some guards against NPE when reading the position from the subscription. Reviewers: Chia-Ping Tsai , Jason Gustafson --- .../kafka/clients/consumer/KafkaConsumer.java | 2 +- .../consumer/internals/ConsumerCoordinator.java| 4 +- .../kafka/clients/consumer/internals/Fetcher.java | 42 ++-- .../consumer/internals/SubscriptionState.java | 57 +- .../internals/ConsumerCoordinatorTest.java | 20 .../clients/consumer/internals/FetcherTest.java| 31 +++- .../consumer/internals/SubscriptionStateTest.java | 54 +++- 7 files changed, 167 insertions(+), 43 deletions(-) diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java index 20da83f..145dd05 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java @@ -2389,7 +2389,7 @@ public class KafkaConsumer implements Consumer { // If there are partitions still needing a position and a reset policy is defined, // request reset using the default policy. If no reset strategy is defined and there // are partitions with a missing position, then we will raise an exception. -subscriptions.resetMissingPositions(); +subscriptions.resetInitializingPositions(); // Finally send an asynchronous request to lookup and update the positions of any // partitions which are awaiting reset. diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java index d4a399f..2978611 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java @@ -767,9 +767,9 @@ public final class ConsumerCoordinator extends AbstractCoordinator { * @return true iff the operation completed within the timeout */ public boolean refreshCommittedOffsetsIfNeeded(Timer timer) { -final Set missingFetchPositions = subscriptions.missingFetchPositions(); +final Set initializingPartitions = subscriptions.initializingPartitions(); -final Map offsets = fetchCommittedOffsets(missingFetchPositions, timer); +final Map offsets = fetchCommittedOffsets(initializingPartitions, timer); if (offsets == null) return false; for (final Map.Entry entry : offsets.entrySet()) { diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java index ea1b7e7..4bfa627 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java +++
[kafka] branch 2.6 updated: KAFKA-10123; Fix incorrect value for AWAIT_RESET#hasPosition (#8841)
This is an automated email from the ASF dual-hosted git repository. jgus pushed a commit to branch 2.6 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/2.6 by this push: new 1f0c847 KAFKA-10123; Fix incorrect value for AWAIT_RESET#hasPosition (#8841) 1f0c847 is described below commit 1f0c84715375261160eab03bd5d2685cd94aebe1 Author: David Arthur AuthorDate: Wed Jun 17 23:23:45 2020 -0400 KAFKA-10123; Fix incorrect value for AWAIT_RESET#hasPosition (#8841) ## Background When a partition subscription is initialized it has a `null` position and is in the INITIALIZING state. Depending on the consumer, it will then transition to one of the other states. Typically a consumer will either reset the offset to earliest/latest, or it will provide an offset (with or without offset metadata). For the reset case, we still have no position to act on so fetches should not occur. Recently we made changes for KAFKA-9724 (#8376) to prevent clients from entering the AWAIT_VALIDATION state when targeting older brokers. New logic to bypass offset validation as part of this change exposed this new issue. ## Bug and Fix In the partition subscriptions, the AWAIT_RESET state was incorrectly reporting that it had a position. In some cases a position might actually exist (e.g., if we were resetting offsets during a fetch after a truncation), but in the initialization case no position had been set. We saw this issue in system tests where there is a race between the offset reset completing and the first fetch request being issued. Since AWAIT_RESET#hasPosition was incorrectly returning `true`, the new logic to bypass offset validation was transitioning the subscription to FETCHING (even though no position existed). The fix was simply to have AWAIT_RESET#hasPosition to return `false` which should have been the case from the start. Additionally, this fix includes some guards against NPE when reading the position from the subscription. Reviewers: Chia-Ping Tsai , Jason Gustafson --- .../kafka/clients/consumer/KafkaConsumer.java | 2 +- .../consumer/internals/ConsumerCoordinator.java| 4 +- .../kafka/clients/consumer/internals/Fetcher.java | 23 ++--- .../consumer/internals/SubscriptionState.java | 57 +- .../internals/ConsumerCoordinatorTest.java | 20 .../clients/consumer/internals/FetcherTest.java| 33 +++-- .../consumer/internals/SubscriptionStateTest.java | 55 +++-- 7 files changed, 157 insertions(+), 37 deletions(-) diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java index 7535a9b..610cfde 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java @@ -2420,7 +2420,7 @@ public class KafkaConsumer implements Consumer { // If there are partitions still needing a position and a reset policy is defined, // request reset using the default policy. If no reset strategy is defined and there // are partitions with a missing position, then we will raise an exception. -subscriptions.resetMissingPositions(); +subscriptions.resetInitializingPositions(); // Finally send an asynchronous request to lookup and update the positions of any // partitions which are awaiting reset. diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java index 914071b..66e702a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java @@ -783,9 +783,9 @@ public final class ConsumerCoordinator extends AbstractCoordinator { * @return true iff the operation completed within the timeout */ public boolean refreshCommittedOffsetsIfNeeded(Timer timer) { -final Set missingFetchPositions = subscriptions.missingFetchPositions(); +final Set initializingPartitions = subscriptions.initializingPartitions(); -final Map offsets = fetchCommittedOffsets(missingFetchPositions, timer); +final Map offsets = fetchCommittedOffsets(initializingPartitions, timer); if (offsets == null) return false; for (final Map.Entry entry : offsets.entrySet()) { diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java index 3b34f14..d6dcda4 100644 ---
[kafka] branch trunk updated: KAFKA-10123; Fix incorrect value for AWAIT_RESET#hasPosition (#8841)
This is an automated email from the ASF dual-hosted git repository. jgus pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/trunk by this push: new 446196d KAFKA-10123; Fix incorrect value for AWAIT_RESET#hasPosition (#8841) 446196d is described below commit 446196d6e9d66f45c64b483e3d375aaeaca28e3b Author: David Arthur AuthorDate: Wed Jun 17 23:23:45 2020 -0400 KAFKA-10123; Fix incorrect value for AWAIT_RESET#hasPosition (#8841) ## Background When a partition subscription is initialized it has a `null` position and is in the INITIALIZING state. Depending on the consumer, it will then transition to one of the other states. Typically a consumer will either reset the offset to earliest/latest, or it will provide an offset (with or without offset metadata). For the reset case, we still have no position to act on so fetches should not occur. Recently we made changes for KAFKA-9724 (#8376) to prevent clients from entering the AWAIT_VALIDATION state when targeting older brokers. New logic to bypass offset validation as part of this change exposed this new issue. ## Bug and Fix In the partition subscriptions, the AWAIT_RESET state was incorrectly reporting that it had a position. In some cases a position might actually exist (e.g., if we were resetting offsets during a fetch after a truncation), but in the initialization case no position had been set. We saw this issue in system tests where there is a race between the offset reset completing and the first fetch request being issued. Since AWAIT_RESET#hasPosition was incorrectly returning `true`, the new logic to bypass offset validation was transitioning the subscription to FETCHING (even though no position existed). The fix was simply to have AWAIT_RESET#hasPosition to return `false` which should have been the case from the start. Additionally, this fix includes some guards against NPE when reading the position from the subscription. Reviewers: Chia-Ping Tsai , Jason Gustafson --- .../kafka/clients/consumer/KafkaConsumer.java | 2 +- .../consumer/internals/ConsumerCoordinator.java| 4 +- .../kafka/clients/consumer/internals/Fetcher.java | 23 ++--- .../consumer/internals/SubscriptionState.java | 57 +- .../internals/ConsumerCoordinatorTest.java | 20 .../clients/consumer/internals/FetcherTest.java| 33 +++-- .../consumer/internals/SubscriptionStateTest.java | 55 +++-- 7 files changed, 157 insertions(+), 37 deletions(-) diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java index 7c8f415..2a03d00 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java @@ -2414,7 +2414,7 @@ public class KafkaConsumer implements Consumer { // If there are partitions still needing a position and a reset policy is defined, // request reset using the default policy. If no reset strategy is defined and there // are partitions with a missing position, then we will raise an exception. -subscriptions.resetMissingPositions(); +subscriptions.resetInitializingPositions(); // Finally send an asynchronous request to lookup and update the positions of any // partitions which are awaiting reset. diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java index 914071b..66e702a 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ConsumerCoordinator.java @@ -783,9 +783,9 @@ public final class ConsumerCoordinator extends AbstractCoordinator { * @return true iff the operation completed within the timeout */ public boolean refreshCommittedOffsetsIfNeeded(Timer timer) { -final Set missingFetchPositions = subscriptions.missingFetchPositions(); +final Set initializingPartitions = subscriptions.initializingPartitions(); -final Map offsets = fetchCommittedOffsets(missingFetchPositions, timer); +final Map offsets = fetchCommittedOffsets(initializingPartitions, timer); if (offsets == null) return false; for (final Map.Entry entry : offsets.entrySet()) { diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/Fetcher.java index 3b34f14..d6dcda4 100644 ---
[kafka] branch trunk updated (42aa0f3 -> 7ed899a)
This is an automated email from the ASF dual-hosted git repository. guozhang pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/kafka.git. from 42aa0f3 MINOR: clean up unused checkstyle suppressions for Streams (#8861) add 7ed899a KAFKA-9896: fix flaky StandbyTaskEOSIntegrationTest (#8883) No new revisions were added by this update. Summary of changes: .../integration/StandbyTaskEOSIntegrationTest.java | 17 + 1 file changed, 5 insertions(+), 12 deletions(-)
[kafka] branch trunk updated: MINOR: clean up unused checkstyle suppressions for Streams (#8861)
This is an automated email from the ASF dual-hosted git repository. mjsax pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/trunk by this push: new 42aa0f3 MINOR: clean up unused checkstyle suppressions for Streams (#8861) 42aa0f3 is described below commit 42aa0f38b9676ecac02de7b0c9246b6f32bac8d4 Author: A. Sophie Blee-Goldman AuthorDate: Wed Jun 17 17:04:43 2020 -0700 MINOR: clean up unused checkstyle suppressions for Streams (#8861) Reviewers: John Roesler , Matthias J. Sax --- checkstyle/suppressions.xml | 50 + 1 file changed, 10 insertions(+), 40 deletions(-) diff --git a/checkstyle/suppressions.xml b/checkstyle/suppressions.xml index 4e206d8..7b5ae40 100644 --- a/checkstyle/suppressions.xml +++ b/checkstyle/suppressions.xml @@ -140,40 +140,25 @@ + files="(KafkaStreams|KStreamImpl|KTableImpl).java"/> + files="KTableImpl.java"/> - - + files="(KStreamImpl|KTableImpl).java"/> - - - - + files="(StreamsPartitionAssignor|StreamThread|TaskManager).java"/> - - + files="(KafkaStreams|StreamsPartitionAssignor|StreamThread|TaskManager).java"/> @@ -186,43 +171,28 @@ - + files="StreamThreadTest.java"/> - - - + files="(EosBetaUpgradeIntegrationTest|KStreamKStreamJoinTest|RocksDBWindowStoreTest).java"/> - - - - + files="(EosBetaUpgradeIntegrationTest|KStreamKStreamJoinTest|KTableKTableForeignKeyJoinIntegrationTest|RocksDBGenericOptionsToDbOptionsColumnFamilyOptionsAdapterTest|RelationalSmokeTest).java"/> + files="(EosBetaUpgradeIntegrationTest|KStreamKStreamJoinTest|TaskManagerTest).java"/> + files="(EosBetaUpgradeIntegrationTest|EosTestDriver|KStreamKStreamJoinTest|KTableKTableForeignKeyJoinIntegrationTest|RelationalSmokeTest).java"/> -
[kafka] branch 2.6 updated: MINOR: reuse toConfigObject(Map) to generate Config (#8889)
This is an automated email from the ASF dual-hosted git repository. rhauch pushed a commit to branch 2.6 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/2.6 by this push: new 8a66e56 MINOR: reuse toConfigObject(Map) to generate Config (#8889) 8a66e56 is described below commit 8a66e569b3658f28ebaaad041404783faf67f172 Author: Chia-Ping Tsai AuthorDate: Thu Jun 18 04:46:05 2020 +0800 MINOR: reuse toConfigObject(Map) to generate Config (#8889) Author: Chia-Ping Tsai Reviewers: Randall Hauch , David Jacot --- .../test/java/org/apache/kafka/clients/admin/MockAdminClient.java| 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java b/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java index 7c6a955..e5ad575 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java @@ -51,7 +51,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; -import java.util.stream.Collectors; public class MockAdminClient extends AdminClient { public static final String DEFAULT_CLUSTER_ID = "I4ZmrWqfT2e-upky_4fdPA"; @@ -532,9 +531,7 @@ public class MockAdminClient extends AdminClient { if (topicMetadata != null && !topicMetadata.markedForDeletion) { if (topicMetadata.fetchesRemainingUntilVisible > 0) topicMetadata.fetchesRemainingUntilVisible = Math.max(0, topicMetadata.fetchesRemainingUntilVisible - 1); -else return new Config(topicMetadata.configs.entrySet().stream() -.map(entry -> new ConfigEntry(entry.getKey(), entry.getValue())) -.collect(Collectors.toList())); +else return toConfigObject(topicMetadata.configs); } throw new UnknownTopicOrPartitionException("Resource " + resource + " not found.");
[kafka] branch trunk updated: MINOR: reuse toConfigObject(Map) to generate Config (#8889)
This is an automated email from the ASF dual-hosted git repository. rhauch pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/trunk by this push: new 3b7c2ab MINOR: reuse toConfigObject(Map) to generate Config (#8889) 3b7c2ab is described below commit 3b7c2ab6d814e7860771f2eec055d34be5002e5d Author: Chia-Ping Tsai AuthorDate: Thu Jun 18 04:46:05 2020 +0800 MINOR: reuse toConfigObject(Map) to generate Config (#8889) Author: Chia-Ping Tsai Reviewers: Randall Hauch , David Jacot --- .../test/java/org/apache/kafka/clients/admin/MockAdminClient.java| 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java b/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java index 7c6a955..e5ad575 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java @@ -51,7 +51,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; -import java.util.stream.Collectors; public class MockAdminClient extends AdminClient { public static final String DEFAULT_CLUSTER_ID = "I4ZmrWqfT2e-upky_4fdPA"; @@ -532,9 +531,7 @@ public class MockAdminClient extends AdminClient { if (topicMetadata != null && !topicMetadata.markedForDeletion) { if (topicMetadata.fetchesRemainingUntilVisible > 0) topicMetadata.fetchesRemainingUntilVisible = Math.max(0, topicMetadata.fetchesRemainingUntilVisible - 1); -else return new Config(topicMetadata.configs.entrySet().stream() -.map(entry -> new ConfigEntry(entry.getKey(), entry.getValue())) -.collect(Collectors.toList())); +else return toConfigObject(topicMetadata.configs); } throw new UnknownTopicOrPartitionException("Resource " + resource + " not found.");
[kafka] branch trunk updated (0c2dfcf -> 492306a)
This is an automated email from the ASF dual-hosted git repository. kkarantasis pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/kafka.git. from 0c2dfcf MINOR: Fix flaky HighAvailabilityTaskAssignorIntegrationTest (#8884) add 492306a MINOR: Upgrade jetty to 9.4.27.v20200227 and jersey to 2.31 (#8859) No new revisions were added by this update. Summary of changes: .../apache/kafka/connect/runtime/rest/util/SSLUtils.java | 16 +--- gradle/dependencies.gradle | 7 ++- 2 files changed, 3 insertions(+), 20 deletions(-)
[kafka] branch 2.6 updated: KAFKA-10147 MockAdminClient#describeConfigs(Collection) is unable to handle broker resource (#8853)
This is an automated email from the ASF dual-hosted git repository. rhauch pushed a commit to branch 2.6 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/2.6 by this push: new be695c4 KAFKA-10147 MockAdminClient#describeConfigs(Collection) is unable to handle broker resource (#8853) be695c4 is described below commit be695c432613f3c84e309676e4eb926e806dade4 Author: Chia-Ping Tsai AuthorDate: Wed Jun 17 22:56:07 2020 +0800 KAFKA-10147 MockAdminClient#describeConfigs(Collection) is unable to handle broker resource (#8853) Author: Chia-Ping Tsai Reviewers: Boyang Chen , Randall Hauch --- .../kafka/clients/admin/MockAdminClient.java | 72 +++--- 1 file changed, 23 insertions(+), 49 deletions(-) diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java b/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java index 2b86d4f..7c6a955 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java @@ -51,6 +51,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.stream.Collectors; public class MockAdminClient extends AdminClient { public static final String DEFAULT_CLUSTER_ID = "I4ZmrWqfT2e-upky_4fdPA"; @@ -366,51 +367,6 @@ public class MockAdminClient extends AdminClient { } @Override -public DescribeConfigsResult describeConfigs(Collection resources) { -Map> topicConfigs = new HashMap<>(); - -if (timeoutNextRequests > 0) { -for (ConfigResource requestedResource : resources) { -KafkaFutureImpl future = new KafkaFutureImpl<>(); -future.completeExceptionally(new TimeoutException()); -topicConfigs.put(requestedResource, future); -} - ---timeoutNextRequests; -return new DescribeConfigsResult(topicConfigs); -} - -for (ConfigResource requestedResource : resources) { -if (requestedResource.type() != ConfigResource.Type.TOPIC) { -continue; -} -for (Map.Entry topicDescription : allTopics.entrySet()) { -String topicName = topicDescription.getKey(); -if (topicName.equals(requestedResource.name()) && !topicDescription.getValue().markedForDeletion) { -if (topicDescription.getValue().fetchesRemainingUntilVisible > 0) { - topicDescription.getValue().fetchesRemainingUntilVisible--; -} else { -TopicMetadata topicMetadata = topicDescription.getValue(); -KafkaFutureImpl future = new KafkaFutureImpl<>(); -Collection entries = new ArrayList<>(); -topicMetadata.configs.forEach((k, v) -> entries.add(new ConfigEntry(k, v))); -future.complete(new Config(entries)); -topicConfigs.put(requestedResource, future); -break; -} -} -} -if (!topicConfigs.containsKey(requestedResource)) { -KafkaFutureImpl future = new KafkaFutureImpl<>(); -future.completeExceptionally(new UnknownTopicOrPartitionException("Resource " + requestedResource + " not found.")); -topicConfigs.put(requestedResource, future); -} -} - -return new DescribeConfigsResult(topicConfigs); -} - -@Override synchronized public DeleteTopicsResult deleteTopics(Collection topicsToDelete, DeleteTopicsOptions options) { Map> deleteTopicsResult = new HashMap<>(); @@ -535,6 +491,19 @@ public class MockAdminClient extends AdminClient { @Override synchronized public DescribeConfigsResult describeConfigs(Collection resources, DescribeConfigsOptions options) { + +if (timeoutNextRequests > 0) { +Map> configs = new HashMap<>(); +for (ConfigResource requestedResource : resources) { +KafkaFutureImpl future = new KafkaFutureImpl<>(); +future.completeExceptionally(new TimeoutException()); +configs.put(requestedResource, future); +} + +--timeoutNextRequests; +return new DescribeConfigsResult(configs); +} + Map> results = new HashMap<>(); for (ConfigResource resource : resources) { KafkaFutureImpl future = new KafkaFutureImpl<>(); @@ -551,7 +520,7 @@ public class MockAdminClient extends AdminClient { synchronized private Config getResourceDescription(ConfigResource resource) { switch (resource.type()) { case BROKER: { -int brokerId =
[kafka] branch 2.6 updated: MINOR: Fix flaky HighAvailabilityTaskAssignorIntegrationTest (#8884)
This is an automated email from the ASF dual-hosted git repository. vvcephei pushed a commit to branch 2.6 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/2.6 by this push: new f9bda44 MINOR: Fix flaky HighAvailabilityTaskAssignorIntegrationTest (#8884) f9bda44 is described below commit f9bda4488b18997c6185636c8fa7063caebe8842 Author: John Roesler AuthorDate: Wed Jun 17 10:01:30 2020 -0500 MINOR: Fix flaky HighAvailabilityTaskAssignorIntegrationTest (#8884) Reduce test data set from 1000 records to 500. Some recent test failures indicate that the Jenkins runners aren't able to process all 1000 records in two minutes. Also add sanity check that all the test data are readable from the input topic. Reviewers: A. Sophie Blee-Goldman --- ...ighAvailabilityTaskAssignorIntegrationTest.java | 91 ++ 1 file changed, 57 insertions(+), 34 deletions(-) diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/HighAvailabilityTaskAssignorIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/HighAvailabilityTaskAssignorIntegrationTest.java index 725c805..7e7cf29 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/HighAvailabilityTaskAssignorIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/HighAvailabilityTaskAssignorIntegrationTest.java @@ -95,6 +95,11 @@ public class HighAvailabilityTaskAssignorIntegrationTest { final String testId = safeUniqueTestName(getClass(), testName); final String appId = "appId_" + System.currentTimeMillis() + "_" + testId; final String inputTopic = "input" + testId; +final Set inputTopicPartitions = mkSet( +new TopicPartition(inputTopic, 0), +new TopicPartition(inputTopic, 1) +); + final String storeName = "store" + testId; final String storeChangelog = appId + "-store" + testId + "-changelog"; final Set changelogTopicPartitions = mkSet( @@ -124,46 +129,27 @@ public class HighAvailabilityTaskAssignorIntegrationTest { builder.table(inputTopic, materializedFunction.apply(storeName)); final Topology topology = builder.build(); -final Properties producerProperties = mkProperties( -mkMap( -mkEntry(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, CLUSTER.bootstrapServers()), -mkEntry(ProducerConfig.ACKS_CONFIG, "all"), -mkEntry(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName()), -mkEntry(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName()) -) -); - -final StringBuilder kiloBuilder = new StringBuilder(1000); -for (int i = 0; i < 1000; i++) { -kiloBuilder.append('0'); -} -final String kilo = kiloBuilder.toString(); - -try (final Producer producer = new KafkaProducer<>(producerProperties)) { -for (int i = 0; i < 1000; i++) { -producer.send(new ProducerRecord<>(inputTopic, String.valueOf(i), kilo)); -} -} - -final Properties consumerProperties = mkProperties( -mkMap( -mkEntry(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, CLUSTER.bootstrapServers()), -mkEntry(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName()), -mkEntry(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName()) -) -); +final int numberOfRecords = 500; +produceTestData(inputTopic, numberOfRecords); try (final KafkaStreams kafkaStreams0 = new KafkaStreams(topology, streamsProperties(appId, assignmentListener)); final KafkaStreams kafkaStreams1 = new KafkaStreams(topology, streamsProperties(appId, assignmentListener)); - final Consumer consumer = new KafkaConsumer<>(consumerProperties)) { + final Consumer consumer = new KafkaConsumer<>(getConsumerProperties())) { kafkaStreams0.start(); +// sanity check: just make sure we actually wrote all the input records +TestUtils.waitForCondition( +() -> getEndOffsetSum(inputTopicPartitions, consumer) == numberOfRecords, +120_000L, +() -> "Input records haven't all been written to the input topic: " + getEndOffsetSum(inputTopicPartitions, consumer) +); + // wait until all the input records are in the changelog TestUtils.waitForCondition( -() -> getChangelogOffsetSum(changelogTopicPartitions, consumer) == 1000, +() -> getEndOffsetSum(changelogTopicPartitions, consumer) == numberOfRecords, 120_000L, -
[kafka] branch trunk updated: MINOR: Fix flaky HighAvailabilityTaskAssignorIntegrationTest (#8884)
This is an automated email from the ASF dual-hosted git repository. vvcephei pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/trunk by this push: new 0c2dfcf MINOR: Fix flaky HighAvailabilityTaskAssignorIntegrationTest (#8884) 0c2dfcf is described below commit 0c2dfcfc85ccf2ab06a69910f5a991720880d7ba Author: John Roesler AuthorDate: Wed Jun 17 10:01:30 2020 -0500 MINOR: Fix flaky HighAvailabilityTaskAssignorIntegrationTest (#8884) Reduce test data set from 1000 records to 500. Some recent test failures indicate that the Jenkins runners aren't able to process all 1000 records in two minutes. Also add sanity check that all the test data are readable from the input topic. Reviewers: A. Sophie Blee-Goldman --- ...ighAvailabilityTaskAssignorIntegrationTest.java | 91 ++ 1 file changed, 57 insertions(+), 34 deletions(-) diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/HighAvailabilityTaskAssignorIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/HighAvailabilityTaskAssignorIntegrationTest.java index 725c805..7e7cf29 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/HighAvailabilityTaskAssignorIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/HighAvailabilityTaskAssignorIntegrationTest.java @@ -95,6 +95,11 @@ public class HighAvailabilityTaskAssignorIntegrationTest { final String testId = safeUniqueTestName(getClass(), testName); final String appId = "appId_" + System.currentTimeMillis() + "_" + testId; final String inputTopic = "input" + testId; +final Set inputTopicPartitions = mkSet( +new TopicPartition(inputTopic, 0), +new TopicPartition(inputTopic, 1) +); + final String storeName = "store" + testId; final String storeChangelog = appId + "-store" + testId + "-changelog"; final Set changelogTopicPartitions = mkSet( @@ -124,46 +129,27 @@ public class HighAvailabilityTaskAssignorIntegrationTest { builder.table(inputTopic, materializedFunction.apply(storeName)); final Topology topology = builder.build(); -final Properties producerProperties = mkProperties( -mkMap( -mkEntry(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, CLUSTER.bootstrapServers()), -mkEntry(ProducerConfig.ACKS_CONFIG, "all"), -mkEntry(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName()), -mkEntry(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName()) -) -); - -final StringBuilder kiloBuilder = new StringBuilder(1000); -for (int i = 0; i < 1000; i++) { -kiloBuilder.append('0'); -} -final String kilo = kiloBuilder.toString(); - -try (final Producer producer = new KafkaProducer<>(producerProperties)) { -for (int i = 0; i < 1000; i++) { -producer.send(new ProducerRecord<>(inputTopic, String.valueOf(i), kilo)); -} -} - -final Properties consumerProperties = mkProperties( -mkMap( -mkEntry(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, CLUSTER.bootstrapServers()), -mkEntry(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName()), -mkEntry(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName()) -) -); +final int numberOfRecords = 500; +produceTestData(inputTopic, numberOfRecords); try (final KafkaStreams kafkaStreams0 = new KafkaStreams(topology, streamsProperties(appId, assignmentListener)); final KafkaStreams kafkaStreams1 = new KafkaStreams(topology, streamsProperties(appId, assignmentListener)); - final Consumer consumer = new KafkaConsumer<>(consumerProperties)) { + final Consumer consumer = new KafkaConsumer<>(getConsumerProperties())) { kafkaStreams0.start(); +// sanity check: just make sure we actually wrote all the input records +TestUtils.waitForCondition( +() -> getEndOffsetSum(inputTopicPartitions, consumer) == numberOfRecords, +120_000L, +() -> "Input records haven't all been written to the input topic: " + getEndOffsetSum(inputTopicPartitions, consumer) +); + // wait until all the input records are in the changelog TestUtils.waitForCondition( -() -> getChangelogOffsetSum(changelogTopicPartitions, consumer) == 1000, +() -> getEndOffsetSum(changelogTopicPartitions, consumer) == numberOfRecords, 120_000L, -
[kafka] branch trunk updated: KAFKA-10147 MockAdminClient#describeConfigs(Collection) is unable to handle broker resource (#8853)
This is an automated email from the ASF dual-hosted git repository. rhauch pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/trunk by this push: new 26e238c KAFKA-10147 MockAdminClient#describeConfigs(Collection) is unable to handle broker resource (#8853) 26e238c is described below commit 26e238c6f5a242459f52bfefa97a6b0c247b2d5e Author: Chia-Ping Tsai AuthorDate: Wed Jun 17 22:56:07 2020 +0800 KAFKA-10147 MockAdminClient#describeConfigs(Collection) is unable to handle broker resource (#8853) Author: Chia-Ping Tsai Reviewers: Boyang Chen , Randall Hauch --- .../kafka/clients/admin/MockAdminClient.java | 72 +++--- 1 file changed, 23 insertions(+), 49 deletions(-) diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java b/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java index 2b86d4f..7c6a955 100644 --- a/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java +++ b/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java @@ -51,6 +51,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.stream.Collectors; public class MockAdminClient extends AdminClient { public static final String DEFAULT_CLUSTER_ID = "I4ZmrWqfT2e-upky_4fdPA"; @@ -366,51 +367,6 @@ public class MockAdminClient extends AdminClient { } @Override -public DescribeConfigsResult describeConfigs(Collection resources) { -Map> topicConfigs = new HashMap<>(); - -if (timeoutNextRequests > 0) { -for (ConfigResource requestedResource : resources) { -KafkaFutureImpl future = new KafkaFutureImpl<>(); -future.completeExceptionally(new TimeoutException()); -topicConfigs.put(requestedResource, future); -} - ---timeoutNextRequests; -return new DescribeConfigsResult(topicConfigs); -} - -for (ConfigResource requestedResource : resources) { -if (requestedResource.type() != ConfigResource.Type.TOPIC) { -continue; -} -for (Map.Entry topicDescription : allTopics.entrySet()) { -String topicName = topicDescription.getKey(); -if (topicName.equals(requestedResource.name()) && !topicDescription.getValue().markedForDeletion) { -if (topicDescription.getValue().fetchesRemainingUntilVisible > 0) { - topicDescription.getValue().fetchesRemainingUntilVisible--; -} else { -TopicMetadata topicMetadata = topicDescription.getValue(); -KafkaFutureImpl future = new KafkaFutureImpl<>(); -Collection entries = new ArrayList<>(); -topicMetadata.configs.forEach((k, v) -> entries.add(new ConfigEntry(k, v))); -future.complete(new Config(entries)); -topicConfigs.put(requestedResource, future); -break; -} -} -} -if (!topicConfigs.containsKey(requestedResource)) { -KafkaFutureImpl future = new KafkaFutureImpl<>(); -future.completeExceptionally(new UnknownTopicOrPartitionException("Resource " + requestedResource + " not found.")); -topicConfigs.put(requestedResource, future); -} -} - -return new DescribeConfigsResult(topicConfigs); -} - -@Override synchronized public DeleteTopicsResult deleteTopics(Collection topicsToDelete, DeleteTopicsOptions options) { Map> deleteTopicsResult = new HashMap<>(); @@ -535,6 +491,19 @@ public class MockAdminClient extends AdminClient { @Override synchronized public DescribeConfigsResult describeConfigs(Collection resources, DescribeConfigsOptions options) { + +if (timeoutNextRequests > 0) { +Map> configs = new HashMap<>(); +for (ConfigResource requestedResource : resources) { +KafkaFutureImpl future = new KafkaFutureImpl<>(); +future.completeExceptionally(new TimeoutException()); +configs.put(requestedResource, future); +} + +--timeoutNextRequests; +return new DescribeConfigsResult(configs); +} + Map> results = new HashMap<>(); for (ConfigResource resource : resources) { KafkaFutureImpl future = new KafkaFutureImpl<>(); @@ -551,7 +520,7 @@ public class MockAdminClient extends AdminClient { synchronized private Config getResourceDescription(ConfigResource resource) { switch (resource.type()) { case BROKER: { -int brokerId
[kafka] branch 2.6 updated: KAFKA-10165: Remove Percentiles from e2e metrics (#8882)
This is an automated email from the ASF dual-hosted git repository. vvcephei pushed a commit to branch 2.6 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/2.6 by this push: new f5cbbe7 KAFKA-10165: Remove Percentiles from e2e metrics (#8882) f5cbbe7 is described below commit f5cbbe7921fff15c23a36ea8cc8cbe9fe86045e0 Author: John Roesler AuthorDate: Wed Jun 17 09:24:07 2020 -0500 KAFKA-10165: Remove Percentiles from e2e metrics (#8882) * Remove problematic Percentiles measurements until the implementation is fixed * Fix leaking e2e metrics when task is closed * Fix leaking metrics when tasks are recycled Reviewers: A. Sophie Blee-Goldman --- .../processor/internals/ProcessorContextImpl.java | 2 +- .../streams/processor/internals/StandbyTask.java | 11 +- .../streams/processor/internals/StreamTask.java| 24 ++-- .../streams/processor/internals/TaskManager.java | 6 - .../internals/metrics/ProcessorNodeMetrics.java| 34 +- .../internals/metrics/StreamsMetricsImpl.java | 43 ++- .../processor/internals/metrics/TaskMetrics.java | 28 + .../integration/MetricsIntegrationTest.java| 4 - .../processor/internals/StandbyTaskTest.java | 42 +++ .../processor/internals/StreamTaskTest.java| 133 +++-- .../metrics/ProcessorNodeMetricsTest.java | 46 ++- .../internals/metrics/StreamsMetricsImplTest.java | 8 +- 12 files changed, 179 insertions(+), 202 deletions(-) diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorContextImpl.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorContextImpl.java index a58a862..b220fa5 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorContextImpl.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorContextImpl.java @@ -235,7 +235,7 @@ public class ProcessorContextImpl extends AbstractProcessorContext implements Re setCurrentNode(child); child.process(key, value); if (child.isTerminalNode()) { -streamTask.maybeRecordE2ELatency(timestamp(), child.name()); +streamTask.maybeRecordE2ELatency(timestamp(), currentSystemTimeMs(), child.name()); } } diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StandbyTask.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StandbyTask.java index 5df59f6..b334bc1 100644 --- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/StandbyTask.java +++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/StandbyTask.java @@ -44,6 +44,7 @@ public class StandbyTask extends AbstractTask implements Task { private final Sensor closeTaskSensor; private final boolean eosEnabled; private final InternalProcessorContext processorContext; +private final StreamsMetricsImpl streamsMetrics; private Map offsetSnapshotSinceLastCommit; @@ -52,7 +53,7 @@ public class StandbyTask extends AbstractTask implements Task { * @param partitions input topic partitions, used for thread metadata only * @param topology the instance of {@link ProcessorTopology} * @param config the {@link StreamsConfig} specified by the user - * @param metricsthe {@link StreamsMetrics} created by the thread + * @param streamsMetricsthe {@link StreamsMetrics} created by the thread * @param stateMgr the {@link ProcessorStateManager} for this task * @param stateDirectory the {@link StateDirectory} created by the thread */ @@ -60,13 +61,14 @@ public class StandbyTask extends AbstractTask implements Task { final Set partitions, final ProcessorTopology topology, final StreamsConfig config, -final StreamsMetricsImpl metrics, +final StreamsMetricsImpl streamsMetrics, final ProcessorStateManager stateMgr, final StateDirectory stateDirectory, final ThreadCache cache, final InternalProcessorContext processorContext) { super(id, topology, stateDirectory, stateMgr, partitions); this.processorContext = processorContext; +this.streamsMetrics = streamsMetrics; processorContext.transitionToStandby(cache); final String threadIdPrefix = String.format("stream-thread [%s] ", Thread.currentThread().getName()); @@ -74,7 +76,7 @@ public class StandbyTask extends AbstractTask implements Task { final LogContext logContext = new LogContext(logPrefix); log = logContext.logger(getClass()); -closeTaskSensor = ThreadMetrics.closeTaskSensor(Thread.currentThread().getName(), metrics); +
[kafka] branch trunk updated (2239004 -> 147ffb9)
This is an automated email from the ASF dual-hosted git repository. vvcephei pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/kafka.git. from 2239004 KAFKA-10150: task state transitions/management and committing cleanup (#8856) add 147ffb9 KAFKA-10165: Remove Percentiles from e2e metrics (#8882) No new revisions were added by this update. Summary of changes: .../processor/internals/ProcessorContextImpl.java | 2 +- .../streams/processor/internals/StandbyTask.java | 11 +- .../streams/processor/internals/StreamTask.java| 24 ++-- .../streams/processor/internals/TaskManager.java | 6 - .../internals/metrics/ProcessorNodeMetrics.java| 34 +- .../internals/metrics/StreamsMetricsImpl.java | 43 ++- .../processor/internals/metrics/TaskMetrics.java | 28 + .../integration/MetricsIntegrationTest.java| 4 - .../processor/internals/StandbyTaskTest.java | 42 +++ .../processor/internals/StreamTaskTest.java| 133 +++-- .../metrics/ProcessorNodeMetricsTest.java | 46 ++- .../internals/metrics/StreamsMetricsImplTest.java | 8 +- 12 files changed, 179 insertions(+), 202 deletions(-)
[kafka] branch trunk updated (2239004 -> 147ffb9)
This is an automated email from the ASF dual-hosted git repository. vvcephei pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/kafka.git. from 2239004 KAFKA-10150: task state transitions/management and committing cleanup (#8856) add 147ffb9 KAFKA-10165: Remove Percentiles from e2e metrics (#8882) No new revisions were added by this update. Summary of changes: .../processor/internals/ProcessorContextImpl.java | 2 +- .../streams/processor/internals/StandbyTask.java | 11 +- .../streams/processor/internals/StreamTask.java| 24 ++-- .../streams/processor/internals/TaskManager.java | 6 - .../internals/metrics/ProcessorNodeMetrics.java| 34 +- .../internals/metrics/StreamsMetricsImpl.java | 43 ++- .../processor/internals/metrics/TaskMetrics.java | 28 + .../integration/MetricsIntegrationTest.java| 4 - .../processor/internals/StandbyTaskTest.java | 42 +++ .../processor/internals/StreamTaskTest.java| 133 +++-- .../metrics/ProcessorNodeMetricsTest.java | 46 ++- .../internals/metrics/StreamsMetricsImplTest.java | 8 +- 12 files changed, 179 insertions(+), 202 deletions(-)