You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@trafficcontrol.apache.org by GitBox <gi...@apache.org> on 2020/10/12 15:21:15 UTC
[GitHub] [trafficcontrol] zrhoffman opened a new pull request #5138: Idempotentiate create_tables.sql
zrhoffman opened a new pull request #5138:
URL: https://github.com/apache/trafficcontrol/pull/5138
<!--
************ STOP!! ************
If this Pull Request is intended to fix a security vulnerability, DO NOT submit it! Instead, contact
the Apache Software Foundation Security Team at security@trafficcontrol.apache.org and follow the
guidelines at https://www.apache.org/security/ regarding vulnerability disclosure.
-->
## What does this PR (Pull Request) do?
<!-- Explain the changes you made here. If this fixes an Issue, identify it by
replacing the text in the checkbox item with the Issue number e.g.
- [x] This PR #9001 OR is not related to any Issue
^ This will automatically close Issue number 9001 when the Pull Request is
merged (The '#' is important).
Be sure you check the box properly, see the "The following criteria are ALL
met by this PR" section for details.
-->
- [x] This PR closes #4984<!-- You can check for an issue here: https://github.com/apache/trafficcontrol/issues -->
- This PR makes it so that, even if `./admin load_schema` is run more than once (for example, installing TO, with a shared database, on more than 1 host simultaneously), an SQL error should not result.
## Which Traffic Control components are affected by this PR?
<!-- Please delete all components from this list that are NOT affected by this
Pull Request. Also, feel free to add the name of a tool or script that is
affected but not on the list.
Additionally, if this Pull Request does NOT affect documentation, please
explain why documentation is not required. -->
- Traffic Ops (initial `create_tables.sql` seed data)
## What is the best way to verify this PR?
<!-- Please include here ALL the steps necessary to test your Pull Request. If
it includes tests (and most should), outline here the steps needed to run the
tests. If not, lay out the manual testing procedure and please explain why
tests are unnecessary for this Pull Request. -->
1. Check that the schema can be loaded twice or more. After starting CDN-in-a-Box:
```shell script
docker-compose exec trafficops db/admin -env production load_schema
docker-compose exec trafficops db/admin -env production load_schema
```
2. Check that the resultant schema is identical to the one we would have gotten from `create_tables.sql` previously.
```shell script
import_and_dump_schema() {
output_file="$1";
<<'DOCKER_COMMANDS' docker run --rm -i \
-v "$(pwd)/traffic_ops/app/db/create_tables.sql:/create_tables.sql" \
-e POSTGRES_USER=traffic_ops \
-e POSTGRES_PASSWORD=twelve \
-e PGPASSWORD=twelve \
-e POSTGRES_DB=traffic_ops \
postgres:9.6-alpine bash >"$output_file";
trap 'echo "Error on line ${LINENO} of ${0}" >/dev/stderr; exit 1' ERR;
set -o errexit;
/docker-entrypoint.sh postgres >/dev/stderr &
echo 'Waiting for Postgres to start...' >/dev/stderr;
sleep 10;
psql -Utraffic_ops -fcreate_tables.sql >/dev/stderr;
pg_dump -Utraffic_ops;
DOCKER_COMMANDS
};
git checkout origin/master;
import_and_dump_schema upstream.sql;
git checkout zrhoffman/postinstall-twice;
import_and_dump_schema pr.sql;
wc -l upstream.sql pr.sql; # Should be 4429 lines
openssl sha256 upstream.sql pr.sql; # Hash should be 794fd7a23fa690eec67f6cd1257a9a8d900ac59edbdc487119ef73023a938d84
```
## The following criteria are ALL met by this PR
<!-- Check the boxes to signify that the associated statement is true. To
"check a box", replace the space inside of the square brackets with an 'x'.
e.g.
- [ x] <- Wrong
- [x ] <- Wrong
- [] <- Wrong
- [*] <- Wrong
- [x] <- Correct!
-->
- [x] We have no tests for the Perl postinstall script or Go `admin` tool. Suggested a way to verify the PR in the *What is the best way to verify this PR?* section
- [x] You should never actually run `create_tables.sql` twice, no documentation necessary
- [x] This PR includes an update to CHANGELOG.md
- [x] This PR includes any and all required license headers
- [x] This PR ensures that database migration sequence is correct
- [x] This PR **DOES NOT FIX A SERIOUS SECURITY VULNERABILITY** (see [the Apache Software Foundation's security guidelines](https://www.apache.org/security/) for details)
## Additional Information
<!-- If you would like to include any additional information on the PR for
potential reviewers please put it here.
Some examples of this would be:
- Before and after screenshots/gifs of the Traffic Portal if it is affected
- Links to other dependent Pull Requests
- References to relevant context (e.g. new/updates to dependent libraries,
mailing list records, blueprints)
Feel free to leave this section blank (or, preferably, delete it entirely).
-->
<!--
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.
-->
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] rawlinp commented on pull request #5138: Idempotentiate create_tables.sql
Posted by GitBox <gi...@apache.org>.
rawlinp commented on pull request #5138:
URL: https://github.com/apache/trafficcontrol/pull/5138#issuecomment-707199065
This would be a good test case to add to https://github.com/apache/trafficcontrol/blob/master/traffic_ops_db/test/docker/run-db-test.sh if we can.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] zrhoffman commented on pull request #5138: Idempotentiate create_tables.sql
Posted by GitBox <gi...@apache.org>.
zrhoffman commented on pull request #5138:
URL: https://github.com/apache/trafficcontrol/pull/5138#issuecomment-707395719
DB test added in 9250b20ec8
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] rawlinp merged pull request #5138: Idempotentiate create_tables.sql
Posted by GitBox <gi...@apache.org>.
rawlinp merged pull request #5138:
URL: https://github.com/apache/trafficcontrol/pull/5138
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] zrhoffman commented on pull request #5138: Idempotentiate create_tables.sql
Posted by GitBox <gi...@apache.org>.
zrhoffman commented on pull request #5138:
URL: https://github.com/apache/trafficcontrol/pull/5138#issuecomment-708096049
Rebased to fix a merge conflict in the changelog
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org