[upgrade master][6.0->8.0] octane fuel-restore fails: can't find file to patch at input line 5

Bug #1599258 reported by sryabin
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Fuel for OpenStack
Fix Committed
High
Sergey Abramov

Bug Description

Detailed bug description:

Steps to reproduce:
 1. Install Fuel Admin node using ISO 6.0
 2. Create cluster HA
 3. Upgrade up to 6.1
 4. Upgrade up to 7.0
 5. Install fuel-octane
 6. Create backup of Fuel Admin node configuration
 7. Install Fuel Admin node using ISO 8.0
 8. Update with lastest MU
 9. Install fuel-octane
 10. Restore backup:
     octane --debug fuel-restore --from ./fuel7_backup.tar --admin-password admin
Expected results:
 Restore is successfully finished

Actual result:
 [2016-07-05 17:32:23,932] INFO octane.util.subprocess Process patch finished with return value 1
[2016-07-05 17:32:23,932] INFO octane.util.subprocess patch[3043] stdout: can't find file to patch at input line 5
[2016-07-05 17:32:23,935] INFO octane.util.subprocess patch[3043] stdout: Perhaps you used the wrong -p or --strip option?
[2016-07-05 17:32:23,935] INFO octane.util.subprocess patch[3043] stdout: The text leading up to this was:
[2016-07-05 17:32:23,936] INFO octane.util.subprocess patch[3043] stdout: --------------------------
[2016-07-05 17:32:23,936] INFO octane.util.subprocess patch[3043] stdout: |diff --git a/deployment/puppet/nailgun/manifests/venv.pp b/deployment/puppet/nailgun/manifests/venv.pp
[2016-07-05 17:32:23,936] INFO octane.util.subprocess patch[3043] stdout: |index 3313333..c383160 100644
[2016-07-05 17:32:23,936] INFO octane.util.subprocess patch[3043] stdout: |--- venv.pp
[2016-07-05 17:32:23,936] INFO octane.util.subprocess patch[3043] stdout: |+++ venv.pp
[2016-07-05 17:32:23,936] INFO octane.util.subprocess patch[3043] stdout: --------------------------
[2016-07-05 17:32:23,937] INFO octane.util.subprocess patch[3043] stdout: File to patch:
[2016-07-05 17:32:23,937] INFO octane.util.subprocess patch[3043] stdout: Skip this patch? [y]
[2016-07-05 17:32:23,937] INFO octane.util.subprocess patch[3043] stdout: Skipping patch.
[2016-07-05 17:32:23,937] INFO octane.util.subprocess patch[3043] stdout: 1 out of 1 hunk ignored
[2016-07-05 17:32:23,938] INFO octane.util.subprocess patch[3046] stdout: can't find file to patch at input line 5
[2016-07-05 17:32:23,938] INFO octane.util.subprocess patch[3046] stdout: Perhaps you used the wrong -p or --strip option?
[2016-07-05 17:32:23,939] INFO octane.util.subprocess Started process patch[3046]: patch -N -p1
[2016-07-05 17:32:23,939] INFO octane.util.subprocess patch[3046] stdout: The text leading up to this was:
[2016-07-05 17:32:23,940] INFO octane.util.subprocess Process patch finished with return value 1
[2016-07-05 17:32:23,940] INFO octane.util.subprocess patch[3046] stdout: --------------------------
[2016-07-05 17:32:23,941] INFO octane.util.subprocess patch[3046] stdout: |diff --git a/deployment/puppet/nailgun/manifests/venv.pp b/deployment/puppet/nailgun/manifests/venv.pp
[2016-07-05 17:32:23,942] INFO octane.util.subprocess patch[3046] stdout: |index 3313333..c383160 100644
[2016-07-05 17:32:23,942] INFO octane.util.subprocess patch[3046] stdout: |--- venv.pp
[2016-07-05 17:32:23,942] INFO octane.util.subprocess patch[3046] stdout: |+++ venv.pp
[2016-07-05 17:32:23,943] INFO octane.util.subprocess patch[3046] stdout: --------------------------
[2016-07-05 17:32:23,944] INFO octane.util.subprocess patch[3046] stdout: File to patch:
[2016-07-05 17:32:23,944] INFO octane.util.subprocess patch[3046] stdout: Skip this patch? [y]
[2016-07-05 17:32:23,945] INFO octane.util.subprocess patch[3046] stdout: Skipping patch.
[2016-07-05 17:32:23,945] INFO octane.util.subprocess patch[3046] stdout: 1 out of 1 hunk ignored
[2016-07-05 17:32:23,943] ERROR octane Command 'patch' returned non-zero exit status 1
Traceback (most recent call last):
  File "/usr/lib/python2.7/site-packages/cliff/app.py", line 374, in run_subcommand
    result = cmd.run(parsed_args)
  File "/usr/lib/python2.7/site-packages/cliff/command.py", line 54, in run
    self.take_action(parsed_args)
  File "/usr/lib/python2.7/site-packages/octane/commands/restore.py", line 56, in take_action
    self.get_context(parsed_args))
  File "/usr/lib/python2.7/site-packages/octane/commands/restore.py", line 31, in restore_data
    archivator.restore()
  File "/usr/lib/python2.7/site-packages/octane/handlers/backup_restore/postgres.py", line 103, in restore
    docker.apply_patches(*args)
  File "/usr/lib/python2.7/site-packages/octane/util/docker.py", line 131, in apply_patches
    patch.patch_apply(tempdir, patches, revert)
  File "/usr/lib/python2.7/site-packages/octane/util/patch.py", line 30, in patch_apply
    subprocess.call(["patch", "-N", "-p1"], stdin=patch, cwd=cwd)
  File "/usr/lib/python2.7/site-packages/octane/util/subprocess.py", line 200, in call
    return proc.communicate()
  File "/usr/lib64/python2.7/contextlib.py", line 24, in __exit__
    self.gen.next()
  File "/usr/lib/python2.7/site-packages/octane/util/subprocess.py", line 195, in popen
    raise CalledProcessError(rv, name)
