Skip to content
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

Jump to bottom

fix: conditional args #1682

Merged
merged 1 commit into from Jan 13, 2021
Merged

fix: conditional args #1682

merged 1 commit into from Jan 13, 2021

Conversation

florian-hoenicke
Copy link
Member

In case we have a separated workspace and set shards to 1, search does not work.
We get rid of this case by forcing to have separated_workspace=False if parallel==1

@jina-bot jina-bot added size/XS area/core This issue/PR affects the core codebase area/network This issue/PR affects network functionality component/peapod labels Jan 13, 2021
JoanFM
JoanFM reviewed Jan 13, 2021
View reviewed changes
Copy link
Member

@JoanFM JoanFM left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be completed with a robust chanhe also on executor/indexer size. I remember the logic there was robust to this condition.

@codecov
Copy link

codecov bot commented Jan 13, 2021 •
edited

Codecov Report

Merging #1682 (abccf1c) into master (cd7d4ad) will decrease coverage by 0.24%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1682      +/-   ##
==========================================
- Coverage   84.42%   84.17%   -0.25%     
==========================================
  Files         132      132              
  Lines        6831     6831              
==========================================
- Hits         5767     5750      -17     
- Misses       1064     1081      +17
Impacted Files Coverage Δ
jina/peapods/runtimes/jinad/api.py 75.65% <0.00%> (-9.87%) ⬇️
jina/peapods/runtimes/asyncio/rest/app.py 89.21% <0.00%> (-1.97%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cd7d4ad...03bad25. Read the comment docs.

@github-actions
Copy link

Latency summary

Current PR yields:

  • 😶 index QPS at 1546, delta to last 3 avg.: +0%
  • 😶 query QPS at 26, delta to last 3 avg.: -4%

Breakdown

Version Index QPS Query QPS
current 1546 26
0.9.13 1550 27
0.9.12 1548 27

Backed by latency-tracking. Further commits will update this comment.

@florian-hoenicke florian-hoenicke marked this pull request as ready for review January 13, 2021 20:19
@florian-hoenicke florian-hoenicke requested a review from a team as a code owner January 13, 2021 20:19
JoanFM
JoanFM requested changes Jan 13, 2021
View reviewed changes
jina/peapods/pods/__init__.py
@@ -227,6 +227,8 @@ def _set_conditional_args(args):
args.runtime_cls = 'RESTRuntime'
else:
args.runtime_cls = 'GRPCRuntime'
if 'parallel' in args and args.parallel == 1:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

parallel is now guaranteed to be in args

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and it would be good to add a warning

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

parallel is now guaranteed to be in args

not in case the gateway is added

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, is a smell but good point

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and it would be good to add a warning

Thanks, good idea!
However, this is actually expected behaviour:
The documentation for --separated-workspace in mixin_zed_runtime_parser says: the data and config files are separated for each pea in this pod, only effective when BasePod\'s parallel > 1.
In addition there is no logging used in jina/peapods/pods/__init__.py for all similar cases.

@florian-hoenicke florian-hoenicke merged commit 7e24d12 into master Jan 13, 2021
@florian-hoenicke florian-hoenicke deleted the fix-conditional-args branch January 13, 2021 20:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JoanFM JoanFM JoanFM approved these changes

@Yongxuanzhang Yongxuanzhang Awaiting requested review from Yongxuanzhang

Assignees
No one assigned
Labels
area/core This issue/PR affects the core codebase area/network This issue/PR affects network functionality component/peapod size/XS
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@florian-hoenicke @JoanFM @jina-bot