Merge branch '0.10.x' into 0.11.x

.gitignore

@@ -97,6 +97,7 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+.virtualenvs/
 
 # Spyder project settings
 .spyderproject

docs/requirements.txt

@@ -1,4 +1,4 @@
-Sphinx==1.5.3
+Sphinx<1.7
 sphinx-argparse==0.1.17
 sphinx-rtd-theme==0.2.4
 boto3==1.15.9

ducktape/cluster/remoteaccount.py

@@ -412,7 +412,7 @@ def ssh_output(self, cmd, allow_fail=False, combine_stderr=True, timeout_sec=Non
             stdin.close()
             stdout.close()
             stderr.close()
-
+        self._log(logging.DEBUG, "Returning ssh command output:\n%s" % stdoutdata)
         return stdoutdata
 
     def alive(self, pid):

systests/cluster/test_remote_account.py

@@ -551,9 +551,10 @@ def test_monitor_log_exception(self):
     @cluster(num_nodes=1)
     def test_kill_process(self):
         """Tests that kill_process correctly works"""
+        grep_str = '"nc -l -p 5000"'
 
         def get_pids():
-            pid_cmd = "ps ax | grep -i nc | grep -v grep | awk '{print $1}'"
+            pid_cmd = f"ps ax | grep -i {grep_str} | grep -v grep | awk '{{print $1}}'"
 
             return list(node.account.ssh_capture(pid_cmd, callback=int))
 
@@ -566,7 +567,7 @@ def get_pids():
                    err_msg="Failed to start process within %d sec" % 10)
 
         # Kill service.
-        node.account.kill_process("nc")
+        node.account.kill_process(grep_str)
 
         wait_until(lambda: len(get_pids()) == 0, timeout_sec=10,
                    err_msg="Failed to kill process within %d sec" % 10)

tox.ini

@@ -16,28 +16,28 @@ setenv =
     PIP_PROCESS_DEPENDENCY_LINKS=1
     PIP_DEFAULT_TIMEOUT=60
     ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future
-envdir = {homedir}/.virtualenvs/ducktape_{envname}
+envdir = {package_root}/.virtualenvs/ducktape_{envname}
 commands =
     pytest {env:PYTESTARGS:} {posargs}
 
 [testenv:py36]
-envdir = {homedir}/.virtualenvs/ducktape-py36
+envdir = {package_root}/.virtualenvs/ducktape-py36
 
 [testenv:py37]
-envdir = {homedir}/.virtualenvs/ducktape-py37
+envdir = {package_root}/.virtualenvs/ducktape-py37
 
 [testenv:py38]
 envdir = {homedir}/.virtualenvs/ducktape-py38
 
 [testenv:style]
 basepython = python3.8
-envdir = {homedir}/.virtualenvs/ducktape
+envdir = {package_root}/.virtualenvs/ducktape
 commands =
     flake8 --config tox.ini
 
 [testenv:cover]
 basepython = python3.8
-envdir = {homedir}/.virtualenvs/ducktape
+envdir = {package_root}/.virtualenvs/ducktape
 commands =
     pytest {env:PYTESTARGS:} --cov ducktape --cov-report=xml --cov-report=html --cov-report=term --cov-report=annotate:textcov \
                              --cov-fail-under=70
@@ -51,6 +51,6 @@ commands = sphinx-build -M {env:SPHINX_BUILDER:html} . _build  {posargs}
 
 
 [flake8]
-exclude = .git,.tox,.eggs,__pycache__,docs,build,dist
+exclude = .git,.tox,.eggs,__pycache__,docs,build,dist,.virtualenvs
 ignore = E111,E121,W292,E123,E226,W503
 max-line-length = 120