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: common: fix missing include boost/noncopyable.hpp #26277

Merged
merged 1 commit into from Feb 18, 2019

Conversation

wjwithagen
Copy link
Contributor

@wjwithagen wjwithagen commented Feb 5, 2019

Clang complains:
```
In file included from /home/jenkins/workspace/ceph-master/src/osd/ReplicatedBackend.cc:15:
In file included from /home/jenkins/workspace/ceph-master/src/osd/ReplicatedBackend.h:18:
In file included from /home/jenkins/workspace/ceph-master/src/osd/PGBackend.h:27:
In file included from /home/jenkins/workspace/ceph-master/src/osd/PGTransaction.h:25:
/home/jenkins/workspace/ceph-master/src/common/inline_variant.h:88:64: error: expected class name
struct generic_visitor : boost::static_visitor<Result>, boost::noncopyable
                                                               ^
1 error generated.
gmake[2]: *** [src/osd/CMakeFiles/osd.dir/build.make:141: src/osd/CMakeFiles/osd.dir/ReplicatedBackend.cc.o] Error 1
gmake[2]: *** Waiting for unfinished jobs....
```

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
(cherry picked from commit 0654099)
@tchaikov tchaikov added this to the mimic milestone Feb 5, 2019
@smithfarm
Copy link
Contributor

@wjwithagen @tchaikov Before opening a PR with a cherry-pick to a stable branch, would it be possible to first:

  1. create a tracker mentioning the PR number of the master fix, fill out Backport field
  2. set that tracker's status to "Pending Backport"

Beyond that the backporting team will take care of it. If you really want to do the cherry-pick yourself, the next steps would be:

  1. run src/script/backport-create-issue [TRACKER_NUMBER] to create the backport tracker issues
  2. assign the backport tracker to yourself
  3. open PR with cherry-pick
  4. put the full URL of the PR in the backport tracker description
  5. put the full URL of the backport tracker in the PR description

@smithfarm smithfarm changed the title common: fix missing include boost/noncopyable.hpp mimic: common: fix missing include boost/noncopyable.hpp Feb 5, 2019
@yuriw
Copy link
Contributor

yuriw commented Feb 5, 2019

@wjwithagen
Copy link
Contributor Author

@smithfarm
Thanx for pointing this out.
I'll put this in my notes. Sure make my work for this a lot easier.
Can I also do this for just a small commit of a larger PR?

@smithfarm
Copy link
Contributor

smithfarm commented Feb 6, 2019

Can I also do this for just a small commit of a larger PR?

@wjwithagen Absolutely! In that case don't fill out "Pull Request ID" field, but just specify the SHA1 of the commit in the tracker description.

E.g. description might be:

"Commit 343asdfkl34321409893jfadfsd fixes issue XYZ. Please backport just this one commit to mimic."

(and fill out "Backport: mimic" and "Status: Pending Backport" - that's all, you're done)

@wjwithagen
Copy link
Contributor Author

@smithfarm

Right, but in this case the whole PR turns out to be only 1 commit to several files.
And I need only once change, and there that part has moved form src/CMakeLists.txt to src/mgr/CMakeLists.txt (see last file in #2351)
So I guessing that is going to be a dedicated commit to mimic?

@smithfarm
Copy link
Contributor

@wjwithagen That's a special case. . . Can you still open the tracker and specify in the description exactly what you need? If you do it now, I'll create the backport issue for you and you can then do the manual partial cherry-pick yourself. OK?

@smithfarm
Copy link
Contributor

In the commit description you can write: "This is a manual partial cherry-pick of [SHA1]"

@wjwithagen
Copy link
Contributor Author

@smithfarm
Tracker: http://tracker.ceph.com/issues/38213

@yuriw yuriw merged commit 6fbe4fd into mimic Feb 18, 2019
@tchaikov
Copy link
Contributor

tchaikov commented Feb 19, 2019

@wjwithagen in future, i'd suggest use one's own repo for topic branches instead of using ceph/ceph for hosting them.

@tchaikov tchaikov deleted the wip-wjw-boost_noncopyable-mimic branch February 19, 2019 02:36
@wjwithagen
Copy link
Contributor Author

@tchaikov
I think you have to be more explicit, since your question makes no sense to me...
As you know I'd like to accomodate where ever I can.
So I will do this, IF I know what you are asking me to do.

@tchaikov
Copy link
Contributor

tchaikov commented Feb 19, 2019

@wjwithagen i suggest push your changes to your own repo, namely https://github.com/wjwithagen/ceph/ , and create PR from there instead of pushing to https://github.com/ceph/ceph/ .

@wjwithagen
Copy link
Contributor Author

@tchaikov
I see, Thanx for pointing that out. I wasn't aware that I did this.
Other backports were along the lines you describe.
And I will try to take better care next time.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants