Skip to content

Commit

Permalink
Use 4Gb for OS
Browse files Browse the repository at this point in the history
  • Loading branch information
tellet-q committed Apr 18, 2024
1 parent 86170ae commit b5543ac
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/manual-all-engines-benchmark.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
compose-file: "engine/servers/elasticsearch-single-node-ci/docker-compose.yaml"
- name: Execution
run: |
./tools/wait_for_elasticsearch_green_status.sh
./tools/wait_for_green_status.sh
source $(poetry env info -p)/bin/activate
poetry run python3 run.py --engines "elasticsearch-default" --datasets "random-100"
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
compose-file: "engine/servers/opensearch-single-node-ci/docker-compose.yaml"
- name: Execution
run: |
./tools/wait_for_opensearch.sh
./tools/wait_for_green_status.sh
source $(poetry env info -p)/bin/activate
poetry run python3 run.py --engines "opensearch-default" --datasets "glove-25-angular"
Expand Down
4 changes: 2 additions & 2 deletions engine/servers/opensearch-single-node-ci/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
environment:
discovery.type: "single-node"
plugins.security.disabled: true
OPENSEARCH_JAVA_OPTS: "-Xms4g -Xmx4g"
OPENSEARCH_JAVA_OPTS: "-Xms2g -Xmx2g"
ports:
- "9200:9200"
- "9300:9300"
Expand All @@ -18,4 +18,4 @@ services:
deploy:
resources:
limits:
memory: 8Gb
memory: 4Gb
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@ until $(curl --output /dev/null --silent --head --fail "$ES_HOST"); do
sleep 1
done

# Wait for ES to start...
# Wait for ES/OS to start...
response=$(curl "$ES_HOST")
until [ "$response" = "200" ]; do
response=$(curl --write-out %{http_code} --silent --output /dev/null "$ES_HOST")
>&2 echo "Elastic Search is unavailable - sleeping"
>&2 echo "Search cluster is unavailable - sleeping"
sleep 1
done

# Wait for ES status to turn to Green
# Wait for ES/OS status to turn Green
health="$(curl -fsSL "$ES_HOST/_cat/health?h=status")"
health="$(echo "$health" | sed -r 's/^[[:space:]]+|[[:space:]]+$//g')"

until [ "$health" = 'green' ]; do
health="$(curl -fsSL "$ES_HOST/_cat/health?h=status")"
health="$(echo "$health" | sed -r 's/^[[:space:]]+|[[:space:]]+$//g')"
>&2 echo "Elastic Search is yet unavailable, sleep 1"
>&2 echo "Search cluster is yet unavailable, sleep 1"
sleep 1
done

>&2 echo "Elastic Search is up"
>&2 echo "Search cluster is up"
12 changes: 0 additions & 12 deletions tools/wait_for_opensearch.sh

This file was deleted.

0 comments on commit b5543ac

Please sign in to comment.