You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by vv...@apache.org on 2020/06/01 19:29:07 UTC

[kafka] branch 2.0 updated (c295cdb -> 702c262)

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

vvcephei pushed a change to branch 2.0
in repository https://gitbox.apache.org/repos/asf/kafka.git.


    from c295cdb  MINOR: Upgrade ducktape to 0.7.7 (#8487)
     new 8bd7715  MINOR: Fix Streams EOS system tests by adding clean-up of state dir (#7693)
     new 702c262  KAFKA-8499: ensure java is in PATH for ducker system tests (#6898)

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


Summary of changes:
 tests/docker/Dockerfile                           | 3 ++-
 tests/kafkatest/tests/streams/streams_eos_test.py | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)


[kafka] 01/02: MINOR: Fix Streams EOS system tests by adding clean-up of state dir (#7693)

Posted by vv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

vvcephei pushed a commit to branch 2.0
in repository https://gitbox.apache.org/repos/asf/kafka.git

commit 8bd7715b858d01cf0fbeba55a28102e5f3b9ed84
Author: Bruno Cadonna <br...@confluent.io>
AuthorDate: Thu Nov 21 16:32:31 2019 +0100

    MINOR: Fix Streams EOS system tests by adding clean-up of state dir (#7693)
    
    Recently, system tests test_rebalance_[simple|complex] failed
    repeatedly with a verfication error. The cause was most probably
    the missing clean-up of a state directory of one of the processors.
    
    A node is cleaned up when a service on that node is started and when
    a test is torn down.
    
    If the clean-up flag clean_node_enabled of a EOS Streams service is
    unset, the clean-up of the node is skipped.
    
    The clean-up flag of processor1 in the EOS tests should stay set before
    its first start, so that the node is cleaned before the service is started.
    Afterwards for the multiple restarts of processor1 the cleans-up flag should
    be unset to re-use the local state.
    
    After the multiple restarts are done, the clean-up flag of processor1 should
    again be set to trigger node clean-up during the test teardown.
    
    A dirty node can lead to test failures when tests from Streams EOS tests are
    scheduled on the same node, because the state store would not start empty
    since it reads the local state that was not cleaned up.
    
    Reviewers: Matthias J. Sax <mj...@apache.org>, Andrew Choi <an...@linkedin.com>, Bill Bejeck <bb...@gmail.com>
---
 tests/kafkatest/tests/streams/streams_eos_test.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/kafkatest/tests/streams/streams_eos_test.py b/tests/kafkatest/tests/streams/streams_eos_test.py
index 7e5cc26..c56489d 100644
--- a/tests/kafkatest/tests/streams/streams_eos_test.py
+++ b/tests/kafkatest/tests/streams/streams_eos_test.py
@@ -60,9 +60,8 @@ class StreamsEosTest(KafkaTest):
 
         self.driver.start()
 
-        processor1.clean_node_enabled = False
-
         self.add_streams(processor1)
+        processor1.clean_node_enabled = False
         self.add_streams2(processor1, processor2)
         self.add_streams3(processor1, processor2, processor3)
         self.stop_streams3(processor2, processor3, processor1)
@@ -70,6 +69,7 @@ class StreamsEosTest(KafkaTest):
         self.stop_streams3(processor1, processor3, processor2)
         self.stop_streams2(processor1, processor3)
         self.stop_streams(processor1)
+        processor1.clean_node_enabled = True
 
         self.driver.stop()
 
@@ -100,9 +100,8 @@ class StreamsEosTest(KafkaTest):
 
         self.driver.start()
 
-        processor1.clean_node_enabled = False
-
         self.add_streams(processor1)
+        processor1.clean_node_enabled = False
         self.add_streams2(processor1, processor2)
         self.add_streams3(processor1, processor2, processor3)
         self.abort_streams(processor2, processor3, processor1)
@@ -112,6 +111,7 @@ class StreamsEosTest(KafkaTest):
         self.abort_streams(processor1, processor3, processor2)
         self.stop_streams2(processor1, processor3)
         self.stop_streams(processor1)
+        processor1.clean_node_enabled = True
 
         self.driver.stop()
 


[kafka] 02/02: KAFKA-8499: ensure java is in PATH for ducker system tests (#6898)

Posted by vv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

vvcephei pushed a commit to branch 2.0
in repository https://gitbox.apache.org/repos/asf/kafka.git

commit 702c262c8465ad76a92b5951fee1fdab66a75e29
Author: Lucas Bradstreet <lu...@confluent.io>
AuthorDate: Fri Jun 7 14:23:49 2019 -0700

    KAFKA-8499: ensure java is in PATH for ducker system tests (#6898)
    
    Reviewers: Colin P. McCabe <cm...@apache.org>
---
 tests/docker/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile
index e96dd48..1912666 100644
--- a/tests/docker/Dockerfile
+++ b/tests/docker/Dockerfile
@@ -37,6 +37,7 @@ RUN pip install -U pip==9.0.3 setuptools && pip install --upgrade cffi virtualen
 # Set up ssh
 COPY ./ssh-config /root/.ssh/config
 RUN ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa && cp -f /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys
+RUN echo 'PermitUserEnvironment yes' >> /etc/ssh/sshd_config
 
 # Install binary test dependencies.
 # we use the same versions as in vagrant/base.sh
@@ -67,7 +68,7 @@ RUN apt-get install fuse
 RUN cd /opt && git clone -q  https://github.com/confluentinc/kibosh.git && cd "/opt/kibosh" && git reset --hard $KIBOSH_VERSION && mkdir "/opt/kibosh/build" && cd "/opt/kibosh/build" && ../configure && make -j 2
 
 # Set up the ducker user.
-RUN useradd -ms /bin/bash ducker && mkdir -p /home/ducker/ && rsync -aiq /root/.ssh/ /home/ducker/.ssh && chown -R ducker /home/ducker/ /mnt/ && echo 'ducker ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
+RUN useradd -ms /bin/bash ducker && mkdir -p /home/ducker/ && rsync -aiq /root/.ssh/ /home/ducker/.ssh && chown -R ducker /home/ducker/ /mnt/ && echo "PATH=$(runuser -l ducker -c 'echo $PATH'):$JAVA_HOME/bin" >> /home/ducker/.ssh/environment && echo 'PATH=$PATH:'"$JAVA_HOME/bin" >> /home/ducker/.profile && echo 'ducker ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
 USER ducker
 
 CMD sudo service ssh start && tail -f /dev/null