Skip to content
This repository was archived by the owner on Aug 1, 2024. It is now read-only.

Commit 03eb127

Browse files
feat: Added Opensearch 1.2.0 (#925)
1 parent 9a964d4 commit 03eb127

3 files changed

Lines changed: 28 additions & 3 deletions

File tree

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,20 +227,22 @@ impl-dev.provision.%: dev.check-memory ## Provision specified services.
227227
dev.provision.%: ## Provision specified services.
228228
@scripts/send_metrics.py wrap "dev.provision.$*"
229229

230-
dev.backup: dev.up.mysql57+mongo+elasticsearch+elasticsearch7+elasticsearch710+coursegraph ## Write all data volumes to the host.
230+
dev.backup: dev.up.mysql57+mongo+elasticsearch+elasticsearch7+elasticsearch710+opensearch12+coursegraph ## Write all data volumes to the host.
231231
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.mysql57) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/mysql57.tar.gz /var/lib/mysql
232232
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.mongo) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/mongo.tar.gz /data/db
233233
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.elasticsearch) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/elasticsearch.tar.gz /usr/share/elasticsearch/data
234234
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.elasticsearch7) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/elasticsearch7.tar.gz /usr/share/elasticsearch/data
235235
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.elasticsearch710) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/elasticsearch710.tar.gz /usr/share/elasticsearch/data
236+
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.opensearch12) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/opensearch12.tar.gz /usr/share/opensearch/data
236237
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.coursegraph) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/coursegraph.tar.gz /data
237238

238-
dev.restore: dev.up.mysql57+mongo+elasticsearch+elasticsearch7+elasticsearch710+coursegraph ## Restore all data volumes from the host. WILL OVERWRITE ALL EXISTING DATA!
239+
dev.restore: dev.up.mysql57+mongo+elasticsearch+elasticsearch7+elasticsearch710+opensearch12+coursegraph ## Restore all data volumes from the host. WILL OVERWRITE ALL EXISTING DATA!
239240
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.mysql57) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/mysql57.tar.gz
240241
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.mongo) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/mongo.tar.gz
241242
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.elasticsearch) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/elasticsearch.tar.gz
242243
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.elasticsearch7) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/elasticsearch7.tar.gz
243244
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.elasticsearch710) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/elasticsearch710.tar.gz
245+
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.opensearch12) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/opensearch12.tar.gz
244246
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.coursegraph) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/coursegraph.tar.gz
245247

246248
# List of Makefile targets to run database migrations, in the form dev.migrate.$(service)

docker-compose.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,25 @@ services:
118118
- bootstrap.memory_lock=true
119119
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
120120

121+
# This is meant to be used to test OS upgrades.
122+
opensearch12:
123+
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.opensearch12"
124+
hostname: opensearch12.devstack.edx
125+
image: opensearchproject/opensearch:1.2.0
126+
networks:
127+
default:
128+
aliases:
129+
- edx.devstack.opensearch12
130+
ports:
131+
- "9202:9200"
132+
- "9600:9600"
133+
volumes:
134+
- opensearch12_data:/usr/share/opensearch/data
135+
environment:
136+
- discovery.type=single-node
137+
- bootstrap.memory_lock=true
138+
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
139+
121140
firefox:
122141
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.firefox"
123142
hostname: firefox.devstack.edx
@@ -396,6 +415,7 @@ services:
396415
- memcached
397416
- mongo
398417
- elasticsearch710
418+
- opensearch12
399419
image: edxops/forum:${OPENEDX_RELEASE:-latest}
400420
stdin_open: true
401421
tty: true
@@ -418,6 +438,7 @@ services:
418438
- memcached
419439
- mongo
420440
- mysql57
441+
- opensearch12
421442
# Allows attachment to the LMS service using 'docker attach <containerID>'.
422443
stdin_open: true
423444
tty: true
@@ -577,6 +598,7 @@ services:
577598
- memcached
578599
- mongo
579600
- mysql57
601+
- opensearch12
580602
# Allows attachment to the Studio service using 'docker attach <containerID>'.
581603
stdin_open: true
582604
tty: true
@@ -814,4 +836,5 @@ volumes:
814836
elasticsearch7_data:
815837
elasticsearch710_data:
816838
mongo_data:
839+
opensearch12_data:
817840
mysql57_data:

options.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,4 @@ credentials+discovery+ecommerce+insights+lms+registrar+studio
9090
# All third-party services.
9191
# Separated by plus signs. Listed in alphabetical order for clarity.
9292
THIRD_PARTY_SERVICES ?= \
93-
chrome+coursegraph+devpi+elasticsearch+elasticsearch7+elasticsearch710+firefox+memcached+mongo+mysql57+redis+namenode+datanode+resourcemanager+nodemanager+sparkmaster+sparkworker+vertica
93+
chrome+coursegraph+devpi+elasticsearch+elasticsearch7+elasticsearch710+firefox+memcached+mongo+mysql57+opensearch12+redis+namenode+datanode+resourcemanager+nodemanager+sparkmaster+sparkworker+vertica

0 commit comments

Comments
 (0)