From: Jason Dillaman <jdillama@redhat.com>
To: Loic Dachary <loic@dachary.org>
Cc: Mykola Golub <mgolub@mirantis.com>,
Ceph Development <ceph-devel@vger.kernel.org>
Subject: Re: rbd-mirror related jewel backports
Date: Wed, 10 Aug 2016 16:14:48 -0400 [thread overview]
Message-ID: <CA+aFP1CFahNravqJ3RuVLnAO9gXsOcsDoPy8=QRBPQ+=txUtLw@mail.gmail.com> (raw)
In-Reply-To: <57AAEEC2.3060108@dachary.org>
Loic,
If you want, I can create the backport PRs for those tickets.
On Wed, Aug 10, 2016 at 5:07 AM, Loic Dachary <loic@dachary.org> wrote:
> Hi Mykola,
>
> There are seven rbd-mirror related backports which do not cherry-pick cleanly. I've not looked at each of them yet and I would very much appreciate your advice about the best way to proceed.
>
> http://tracker.ceph.com/issues/16511
> http://tracker.ceph.com/issues/16512
> http://tracker.ceph.com/issues/16658
> http://tracker.ceph.com/issues/16701
> http://tracker.ceph.com/issues/16747
> http://tracker.ceph.com/issues/16902
> http://tracker.ceph.com/issues/16978
>
> Maybe they should be cherry-picked in a specific order in order to avoid conflicts ? For instance, maybe one of the pending backports that you can see at
>
> https://github.com/ceph/ceph/pulls?q=is%3Aopen+is%3Apr+milestone%3Ajewel+label%3Arbd
>
> would avoid some of the conflicts if merged ? I'm thinking specifically
>
> https://github.com/ceph/ceph/pull/10646
> https://github.com/ceph/ceph/pull/10644
>
> What I'm looking for, ideally, is a way to order the cherry-picks to avoid any conflict. That may involve backporting a few additional pull requests (for instance when the type of an argument changes from int64_t to uint64_t, that creates a lot of potential conflicts and backporting that change could help, even if it is not required to fix a given bug.
>
> There are three backports that also do not apply because of a conflict but do not seem to be related to rbd-mirror. Unless you advise otherwise, I'll attempt to resolve these individually and assume there is complex interaction with other backports.
>
> http://tracker.ceph.com/issues/16950
> http://tracker.ceph.com/issues/16904
> http://tracker.ceph.com/issues/16735
>
> Thanks in advance for your guidance !
>
> --
> Loïc Dachary, Artisan Logiciel Libre
>
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Jason
next prev parent reply other threads:[~2016-08-10 20:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-10 9:07 rbd-mirror related jewel backports Loic Dachary
2016-08-10 20:14 ` Jason Dillaman [this message]
2016-08-10 21:00 ` Loic Dachary
2016-08-11 13:22 ` Jason Dillaman
2016-08-11 13:58 ` Loic Dachary
2016-08-11 15:01 ` Jason Dillaman
2016-08-12 9:12 ` Loic Dachary
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CA+aFP1CFahNravqJ3RuVLnAO9gXsOcsDoPy8=QRBPQ+=txUtLw@mail.gmail.com' \
--to=jdillama@redhat.com \
--cc=ceph-devel@vger.kernel.org \
--cc=dillaman@redhat.com \
--cc=loic@dachary.org \
--cc=mgolub@mirantis.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.