Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mimic: qa: Fix issues in vstart runner #28208

Merged
merged 1 commit into from Jul 15, 2019
Merged

Conversation

@votdev
Copy link
Contributor

votdev commented May 22, 2019

Add missing timeout parameter to LocalRemote::run() and LocalCephManager::admin_socket() method

Fixes: https://tracker.ceph.com/issues/40054

cherry picked from commit 00e3022
partial manual backport of 8620c4c (partly because the origin patch contains changes that i was not affected from and i don't know if they are needed in Mimic and do not break something).

Signed-off-by: Volker Theile vtheile@suse.com

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug
@votdev votdev added the bug fix label May 22, 2019
@votdev votdev requested review from batrick and rishabh-d-dave May 22, 2019
@votdev votdev changed the title qa: Fix issues in vstart runner mimic: qa: Fix issues in vstart runner May 22, 2019
@LenzGr LenzGr requested review from smithfarm and tchaikov May 22, 2019
@LenzGr LenzGr added this to the mimic milestone May 22, 2019
@votdev votdev mentioned this pull request May 22, 2019
2 of 3 tasks complete
@smithfarm smithfarm removed the needs-qa label May 22, 2019
@smithfarm

This comment has been minimized.

Copy link
Contributor

smithfarm commented May 22, 2019

@votdev Can you edit the commit message (using git commit --amend) so it explains why this backportfix cannot be implemented as a cherry-pick from master or nautilus?

@smithfarm

This comment has been minimized.

Copy link
Contributor

smithfarm commented May 22, 2019

One option is to:

  1. find out which commit fixed the issue in master
  2. append to commit message: partial manual backport of $SHA1
  3. preferably also explain why the master commit cannot be cherry-picked in its entirety
@votdev votdev force-pushed the votdev:fix_vstart_runner branch 2 times, most recently from dc18e7f to 980328e May 23, 2019
Add missing timeout parameter to LocalRemote::run() and LocalCephManager::admin_socket() method

Fixes: https://tracker.ceph.com/issues/40054

cherry picked from commit 00e3022
partial manual backport of 8620c4c (partly because the origin patch contains changes that i was not affected from and i don't know if they are needed in Mimic and do not break something).

Signed-off-by: Volker Theile <vtheile@suse.com>
@votdev votdev force-pushed the votdev:fix_vstart_runner branch from 980328e to 7fb7812 May 29, 2019
@smithfarm

This comment has been minimized.

Copy link
Contributor

smithfarm commented May 29, 2019

jenkins test make check

@smithfarm

This comment has been minimized.

Copy link
Contributor

smithfarm commented May 30, 2019

@votdev I'm confused by the commit message now. It says:

cherry picked from commit 00e3022
partial manual backport of 8620c4c

Is this commit a cherry-pick of 00e3022 or a partial manual backport of 8620c4c, or both?

@votdev

This comment has been minimized.

Copy link
Contributor Author

votdev commented Jun 17, 2019

@votdev I'm confused by the commit message now. It says:

cherry picked from commit 00e3022
partial manual backport of 8620c4c

Is this commit a cherry-pick of 00e3022 or a partial manual backport of 8620c4c, or both?

It's both.

@votdev votdev requested a review from LenzGr Jul 9, 2019
@votdev

This comment has been minimized.

Copy link
Contributor Author

votdev commented Jul 9, 2019

This PR is needed by #28210, so please review to be able to process the mentioned PR.

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Jul 11, 2019

@yuriw yuriw merged commit 2259f89 into ceph:mimic Jul 15, 2019
4 checks passed
4 checks passed
Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
@votdev votdev deleted the votdev:fix_vstart_runner branch Jul 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.