CalledProcessError: Command 'patch' returned non-zero exit status 1
Reproducibility:
 ?
Workaround:
  No
Impact:
  Critical
Description of the environment:
# rpm -qa | grep -i octane
fuel-octane-8.0.0-1.mos1182.noarch
VERSION:
  feature_groups:
    - mirantis
  production: "docker"
  release: "8.0"
  api: "1.0"
  build_number: "570"
  build_id: "570"
  fuel-nailgun_sha: "558ca91a854cf29e395940c232911ffb851899c1"
  python-fuelclient_sha: "4f234669cfe88a9406f4e438b1e1f74f1ef484a5"
  fuel-agent_sha: "658be72c4b42d3e1436b86ac4567ab914bfb451b"
  fuel-nailgun-agent_sha: "b2bb466fd5bd92da614cdbd819d6999c510ebfb1"
  astute_sha: "b81577a5b7857c4be8748492bae1dec2fa89b446"
  fuel-library_sha: "c2a335b5b725f1b994f78d4c78723d29fa44685a"
  fuel-ostf_sha: "3bc76a63a9e7d195ff34eadc29552f4235fa6c52"
  fuel-mirror_sha: "fb45b80d7bee5899d931f926e5c9512e2b442749"
  fuelmenu_sha: "78ffc73065a9674b707c081d128cb7eea611474f"
  shotgun_sha: "63645dea384a37dde5c01d4f8905566978e5d906"
  network-checker_sha: "a43cf96cd9532f10794dce736350bf5bed350e9d"
  fuel-upgrade_sha: "616a7490ec7199f69759e97e42f9b97dfc87e85b"
  fuelmain_sha: "d605bcbabf315382d56d0ce8143458be67c53434"

Additional information:
 No

sryabin (sryabin)
summary: - [upgrade master][6.0->8.0] octane fuel-restore fails: patch not found
+ [upgrade master][6.0->8.0] octane fuel-restore fails: can't find file to
+ patch at input line 5
Changed in fuel:
assignee: nobody → Sergey Abramov (sabramov)
status: New → In Progress
Ilya Kharin (akscram)
Changed in fuel:
milestone: none → 8.0-updates
importance: Undecided → High
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to fuel-octane (master)

Reviewed: https://review.openstack.org/338176
Committed: https://git.openstack.org/cgit/openstack/fuel-octane/commit/?id=56017df7f7d0733bb804ea8ed2a1253f2ac5170d
Submitter: Jenkins
Branch: master

commit 56017df7f7d0733bb804ea8ed2a1253f2ac5170d
Author: Sergey Abramov <email address hidden>
Date: Wed Jul 6 13:33:56 2016 +0300

    Fix path problem on patch docker container files

    Closes-bug: 1599258
    Change-Id: Id5ec802552256b8b1d684cc169a2cd86a6657980

Changed in fuel:
status: In Progress → Fix Committed
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to fuel-octane (stable/8.0)

Reviewed: https://review.openstack.org/338171
Committed: https://git.openstack.org/cgit/openstack/fuel-octane/commit/?id=bf24f933aa2cb0145f123cc29de4448d8c25a2fd
Submitter: Jenkins
Branch: stable/8.0

commit bf24f933aa2cb0145f123cc29de4448d8c25a2fd
Author: Sergey Abramov <email address hidden>
Date: Wed Jul 6 13:33:56 2016 +0300

    Fix path problem on patch docker container files

    Closes-bug: 1599258
    Change-Id: Id5ec802552256b8b1d684cc169a2cd86a6657980
    (cherry picked from commit 56017df7f7d0733bb804ea8ed2a1253f2ac5170d)

