fix: remove references for mysql 5.6 (#834)

Author: mraarif

Makefile

@@ -8,8 +8,8 @@
 #     make dev.attach.credentials
 #     make dev.pull.registrar+studio
 #     make dev.up.lms
-#     make dev.up.without-deps.lms+forum+discovery+mysql+elasticsearch+memcached
-#     make dev.restart-container.mysql+lms
+#     make dev.up.without-deps.lms+forum+discovery+mysql57+elasticsearch+memcached
+#     make dev.restart-container.mysql57+lms
 
 # There are also "prefix-form" targets, which are simply an alternate way to spell
 # the 'dev.' targets.
@@ -227,17 +227,15 @@ impl-dev.provision.%: dev.check-memory ## Provision specified services.
 dev.provision.%: ## Provision specified services.
 	@scripts/send_metrics.py wrap "dev.provision.$*"
 
-dev.backup: dev.up.mysql+mysql57+mongo+elasticsearch+elasticsearch7+elasticsearch710+coursegraph ## Write all data volumes to the host.
-	docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.mysql) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/mysql.tar.gz /var/lib/mysql
+dev.backup: dev.up.mysql57+mongo+elasticsearch+elasticsearch7+elasticsearch710+coursegraph ## Write all data volumes to the host.
 	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
 	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
 	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
 	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
 	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
 	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
 
-dev.restore: dev.up.mysql+mysql57+mongo+elasticsearch+elasticsearch7+elasticsearch710+coursegraph ## Restore all data volumes from the host. WILL OVERWRITE ALL EXISTING DATA!
-	docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.mysql) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/mysql.tar.gz
+dev.restore: dev.up.mysql57+mongo+elasticsearch+elasticsearch7+elasticsearch710+coursegraph ## Restore all data volumes from the host. WILL OVERWRITE ALL EXISTING DATA!
 	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
 	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
 	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
@@ -267,7 +265,6 @@ dev.migrate.%: ## Run migrations on a service.
 dev.drop-db: _expects-database.dev.drop-db
 
 dev.drop-db.%: ## Irreversably drop the contents of a MySQL database in each mysql container.
-	docker-compose exec -T mysql bash -c "mysql --execute=\"DROP DATABASE $*;\""
 	docker-compose exec -T mysql57 bash -c "mysql --execute=\"DROP DATABASE $*;\""
 
 
@@ -457,11 +454,6 @@ dev.dbshell:
 dev.dbshell.%: ## Run a SQL shell on the given database.
 	docker-compose exec mysql57 bash -c "mysql $*"
 
-dev.dbcopy57.%: ## Copy data from old mysql 5.6 container into a new 5.7 db
-	docker-compose exec mysql bash -c "mysqldump $*" > .dev/$*.sql
-	docker-compose exec -T mysql57 bash -c "mysql $*" < .dev/$*.sql
-	rm .dev/$*.sql
-
 # List of Makefile targets to run static asset generation, in the form dev.static.$(service)
 # Services will only have their asset generation added here
 # if the service is present in both $(DEFAULT_SERVICES) and $(ASSET_SERVICES).

README.rst

@@ -178,7 +178,6 @@ The default devstack services can be run by following the steps below.
 
    This is expected to take a while, produce a lot of output from a bunch of steps, and finally end with ``Provisioning complete!``
 
-   **NOTE:** This command will bring up both MySQL 5.6 and 5.7 databases until all services are upgraded to 5.7.
 
 #. Start the desired services. This command will mount the repositories under the
    ``DEVSTACK_WORKSPACE`` directory.

docker-compose.yml

@@ -161,23 +161,6 @@ services:
     volumes:
       - mongo_data:/data/db
 
-  mysql:
-    command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci
-    container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.mysql"
-    hostname: mysql.devstack.edx
-    environment:
-      MYSQL_ROOT_PASSWORD: ""
-      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
-    image: mysql:5.6
-    networks:
-      default:
-        aliases:
-          - edx.devstack.mysql
-    # ports:
-    #   - "3506:3306"
-    volumes:
-      - mysql_data:/var/lib/mysql
-
   mysql57:
     command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci
     container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.mysql57"
@@ -396,7 +379,7 @@ services:
       - "18110:18110"
     volumes:
       - /edx/var/insights/
- 
+
   registrar:
     command: bash -c 'source /edx/app/registrar/registrar_env && while true; do python /edx/app/registrar/registrar/manage.py runserver 0.0.0.0:18734; sleep 2; done'
     container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.registrar"
