bifrost and bookshelf schemas explicit upgrade #715
Conversation
|
Testing in progress, but opening for review now. Note that depending on ongoing discussion, we may expand this to include the necessary partybus changes to support the requirement. The current state of partybus means that we can't perform a schema migration against anything other than the |
I think that is a good idea. I'd like the support to be there for the next person who has to do a schema update. |
marcparadise
force-pushed
the
mp/HA-23
branch
from
ef2e8b8 to
3f8d0a3
Compare
marcparadise
force-pushed
the
mp/HA-23
branch
from
3f8d0a3 to
a3d0d55
Compare
| # EITHER: :service - name of key into 'secrets' that should contain | ||
| # sql_user and sql_password entries, | ||
| # OR: :username, :password for sql auth | ||
| def run_sqitch(target, path, database, credentials) |
There was a problem hiding this comment.
Perhaps this might be a bit nicer from the caller's perspective if we just had to pass in a single 'service' argument that would know how to look up the correct path, username, password, and database. We could leave the final param as an optional opts hash for when you need to set things manually:
def run_sqitch(target, service, opts={})
username = opts[:username] || username_for_service(service)
password = opts[:password] || password_for_service(service)
database = opts[:database] || database_for_service(service)
path = opts[:path] || path_for_service(service)
...
endThere was a problem hiding this comment.
I started down that path, but currently can't recall why I didn't stick with it. In any case - that sounds good to me.
|
Overall, looks good. Made a minor suggestion regarding the API of run_sqitch, let me know what you think. |
|
Updated with a variant on the comments above. |
| @@ -1,6 +1,7 @@ | |||
| define_upgrade do | |||
| if Partybus.config.bootstrap_server | |||
| must_be_data_master | |||
| run_sqitch("@cbv-type", "@1.0.4") | |||
| # Performance improvements for cookbook fetching. | |||
| run_sqitch('@cbv-type', 'oc_erchef/schema') | |||
There was a problem hiding this comment.
This should be 'oc_erchef' I think?
marcparadise
force-pushed
the
mp/HA-23
branch
from
da4d452 to
c3f63af
Compare
|
👍 |
marcparadise
force-pushed
the
mp/HA-23
branch
from
c3f63af to
8a11e49
Compare
marcparadise
force-pushed
the
mp/HA-23
branch
from
8a11e49 to
67f728e
Compare
| end | ||
|
|
||
| def default_opts_for_service(service) | ||
| username = Partybus.config.secrets[service]['sql_user'] |
There was a problem hiding this comment.
The sql_user isn't stored in the secrets hash, which is why this is failing tests.
marcparadise
force-pushed
the
mp/HA-23
branch
from
67f728e to
206d8ab
Compare
marcparadise
force-pushed
the
mp/HA-23
branch
from
206d8ab to
afa6781
Compare
marcparadise
force-pushed
the
mp/HA-23
branch
from
afa6781 to
5558b8b
Compare
marcparadise
force-pushed
the
mp/HA-23
branch
from
5558b8b to
ccd87be
Compare
Instead of upgrading bifrost and bookshelf schemas to the latest with every chef-server-ctl reconfigure, we're taking the more conservative approach used for the opscode_chef schema: 1. Install the schema to the latest version on a new install 2. Changes to schemas during upgrades must be explicitly performed via a partybus migration.
Partybus.run_sqitch was previously hard-coded to apply database migrations only to opscode_chef, from the opscode_chef schema path. It also re-applied the legacy 1.0.4 schema with every new schema change. This change updates the function so that it only applies the migration it's told to apply. It also expands it to permit other services to invoke run_sqitch for updating their own databases. The partybus migrations were retrofitted to use the new form. In addition migration 014 was updated to explicitly apply the legacy 1.0.4 schema. This was added as a precaution -- there should be no path that has migration 14 (or later) running, that does not already have the baseline sqitch deployments applied: * new installations will already have the baseline properly applied. * EC 11.current will already have the baseline properly applied, as sqitch was introduced sometime early in the 11.x timeframe. * Upgrading from 11.old (pre-sqitch) requires an upgrade to 11.x current before proceeding.
bifrost and bookshelf schemas explicit upgrade
Instead of upgrading bifrost and bookshelf schemas to the
latest with every chef-server-ctl reconfigure, we're taking the more
conservative approach used for the opscode_chef schema:
via a partybus migration.