This is an automated email from the ASF dual-hosted git repository. laiyingchun pushed a commit to tag kudu-1.12.0-mdh1.0.0-4c2c075-centos-release in repository https://gitbox.apache.org/repos/asf/kudu.git
commit 647df1bfaffe5e4b441146ca1ab7f9e94ed97fe9 Author: 张一帆 <[email protected]> AuthorDate: Mon Jan 13 16:18:29 2020 +0800 [scripts] fix minos_control_server.py for minos2 --- src/kudu/scripts/minos_control_server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kudu/scripts/minos_control_server.py b/src/kudu/scripts/minos_control_server.py index 8db2bdc..875802c 100755 --- a/src/kudu/scripts/minos_control_server.py +++ b/src/kudu/scripts/minos_control_server.py @@ -58,7 +58,7 @@ def is_cluster_health(): ' 2>/dev/null' % cluster) unhealth_nodes = set() - if status == 0: + if status == 0 or status == 256: ksck_info = json.loads(output) for master in ksck_info['master_summaries']: if master['health'] != 'HEALTHY': @@ -106,7 +106,7 @@ def wait_cluster_health(): def parse_node_from_minos_output(output, job): host = '' - regex = re.compile('[a-zA-Z\s]*[tT]ask [0-9]+ of (%s) on ([0-9a-z-.]+)\(0\).+' % job) + regex = re.compile('[a-zA-Z\s]*[tT]ask [0-9]+ of (%s) on ([0-9a-z-.]+)(:[0-9]+)*\(0\).+' % job) match = regex.search(output) if match is not None: host = match.group(2)
