kezhenxu94 commented on code in PR #9689: URL: https://github.com/apache/skywalking/pull/9689#discussion_r980063735
########## test/e2e-v2/cases/storage/mysql/sharding/docker-compose.yml: ########## @@ -0,0 +1,114 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +version: '2.1' + +services: + sharding-proxy: + extends: + file: ../../../../script/docker-compose/base-compose.yml + service: sharding-proxy + networks: + - e2e + ports: + - 3307 + depends_on: + mysql-1: + condition: service_healthy + mysql-2: + condition: service_healthy + + mysql-1: + image: mysql/mysql-server:8.0.13 + networks: + - e2e + ports: + - 3306 + environment: + MYSQL_ROOT_PASSWORD: "root@1234" + MYSQL_DATABASE: "swtest" + MYSQL_ROOT_HOST: "%" + healthcheck: + test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/3306"] + interval: 5s + timeout: 60s + retries: 120 + + mysql-2: + image: mysql/mysql-server:8.0.13 + networks: + - e2e + ports: + - 3306 + environment: + MYSQL_ROOT_PASSWORD: "root@1234" + MYSQL_DATABASE: "swtest" + MYSQL_ROOT_HOST: "%" + healthcheck: + test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/3306"] + interval: 5s + timeout: 60s + retries: 120 + Review Comment: ```suggestion mysql-1: &mysql image: mysql/mysql-server:8.0.13 networks: - e2e ports: - 3306 environment: MYSQL_ROOT_PASSWORD: "root@1234" MYSQL_DATABASE: "swtest" MYSQL_ROOT_HOST: "%" healthcheck: test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/3306"] interval: 5s timeout: 60s retries: 120 mysql-2: <<: *mysql ``` ########## test/e2e-v2/cases/zipkin/mysql/sharding/docker-compose.yml: ########## @@ -0,0 +1,113 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +version: '2.1' + +services: + sharding-proxy: + extends: + file: ../../../../script/docker-compose/base-compose.yml + service: sharding-proxy + networks: + - e2e + ports: + - 3307 + depends_on: + mysql-1: + condition: service_healthy + mysql-2: + condition: service_healthy + + mysql-1: + image: mysql/mysql-server:8.0.13 + networks: + - e2e + ports: + - 3306 + environment: + MYSQL_ROOT_PASSWORD: "root@1234" + MYSQL_DATABASE: "swtest" + MYSQL_ROOT_HOST: "%" + healthcheck: + test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/3306"] + interval: 5s + timeout: 60s + retries: 120 + + mysql-2: Review Comment: Same here ########## test/e2e-v2/cases/log/mysql/sharding/docker-compose.yml: ########## @@ -0,0 +1,101 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +version: '2.1' + +services: + sharding-proxy: + extends: + file: ../../../../script/docker-compose/base-compose.yml + service: sharding-proxy + networks: + - e2e + ports: + - 3307 + depends_on: + mysql-1: + condition: service_healthy + mysql-2: + condition: service_healthy + + mysql-1: + image: mysql/mysql-server:8.0.13 + networks: + - e2e + ports: + - 3306 + environment: + MYSQL_ROOT_PASSWORD: "root@1234" + MYSQL_DATABASE: "swtest" + MYSQL_ROOT_HOST: "%" + healthcheck: + test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/3306"] + interval: 5s + timeout: 60s + retries: 120 + + mysql-2: + image: mysql/mysql-server:8.0.13 + networks: + - e2e + ports: + - 3306 + environment: + MYSQL_ROOT_PASSWORD: "root@1234" + MYSQL_DATABASE: "swtest" + MYSQL_ROOT_HOST: "%" + healthcheck: + test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/3306"] + interval: 5s + timeout: 60s + retries: 120 + Review Comment: Try to use yaml anchor to reduce duplications ```suggestion mysql-1: &mysql image: mysql/mysql-server:8.0.13 networks: - e2e ports: - 3306 environment: MYSQL_ROOT_PASSWORD: "root@1234" MYSQL_DATABASE: "swtest" MYSQL_ROOT_HOST: "%" healthcheck: test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/3306"] interval: 5s timeout: 60s retries: 120 mysql-2: <<: *mysql ``` ########## test/e2e-v2/cases/browser/mysql/sharding/docker-compose.yml: ########## @@ -0,0 +1,176 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +version: '2.1' + +services: + sharding-proxy: + extends: + file: ../../../../script/docker-compose/base-compose.yml + service: sharding-proxy + networks: + - e2e + ports: + - 3307 + depends_on: + mysql-1: + condition: service_healthy + mysql-2: + condition: service_healthy + + mysql-1: + image: mysql/mysql-server:8.0.13 + networks: + - e2e + ports: + - 3306 + environment: + MYSQL_ROOT_PASSWORD: "root@1234" + MYSQL_DATABASE: "swtest" + MYSQL_ROOT_HOST: "%" + healthcheck: + test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/3306"] + interval: 5s + timeout: 60s + retries: 120 + + mysql-2: Review Comment: And here ########## test/e2e-v2/script/docker-compose/base-compose.yml: ########## @@ -114,5 +114,21 @@ services: timeout: 60s retries: 120 + sharding-proxy: Review Comment: This base docker is for some very basic components that all cases should use, I'd rather not to add this here, otherwise future developers tend to add all other components here and this file will lose its point -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
