Diff for "PolicyAndProcess/DatabaseSchemaChangesProcess"

Not logged in - Log In / Register

Differences between revisions 23 and 91 (spanning 68 versions)
Revision 23 as of 2010-10-22 04:28:16
Size: 10739
Editor: lifeless
Comment: db number
Revision 91 as of 2022-07-29 14:22:13
Size: 13444
Editor: lgp171188
Comment: Updated the new location of the dbpatches repository
Deletions are marked like this. Additions are marked like this.
Line 3: Line 3:
We change the schema through database patches. These live in branches that go through review and landing, just like code changes. = Step-by-step procedure =
Line 5: Line 5:
A schema change needs a review of type "db" from the DBA (`stub`) or, in his absence, the technical architect (`lifeless`). But ''request db reviews from both'' these people, so that they can both track changes. A database patch also needs an identifying "patch number"; the db reviewer will assign one.  1. Prepare a branch containing just [[#Making_a_database_patch|your database patch]] for review.
  * The patch must either be a hot patch (function / trigger / index) or a cold patch (model change / model change + function/trigger). If you need both hot and cold changes, you require multiple branches.
Line 7: Line 8:
Changes to the permissions in `database/schema/security.py` or the comments in `database/schema/comments.sql` do not require db review. If you get both code and db reviews, the code reviewer should look at them. (But if nothing else in your branch requires code review, then they're for the db reviewer to inspect).  1. Submit a merge proposal for your branch, requesting a '''db''' review from launchpad-reviewers. For hot patches the target branch is `master`, but for cold patches it should be `db-devel`.
Line 9: Line 10:
 1. Iterate on the branch as needed. The DB review process can sometimes require significant changes to achieve acceptable performance on either the patch application or queries / updates to the resulting schema.
Line 10: Line 12:
== Procedure ==  1. The schema change is approved for landing when you have an 'Approved' vote from a DB reviewer (unless the reviewer in question explicitly sets a higher barrier).
Line 12: Line 14:
 1. Discuss non-trivial or controversial changes.  1. Wait until there are '''no''' blockers to deploying the patch. One common blocker is having code changes made prior to the patch sitting in stable and not yet deployed to all affected service instances.
Line 14: Line 16:
 1. Prepare a branch containing your database patch for review. Feel free to request assistance from or outsource work to the DBA (stub).  1. Land the branch on `master` (for hot patches) or `db-devel` (for cold patches) by setting the merge proposal to Approved as usual, unless someone has stated it is being landed it on your behalf. (Only Canonical staff can do the landing step).
Line 16: Line 18:
 1. Submit a merge proposal for your branch into `lp:launchpad` (`lp:~launchpad-pqm/launchpad/db-devel`), requesting two '''db''' reviews from respectively the technical architect (lifeless) and the DBA (stub).  1. [Cold patches] Wait until the branch reaches staging. Use the [[https://deployable.ols.canonical.com/project/launchpad-db|db-stable deployment report]] to check this.
Line 18: Line 20:
 1. If your branch also contains code changes, then request a separate code review as well.  1. [Cold patches] After the branch reaches staging check the duration that the patch took to apply by rsyncing `pamola.internal::staging-logs/dbupgrade.log` from carob. If it took more than 15 seconds, mark the revision bad and revert it.
Line 20: Line 22:
 1. Follow your reviewers' instructions. The DBA or Technical Architect will allocate a database patch number as required. The schema change is approved for landing when you have an 'Approved' vote from the DBA - no need to block waiting on the Technical Architect review.  1. [Cold patches] QA the patch as usual, check things still work on staging.
Line 22: Line 24:
 1. Ensure the sampledata is up to date on your branch.  1. [Hot patches] Ask a member of IS to manually apply the patch to qastaging, and check that things still work. ''Note: This is a temporary exception from normal deployment rules, to be reviewed when buildbot is faster.''
Line 24: Line 26:
 1. Ensure the test suite still passes.  1. Request a deployment per the internal [[https://wiki.canonical.com/Launchpad/PolicyandProcess/ProductionChange|production change process]].
Line 26: Line 28:
 1. Land the branch on `lp:launchpad` (`lp:~launchpad-pqm/launchpad/db-devel`) unless someone has stated it is being landed it on your behalf.  1. Now get your python code that builds on the schema landed and deployed as usual.
Line 28: Line 30:
= Background =
Line 29: Line 32:
== Making a database patch == We change the schema through database patches. These live in branches that go through review and landing, just like code changes.

Schema patches are either applied while the system has no activity ('cold patches') or while the system is under load ('hot patches'). Some things, like changing a table '''and''' adding an index, will need to be split into two separate patches - one hot and one cold.

Schema patches must '''not''' be combined with changes to the Launchpad python code - any branch landing on devel or db-devel must be one or the other. Test *only* code may be included if absolutely necessary. Exceptions to this rule require approval from the project lead, because deploying them will require a 1 hour plus complete downtime window.

Cold schema patches always land on `db-devel`. After they are made live they will be promoted to `master` as part of the go-live process.

== Hot Patches ==

[[Database/LivePatching]] explains how hot-patching works and what sorts of things we can hot-patch. It's the authority — we may be able to hot-patch more as our tooling improves.

== Cold Patches ==

Anything that is not a hot patch is a cold patch and can only be applied while the appservers and so on are disconnected from the database cluster.

For qa on a cold patch, check the application time from the staging log - it must be < 15 seconds [even with cold disk cache], or we will exceed our downtime window. To exceed that window requires signoff by the technical architect or project lead.

If some parts of a change can be applied as a hot patch, it is a good idea to do it that way, in order to keep application time minimal. For example, applying an index to thousands of rows may be okay, but tens of thousands of rows is typically too slow to do in a cold patch.

= Deploying patches =

After successful QA on a patch, request a deploy via the internal process [[https://wiki.canonical.com/Launchpad/PolicyandProcess/ProductionChange|production change process]]..

= Reviews =

All schema changes should have reviews of type "db" requested from the regular review team (`launchpad-reviewers`). An approve vote from any DB reviewer is sufficient to land the patch.

As schema changes have no appserver code changes landed at the same time, no other reviews are needed (unless an exception to the no-mixing rule has been granted, in which case a normal review is also needed).

Changes to the permissions in `database/schema/security.cfg` or the comments in `database/schema/comments.sql` are not schema patches and do not require db review when done on their own. If they are included in a schema patch then the db reviewer will review them.

= Patch ids =

The schema application code needs a unique id for each patch. This is allocated by editing a shared document stored in the [[https://code.launchpad.net/~launchpad/+git/dbpatches|dbpatches repository]]. If you are in `~launchpad` please allocate this yourself. Other developers can ask any ~launchpad member to allocate a patch number for them.

As we no longer synchronise appserver deployments with schema deployments, '''no-one should use a -0 patch.'''

Instructions for choosing a patch number are in the docs in the dbpatches repository.

= Making a database patch =
Line 32: Line 75:
whether you intend to add new sample data or not. For example, if you are
adding a new column to the `Person` table, these steps ensure that the new
sample data will include this new column.
whether you intend to delete sample data or not. For example, if you are
adding a new column to the `Person` table, these steps ensure that the sample
data will include this new column.
Line 38: Line 81:
 1. Create a SQL file in `database/schema/pending/` containing the changes you want.
    1. The first line of your file should be `SET client_min_messages=ERROR;`.
    1. Don't use the TRUNCATE or DROP TABLE statements as they don't work with Slony-I replication.
       1. To drop a table, rename it into the `todrop` namespace using a statement like `ALTER TABLE FooBar RENAME TO todrop.FooBar`.
    1. If you are doing data initialization or data migration, don't use indeterminate values that might give different results on different databases, such as random() or CURRENT_TIMESTAMP. This would create skew in our data between the master and slave databases.
         1. For a new column with an indeterminate DEFAULT, you may need to manually set the initial values to something determinate before adding the DEFAULT to the column. eg. initialize the new date_eviscerated column to a fixed, known timestamp before setting its default to CURRENT_TIMESTAMP AT TIME ZONE 'UTC'.
 1. Claim a patch number in [[https://code.launchpad.net/~launchpad/+git/dbpatches|the dbpatches repository]] (be sure to commit and push back to the `main` branch).
Line 45: Line 83:
 1. Run your new SQL patch on the development database to ensure that it works. Do this by running `psql launchpad_dev -f your-patch.sql`  1. Create a SQL file in `database/schema/` containing the changes you want. It should look like this: {{{
-- Copyright 2011 Canonical Ltd. This software is licensed under the
-- GNU Affero General Public License version 3 (see the file LICENSE).
Line 47: Line 87:
 1. ''(Optional):'' Interact with `launchpad.dev` to add any additional sample data you want to demonstrate in the web u/i. SET client_min_messages=ERROR;
Line 49: Line 89:
 1. Run `psql launchpad_ftest_playground -f your-patch.sql` as the ftest playground db is used to generate newsampledata.sql in the following step. -- put your changes in here.
Line 51: Line 91:
 1. Run `make newsampledata`. INSERT INTO LaunchpadDatabaseRevision VALUES (XXXX, YY, Z);
}}}
 1. Run your new SQL patch on the development database to ensure that it works. Do this by running `psql launchpad_dev -1 -f your-patch.sql`
Line 53: Line 95:
 1. Review the sample data changes that occured using `diff database/sampledata/current.sql database/sampledata/newsampledata.sql`. This diff can be hard to review as-is. You might want to use a graphical diff viewer like `kompare` or `meld` which will make it easier. Make sure that you understand all the changes you see.  1. Run `psql launchpad_ftest_playground -f your-patch.sql` as the ftest playground db is used to regenerate sampledata snapshots in the following step. (Also be sure you ran `psql launchpad_dev -f your-patch.sql` in the previous step-- this updates the dev database's sampledata. Note that this is ''not'' sufficient to let the test suite see your changes: for that, you'll need to update `launchpad_ftest_template`, though it's simplest to run `make schema` or `make -C database/schema test` as described below.)
Line 55: Line 97:
 1. In `database/sampledata/`, move `newsampledata.sql` to `current.sql`, replacing the latter.  1. You may wish to run `make newsampledata`, although it isn't critical; this will let you see what changes your patch would make to initial setups.
Line 57: Line 99:
 1. In `database/sampledata/`, move `newsampledata-dev.sql` to `current-dev.sql`, replacing the latter.     1. This will produce a lot of noise. Feel free to ignore it.
Line 59: Line 101:
 1. Move your pending SQL file into `database/schema/` with a name like `patch-xx-99-0.sql` (where ''xx'' matches the existing patches), and ending with the line `INSERT INTO LaunchpadDatabaseRevision VALUES (xx, 99, 0);`. When your patch is reviewed and approved, you will be assigned an official patch number, which you will use instead of `99` in both the name of the file and this last line.  1. Review the sample data changes that occured using `git diff database/sampledata`. This diff can be hard to review as-is. You might want to use a graphical diff viewer like `kompare` or `meld` which will make it easier. Make sure that you understand all the changes you see.
Line 61: Line 103:
 1. '''Run `make schema` again to ensure that it works, and that you now have a pristine database with the new sample data.'''  1. Move your pending SQL file into `database/schema/` with a name like `patch-xx-yy-zz.sql` (where ''xx'' matches the existing patches), and ending with the line `INSERT INTO LaunchpadDatabaseRevision VALUES (xx, yy, zz);`.

 1. If you have removed or renamed a table or column, update `database/schema/comments.sql`.

 1. '''Run `make schema` again to ensure that it works, and that you now have a pristine database with the new sample data.''' If you don't want to blow away your `launchpad_dev` database, then you can use `make -C database/schema test` instead to update only the test databases.
Line 65: Line 111:
 1. Make any necessary changes to `database/schema/fti.py`, `database/schema/security.cfg`, and at least the minimum code changes required to keep the test suite passing.  1. Make any necessary changes to `database/schema/fti.py`, `database/schema/security.cfg`.
Line 67: Line 113:
 1. Make any necessary changes to the SQL patch to reflect new default values.  1. '''Run the full test suite to ensure that your new schema doesn't break any existing tests/code by side effect.'''
Line 69: Line 115:
 1. '''Run the full test suite to ensure that your new sample data doesn't break any existing tests by side effect.'''  1. Commit without sample data changes, push and propose for merging to `db-devel`
Line 71: Line 117:
 1. Go have lunch.
Line 73: Line 118:
Note that if you make subsequent additional changes, you may be able to skip straight to step 5. == Rules for patches ==
Line 75: Line 120:
 1. Don't use the TRUNCATE or DROP TABLE statements as they don't work with Slony-I replication.

 1. To drop a table, move it into the `todrop` namespace using a statement like `ALTER TABLE FooBar SET SCHEMA todrop`. Then `upgrade.py` will automatically drop these tables during the downtime. Be careful about foreign keys: the drop order is undefined so foreign keys between the tables must be dropped explicitly, and foreign keys handled specially by application code (most branch and person) may need to be dropped first in a separate patch.

 1. Do not migrate data in schema patches unless the data size is extraordinarily small (< 100's of rows).

 1. Similarly, new columns must default NULL unless the data size is extraordinarily small (< 100's of rows).

 1. When changing existing DB functions, start your patch with the original version (`SELECT pg_get_functiondef(oid) FROM pg_proc WHERE proname IN ('foofunc', 'barfunc') ORDER BY proname;`). This makes it much easier to review the diff.
Line 81: Line 135:

We have deprecated sample data. That means that you should never ''add'' new rows to the sample data.
Line 89: Line 145:
If your tests require new data, you should strongly consider creating the data If your tests require new data, you should create the data
Line 95: Line 151:
suite uses the `launchpad_ftest` database, there is no chance that running the
test suite will accidentally add new sample data.
suite uses the `launchpad_ftest_template` database, there is no chance that running the
test suite will accidentally alter the sample data.
Line 110: Line 166:
generate new karma events, you will probably break the `karma_sample_data` generate new karma events, you will break the `karma_sample_data`
Line 127: Line 183:
mv ../sampledata/newsampledata.sql ../sampledata/current.sql
Line 134: Line 189:
== Notes on Changing security.cfg == = Notes on Changing security.cfg =
Line 136: Line 191:
It is possible to land changes to security.cfg on lp:~launchpad-pqm/launchpad/devel rather than lp:~launchpad-pqm/launchpad/db-devel. These changes can cause OOPSes on edge.launchpad.net if edge requires a permission that has not been granted to the production DB. So if you are landing a security.cfg change that needs to land on lp:~launchpad-pqm/launchpad/devel, you need to email stub & the losas, CC: launchpad@ asking them to apply the manual change to the production databases as well. Reviewers should remind about this when seeing a security.cfg change. It is possible to land changes to security.cfg on `master` rather than `db-devel`. These changes are deployed during nodowntime rollouts.
Line 138: Line 193:

=== Triggers ===

 1. Developer needs a database schema change implemented as part of his/her development activities
 1. Developer needs a database schema change implemented as part of his/her bug fixing activities


=== Inputs ===

 1. Developer originated schema change concept

=== Outputs ===

 1. SQL Patch File

=== Participants ===

 1. Developer
 2. DBA (in our case, StuartBishop)
 3. Technical Architect (in our case, RobertCollins)

== Subprocesses ==

 N/A.

== Standard Path Events/Activities ==

 1. When a developer has a change they want to make to the database schema, they write a database patch (see database/schema in the source tree).
 1. They can give themselves a provisional patch number on their development tree.
 1. A merge proposal is submitted, with reviews requested from the Launchpad Product Strategist and the DBA.
 1. When it has passed review, the DBA gives them a database patch number, which becomes the filename of the SQL.
 1. The DBA will also issue further instuctions on how to proceed.
Notes:
 * Because each database patch number is unique, various database schema changes can be worked on by different members of the team in parallel, and successfully merged together in different ways.
 * This is most often used just for schema changes.
 * Sometimes schema changes have accompanying data updates.

== Alternative Path Events/Activities ==


== Comments ==

== Current db patch number ==

This is the highest allocated patch number, which may not have landed yet.

[{{2208-26-0}}}
Note that adding new users requires manual DB reconfiguration, so you need to file an RT ticket to grant access to relevant machines and make sure it is resolved '''before landing the branch''' that needs them.

Step-by-step procedure

  1. Prepare a branch containing just your database patch for review.

    • The patch must either be a hot patch (function / trigger / index) or a cold patch (model change / model change + function/trigger). If you need both hot and cold changes, you require multiple branches.
  2. Submit a merge proposal for your branch, requesting a db review from launchpad-reviewers. For hot patches the target branch is master, but for cold patches it should be db-devel.

  3. Iterate on the branch as needed. The DB review process can sometimes require significant changes to achieve acceptable performance on either the patch application or queries / updates to the resulting schema.
  4. The schema change is approved for landing when you have an 'Approved' vote from a DB reviewer (unless the reviewer in question explicitly sets a higher barrier).
  5. Wait until there are no blockers to deploying the patch. One common blocker is having code changes made prior to the patch sitting in stable and not yet deployed to all affected service instances.

  6. Land the branch on master (for hot patches) or db-devel (for cold patches) by setting the merge proposal to Approved as usual, unless someone has stated it is being landed it on your behalf. (Only Canonical staff can do the landing step).

  7. [Cold patches] Wait until the branch reaches staging. Use the db-stable deployment report to check this.

  8. [Cold patches] After the branch reaches staging check the duration that the patch took to apply by rsyncing pamola.internal::staging-logs/dbupgrade.log from carob. If it took more than 15 seconds, mark the revision bad and revert it.

  9. [Cold patches] QA the patch as usual, check things still work on staging.
  10. [Hot patches] Ask a member of IS to manually apply the patch to qastaging, and check that things still work. Note: This is a temporary exception from normal deployment rules, to be reviewed when buildbot is faster.

  11. Request a deployment per the internal production change process.

  12. Now get your python code that builds on the schema landed and deployed as usual.

Background

We change the schema through database patches. These live in branches that go through review and landing, just like code changes.

Schema patches are either applied while the system has no activity ('cold patches') or while the system is under load ('hot patches'). Some things, like changing a table and adding an index, will need to be split into two separate patches - one hot and one cold.

Schema patches must not be combined with changes to the Launchpad python code - any branch landing on devel or db-devel must be one or the other. Test *only* code may be included if absolutely necessary. Exceptions to this rule require approval from the project lead, because deploying them will require a 1 hour plus complete downtime window.

Cold schema patches always land on db-devel. After they are made live they will be promoted to master as part of the go-live process.

Hot Patches

Database/LivePatching explains how hot-patching works and what sorts of things we can hot-patch. It's the authority — we may be able to hot-patch more as our tooling improves.

Cold Patches

Anything that is not a hot patch is a cold patch and can only be applied while the appservers and so on are disconnected from the database cluster.

For qa on a cold patch, check the application time from the staging log - it must be < 15 seconds [even with cold disk cache], or we will exceed our downtime window. To exceed that window requires signoff by the technical architect or project lead.

If some parts of a change can be applied as a hot patch, it is a good idea to do it that way, in order to keep application time minimal. For example, applying an index to thousands of rows may be okay, but tens of thousands of rows is typically too slow to do in a cold patch.

Deploying patches

After successful QA on a patch, request a deploy via the internal process production change process..

Reviews

All schema changes should have reviews of type "db" requested from the regular review team (launchpad-reviewers). An approve vote from any DB reviewer is sufficient to land the patch.

As schema changes have no appserver code changes landed at the same time, no other reviews are needed (unless an exception to the no-mixing rule has been granted, in which case a normal review is also needed).

Changes to the permissions in database/schema/security.cfg or the comments in database/schema/comments.sql are not schema patches and do not require db review when done on their own. If they are included in a schema patch then the db reviewer will review them.

Patch ids

The schema application code needs a unique id for each patch. This is allocated by editing a shared document stored in the dbpatches repository. If you are in ~launchpad please allocate this yourself. Other developers can ask any ~launchpad member to allocate a patch number for them.

As we no longer synchronise appserver deployments with schema deployments, no-one should use a -0 patch.

Instructions for choosing a patch number are in the docs in the dbpatches repository.

Making a database patch

You need to run these steps whenever you make a schema change, regardless of whether you intend to delete sample data or not. For example, if you are adding a new column to the Person table, these steps ensure that the sample data will include this new column.

  1. Run make schema to get a pristine database of sample data.

  2. Claim a patch number in the dbpatches repository (be sure to commit and push back to the main branch).

  3. Create a SQL file in database/schema/ containing the changes you want. It should look like this:

    -- Copyright 2011 Canonical Ltd.  This software is licensed under the
    -- GNU Affero General Public License version 3 (see the file LICENSE).
    
    SET client_min_messages=ERROR;
    
    -- put your changes in here.
    
    INSERT INTO LaunchpadDatabaseRevision VALUES (XXXX, YY, Z);
  4. Run your new SQL patch on the development database to ensure that it works. Do this by running psql launchpad_dev -1 -f your-patch.sql

  5. Run psql launchpad_ftest_playground -f your-patch.sql as the ftest playground db is used to regenerate sampledata snapshots in the following step. (Also be sure you ran psql launchpad_dev -f your-patch.sql in the previous step-- this updates the dev database's sampledata. Note that this is not sufficient to let the test suite see your changes: for that, you'll need to update launchpad_ftest_template, though it's simplest to run make schema or make -C database/schema test as described below.)

  6. You may wish to run make newsampledata, although it isn't critical; this will let you see what changes your patch would make to initial setups.

    1. This will produce a lot of noise. Feel free to ignore it.
  7. Review the sample data changes that occured using git diff database/sampledata. This diff can be hard to review as-is. You might want to use a graphical diff viewer like kompare or meld which will make it easier. Make sure that you understand all the changes you see.

  8. Move your pending SQL file into database/schema/ with a name like patch-xx-yy-zz.sql (where xx matches the existing patches), and ending with the line INSERT INTO LaunchpadDatabaseRevision VALUES (xx, yy, zz);.

  9. If you have removed or renamed a table or column, update database/schema/comments.sql.

  10. Run make schema again to ensure that it works, and that you now have a pristine database with the new sample data. If you don't want to blow away your launchpad_dev database, then you can use make -C database/schema test instead to update only the test databases.

  11. Comments on new tables and columns need to be added to database/schema/comments.sql.

  12. Make any necessary changes to database/schema/fti.py, database/schema/security.cfg.

  13. Run the full test suite to ensure that your new schema doesn't break any existing tests/code by side effect.

  14. Commit without sample data changes, push and propose for merging to db-devel

Rules for patches

  1. Don't use the TRUNCATE or DROP TABLE statements as they don't work with Slony-I replication.
  2. To drop a table, move it into the todrop namespace using a statement like ALTER TABLE FooBar SET SCHEMA todrop. Then upgrade.py will automatically drop these tables during the downtime. Be careful about foreign keys: the drop order is undefined so foreign keys between the tables must be dropped explicitly, and foreign keys handled specially by application code (most branch and person) may need to be dropped first in a separate patch.

  3. Do not migrate data in schema patches unless the data size is extraordinarily small (< 100's of rows).

  4. Similarly, new columns must default NULL unless the data size is extraordinarily small (< 100's of rows).

  5. When changing existing DB functions, start your patch with the original version (SELECT pg_get_functiondef(oid) FROM pg_proc WHERE proname IN ('foofunc', 'barfunc') ORDER BY proname;). This makes it much easier to review the diff.

Sample data

Let's say your branch needs to make changes to the database schema. You need to follow the steps on this page to ensure that the sample data is updated to match your schema changes.

We have deprecated sample data. That means that you should never add new rows to the sample data.

In fact, there are now two sets of sampledata that need to be updated.

We use sample data to provide well-known baseline data for the test suite, and to populate a developer's Launchpad instance so that launchpad.dev can display interesting stuff. There are some guidelines and recommendations you should be aware of before you make changes to the test suite sample data, or you may break the tests for yourself or others.

Please note that sample data is for developer's instances only. It would make no sense to use the sample data on production systems!

If your tests require new data, you should create the data in your test's harness instead of adding new sample data. This will often make the tests themselves more readable because you're not relying on magical values in the sample database. Doing it this way also reduces the chance that your changes will break other tests by side-effect. Add the new data in your test's setUp() or in the narrative of your doctest. Because the test suite uses the launchpad_ftest_template database, there is no chance that running the test suite will accidentally alter the sample data.

However, if you interact with the web U/I for launchpad.dev your changes will end up in the launchpad_dev database. This database is used to create the new sample data, so it is imperative that you run make schema to start with a pristine database before generating new sample data. If in fact you do want the effects of your u/i interactions to land in the new sample data, then the general process is to

  • run make schema

  • interact with launchpad.dev

  • follow the make newsampledata steps above.

Be aware though that your generation of new sample data will probably have an effect on tests not related to your changes! For example, if you generate new karma events, you will break the karma_sample_data tests because they expect all karma events to be dated prior to the year 2002. If you make changes to the sample data, you must run the full test suite and ensure that you get no failures, otherwise there is a very high likelihood that you will break the trunk.

Resolving schema conflicts

Resolving conflicts in current.sql manually is usually more trouble than it's worth. Instead, first resolve any conflicts in comments.sql, then:

cd database/schema/
mv {patch-in-question}-0.sql comments.sql pending/
cp {parent branch, e.g. rocketfuel}/database/schema/comments.sql ./
cp ../sampledata/current.sql.OTHER ../sampledata/current.sql
make
psql launchpad_dev -f pending/patch-xx-99-0.sql
make newsampledata
mv pending/{patch-in-question}-0.sql pending/comments.sql ./
make   # Just to make sure everything works
cd ../..
bzr resolve database/sampledata/current.sql

Notes on Changing security.cfg

It is possible to land changes to security.cfg on master rather than db-devel. These changes are deployed during nodowntime rollouts.

Note that adding new users requires manual DB reconfiguration, so you need to file an RT ticket to grant access to relevant machines and make sure it is resolved before landing the branch that needs them.

PolicyAndProcess/DatabaseSchemaChangesProcess (last edited 2022-09-29 10:26:50 by cjwatson)