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.

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

Update ingestion #592

Merged
merged 4 commits into from
Jun 27, 2022
Merged

Conversation

amitgalitz
Copy link
Member

Description

Update numpy to fix CVE, upgrade scipy to be compatible with upgraded numpy and upgrade opensearch-py to latest version. Changed accordingly the minimum Python version to 3.8 because of numpy upgrade. Added more retries to handle exceptions during bulk ingestions that would lead to threads being dropped.

Issues Resolved

#590
#591

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@codecov-commenter
Copy link

codecov-commenter commented Jun 27, 2022

Codecov Report

Merging #592 (46b1a89) into main (4d7a8a4) will decrease coverage by 0.14%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##               main     #592      +/-   ##
============================================
- Coverage     79.03%   78.89%   -0.15%     
+ Complexity     4209     4201       -8     
============================================
  Files           296      296              
  Lines         17686    17686              
  Branches       1880     1880              
============================================
- Hits          13979    13954      -25     
- Misses         2808     2838      +30     
+ Partials        899      894       -5     
Flag Coverage Δ
plugin 78.89% <ø> (-0.15%) ⬇️

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

Impacted Files Coverage Δ
.../java/org/opensearch/ad/AnomalyDetectorRunner.java 37.64% <0.00%> (-5.89%) ⬇️
...c/main/java/org/opensearch/ad/util/ParseUtils.java 73.92% <0.00%> (-3.93%) ⬇️
...va/org/opensearch/ad/feature/SearchFeatureDao.java 82.78% <0.00%> (-3.86%) ⬇️
...ain/java/org/opensearch/ad/model/ModelProfile.java 70.90% <0.00%> (-1.82%) ⬇️
...rch/ad/transport/AnomalyResultTransportAction.java 80.13% <0.00%> (ø)
...opensearch/ad/indices/AnomalyDetectionIndices.java 72.31% <0.00%> (+0.18%) ⬆️
.../main/java/org/opensearch/ad/ml/CheckpointDao.java 70.19% <0.00%> (+0.64%) ⬆️
...ansport/handler/AnomalyResultBulkIndexHandler.java 87.09% <0.00%> (+3.22%) ⬆️

hosts=[{'host': URL, 'port': 443}],
use_ssl=True,
verify_certs=False,
http_auth=(USERNAME, PASSWORD),
http_auth=('admin', 'admin'),
Copy link
Collaborator

Choose a reason for hiding this comment

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

You uploaded the wrong file, right?

Copy link
Member Author

Choose a reason for hiding this comment

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

my mistake

ylwu-amzn
ylwu-amzn previously approved these changes Jun 27, 2022
def main():
global client
for i in range(0, THREADS):
client.append(create_client(SECURITY, URL))
Copy link
Collaborator

Choose a reason for hiding this comment

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

only saw you used the refactored create_client code, not anything else I sent to you. Does my fix solve the dropping entity issue?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes I actually used the wrong file to ingest data, not the one with adding more retry logic in a loop. It worked for ingesting 1b documents, 7 days of 1440 points a day. I will try using the right file now with more retry logic for 14 days of 1440 points a day

Signed-off-by: Amit Galitzky <[email protected]>
@amitgalitz amitgalitz merged commit 0bd6e0e into opensearch-project:main Jun 27, 2022
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jun 27, 2022
Signed-off-by: Amit Galitzky <[email protected]>
(cherry picked from commit 0bd6e0e)
@amitgalitz amitgalitz added the dependencies Pull requests that update a dependency file label Jun 27, 2022
amitgalitz added a commit that referenced this pull request Jun 27, 2022
Signed-off-by: Amit Galitzky <[email protected]>
(cherry picked from commit 0bd6e0e)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants