From f5c219ddd0569ab96b4e8f4b6901aa4f4c7c335a Mon Sep 17 00:00:00 2001 From: Graham Arthur Mackenzie Date: Sat, 29 May 2021 14:00:21 -0700 Subject: [PATCH 1/2] fix: naming of peas replicas in logs --- jina/peapods/pods/__init__.py | 2 +- jina/peapods/pods/compound.py | 2 +- tests/unit/peapods/pods/test_compound_pods.py | 55 ++++++++++--------- tests/unit/peapods/pods/test_pods.py | 16 +++--- 4 files changed, 38 insertions(+), 37 deletions(-) diff --git a/jina/peapods/pods/__init__.py b/jina/peapods/pods/__init__.py index 1a7e738c1cd54..92fa9bdb05886 100644 --- a/jina/peapods/pods/__init__.py +++ b/jina/peapods/pods/__init__.py @@ -596,7 +596,7 @@ def _set_peas_args( if _args.peas_hosts: _args.host = pea_host if _args.name: - _args.name += f'/{idx}' + _args.name += f'/pea-{idx}' else: _args.name = f'{idx}' else: diff --git a/jina/peapods/pods/compound.py b/jina/peapods/pods/compound.py index 5aad3c940aba1..c81d1700d3d6c 100644 --- a/jina/peapods/pods/compound.py +++ b/jina/peapods/pods/compound.py @@ -203,7 +203,7 @@ def _set_replica_args( _args.replica_id = idx _args.identity = random_identity() if _args.name: - _args.name += f'/{idx}' + _args.name += f'/replica-{idx}' else: _args.name = f'{idx}' diff --git a/tests/unit/peapods/pods/test_compound_pods.py b/tests/unit/peapods/pods/test_compound_pods.py index 5e5540eb90a3c..5ecb6d84ba645 100644 --- a/tests/unit/peapods/pods/test_compound_pods.py +++ b/tests/unit/peapods/pods/test_compound_pods.py @@ -5,6 +5,7 @@ from jina import __default_executor__ from jina.peapods import CompoundPod, Pod + @pytest.fixture(scope='function') def pod_args(): args = [ @@ -117,54 +118,54 @@ def test_pod_naming_with_parallel(runtime): assert bp.head_pea.name == 'pod/head' assert bp.tail_pea.name == 'pod/tail' - assert bp.replicas[0].name == 'pod/0' - assert bp.replicas[0].peas[0].name == 'pod/0/head' + assert bp.replicas[0].name == 'pod/replica-0' + assert bp.replicas[0].peas[0].name == 'pod/replica-0/head' assert bp.replicas[0].peas[0].inner is False - assert bp.replicas[0].peas[1].name == 'pod/0/0' + assert bp.replicas[0].peas[1].name == 'pod/replica-0/pea-0' assert bp.replicas[0].peas[1].inner - assert bp.replicas[0].peas[2].name == 'pod/0/1' + assert bp.replicas[0].peas[2].name == 'pod/replica-0/pea-1' assert bp.replicas[0].peas[2].inner - assert bp.replicas[0].peas[3].name == 'pod/0/tail' + assert bp.replicas[0].peas[3].name == 'pod/replica-0/tail' assert bp.replicas[0].peas[3].inner is False - assert bp.replicas[1].name == 'pod/1' - assert bp.replicas[1].peas[0].name == 'pod/1/head' + assert bp.replicas[1].name == 'pod/replica-1' + assert bp.replicas[1].peas[0].name == 'pod/replica-1/head' assert bp.replicas[1].peas[0].inner is False - assert bp.replicas[1].peas[1].name == 'pod/1/0' + assert bp.replicas[1].peas[1].name == 'pod/replica-1/pea-0' assert bp.replicas[1].peas[1].inner - assert bp.replicas[1].peas[2].name == 'pod/1/1' + assert bp.replicas[1].peas[2].name == 'pod/replica-1/pea-1' assert bp.replicas[1].peas[2].inner - assert bp.replicas[1].peas[3].name == 'pod/1/tail' + assert bp.replicas[1].peas[3].name == 'pod/replica-1/tail' assert bp.replicas[1].peas[3].inner is False - assert bp.replicas[2].name == 'pod/2' - assert bp.replicas[2].peas[0].name == 'pod/2/head' + assert bp.replicas[2].name == 'pod/replica-2' + assert bp.replicas[2].peas[0].name == 'pod/replica-2/head' assert bp.replicas[2].peas[0].inner is False - assert bp.replicas[2].peas[1].name == 'pod/2/0' + assert bp.replicas[2].peas[1].name == 'pod/replica-2/pea-0' assert bp.replicas[2].peas[1].inner - assert bp.replicas[2].peas[2].name == 'pod/2/1' + assert bp.replicas[2].peas[2].name == 'pod/replica-2/pea-1' assert bp.replicas[2].peas[2].inner - assert bp.replicas[2].peas[3].name == 'pod/2/tail' + assert bp.replicas[2].peas[3].name == 'pod/replica-2/tail' assert bp.replicas[2].peas[3].inner is False # runtime assert bp.head_pea.runtime.name == 'pod/head/ZEDRuntime' assert bp.tail_pea.runtime.name == 'pod/tail/ZEDRuntime' - assert bp.replicas[0].peas[0].runtime.name == 'pod/0/head/ZEDRuntime' - assert bp.replicas[0].peas[1].runtime.name == 'pod/0/0/ZEDRuntime' - assert bp.replicas[0].peas[2].runtime.name == 'pod/0/1/ZEDRuntime' - assert bp.replicas[0].peas[3].runtime.name == 'pod/0/tail/ZEDRuntime' + assert bp.replicas[0].peas[0].runtime.name == 'pod/replica-0/head/ZEDRuntime' + assert bp.replicas[0].peas[1].runtime.name == 'pod/replica-0/pea-0/ZEDRuntime' + assert bp.replicas[0].peas[2].runtime.name == 'pod/replica-0/pea-1/ZEDRuntime' + assert bp.replicas[0].peas[3].runtime.name == 'pod/replica-0/tail/ZEDRuntime' - assert bp.replicas[1].peas[0].runtime.name == 'pod/1/head/ZEDRuntime' - assert bp.replicas[1].peas[1].runtime.name == 'pod/1/0/ZEDRuntime' - assert bp.replicas[1].peas[2].runtime.name == 'pod/1/1/ZEDRuntime' - assert bp.replicas[1].peas[3].runtime.name == 'pod/1/tail/ZEDRuntime' + assert bp.replicas[1].peas[0].runtime.name == 'pod/replica-1/head/ZEDRuntime' + assert bp.replicas[1].peas[1].runtime.name == 'pod/replica-1/pea-0/ZEDRuntime' + assert bp.replicas[1].peas[2].runtime.name == 'pod/replica-1/pea-1/ZEDRuntime' + assert bp.replicas[1].peas[3].runtime.name == 'pod/replica-1/tail/ZEDRuntime' - assert bp.replicas[2].peas[0].runtime.name == 'pod/2/head/ZEDRuntime' - assert bp.replicas[2].peas[1].runtime.name == 'pod/2/0/ZEDRuntime' - assert bp.replicas[2].peas[2].runtime.name == 'pod/2/1/ZEDRuntime' - assert bp.replicas[2].peas[3].runtime.name == 'pod/2/tail/ZEDRuntime' + assert bp.replicas[2].peas[0].runtime.name == 'pod/replica-2/head/ZEDRuntime' + assert bp.replicas[2].peas[1].runtime.name == 'pod/replica-2/pea-0/ZEDRuntime' + assert bp.replicas[2].peas[2].runtime.name == 'pod/replica-2/pea-1/ZEDRuntime' + assert bp.replicas[2].peas[3].runtime.name == 'pod/replica-2/tail/ZEDRuntime' @pytest.mark.parametrize( diff --git a/tests/unit/peapods/pods/test_pods.py b/tests/unit/peapods/pods/test_pods.py index ad9669eadfdd4..56d91f87064b5 100644 --- a/tests/unit/peapods/pods/test_pods.py +++ b/tests/unit/peapods/pods/test_pods.py @@ -144,12 +144,12 @@ def test_pod_naming_with_parallel_any(runtime): ) with Pod(args) as bp: assert bp.peas[0].name == 'pod/head' - assert bp.peas[1].name == 'pod/0' - assert bp.peas[2].name == 'pod/1' + assert bp.peas[1].name == 'pod/pea-0' + assert bp.peas[2].name == 'pod/pea-1' assert bp.peas[3].name == 'pod/tail' assert bp.peas[0].runtime.name == 'pod/head/ZEDRuntime' - assert bp.peas[1].runtime.name == 'pod/0/ZEDRuntime' - assert bp.peas[2].runtime.name == 'pod/1/ZEDRuntime' + assert bp.peas[1].runtime.name == 'pod/pea-0/ZEDRuntime' + assert bp.peas[2].runtime.name == 'pod/pea-1/ZEDRuntime' assert bp.peas[3].runtime.name == 'pod/tail/ZEDRuntime' @@ -169,12 +169,12 @@ def test_pod_naming_with_parallel_all(runtime): ) with Pod(args) as bp: assert bp.peas[0].name == 'pod/head' - assert bp.peas[1].name == 'pod/0' - assert bp.peas[2].name == 'pod/1' + assert bp.peas[1].name == 'pod/pea-0' + assert bp.peas[2].name == 'pod/pea-1' assert bp.peas[3].name == 'pod/tail' assert bp.peas[0].runtime.name == 'pod/head/ZEDRuntime' - assert bp.peas[1].runtime.name == 'pod/0/ZEDRuntime' - assert bp.peas[2].runtime.name == 'pod/1/ZEDRuntime' + assert bp.peas[1].runtime.name == 'pod/pea-0/ZEDRuntime' + assert bp.peas[2].runtime.name == 'pod/pea-1/ZEDRuntime' assert bp.peas[3].runtime.name == 'pod/tail/ZEDRuntime' From 8b96cdc585365788da3a0ba58dccaed105f02a84 Mon Sep 17 00:00:00 2001 From: Graham Arthur Mackenzie Date: Tue, 1 Jun 2021 08:11:11 -0700 Subject: [PATCH 2/2] fix: change replica- to rep- --- jina/peapods/pods/compound.py | 2 +- tests/unit/peapods/pods/test_compound_pods.py | 54 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/jina/peapods/pods/compound.py b/jina/peapods/pods/compound.py index c81d1700d3d6c..2945b09b42345 100644 --- a/jina/peapods/pods/compound.py +++ b/jina/peapods/pods/compound.py @@ -203,7 +203,7 @@ def _set_replica_args( _args.replica_id = idx _args.identity = random_identity() if _args.name: - _args.name += f'/replica-{idx}' + _args.name += f'/rep-{idx}' else: _args.name = f'{idx}' diff --git a/tests/unit/peapods/pods/test_compound_pods.py b/tests/unit/peapods/pods/test_compound_pods.py index 5ecb6d84ba645..19d12af317758 100644 --- a/tests/unit/peapods/pods/test_compound_pods.py +++ b/tests/unit/peapods/pods/test_compound_pods.py @@ -118,54 +118,54 @@ def test_pod_naming_with_parallel(runtime): assert bp.head_pea.name == 'pod/head' assert bp.tail_pea.name == 'pod/tail' - assert bp.replicas[0].name == 'pod/replica-0' - assert bp.replicas[0].peas[0].name == 'pod/replica-0/head' + assert bp.replicas[0].name == 'pod/rep-0' + assert bp.replicas[0].peas[0].name == 'pod/rep-0/head' assert bp.replicas[0].peas[0].inner is False - assert bp.replicas[0].peas[1].name == 'pod/replica-0/pea-0' + assert bp.replicas[0].peas[1].name == 'pod/rep-0/pea-0' assert bp.replicas[0].peas[1].inner - assert bp.replicas[0].peas[2].name == 'pod/replica-0/pea-1' + assert bp.replicas[0].peas[2].name == 'pod/rep-0/pea-1' assert bp.replicas[0].peas[2].inner - assert bp.replicas[0].peas[3].name == 'pod/replica-0/tail' + assert bp.replicas[0].peas[3].name == 'pod/rep-0/tail' assert bp.replicas[0].peas[3].inner is False - assert bp.replicas[1].name == 'pod/replica-1' - assert bp.replicas[1].peas[0].name == 'pod/replica-1/head' + assert bp.replicas[1].name == 'pod/rep-1' + assert bp.replicas[1].peas[0].name == 'pod/rep-1/head' assert bp.replicas[1].peas[0].inner is False - assert bp.replicas[1].peas[1].name == 'pod/replica-1/pea-0' + assert bp.replicas[1].peas[1].name == 'pod/rep-1/pea-0' assert bp.replicas[1].peas[1].inner - assert bp.replicas[1].peas[2].name == 'pod/replica-1/pea-1' + assert bp.replicas[1].peas[2].name == 'pod/rep-1/pea-1' assert bp.replicas[1].peas[2].inner - assert bp.replicas[1].peas[3].name == 'pod/replica-1/tail' + assert bp.replicas[1].peas[3].name == 'pod/rep-1/tail' assert bp.replicas[1].peas[3].inner is False - assert bp.replicas[2].name == 'pod/replica-2' - assert bp.replicas[2].peas[0].name == 'pod/replica-2/head' + assert bp.replicas[2].name == 'pod/rep-2' + assert bp.replicas[2].peas[0].name == 'pod/rep-2/head' assert bp.replicas[2].peas[0].inner is False - assert bp.replicas[2].peas[1].name == 'pod/replica-2/pea-0' + assert bp.replicas[2].peas[1].name == 'pod/rep-2/pea-0' assert bp.replicas[2].peas[1].inner - assert bp.replicas[2].peas[2].name == 'pod/replica-2/pea-1' + assert bp.replicas[2].peas[2].name == 'pod/rep-2/pea-1' assert bp.replicas[2].peas[2].inner - assert bp.replicas[2].peas[3].name == 'pod/replica-2/tail' + assert bp.replicas[2].peas[3].name == 'pod/rep-2/tail' assert bp.replicas[2].peas[3].inner is False # runtime assert bp.head_pea.runtime.name == 'pod/head/ZEDRuntime' assert bp.tail_pea.runtime.name == 'pod/tail/ZEDRuntime' - assert bp.replicas[0].peas[0].runtime.name == 'pod/replica-0/head/ZEDRuntime' - assert bp.replicas[0].peas[1].runtime.name == 'pod/replica-0/pea-0/ZEDRuntime' - assert bp.replicas[0].peas[2].runtime.name == 'pod/replica-0/pea-1/ZEDRuntime' - assert bp.replicas[0].peas[3].runtime.name == 'pod/replica-0/tail/ZEDRuntime' + assert bp.replicas[0].peas[0].runtime.name == 'pod/rep-0/head/ZEDRuntime' + assert bp.replicas[0].peas[1].runtime.name == 'pod/rep-0/pea-0/ZEDRuntime' + assert bp.replicas[0].peas[2].runtime.name == 'pod/rep-0/pea-1/ZEDRuntime' + assert bp.replicas[0].peas[3].runtime.name == 'pod/rep-0/tail/ZEDRuntime' - assert bp.replicas[1].peas[0].runtime.name == 'pod/replica-1/head/ZEDRuntime' - assert bp.replicas[1].peas[1].runtime.name == 'pod/replica-1/pea-0/ZEDRuntime' - assert bp.replicas[1].peas[2].runtime.name == 'pod/replica-1/pea-1/ZEDRuntime' - assert bp.replicas[1].peas[3].runtime.name == 'pod/replica-1/tail/ZEDRuntime' + assert bp.replicas[1].peas[0].runtime.name == 'pod/rep-1/head/ZEDRuntime' + assert bp.replicas[1].peas[1].runtime.name == 'pod/rep-1/pea-0/ZEDRuntime' + assert bp.replicas[1].peas[2].runtime.name == 'pod/rep-1/pea-1/ZEDRuntime' + assert bp.replicas[1].peas[3].runtime.name == 'pod/rep-1/tail/ZEDRuntime' - assert bp.replicas[2].peas[0].runtime.name == 'pod/replica-2/head/ZEDRuntime' - assert bp.replicas[2].peas[1].runtime.name == 'pod/replica-2/pea-0/ZEDRuntime' - assert bp.replicas[2].peas[2].runtime.name == 'pod/replica-2/pea-1/ZEDRuntime' - assert bp.replicas[2].peas[3].runtime.name == 'pod/replica-2/tail/ZEDRuntime' + assert bp.replicas[2].peas[0].runtime.name == 'pod/rep-2/head/ZEDRuntime' + assert bp.replicas[2].peas[1].runtime.name == 'pod/rep-2/pea-0/ZEDRuntime' + assert bp.replicas[2].peas[2].runtime.name == 'pod/rep-2/pea-1/ZEDRuntime' + assert bp.replicas[2].peas[3].runtime.name == 'pod/rep-2/tail/ZEDRuntime' @pytest.mark.parametrize(