zookeeper-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Edward Ribeiro <edward.ribe...@gmail.com>
Subject Re: ZooKeeper 3.4.10 release discussion
Date Thu, 02 Feb 2017 18:44:19 GMT
Hi all,

Any chance of us getting ZOOKEEPER-2184 and ZOOKEEPER-2680 into 3.4.10
release?

IMHO, those look in good shape and would benefit from a final commit review.

Thanks,
Eddie

On Thu, Feb 2, 2017 at 2:13 PM, Rakesh Radhakrishnan <rakeshr@apache.org>
wrote:

> Hi All,
>
> I've tried an attempt by converting all the applicable svn commands to git
> commands in "HowToRelease using git" cwiki page. Welcome comments, thanks!
>
> https://cwiki.apache.org/confluence/display/ZOOKEEPER/
> HowToRelease+using+git
>
> Thanks,
> Rakesh
>
> On Fri, Jan 27, 2017 at 11:54 PM, Edward Ribeiro <edward.ribeiro@gmail.com
> >
> wrote:
>
> > ​​
> > Hi Rakesh,
> >
> > I have comment on ZK-2622.
> >
> > Took a look at the 'HowToRelease' using git page and have one minor
> > comment:
> >
> > 2. "If not already done, merge desired patches from master into the
> branch
> > and commit these changes.
> > (...)
> > "
> >
> > AFAIK merging from master to branch-3.4 would bring all those changes in
> > master and try to apply them to branch-3.4. This usuallys leads to lots
> of
> > conflicts and is not desirable. What I usually see in Cassandra commit
> > history is merging upwards: 2.2 -> 3.0 -> 3.1 -> master so that changes
> in
> > previous versions are
> > ​ported​ to
> >  further releases
> > ​: https://github.com/apache/cassandra/commits/trunk​
> >
> >
> > So
> > ​,​
> > I would rephrase the "merge desired patches from master into branch and
> > commit those changes" to "cherry-pick desired commits from master into
> > branch". The act of merging/rebasing/cherry-picking auto commit the
> > changes
> > on the target branch. If you want to avoid doing that then have to resort
> > to things like this:
> > http://stackoverflow.com/questions/8640887/git-merge-without-auto-commit
> >
> > BUT I AM NOT GIT EXPERT, so I feel free to ignore this suggestion.
> > ​Further info​
> >  here:
> > http://stackoverflow.com/questions/1241720/git-cherry-
> > pick-vs-merge-workflow
> >
> > ​Best regards,
> > Eddie​
> >
> >
> > On Fri, Jan 27, 2017 at 9:30 AM, Rakesh Radhakrishnan <
> rakeshr@apache.org>
> > wrote:
> >
> > > Thanks Edward for the interest. I hope you are watching 'HowToRelease'
> > > using git page discussion, which is still in progress. I'd like to give
> > > some more time to the folks to push their interesting issues(I'd prefer
> > > issues with low risk) until the release procedure is finalized.
> > >
> > > I've marked ZOOKEEPER-2622's fix version to 3.4.10, appreciate your
> > > feedback on the attached pull request so that some of our committers
> will
> > > help in pushing it upstream.
> > >
> > > Thanks,
> > > Rakesh
> > >
> > > On Thu, Jan 26, 2017 at 5:35 PM, Edward Ribeiro <
> > edward.ribeiro@gmail.com>
> > > wrote:
> > >
> > > > Hi,
> > > >
> > > > Rakesh and Flavio, what do you think about merging ZOOKEEPER-2622 to
> > > > branch-3.4 and include it in 3.4.10 besides branch-3.5 and master?
> > > >
> > > > Edward
> > > >
> > > > On Thu, Jan 26, 2017 at 8:20 AM, Flavio Junqueira <fpj@apache.org>
> > > wrote:
> > > >
> > > > > Here are a few comments on the proposal of changes to the release
> > > > process:
> > > > >
> > > > > - It might be a better idea to preserve the HowToRelease document
> for
> > > > > future reference, clone the document, and change the cloned
> document
> > to
> > > > > reflect the git commands rather than svn.
> > > > > - We still need to modify Step 2 to be git oriented, otherwise it
> > will
> > > > > look odd that we have svn there.
> > > > > - In Step 4, I thought that we had informally agreed to rely on the
> > git
> > > > > log rather than maintain the CHANGES.txt file. If we aren't all
> > onboard
> > > > > with the idea of stopping to use CHANGES.txt, then we need to
> discuss
> > > > this
> > > > > separately.
> > > > > - Steps 5 and 6: I'm not sure why the steps to produce the release
> > > notes
> > > > > changes. We still resolve issues on jira which is pretty much the
> > > source
> > > > of
> > > > > data for the release notes.
> > > > > - Step 10: I personally don't like using "git commit -a" unless
> > you're
> > > > > pretty sure that it is what you want. A much safer approach is to
> run
> > > > "git
> > > > > status" and "git add" to the individual files/directories.
> > > > > - Step 11: Why are we tagging with -s? Is that standard practice
in
> > > other
> > > > > projects?
> > > > >
> > > > > -Flavio
> > > > >
> > > > > > On 26 Jan 2017, at 03:30, Rakesh Radhakrishnan <
> rakeshr@apache.org
> > >
> > > > > wrote:
> > > > > >
> > > > > > Agreed, will try to resolve ZK-2184. I have included this to
> 3.4.10
> > > > > > releasing. I could see few open review comments in the PR,
> probably
> > > > will
> > > > > > push once this is concluded.
> > > > > >
> > > > > > Thanks,
> > > > > > Rakesh
> > > > > >
> > > > > > On Thu, Jan 26, 2017 at 2:01 AM, Flavio Junqueira <
> fpj@apache.org>
> > > > > wrote:
> > > > > >
> > > > > >> I'd like to have ZK-2184 in as well. I have seen many cases
in
> > which
> > > > > >> applications are affected by that problem. If folks can
help me
> > push
> > > > it
> > > > > >> through, I'd appreciate.
> > > > > >>
> > > > > >> -Flavio
> > > > > >>
> > > > > >>> On 25 Jan 2017, at 17:01, Rakesh Radhakrishnan <
> > rakeshr@apache.org
> > > >
> > > > > >> wrote:
> > > > > >>>
> > > > > >>> I've reviewed ZOOKEEPER-2044 pull request and added
few
> > comments. I
> > > > > hope
> > > > > >>> this will be committed soon.
> > > > > >>>
> > > > > >>> I'm planning to keep the CHANGE.txt file for this release.
But,
> > not
> > > > > >>> updating the commit history considering that git revision
can
> be
> > > used
> > > > > as
> > > > > >> a
> > > > > >>> reference. Please see my comment https://goo.gl/wu5V2M
in
> > > > > ZOOKEEPER-2672
> > > > > >>> jira.
> > > > > >>>
> > > > > >>> Sometime back, I've filtered the issues which was marked
for
> > 3.4.10
> > > > and
> > > > > >>> moved out these to 3.4.11 release.
> > > > > >>>
> > > > > >>> Thanks,
> > > > > >>> Rakesh
> > > > > >>>
> > > > > >>> On Wed, Jan 25, 2017 at 5:41 AM, Michael Han <
> hanm@cloudera.com>
> > > > > wrote:
> > > > > >>>
> > > > > >>>> Hi Rakesh,
> > > > > >>>>
> > > > > >>>> Thanks for driving 3.4.10 release.
> > > > > >>>>
> > > > > >>>> I've been looking at https://issues.apache.org/
> > > > > >> jira/browse/ZOOKEEPER-2044
> > > > > >>>> today I think this could be a good addition to 3.4.10
release
> -
> > > what
> > > > > do
> > > > > >> you
> > > > > >>>> think? Should we get this in 3.4.10?
> > > > > >>>>
> > > > > >>>>
> > > > > >>>> On Tue, Jan 24, 2017 at 9:13 AM, Rakesh Radhakrishnan
<
> > > > > >> rakeshr@apache.org>
> > > > > >>>> wrote:
> > > > > >>>>
> > > > > >>>>> Hi folks,
> > > > > >>>>>
> > > > > >>>>> ZOOKEEPER-2573 fix is agreed and will be resolved
soon. After
> > > > > >> committing
> > > > > >>>>> this jira, I'm planning to start cutting a release
candidate
> > > based
> > > > on
> > > > > >> my
> > > > > >>>>> proposed "HowToRelease" ZK cwiki changes.
> > > > > >>>>>
> > > > > >>>>> Appreciate feedback on proposed ZK cwiki
> > > https://cwiki.apache.org/
> > > > > >>>>> confluence/display/ZOOKEEPER/HowToRelease changes.
Please
> > refer
> > > my
> > > > > >>>>> previous
> > > > > >>>>> mail to understand more about it.
> > > > > >>>>>
> > > > > >>>>> Thanks,
> > > > > >>>>> Rakesh
> > > > > >>>>>
> > > > > >>>>> On Tue, Jan 17, 2017 at 12:11 PM, Rakesh Radhakrishnan
<
> > > > > >>>> rakeshr@apache.org
> > > > > >>>>>>
> > > > > >>>>> wrote:
> > > > > >>>>>
> > > > > >>>>>> OK. I have modified ZK cwiki page https://cwiki.apache.org/
> > > > > >>>>>> confluence/display/ZOOKEEPER/HowToRelease
directly. Please
> > > review
> > > > > the
> > > > > >>>>> newly
> > > > > >>>>>> added lines in orange color to understand
the changes. The
> > > > following
> > > > > >>>>>> sections has been modified:
> > > > > >>>>>>
> > > > > >>>>>>  - *Updating the release branch -> modified
steps **1, 4,
> 10,
> > > 11*
> > > > > >>>>>>  - *Building -> modified step 9*
> > > > > >>>>>>  - *Publishing -> modified step 1*
> > > > > >>>>>>
> > > > > >>>>>> Thanks,
> > > > > >>>>>> Rakesh
> > > > > >>>>>>
> > > > > >>>>>> On Tue, Jan 17, 2017 at 11:36 AM, Patrick
Hunt <
> > > phunt@apache.org>
> > > > > >>>> wrote:
> > > > > >>>>>>
> > > > > >>>>>>> Perhaps you can make the changes directly
on the wiki page
> > as a
> > > > > >>>>> duplicate
> > > > > >>>>>>> line item under the original in a different
color? It's
> hard
> > > for
> > > > me
> > > > > >> to
> > > > > >>>>>>> really follow, esp as it's not a 1:1
replacement iiuc.
> Could
> > > you
> > > > > try
> > > > > >>>>>>> editing the wiki directly to start with,
leave the original
> > > line
> > > > > and
> > > > > >>>> add
> > > > > >>>>>>> the new line(s) but in another color
or some other
> > indication?
> > > > > >>>>>>>
> > > > > >>>>>>> Thanks Rakesh.
> > > > > >>>>>>>
> > > > > >>>>>>> Patrick
> > > > > >>>>>>>
> > > > > >>>>>>> On Mon, Jan 16, 2017 at 8:48 AM, Rakesh
Radhakrishnan <
> > > > > >>>>> rakeshr@apache.org
> > > > > >>>>>>>>
> > > > > >>>>>>> wrote:
> > > > > >>>>>>>
> > > > > >>>>>>>> Hi folks,
> > > > > >>>>>>>>
> > > > > >>>>>>>> As we all know, 3.4.10 release is
the first ZooKeeper
> > release
> > > > > after
> > > > > >>>>> the
> > > > > >>>>>>>> github repository migration. I have
tried an attempt to
> > modify
> > > > the
> > > > > >>>>> steps
> > > > > >>>>>>>> described in the '
> > > > > >>>>>>>> https://cwiki.apache.org/confluence/display/ZOOKEEPER/
> > > > > HowToRelease'
> > > > > >>>>>>> page
> > > > > >>>>>>>> to
> > > > > >>>>>>>> make the release. Since this release
is from an already
> > > created
> > > > > >>>>> branch,
> > > > > >>>>>>> I
> > > > > >>>>>>>> have focused only the branch related
parts in cwiki and
> > below
> > > > > >>>> sections
> > > > > >>>>>>> in
> > > > > >>>>>>>> the page needed changes like,
> > > > > >>>>>>>>
> > > > > >>>>>>>>
> > > > > >>>>>>>> *Updating the release branch*
> > > > > >>>>>>>> 1. Check out the branch with:
> > > > > >>>>>>>> git clone -b branch-X.Y
> > > > > >>>>>>>> https://git-wip-us.apache.org/repos/asf/zookeeper.git
> > > > > >>>>>>>>
> > > > > >>>>>>>> 2. I'm skipping this step, which
is not required now.
> > > > > >>>>>>>>
> > > > > >>>>>>>> 4. Update CHANGES.txt with the committed
jira details. As
> we
> > > > > follow
> > > > > >>>> PR
> > > > > >>>>>>>> merging, most of the jira info is
not updated in this
> file.
> > I
> > > > > >>>> believe
> > > > > >>>>>>>> release manager need to update this
file to capture the
> jira
> > > > > details
> > > > > >>>>>>> marked
> > > > > >>>>>>>> for that release.
> > > > > >>>>>>>>
> > > > > >>>>>>>> 10. Commit these changes.
> > > > > >>>>>>>> git commit -a -m "Preparing for
release X.Y.Z"
> > > > > >>>>>>>> git push <remote> <branch>
> > > > > >>>>>>>>
> > > > > >>>>>>>> 11. Tag the release candidate (R
is the release candidate
> > > > number,
> > > > > >>>> and
> > > > > >>>>>>>> starts from 0):
> > > > > >>>>>>>> git tag -s release-X.Y.Z-rcR -m
"ZooKeeper X.Y.Z-rcR
> > release."
> > > > > >>>>>>>>
> > > > > >>>>>>>> Push the newly created rc tag to
the remote repo.
> > > > > >>>>>>>> git push <remote> release-X.Y.Z-rcR
> > > > > >>>>>>>>
> > > > > >>>>>>>>
> > > > > >>>>>>>> *Building*
> > > > > >>>>>>>> 9. Call for a release vote on dev
> > > > > >>>>>>>>         In the release candidate
dev mail format, it needs
> > to
> > > > > >>>> change
> > > > > >>>>>>> the
> > > > > >>>>>>>> tag like,
> > > > > >>>>>>>>
> > > > > >>>>>>>>         "The RC tag in git to be
voted upon:
> > > release-X.Y.Z-rcR"
> > > > > >>>>>>>>
> > > > > >>>>>>>>
> > > > > >>>>>>>> *Publishing*
> > > > > >>>>>>>> 1. Tag the release:
> > > > > >>>>>>>> git tag -s release-X.Y.Z -m "ZooKeeper
X.Y.Z release."
> > > > > >>>>>>>>
> > > > > >>>>>>>> Push the newly created release tag
to the remote repo.
> > > > > >>>>>>>> git push <remote> release-X.Y.Z
> > > > > >>>>>>>>
> > > > > >>>>>>>>
> > > > > >>>>>>>> I'd like to know whether I'm going
in the right direction
> > and
> > > > > start
> > > > > >>>>>>> cutting
> > > > > >>>>>>>> the 3.4.10 release by following
this approach. Thanks!
> > > > > >>>>>>>>
> > > > > >>>>>>>> Thanks,
> > > > > >>>>>>>> Rakesh
> > > > > >>>>>>>>
> > > > > >>>>>>>> On Mon, Jan 16, 2017 at 11:09 AM,
Rakesh Radhakrishnan <
> > > > > >>>>>>> rakeshr@apache.org
> > > > > >>>>>>>>>
> > > > > >>>>>>>> wrote:
> > > > > >>>>>>>>
> > > > > >>>>>>>>> Thanks for pointing this jira.
I will take a look at
> this.
> > > > > >>>>>>>>>
> > > > > >>>>>>>>> Rakesh
> > > > > >>>>>>>>>
> > > > > >>>>>>>>> On Fri, Jan 13, 2017 at 7:27
PM, Edward Ribeiro <
> > > > > >>>>>>>> edward.ribeiro@gmail.com>
> > > > > >>>>>>>>> wrote:
> > > > > >>>>>>>>>
> > > > > >>>>>>>>>> Hi Rakesh,
> > > > > >>>>>>>>>>
> > > > > >>>>>>>>>> Thansk for stepping up to
this task! Pretty cool! :)
> > > > > >>>>>>>>>>
> > > > > >>>>>>>>>> Do you think https://issues.apache.org/
> > > > > >>>> jira/browse/ZOOKEEPER-2573
> > > > > >>>>> is
> > > > > >>>>>>>>>> worth
> > > > > >>>>>>>>>> targeting 3.4.10 too?
> > > > > >>>>>>>>>>
> > > > > >>>>>>>>>> Edward
> > > > > >>>>>>>>>>
> > > > > >>>>>>>>>>
> > > > > >>>>>>>>>>
> > > > > >>>>>>>>>> On Fri, Jan 13, 2017 at
7:56 AM, Rakesh Radhakrishnan <
> > > > > >>>>>>>> rakeshr@apache.org
> > > > > >>>>>>>>>>>
> > > > > >>>>>>>>>> wrote:
> > > > > >>>>>>>>>>
> > > > > >>>>>>>>>>> Hi All,
> > > > > >>>>>>>>>>>
> > > > > >>>>>>>>>>> I hope to cut an RC
in a week - giving some more time
> for
> > > > your
> > > > > >>>>>>>> favorite
> > > > > >>>>>>>>>>> outstanding blocker/critical
issues. Will start moving
> > out
> > > > any
> > > > > >>>>>>> tickets
> > > > > >>>>>>>>>> that
> > > > > >>>>>>>>>>> are not blockers and/or
won’t fit the timeline - there
> > are
> > > 1
> > > > > >>>>>>> blocker,
> > > > > >>>>>>>> 5
> > > > > >>>>>>>>>>> critical, 15 major,
7 minor tickets outstanding as of
> > now.
> > > > > >>>>>>> Appreciate
> > > > > >>>>>>>>>> your
> > > > > >>>>>>>>>>> support in releasing
3.4.10 version. Thanks!
> > > > > >>>>>>>>>>>
> > > > > >>>>>>>>>>> Please find the open
issues marked for 3.4.10 release
> > here,
> > > > > >>>>>>>>>>> https://goo.gl/XdraFA
> > > > > >>>>>>>>>>>
> > > > > >>>>>>>>>>> Thanks,
> > > > > >>>>>>>>>>> Rakesh
> > > > > >>>>>>>>>>>
> > > > > >>>>>>>>>>>
> > > > > >>>>>>>>>>> On Tue, Dec 6, 2016
at 4:15 PM, Rakesh Radhakrishnan <
> > > > > >>>>>>>>>> rakeshr@apache.org>
> > > > > >>>>>>>>>>> wrote:
> > > > > >>>>>>>>>>>
> > > > > >>>>>>>>>>>> Hi All,
> > > > > >>>>>>>>>>>>
> > > > > >>>>>>>>>>>> I am interested
in going through the release process
> as
> > > the
> > > > > >>>> RM.
> > > > > >>>>>>>>>>>>
> > > > > >>>>>>>>>>>> Overall, I could
see total 41 issues marked for 3.4.10
> > > > > >>>> release
> > > > > >>>>>>> as of
> > > > > >>>>>>>>>> now,
> > > > > >>>>>>>>>>>> which includes 4
blockers, 5 critical, 20 major and 12
> > > minor
> > > > > >>>>>>>> issues. I
> > > > > >>>>>>>>>>>> count 9 issues fixed/committed
already for 3.4.10
> which
> > > > > >>>>> includes
> > > > > >>>>>>> 1
> > > > > >>>>>>>>>>> blocker
> > > > > >>>>>>>>>>>> and 1 critical(security
related) issue. ZOOKEEPER-1045
> > is
> > > a
> > > > > >>>>> much
> > > > > >>>>>>>>>> awaited
> > > > > >>>>>>>>>>>> one and the feature
code is committed. I think it is a
> > > good
> > > > > >>>>> time
> > > > > >>>>>>> to
> > > > > >>>>>>>>>>>> initiate the discussion
of 3.4.10 release processes.
> > > > > >>>>>>>>>>>>
> > > > > >>>>>>>>>>>> Please find the
issues marked for 3.4.10 release here,
> > > > > >>>>>>>>>>>> https://goo.gl/FfbpVG
> > > > > >>>>>>>>>>>>
> > > > > >>>>>>>>>>>> Currently, I'm focusing
on updating ZOOKEEPER-1045
> > feature
> > > > > >>>>>>> details
> > > > > >>>>>>>>>> into
> > > > > >>>>>>>>>>>> our project cwiki
and related ZOOKEEPER-2479
> improvement
> > > > > >>>> jira.
> > > > > >>>>>>> I'd
> > > > > >>>>>>>>>> like
> > > > > >>>>>>>>>>> to
> > > > > >>>>>>>>>>>> include ZOOKEEPER-2383
into this release if everyone
> > > agrees.
> > > > > >>>>>>>>>> Appreciate
> > > > > >>>>>>>>>>>> your help in reviewing
the jira patches and making it
> > > stable
> > > > > >>>>> for
> > > > > >>>>>>>>>> release.
> > > > > >>>>>>>>>>>> Also, please feel
free to push your favorite issues
> > ahead
> > > of
> > > > > >>>>>>> 3.4.10
> > > > > >>>>>>>>>>> release.
> > > > > >>>>>>>>>>>>
> > > > > >>>>>>>>>>>> I hope with the
community support, we should be able
> to
> > > > close
> > > > > >>>>> all
> > > > > >>>>>>>>>>>> necessary blockers/critical
issues soon. Kindly
> > requesting
> > > > > >>>>>>> everyone
> > > > > >>>>>>>> to
> > > > > >>>>>>>>>>> look
> > > > > >>>>>>>>>>>> at the issues marked
for 3.4.10 and push these asap or
> > can
> > > > be
> > > > > >>>>>>> pushed
> > > > > >>>>>>>>>> out
> > > > > >>>>>>>>>>> to
> > > > > >>>>>>>>>>>> 3.4.11.
> > > > > >>>>>>>>>>>>
> > > > > >>>>>>>>>>>> Imp: Since we moved
to github repository, the release
> > > > > >>>> procedure
> > > > > >>>>>>>>>>>> https://cwiki.apache.org/
> confluence/display/ZOOKEEPER/
> > > > HowToR
> > > > > >>>>>>> elease
> > > > > >>>>>>>>>>>> requires changes.
Appreciate your help in this part.
> > > Thanks!
> > > > > >>>>>>>>>>>>
> > > > > >>>>>>>>>>>> Please let me know
your thoughts on the plan.
> > > > > >>>>>>>>>>>>
> > > > > >>>>>>>>>>>> Thanks,
> > > > > >>>>>>>>>>>> Rakesh
> > > > > >>>>>>>>>>>>
> > > > > >>>>>>>>>>>
> > > > > >>>>>>>>>>
> > > > > >>>>>>>>>
> > > > > >>>>>>>>>
> > > > > >>>>>>>>
> > > > > >>>>>>>
> > > > > >>>>>>
> > > > > >>>>>>
> > > > > >>>>>
> > > > > >>>>
> > > > > >>>>
> > > > > >>>>
> > > > > >>>> --
> > > > > >>>> Cheers
> > > > > >>>> Michael.
> > > > > >>>>
> > > > > >>
> > > > > >>
> > > > >
> > > > >
> > > >
> > >
> >
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message