Revision history for this message
OpenStack Infra (hudson-openstack) wrote :

Reviewed: https://review.openstack.org/338172
Committed: https://git.openstack.org/cgit/openstack/fuel-octane/commit/?id=9744210c79e7b7cdbd196df536dc711e9f9f5ea0
Submitter: Jenkins
Branch: stable/8.0

commit 9744210c79e7b7cdbd196df536dc711e9f9f5ea0
Author: Sergey Abramov <email address hidden>
Date: Wed Jul 6 13:35:11 2016 +0300

    Change timeout patch on docker nailgun container to new style

    Closes-bug: 1599258
    Change-Id: I047246fe8d5a69ba72107c19a285d4e6e0dfac38

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to fuel-octane (master)

Fix proposed to branch: master
Review: https://review.openstack.org/351721

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Change abandoned on fuel-octane (master)

Change abandoned by Ilya Kharin (<email address hidden>) on branch: master
Review: https://review.openstack.org/351721
Reason: This patch have to go in stable/mitaka instead of master.

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to fuel-octane (stable/mitaka)

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

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to fuel-octane (stable/mitaka)
Download full text (17.8 KiB)

Reviewed: https://review.openstack.org/351728
Committed: https://git.openstack.org/cgit/openstack/fuel-octane/commit/?id=3101bf302ea0f2d501fd42a6ae6046c3587ac093
Submitter: Jenkins
Branch: stable/mitaka

commit a05d2ecf13e15c12f10e1517fae425e583e0d714
Author: Nikita Zubkov <email address hidden>
Date: Thu Aug 4 17:51:56 2016 +0300

    fix ssh connection auth

    According to spec [1] service user must use key authentication​ for ssh

    [1] https://github.com/openstack/fuel-specs/blame/ba4504/specs/9.0/fuel-nonroot-openstack-nodes.rst#L61-L64

    Change-Id: I461f659d4f0985283a43ec6a702bdd78af91a072

commit 7140398e501879a4e1f5605f3d1cc99195464850
Author: Sergey Abramov <email address hidden>
Date: Tue Aug 2 12:12:57 2016 +0300

    Setup upgrade levels for each fuel version

    Setup upgrade levels block in nova.conf for each fuel version,
    this is required for backward compatibility on RPC.

    Change-Id: I6ccbc34457d11616b015cdb1e46e733b0b49ce58

commit 9e2a419ac79ad591faee9afe16419bf4497eacad
Author: Vladimir Khlyunev <email address hidden>
Date: Mon Aug 1 21:31:56 2016 +0300

    Fix several typos

    Copypasting is evil, lets remove typos

    Change-Id: Icf4bec1a3de954911a469fa98380af2b6175da08

commit 013a7ded2275245a38ee58289dac2bc8b90fa37e
Author: Sergey Abramov <email address hidden>
Date: Wed Jul 20 16:05:10 2016 +0300

    Host evacuation using nova

    Evacuate instance from compute node using
    nova host-evacuate-live except host_evacuation.sh script

    Change-Id: I01a04cfa1ed2aafce7987e523e6b589dea21fbb0

commit 00a1d0dce1f7ae5db6706a59353403516f7913dc
Author: Sergey Abramov <email address hidden>
Date: Tue Jul 19 17:10:44 2016 +0300

    Change shutoff vm command

    * run nova commands using nova util function
    * host filter using get nova node handle method(
        hostname for fuel < 6.1 and fqdn for newer version)

    Change-Id: Ib5c373714e359982b13910a225787167db7b35e9

commit 49357c98313c5f551b13d0877581c5fb5e108db1
Author: Nikita Zubkov <email address hidden>
Date: Mon Jun 27 18:40:13 2016 +0300

    Add `stderr_log_level` parameter to popen

    Now posible to set logging level in popen for logging stderr

    fuel-bootstrap build comand stderr now logged with INFO level

    Change-Id: Ibaa2be54c68ce7a428e07052c917f54e99b95a5e

commit fb582b271dab4bdd10d27149a77c0e1f6a580b9e
Author: Sergey Abramov <email address hidden>
Date: Thu Jul 21 17:56:41 2016 +0300

    Add run_nova_cmd function

    This is required for running nova command on contoller without
    manipulating manipulating with command.

    It makes code easier and more readable

    Usage:

        from fuelclient.objects import environment as environment_obj

        from octane.util import env
        from octane.util import nova

        env_id = ...
        my_env = environment_obj.Environment(env_id)
        controller = env.get_one_controller(my_env)
        nova_cmd_just_run = [...]
        nova_cmd_with_output = [...]
        nova.run_nova_cmd(nova_cmd_just_run, controller, False)
        result = nova.run_nova_cmd(nova_cmd_w...

tags: added: in-stable-mitaka
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix included in openstack/fuel-octane ocata-eol

This issue was fixed in the openstack/fuel-octane ocata-eol release.

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.