Skip to content

Commit 61c47c9

Browse files
M Umar KhanM Umar Khan
M Umar Khan
authored and
M Umar Khan
committed
chore: remove mysql57
1 parent 69337bc commit 61c47c9

File tree

5 files changed

+4
-63
lines changed

5 files changed

+4
-63
lines changed

Makefile

+2-21
Original file line numberDiff line numberDiff line change
@@ -186,16 +186,14 @@ dev.provision.%: dev.check-memory ## Provision specified services.
186186
echo $*
187187
bash ./provision.sh $*
188188

189-
dev.backup: dev.up.mysql57+mysql80+mongo+elasticsearch710+opensearch12+coursegraph ## Write all data volumes to the host.
190-
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
189+
dev.backup: dev.up.mysql80+mongo+elasticsearch710+opensearch12+coursegraph ## Write all data volumes to the host.
191190
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.mysql80) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/mysql80.tar.gz /var/lib/mysql
192191
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
193192
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
194193
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
195194
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
196195

197-
dev.restore: dev.up.mysql57+mysql80+mongo+elasticsearch710+opensearch12+coursegraph ## Restore all data volumes from the host. WILL OVERWRITE ALL EXISTING DATA!
198-
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
196+
dev.restore: dev.up.mysql80+mongo+elasticsearch710+opensearch12+coursegraph ## Restore all data volumes from the host. WILL OVERWRITE ALL EXISTING DATA!
199197
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.mysql80) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/mysql80.tar.gz
200198
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
201199
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
@@ -413,23 +411,6 @@ dev.shell.%: ## Run a shell on the specified service's container.
413411
dev.dbshell:
414412
docker compose exec mysql80 bash -c "mysql"
415413

416-
DB_NAMES_LIST = credentials discovery ecommerce notes registrar xqueue edxapp edxapp_csmh dashboard analytics-api reports reports_v1
417-
_db_copy8_targets = $(addprefix dev.dbcopy8.,$(DB_NAMES_LIST))
418-
dev.dbcopyall8: ## Clean mysql80 container and copy data from old mysql 5.7 containers into new mysql8 dbs
419-
$(MAKE) stop
420-
$(MAKE) dev.remove-containers.mysql80
421-
docker volume rm devstack_mysql80_data
422-
$(MAKE) dev.up.mysql57+mysql80
423-
$(MAKE) dev.wait-for.mysql57+mysql80
424-
docker compose exec -T mysql80 mysql -uroot mysql < provision-mysql80.sql
425-
$(MAKE) $(_db_copy8_targets)
426-
$(MAKE) stop
427-
428-
dev.dbcopy8.%: ## Copy data from old mysql 5.7 container into a new 8 db
429-
docker compose exec mysql57 mysqldump "$*" > .dev/$*.sql
430-
docker compose exec -T mysql80 mysql "$*" < .dev/$*.sql
431-
rm .dev/$*.sql
432-
433414
dev.dbshell.%: ## Run a SQL shell on the given database.
434415
docker compose exec mysql80 bash -c "mysql $*"
435416

check.sh

-5
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@ mysql_run_check() {
7070
"docker compose exec -T $(printf %q "$container_name") mysql --protocol tcp -uroot -se $(printf %q "$mysql_probe")"
7171
}
7272

73-
if should_check mysql57; then
74-
echo "Checking MySQL 5.7 query endpoint:"
75-
mysql_run_check mysql57
76-
fi
77-
7873
if should_check mysql80; then
7974
echo "Checking MySQL 8.0 query endpoint:"
8075
mysql_run_check mysql80

docker-compose.yml

-32
Original file line numberDiff line numberDiff line change
@@ -186,23 +186,6 @@ services:
186186
- mongo_data:/data/db
187187
- mongo_config_data:/data/configdb
188188

