8000 fix: #3351 by cristianmtr · Pull Request #3353 · jina-ai/serve · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: #3351 #3353

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.

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 1 commit into from
Sep 7, 2021
Merged

fix: #3351 #3353

merged 1 commit into from
Sep 7, 2021

Conversation

cristianmtr
Copy link
Contributor

No description provided.

@cristianmtr cristianmtr requested a review from a team as a code owner September 6, 2021 15:41
@github-actions
Copy link
github-actions bot commented Sep 6, 2021

This PR closes: #3351

@github-actions github-actions bot added size/S area/core This issue/PR affects the core codebase component/jaml labels Sep 6, 2021
@codecov
Copy link
codecov bot commented Sep 6, 2021

Codecov Report

Merging #3353 (20f28d0) into master (b8a61b6) will increase coverage by 0.97%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3353      +/-   ##
==========================================
+ Coverage   88.72%   89.70%   +0.97%     
==========================================
  Files         152      152              
  Lines       10806    10843      +37     
==========================================
+ Hits         9588     9727     +139     
+ Misses       1218     1116     -102     
Flag Coverage Δ
daemon 45.55% <60.00%> (-0.11%) ⬇️
jina 89.69% <100.00%> (+1.42%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
jina/jaml/parsers/executor/legacy.py 92.30% <100.00%> (-1.14%) ⬇️
jina/jaml/parsers/base.py 71.42% <0.00%> (-28.58%) ⬇️
jina/types/ndarray/__init__.py 80.00% <0.00%> (-10.91%) ⬇️
jina/types/ndarray/sparse/__init__.py 93.33% <0.00%> (-6.67%) ⬇️
jina/proto/jina_pb2_grpc.py 77.77% <0.00%> (-4.58%) ⬇️
jina/peapods/runtimes/base.py 87.09% <0.00%> (-2.91%) ⬇️
jina/optimizers/__init__.py 94.23% <0.00%> (-2.80%) ⬇️
jina/peapods/pods/k8slib/kubernetes_tools.py 28.57% <0.00%> (-2.47%) ⬇️
jina/optimizers/flow_runner.py 95.45% <0.00%> (-2.22%) ⬇️
jina/peapods/runtimes/zmq/asyncio.py 92.98% <0.00%> (-1.57%) ⬇️
... and 33 more

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 1cc72fd...20f28d0. Read the comment docs.

@github-actions
Copy link
github-actions bot commented Sep 6, 2021

Latency summary

Current PR yields:

  • 🐎🐎🐎🐎 index QPS at 1272, delta to last 2 avg.: +22%
  • 🐎🐎🐎🐎 query QPS at 55, delta to last 2 avg.: +30%
  • 🐎🐎🐎🐎 dam extend QPS at 52975, delta to last 2 avg.: +34%
  • 🐎🐎🐎🐎 avg flow time within 1.1422 seconds, delta to last 2 avg.: -36%
  • 🐎🐎 import jina within 0.4567 seconds, delta to last 2 avg.: +7%

Breakdown

Version Index QPS Query QPS DAM Extend QPS Avg Flow Time (s) Import Time (s)
current 1272 55 52975 1.1422 0.4567
2.0.23 1036 41 38544 1.7993 0.4284
2.0.22 1034 42 40516 1.7984 0.4248

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

Comment on lines 107 to 108
except Exception as e:
print(f'========= {e}')
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
except Exception as e:
print(f'========= {e}')
except Exception:
pass # intentionally pass as <write why there is no reason to handle it>

Copy link
Contributor
@jacobowitz jacobowitz left a comment

Choose a reason for hiding this comment

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

One small comment on a comment :) And one question as I am confused by the if

"""Based on name, compute if this is a tail/head Pea or a main Pea

:param data: the data for the parser
:return: boolean of whether it is tail/head or main
Copy link
Contributor

Choose a reason for hiding this comment

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

that description is slightly misleading? I assume this is True if it is head/tail .

So I'd write :return: boolean True if it is tail/head., False otherwise

Copy link
Contributor Author

Choose a reason for hiding this comment

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

adjusted, thanks

@@ -78,7 +78,8 @@ def parse(self, cls: Type['BaseExecutor'], data: Dict) -> 'BaseExecutor':
arguments_from_cls = LegacyParser._get_all_arguments(cls)
arguments_from_yaml = set(data.get('with', {}))
difference_set = arguments_from_yaml - arguments_from_cls
if any(difference_set):
# only log warnings about unknown args for main Pea
if any(difference_set) and LegacyParser.is_tail_or_head(data):
Copy link
Contributor

Choose a reason for hiding this comment

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

I somehow dont get this one? Your comment says you only want to do this for a main pea but then you enter the if here if it is tail/head? I guess I am missing something here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I fixed that. Initially I wanted the method to return if it's a main Pea. But switched it around and forgot to change here. The pains of not having a proper test for logging

Copy link
Contributor
@jacobowitz jacobowitz left a comment

Choose a reason for hiding this comment

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

looking good 👍

@cristianmtr cristianmtr requested a review from hanxiao September 7, 2021 08:52
@cristianmtr cristianmtr merged commit 6a272d9 into master Sep 7, 2021
@cristianmtr cristianmtr deleted the fix-3351 branch September 7, 2021 09:13
deepankarm pushed a commit that referenced this pull request Sep 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/core This issue/PR affects the core codebase component/jaml size/S
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants
0