Ben,
I ran into issues while maintaining my company's airflow fork and
cherry-picking my changes into the fork, especially when my changes
included db changes.
I had to play with the alembic_version in the db and do some other magic
that escapes me now. My best guidance for the future is to cherry pick ALL
DB-related changes from both master and your own btallman github fork into
your apigee fork. That way, the db migration lineage in your apigee fork
matches what is in master.
-s
On Fri, Nov 11, 2016 at 4:49 AM, Sumit Maheshwari <sumeet.ma...@gmail.com>
wrote:
> Ben,
>
> Can u see whats current version using "alembic current".. afaik
> version f2ca10b85618
> is the latest migration in master and I had no issue migrating to it..
>
> Also did your CPs contain any custom migrations?
>
>
>
> On Fri, Nov 11, 2016 at 5:04 AM, Ben Tallman <btall...@gmail.com> wrote:
>
> > We are running master with a few cherry picked features... Did we squash
> > commits that Alembic is expecting? Did I?
> >
> > Basically, there are revisions that are no longer in master??
> Specifically
> > at least:
> >
> > Can't locate revision identified by 'f2ca10b85618'
> >
> > ===========================
> >
> > *airflow upgradedb*
> > [2016-11-10 15:31:04,156] {__init__.py:36} INFO - Using executor
> > CeleryExecutor
> > DB: postgresql://airflow_qa:***@
> > nucleus.c7b2twrxxjtc.us-west-2.rds.amazonaws.com/nucleus
> > [2016-11-10 15:31:05,707] {utils.py:288} INFO - Creating tables
> > INFO [alembic.runtime.migration] Context impl PostgresqlImpl.
> > INFO [alembic.runtime.migration] Will assume transactional DDL.
> > Traceback (most recent call last):
> > File "/usr/local/bin/airflow", line 15, in <module>
> > args.func(args)
> > File "/Library/Python/2.7/site-packages/airflow/bin/cli.py", line 459,
> > in
> > upgradedb
> > utils.upgradedb()
> > File "/Library/Python/2.7/site-packages/airflow/utils.py", line 295,
> in
> > upgradedb
> > command.upgrade(config, 'heads')
> > File "/Library/Python/2.7/site-packages/alembic/command.py", line 174,
> > in
> > upgrade
> > script.run_env()
> > File "/Library/Python/2.7/site-packages/alembic/script/base.py", line
> > 397, in run_env
> > util.load_python_file(self.dir, 'env.py')
> > File "/Library/Python/2.7/site-packages/alembic/util/pyfiles.py", line
> > 81, in load_python_file
> > module = load_module_py(module_id, path)
> > File "/Library/Python/2.7/site-packages/alembic/util/compat.py", line
> > 79,
> > in load_module_py
> > mod = imp.load_source(module_id, path, fp)
> > File "/Library/Python/2.7/site-packages/airflow/migrations/env.py",
> line
> > 74, in <module>
> > run_migrations_online()
> > File "/Library/Python/2.7/site-packages/airflow/migrations/env.py",
> line
> > 69, in run_migrations_online
> > context.run_migrations()
> > File "<string>", line 8, in run_migrations
> > File "/Library/Python/2.7/site-packages/alembic/runtime/
> environment.py",
> > line 797, in run_migrations
> > self.get_context().run_migrations(**kw)
> > File "/Library/Python/2.7/site-packages/alembic/runtime/migration.py",
> > line 303, in run_migrations
> > for step in self._migrations_fn(heads, self):
> > File "/Library/Python/2.7/site-packages/alembic/command.py", line 163,
> > in
> > upgrade
> > return script._upgrade_revs(revision, rev)
> > File "/Library/Python/2.7/site-packages/alembic/script/base.py", line
> > 314, in _upgrade_revs
> > for script in reversed(list(revs))
> > File
> > "/System/Library/Frameworks/Python.framework/Versions/2.7/
> > lib/python2.7/contextlib.py",
> > line 35, in __exit__
> > self.gen.throw(type, value, traceback)
> > File "/Library/Python/2.7/site-packages/alembic/script/base.py", line
> > 160, in _catch_revision_errors
> > compat.raise_from_cause(util.CommandError(resolution))
> > File "/Library/Python/2.7/site-packages/alembic/util/compat.py", line
> > 132, in raise_from_cause
> > reraise(type(exception), exception, tb=exc_tb)
> > File "/Library/Python/2.7/site-packages/alembic/script/base.py", line
> > 129, in _catch_revision_errors
> > yield
> > File "/Library/Python/2.7/site-packages/alembic/script/base.py", line
> > 310, in _upgrade_revs
> > revs = list(revs)
> > File "/Library/Python/2.7/site-packages/alembic/script/revision.py",
> > line
> > 610, in _iterate_revisions
> > requested_lowers = self.get_revisions(lower)
> > File "/Library/Python/2.7/site-packages/alembic/script/revision.py",
> > line
> > 299, in get_revisions
> > return sum([self.get_revisions(id_elem) for id_elem in id_], ())
> > File "/Library/Python/2.7/site-packages/alembic/script/revision.py",
> > line
> > 304, in get_revisions
> > for rev_id in resolved_id)
> > File "/Library/Python/2.7/site-packages/alembic/script/revision.py",
> > line
> > 304, in <genexpr>
> > for rev_id in resolved_id)
> > File "/Library/Python/2.7/site-packages/alembic/script/revision.py",
> > line
> > 359, in _revision_for_ident
> > resolved_id)
> > alembic.util.CommandError: Can't locate revision identified by
> > 'f2ca10b85618'
> >
> > Thanks,
> > Ben
> >
> > --
> > Ben Tallman - 503.680.5709
> >
>
