Currently if the cartridge manifest does not match the gear layout, the migration will fail because it will construct an invalid path to a cartridge. Instead, we should skip the migration for that cartridge and log a note.
PRs submitted to master and stage.
Commit pushed to master at https://github.com/openshift/li https://github.com/openshift/li/commit/ceaf3cfeacd529ac3e833ec389a503f4285fa632 Fix bug 975174: skip migration for cartridges when manifest does not match gear layout
Will be in devenv 3373
Verified on devenv_3375 Create an application, rename the cartridge dir, making which inconsistent with its manifest.yml, then migrate the gear. The cartridge will be skipped. rhc-admin-migrate --version 2.0.29 --login jhou+1 --app-name skip --migrate-gear 51c03b76b2564e03a1000002 Migrating gear on node with: /usr/bin/rhc-admin-migrate --login 'jhou+1' --migrate-gear '51c03b76b2564e03a1000002' --app-name 'skip' --version '2.0.29' Migrating on node... ***time_migrate_on_node_measured_from_broker=955*** Migrate on node output: Beginning 2.0.29 migration for 51c03b76b2564e03a1000002 Inspecting gear at /var/lib/openshift/51c03b76b2564e03a1000002 Pre-migration state: started Marking step inspect_gear_state complete Migrating gear at /var/lib/openshift/51c03b76b2564e03a1000002 Skipping migration for diy: cartridge manifest does not match gear layout: /var/lib/openshift/51c03b76b2564e03a1000002/diy is not a directory Cleaning up after migration ***time_migrate_on_node_measured_from_node=382*** ***time_redeploy_httpd_proxy=0*** ***time_restart=0*** ***time_total_migrate_gear_measured_from_broker=961***