Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.

Reorder SQL migrations to fix some upgrade issues#5528

Merged
rawlinp merged 1 commit intoapache:masterfrom
hbeatty:HB-fix-sql-migrations-order_master
Feb 16, 2021
Merged

Reorder SQL migrations to fix some upgrade issues#5528
rawlinp merged 1 commit intoapache:masterfrom
hbeatty:HB-fix-sql-migrations-order_master

Conversation

@hbeatty
Copy link
Contributor

@hbeatty hbeatty commented Feb 16, 2021

What does this PR (Pull Request) do?

This moves some SQL migrations past the last one in 5.0.x that were not in the 4.1.x and 5.0.x branch.

  • This PR is not related to any Issue

Which Traffic Control components are affected by this PR?

  • Traffic Ops

What is the best way to verify this PR?

Do a DB upgrade from 5.0.0 to 5.1.0

If this is a bug fix, what versions of Traffic Control are affected?

  • 5.0.0
  • 5.1.0

The following criteria are ALL met by this PR

  • This PR includes tests OR I have explained why tests are unnecessary
  • This PR includes documentation OR I have explained why documentation is unnecessary
  • This PR includes an update to CHANGELOG.md OR such an update is not necessary
  • This PR includes any and all required license headers
  • This PR DOES NOT FIX A SERIOUS SECURITY VULNERABILITY (see the Apache Software Foundation's security guidelines for details)

This moves some SQL migrations past the last one in 5.0.x that were not in the 4.1.x and 5.0.x branch.
@hbeatty hbeatty requested a review from rawlinp February 16, 2021 17:45
@hbeatty hbeatty self-assigned this Feb 16, 2021
@rawlinp rawlinp added this to the 5.1.0 milestone Feb 16, 2021
@rawlinp rawlinp added bug something isn't working as intended database relating to setup/installation/structure of the Traffic Ops database labels Feb 16, 2021
@rawlinp
Copy link
Contributor

rawlinp commented Feb 16, 2021

Ok, once this is merged it can be backported to 5.1.x, so we don't need #5528.

@ocket8888
Copy link
Contributor

Yeah, I can do that for you. No need of a separate PR

@hbeatty
Copy link
Contributor Author

hbeatty commented Feb 16, 2021

Just curious what the difference is?

@rawlinp
Copy link
Contributor

rawlinp commented Feb 16, 2021

By cherrypicking, we include the original commit hash from master by using the -x option. It also helps ensure that the master version and the 5.1.x version are actually the same changes (in case we request changes here which would cause it to diverge from the 5.1.x PR that was opened simultaneously).

Copy link
Contributor

@rawlinp rawlinp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, DB upgrades from 2020110200000000_add_service_category_deleted.sql (first migration script in 5.0) to the latest and downgrades back successfully.

@rawlinp rawlinp merged commit 1fc56ce into apache:master Feb 16, 2021
ocket8888 pushed a commit that referenced this pull request Feb 16, 2021
This moves some SQL migrations past the last one in 5.0.x that were not in the 4.1.x and 5.0.x branch.

(cherry picked from commit 1fc56ce)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

bug something isn't working as intended database relating to setup/installation/structure of the Traffic Ops database

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants