Restore not working in stable/mitaka because of metadata included in bad merge

[Deklan Dieterly]

Bad merge from master. The log shows that metadata is not an attribute of the Backup class. This was introduced in git commit ID a34980e in tar_engine.py.

2016-07-19 21:22:40.428 17783 INFO __main__ [-] Begin freezer agent process with args: ['/home/stack/freezer/main.py', '--action', 'restore', '--restore-abs-path', '/tmp/hohoho/', '--backup-name', 'bbb', '--container', 'ccc']
2016-07-19 21:22:40.429 17783 INFO __main__ [-] log file at /home/stack/.freezer/freezer.log
2016-07-19 21:22:40.430 17783 INFO freezer.openstack.osclients [-] [*] Creation of swift client
2016-07-19 21:22:48.527 17783 INFO freezer.job [-] [*] Job execution Started at: 2016-07-19 21:22:48
2016-07-19 21:22:48.527 17783 INFO freezer.job [-] [*] Executing FS restore...
2016-07-19 21:22:48.558 17783 INFO freezer.engine.engine [-] Creation restore path: /tmp/hohoho/
2016-07-19 21:22:48.559 17783 INFO freezer.engine.engine [-] Creation restore path completed
2016-07-19 21:22:48.560 17783 INFO freezer.engine.engine [-] Restore backup hlm305-cp1-c1-m3-mgmt_bbb_1468948047_0
2016-07-19 21:22:51.001 17783 CRITICAL freezer.engine.engine [-] Engine error: Backup instance has no attribute 'metadata'
2016-07-19 21:22:51.003 17783 ERROR __main__ [-] Engine error. Failed to restore.
2016-07-19 21:22:51.003 17783 ERROR __main__ Traceback (most recent call last):
2016-07-19 21:22:51.003 17783 ERROR __main__ File "/home/stack/freezer/main.py", line 213, in main
2016-07-19 21:22:51.003 17783 ERROR __main__ freezer_main(backup_args)
2016-07-19 21:22:51.003 17783 ERROR __main__ File "/home/stack/freezer/main.py", line 112, in freezer_main
2016-07-19 21:22:51.003 17783 ERROR __main__ run_job(backup_args, storage)
2016-07-19 21:22:51.003 17783 ERROR __main__ File "/home/stack/freezer/main.py", line 125, in run_job
2016-07-19 21:22:51.003 17783 ERROR __main__ response = freezer_job.execute()
2016-07-19 21:22:51.003 17783 ERROR __main__ File "/opt/stack/service/freezer-agent/venv/lib/python2.7/site-packages/freezer/job.py", line 58, in wrapper
2016-07-19 21:22:51.003 17783 ERROR __main__ retval = func(self)
2016-07-19 21:22:51.003 17783 ERROR __main__ File "/opt/stack/service/freezer-agent/venv/lib/python2.7/site-packages/freezer/job.py", line 188, in execute
2016-07-19 21:22:51.003 17783 ERROR __main__ self.engine.restore(backup, restore_abs_path, conf.overwrite)
2016-07-19 21:22:51.003 17783 ERROR __main__ File "/opt/stack/service/freezer-agent/venv/lib/python2.7/site-packages/freezer/engine/engine.py", line 226, in restore
2016-07-19 21:22:51.003 17783 ERROR __main__ raise EngineException("Engine error. Failed to restore.")
2016-07-19 21:22:51.003 17783 ERROR __main__ EngineException: Engine error. Failed to restore.
2016-07-19 21:22:51.003 17783 ERROR __main__
2016-07-19 21:22:51.007 17783 CRITICAL __main__ [-] End freezer agent process unsuccessfully
2016-07-19 21:22:51.007 17783 CRITICAL __main__ [-] Critical Error: Engine error. Failed to restore.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/mitaka
Review: https://review.openstack.org/344491

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/344491
Committed: https://git.openstack.org/cgit/openstack/freezer/commit/?id=67ac05afc7d293ce2ba3e5b79d40a90150448cba
Submitter: Jenkins
Branch: stable/mitaka

commit 67ac05afc7d293ce2ba3e5b79d40a90150448cba
Author: Deklan Dieterly <email address hidden>
Date: Tue Jul 19 16:34:00 2016 -0600

    Fix restore bug

    Fix bad merge in which metadata code was added to
    stable/mitaka release.

    Change-Id: Ibaf25a1ae9e5816ace1a55162d8d2dffaffe9040
    Closes-Bug: #1604605