Description of problem: The oo-admin-repair-node can not clean successfully when there are upgrade metadata in gears, but oo-accept-node can detect the upgrade metadata. Version-Release number of selected component (if applicable): devenv_3449 How reproducible: always Steps to Reproduce: 1. Create a app rhc app create cpl01 perl-5.10 --no-git 2. SSH into this app 1)create some file with '.upgrade' beginning on 'app-root/data/', like ' ..upgrade13', '.upgrade-32.tst'. 2)create some file named '.preupgrade_state' on 'app-root/runtime/' 3. SSH into the instance and run oo-accept-node oo-accept-node --include-upgrade-checks 4. SSH into the instance and run oo-admin-repair-node oo-admin-repair-node clean-upgrade 5. SSH into this app and check the upgrade metadata ls -a app-root/runtime/ ls -a app-root/data/ Actual results: Step3: FAIL: directory f9107d6ce48e11e29efd22000aec86aa contains upgrade data FAIL: directory f9107d6ce48e11e29efd22000aec86aa contains pre-upgrade state 2 ERRORS Step5 \> ls -a app-root/runtime/ . .. data .preupgrade_state repo .state \> ls -a app-root/data . .. .bash_history .bash_profile .upgrade13 .upgrade-32.tst Expected results: The upgrade metadata should be cleaned Additional info:
Commit pushed to master at https://github.com/openshift/origin-server https://github.com/openshift/origin-server/commit/5c86189155f5fbe16081ae7c71d8d55833787ad1 Fix bug 981273
Should be available in devenv ami 3471
It's fixed, verified on devenv_3471, please refer to the following results: # oo-admin-repair-node clean-upgrade Removing /var/lib/openshift/51dcc0960ef4360893000001/app-root/data/.upgrade-32.tst Removing /var/lib/openshift/51dcc0960ef4360893000001/app-root/data/.upgrade13 Removing /var/lib/openshift/51dcc0960ef4360893000001/app-root/runtime/.preupgrade_state [root@F17-CCY ~]# rhc ssh drupal "ls -a app-root/runtime/" . .. data repo .state [root@F17-CCY ~]# rhc ssh drupal "ls -a app-root/data/" . .. .bash_history .bash_profile