189-
mysql57:
190-
command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci
191-
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.mysql57"
192-
hostname: mysql57.devstack.edx
193-
environment:
194-
MYSQL_ROOT_PASSWORD: ""
195-
MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
196-
image: edxops/mysql:5.7
197-
networks:
198-
default:
199-
aliases:
200-
- edx.devstack.mysql57
201-
ports:
202-
- "3506:3306"
203-
volumes:
204-
- mysql57_data:/var/lib/mysql
205-
206189
mysql80:
207190
command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci
208191
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.mysql80"
@@ -280,7 +263,6 @@ services:
280263
- lms
281264
- memcached
282265
- mysql80
283-
- mysql57
284266
# Allows attachment to the credentials service using 'docker attach <containerID>'.
285267
stdin_open: true
286268
tty: true
@@ -306,7 +288,6 @@ services:
306288
- elasticsearch710
307289
- memcached
308290
- mysql80
309-
- mysql57
310291
- opensearch12
311292
- redis
312293
# Allows attachment to the discovery service using 'docker attach <containerID>'.
@@ -339,7 +320,6 @@ services:
339320
- lms
340321
- memcached
341322
- mysql80
342-
- mysql57
343323
# Allows attachment to the ecommerce service using 'docker attach <containerID>'.
344324
stdin_open: true
345325
tty: true
@@ -366,7 +346,6 @@ services:
366346
- elasticsearch710
367347
- lms
368348
- mysql80
369-
- mysql57
370349
image: edxops/edx-notes-api-dev:latest
371350
networks:
372351
default:
@@ -480,7 +459,6 @@ services:
480459
- memcached
481460
- mongo
482461
- mysql80
483-
- mysql57
484462
# Allows attachment to the LMS service using 'docker attach <containerID>'.
485463
stdin_open: true
486464
tty: true
@@ -516,7 +494,6 @@ services:
516494
hostname: lms-worker.devstack.edx
517495
depends_on:
518496
- mysql80
519-
- mysql57
520497
- redis
521498
stdin_open: true
522499
tty: true
@@ -533,7 +510,6 @@ services:
533510
depends_on:
534511
- analyticsapi
535512
- mysql80
536-
- mysql57
537513
- lms
538514
- memcached
539515
# Allows attachment to the insights service using 'docker attach <containerID>'.
@@ -566,7 +542,6 @@ services:
566542
hostname: analyticsapi
567543
depends_on:
568544
- mysql80
569-
- mysql57
570545
- elasticsearch710
571546
command: bash -c 'source /edx/app/analytics_api/analytics_api_env && while true; do python /edx/app/analytics_api/analytics_api/manage.py runserver 0.0.0.0:19001 --settings analyticsdataserver.settings.devstack; sleep 2; done'
572547
stdin_open: true
@@ -592,7 +567,6 @@ services:
592567
- discovery
593568
- lms
594569
- mysql80
595-
- mysql57
596570
- memcached
597571
- redis
598572
- registrar-worker
@@ -635,7 +609,6 @@ services:
635609
depends_on:
636610
- lms
637611
- mysql80
638-
- mysql57
639612
- redis
640613
stdin_open: true
641614
tty: true
@@ -674,7 +647,6 @@ services:
674647
- memcached
675648
- mongo
676649
- mysql80
677-
- mysql57
678650
# Allows attachment to the CMS service using 'docker attach <containerID>'.
679651
stdin_open: true
680652
tty: true
@@ -710,7 +682,6 @@ services:
710682
hostname: cms-worker.devstack.edx
711683
depends_on:
712684
- mysql80
713-
- mysql57
714685
- redis
715686
stdin_open: true
716687
tty: true
@@ -745,7 +716,6 @@ services:
745716
- ${PWD}/configuration_files/xqueue.yml:/edx/etc/xqueue.yml
746717
depends_on:
747718
- mysql80
748-
- mysql57
749719
environment:
750720
XQUEUE_CFG: "/edx/etc/xqueue.yml"
751721
networks:
@@ -765,7 +735,6 @@ services:
765735
- ${PWD}/configuration_files/xqueue.yml:/edx/etc/xqueue.yml
766736
depends_on:
767737
- mysql80
768-
- mysql57
769738
networks:
770739
default:
771740
aliases:
@@ -1200,6 +1169,5 @@ volumes:
12001169
mongo_data:
12011170
mongo_config_data:
12021171
opensearch12_data:
1203-
mysql57_data:
12041172
mysql80_data:
12051173
redis_data:

options.mk

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

provision.sh

+1-4
Original file line numberDiff line numberDiff line change
@@ -127,21 +127,18 @@ fi
127127
echo -e "${GREEN}Will provision the following:\n ${to_provision_ordered}${NC}"
128128

129129
# Bring the databases online.
130-
docker compose up -d mysql57
131130
docker compose up -d mysql80
132131
if needs_mongo "$to_provision_ordered"; then
133132
docker compose up -d mongo
134133
fi
135134

136135
# Ensure the MySQL server is online and usable
137136
echo -e "${GREEN}Waiting for MySQL.${NC}"
138-
make dev.wait-for.mysql57+mysql80
137+
make dev.wait-for.mysql80
139138
echo -e "${GREEN}MySQL is ready.${NC}"
140139

141140
# Ensure that the MySQL databases and users are created for all IDAs.
142141
# (A no-op for databases and users that already exist).
143-
echo -e "${GREEN}Ensuring MySQL 5.7 databases and users exist...${NC}"
144-
docker compose exec -T mysql57 bash -e -c "mysql -uroot mysql" < provision.sql
145142
echo -e "${GREEN}Ensuring MySQL 8.0 databases and users exist...${NC}"
146143
docker compose exec -T mysql80 bash -e -c "mysql -uroot mysql" < provision-mysql80.sql
147144

0 commit comments

Comments
 (0)