@@ -555,7 +538,7 @@ services:
       - "1997:1997"
     depends_on:
       - lms
-  
+
   frontend-app-course-authoring:
     extends:
       file: microfrontend.yml
@@ -673,5 +656,4 @@ volumes:
   elasticsearch7_data:
   elasticsearch710_data:
   mongo_data:
-  mysql_data:
   mysql57_data:

docs/developing_on_named_release_branches.rst

@@ -47,7 +47,7 @@ Switch between your Devstack releases by doing the following:
 Examples of Docker Service Names After Setting the ``COMPOSE_PROJECT_NAME`` variable. Notice that the **devstack-juniper.master** name represents the ``COMPOSE_PROJECT_NAME``.
 
 -  edx.devstack-juniper.master.lms
--  edx.devstack-juniper.master.mysql
+-  edx.devstack-juniper.master.mysql57
 
 Each instance has an isolated set of databases. This could, for example, be used to quickly switch between versions of Open edX without hitting as many issues with migrations, data integrity, etc.
 

docs/devstack_faq.rst

@@ -134,7 +134,7 @@ How do I connect to the databases from an outside editor?
 ---------------------------------------------------------
 
 To connect to the databases from an outside editor (such as MySQLWorkbench),
-first uncomment these lines from ``docker-compose.yml``'s ``mysql`` or ``mysql57`` section (depending on what service you're on):
+first uncomment these lines from ``docker-compose.yml``'s ``mysql57`` section
 
 .. code:: yaml
 
@@ -158,7 +158,7 @@ vary depending on the database. For all of the options, see ``provision.sql``.
 
 If you have trouble connecting, ensure the port was mapped successfully by
 running ``make dev.ps`` and looking for a line like this:
-``edx.devstack.mysql docker-entrypoint.sh mysql ... Up 0.0.0.0:3506→3306/tcp``.
+``edx.devstack.mysql57 docker-entrypoint.sh mysql ... Up 0.0.0.0:3506→3306/tcp``.
 
 How do I build the service images myself?
 -----------------------------------------
@@ -209,7 +209,7 @@ To access the MySQL shell for a particular database, run:
 
 .. code:: sh
 
-   make dev.shell.mysql
+   make dev.shell.mysql57
    mysql
    use <database>;
 

options.mk

@@ -90,4 +90,4 @@ credentials+discovery+ecommerce+insights+lms+registrar+studio
 # All third-party services.
 # Separated by plus signs. Listed in alphabetical order for clarity.
 THIRD_PARTY_SERVICES ?= \
-chrome+coursegraph+devpi+elasticsearch+elasticsearch7+elasticsearch710+firefox+memcached+mongo+mysql+mysql57+redis+namenode+datanode+resourcemanager+nodemanager+sparkmaster+sparkworker+vertica
+chrome+coursegraph+devpi+elasticsearch+elasticsearch7+elasticsearch710+firefox+memcached+mongo+mysql57+redis+namenode+datanode+resourcemanager+nodemanager+sparkmaster+sparkworker+vertica

provision.sh

@@ -122,20 +122,11 @@ fi
 echo -e "${GREEN}Will provision the following:\n  ${to_provision_ordered}${NC}"
 
 # Bring the databases online.
-docker-compose up -d mysql # (temporary until 5.6 is removed)
 docker-compose up -d mysql57
 if needs_mongo "$to_provision_ordered"; then
 	docker-compose up -d mongo
 fi
 
-# Temporary until MySQL 5.6 is removed
-echo "${GREEN}Waiting for MySQL 5.6.${NC}"
-until docker-compose exec -T mysql bash -e -c "mysql -uroot -se \"SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')\"" &> /dev/null
-do
-  printf "."
-  sleep 1
-done
-
 # Ensure the MySQL server is online and usable
 echo "${GREEN}Waiting for MySQL 5.7.${NC}"
 until docker-compose exec -T mysql57 bash -e -c "mysql -uroot -se \"SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')\"" &> /dev/null
@@ -149,9 +140,6 @@ done
 sleep 20
 echo -e "${GREEN}MySQL ready.${NC}"
 
-# Temporary until MySQL 5.6 is removed
-echo -e "${GREEN}Ensuring MySQL 5.6 databases and users exist...${NC}"
-docker-compose exec -T mysql bash -e -c "mysql -uroot mysql" < provision.sql
 
 # Ensure that the MySQL databases and users are created for all IDAs.
 # (A no-op for databases and users that already exist).