From c83847510cc19238f019e0439befd588ae35c819 Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Thu, 7 Sep 2023 17:55:49 -0700 Subject: [PATCH] Revert "Downgrading the version of request lib to fix the CVE-2015-2296 (#1105)" (#1110) (#1111) This reverts commit 47ccb1b085e9793844256cd1d243d9f40ad61f41. Signed-off-by: Navneet Verma (cherry picked from commit 7dbcbcd961d737eb42f8f6a4f1ec979d33b4e03d) Co-authored-by: Navneet Verma --- benchmarks/perf-tool/okpt/test/steps/steps.py | 2 +- benchmarks/perf-tool/requirements.in | 2 +- benchmarks/perf-tool/requirements.txt | 20 ++++++++++++++----- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/benchmarks/perf-tool/okpt/test/steps/steps.py b/benchmarks/perf-tool/okpt/test/steps/steps.py index 183a37cfa..cc1773330 100644 --- a/benchmarks/perf-tool/okpt/test/steps/steps.py +++ b/benchmarks/perf-tool/okpt/test/steps/steps.py @@ -796,7 +796,7 @@ def query_index(opensearch: OpenSearch, index_name: str, body: dict, def bulk_index(opensearch: OpenSearch, index_name: str, body: List): - return opensearch.bulk(index=index_name, body=body) + return opensearch.bulk(index=index_name, body=body, timeout='5m') def get_segment_stats(opensearch: OpenSearch, index_name: str): return opensearch.indices.segments(index=index_name) diff --git a/benchmarks/perf-tool/requirements.in b/benchmarks/perf-tool/requirements.in index 575ca566b..fd3555aab 100644 --- a/benchmarks/perf-tool/requirements.in +++ b/benchmarks/perf-tool/requirements.in @@ -3,5 +3,5 @@ opensearch-py PyYAML numpy h5py -requests>=2.1.0,<2.6.0 +requests psutil diff --git a/benchmarks/perf-tool/requirements.txt b/benchmarks/perf-tool/requirements.txt index 5981e6355..5489e63dd 100644 --- a/benchmarks/perf-tool/requirements.txt +++ b/benchmarks/perf-tool/requirements.txt @@ -1,15 +1,23 @@ # -# This file is autogenerated by pip-compile with Python 3.8 -# by the following command: +# This file is autogenerated by pip-compile with python 3.9 +# To update, run: # # pip-compile # +cached-property==1.5.2 + # via h5py cerberus==1.3.4 # via -r requirements.in certifi==2023.7.22 - # via opensearch-py + # via + # opensearch-py + # requests +charset-normalizer==2.0.4 + # via requests h5py==3.3.0 # via -r requirements.in +idna==3.2 + # via requests numpy==1.24.2 # via # -r requirements.in @@ -20,10 +28,12 @@ psutil==5.8.0 # via -r requirements.in pyyaml==5.4.1 # via -r requirements.in -requests==2.5.3 +requests==2.31.0 # via -r requirements.in urllib3==1.26.6 - # via opensearch-py + # via + # opensearch-py + # requests # The following packages are considered to be unsafe in a requirements file: # setuptools