8000 fix: naming of peas replicas in logs by properGrammar · Pull Request #2508 · jina-ai/serve · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: naming of peas replicas in logs #2508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 7, 2021
Merged

fix: naming of peas replicas in logs #2508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5c219d
fix: naming of peas replicas in logs
May 29, 2021
8b96cdc
fix: change replica- to rep-
Jun 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jina/peapods/pods/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion jina/peapods/pods/compound.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'/rep-{idx}'
else:
_args.name = f'{idx}'

Expand Down
55 changes: 28 additions & 27 deletions tests/unit/peapods/pods/test_compound_pods.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from jina import __default_executor__
from jina.peapods import CompoundPod, Pod


@pytest.fixture(scope='function')
def pod_args():
args = [
Expand Down Expand Up @@ -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/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/0/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/0/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/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/1'
assert bp.replicas[1].peas[0].name == 'pod/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/1/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/1/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/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/2'
assert bp.replicas[2].peas[0].name == 'pod/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/2/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/2/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/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/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/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/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/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/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/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(
Expand Down
16 changes: 8 additions & 8 deletions tests/unit/peapods/pods/test_pods.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'


Expand All @@ -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'


Expand Down
0