You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@hbase.apache.org by Jingcheng Du <ji...@intel.com> on 2015/07/22 09:45:14 UTC
[RESULT][VOTE] Merge branch hbase-11339 HBase MOB to trunk
Hi all,
The vote passes with 8 +1s and no -1. Thanks all for guiding, helping and
voting!
We will work on the merge activities and will let guys know about the
detailed plan for merge time.
And thanks Jon for helping merge this branch to trunk!
Regards,
Jingcheng
--
View this message in context: http://apache-hbase.679495.n3.nabble.com/RESULT-VOTE-Merge-branch-hbase-11339-HBase-MOB-to-trunk-tp4073446.html
Sent from the HBase Developer mailing list archive at Nabble.com.
Re: Re[2]: [RESULT][VOTE] Merge branch hbase-11339 HBase MOB to trunk
Posted by Jonathan Hsieh <jo...@cloudera.com>.
I took the latest patch on the jira and then applied to apache master.
Then I merged the branch based on that code.
Roughly:
# checked out apache/master,
git checkout apache/master
# apply mega patch
patch -p1 < 11339-master-v10.patch
# I did some testing on it (made sure it built, made sure Test*Mob* passed)
and then did a local commit.
git add .... # add all the new code changes from the mega patch)
git branch hbase-11339-merge
git checkout hbase-11339-merge
git commit hbase-11339-merge
# checked out apache/master again
git checkout apache/master
git branch -f master
git checkout master
# merged with apache/hbase-11339.
git merge apache/hbase-11339
# there are many conflicts so I forced all the changes in the
hbase-11339-merge branch in
git checkout hbase-11339-merge hbase-* src
git add .... # add all the new code changes from previous checkout command
git commit master
# compared against temporary commit and saw no change
git diff hbase-11339-merge
# committed to master.
git push apache master
On Wed, Jul 22, 2015 at 5:40 PM, Ted Yu <yu...@gmail.com> wrote:
>
> Jon:
> How did you deal with mega patch attached to HBASE-11339 ?
>
> To my knowledge, some of the changes in mega patch were not merged to
> hbase-11339 branch.
>
> These changes were made so that unit tests could pass.
>
> Cheers
>
>
> Thursday, July 23, 2015, 7:32 AM +0800 from Jonathan Hsieh <
> jon@cloudera.com>:
> >Although the the precommit buiid passed, and the compilation and mob
> >testing I ran after before the merge was commited passed, It looks like
> the
> >first full build after the merge [1] failed. It looked like something
> hung
> >along the way, and that most of the previous builds had failed for various
> >reasons. :(
> >
> >I kicked it off again have it do another try. If it is mob related we'll
> >take hunt it down and take care of it.
> >
> >Jon.
> >
> >[1] https://builds.apache.org/job/HBase-TRUNK/6672/
> >
> >On Wed, Jul 22, 2015 at 1:16 PM, Jonathan Hsieh < jon@cloudera.com >
> wrote:
> >
> >> I've merged the code in to master. Thanks for all the hard work
> Jingcheng
> >> and thanks to all who have been involved with reviews, discussion, and
> >> voting!
> >>
> >> Jon
> >>
> >> On Wed, Jul 22, 2015 at 12:45 AM, Jingcheng Du < jingcheng.du@intel.com
> >
> >> wrote:
> >>
> >>> Hi all,
> >>>
> >>> The vote passes with 8 +1s and no -1. Thanks all for guiding, helping
> and
> >>> voting!
> >>> We will work on the merge activities and will let guys know about the
> >>> detailed plan for merge time.
> >>> And thanks Jon for helping merge this branch to trunk!
> >>>
> >>> Regards,
> >>> Jingcheng
> >>>
> >>>
> >>>
> >>> --
> >>> View this message in context:
> >>>
> http://apache-hbase.679495.n3.nabble.com/RESULT-VOTE-Merge-branch-hbase-11339-HBase-MOB-to-trunk-tp4073446.html
> >>> Sent from the HBase Developer mailing list archive at Nabble.com.
> >>>
> >>
> >>
> >>
> >> --
> >> // Jonathan Hsieh (shay)
> >> // HBase Tech Lead, Software Engineer, Cloudera
> >> // jon@cloudera.com // @jmhsieh
> >>
> >>
> >
> >
> >
> >--
> >// Jonathan Hsieh (shay)
> >// HBase Tech Lead, Software Engineer, Cloudera
> >// jon@cloudera.com // @jmhsieh
>
--
// Jonathan Hsieh (shay)
// HBase Tech Lead, Software Engineer, Cloudera
// jon@cloudera.com // @jmhsieh
Re[2]: [RESULT][VOTE] Merge branch hbase-11339 HBase MOB to trunk
Posted by Ted Yu <yu...@gmail.com>.
Jon:
How did you deal with mega patch attached to HBASE-11339 ?
To my knowledge, some of the changes in mega patch were not merged to hbase-11339 branch.
These changes were made so that unit tests could pass.
Cheers
Thursday, July 23, 2015, 7:32 AM +0800 from Jonathan Hsieh <jo...@cloudera.com>:
>Although the the precommit buiid passed, and the compilation and mob
>testing I ran after before the merge was commited passed, It looks like the
>first full build after the merge [1] failed. It looked like something hung
>along the way, and that most of the previous builds had failed for various
>reasons. :(
>
>I kicked it off again have it do another try. If it is mob related we'll
>take hunt it down and take care of it.
>
>Jon.
>
>[1] https://builds.apache.org/job/HBase-TRUNK/6672/
>
>On Wed, Jul 22, 2015 at 1:16 PM, Jonathan Hsieh < jon@cloudera.com > wrote:
>
>> I've merged the code in to master. Thanks for all the hard work Jingcheng
>> and thanks to all who have been involved with reviews, discussion, and
>> voting!
>>
>> Jon
>>
>> On Wed, Jul 22, 2015 at 12:45 AM, Jingcheng Du < jingcheng.du@intel.com >
>> wrote:
>>
>>> Hi all,
>>>
>>> The vote passes with 8 +1s and no -1. Thanks all for guiding, helping and
>>> voting!
>>> We will work on the merge activities and will let guys know about the
>>> detailed plan for merge time.
>>> And thanks Jon for helping merge this branch to trunk!
>>>
>>> Regards,
>>> Jingcheng
>>>
>>>
>>>
>>> --
>>> View this message in context:
>>> http://apache-hbase.679495.n3.nabble.com/RESULT-VOTE-Merge-branch-hbase-11339-HBase-MOB-to-trunk-tp4073446.html
>>> Sent from the HBase Developer mailing list archive at Nabble.com.
>>>
>>
>>
>>
>> --
>> // Jonathan Hsieh (shay)
>> // HBase Tech Lead, Software Engineer, Cloudera
>> // jon@cloudera.com // @jmhsieh
>>
>>
>
>
>
>--
>// Jonathan Hsieh (shay)
>// HBase Tech Lead, Software Engineer, Cloudera
>// jon@cloudera.com // @jmhsieh
Re: [RESULT][VOTE] Merge branch hbase-11339 HBase MOB to trunk
Posted by Andrew Purtell <ap...@apache.org>.
Thanks Jon.
When I'm back in the office I'll check out master and have a look into any
locally repeatable test failures. Anyway in my opinion at this point it
would make the most sense for us to keep the MOB changes in on master and
deal with any fallout in follow on issues. I think all who voted +1 for
this change were aware that large changes like this can have a temporarily
destabilizing effect. As long as the MOB devs are around to help clean up,
we should be good!
On Wed, Jul 22, 2015 at 8:09 PM, Jonathan Hsieh <jo...@cloudera.com> wrote:
> I had two clean full builds/unit test on my internal setup and the latest
> build went back to ~4325 total tests and failures on Procedure relate tests
> cases.
>
> I don't think mob is responsible for these failures.
>
> Jon.
>
> On Wed, Jul 22, 2015 at 4:32 PM, Jonathan Hsieh <jo...@cloudera.com> wrote:
>
> > Although the the precommit buiid passed, and the compilation and mob
> > testing I ran after before the merge was commited passed, It looks like
> > the first full build after the merge [1] failed. It looked like
> > something hung along the way, and that most of the previous builds had
> > failed for various reasons. :(
> >
> > I kicked it off again have it do another try. If it is mob related we'll
> > take hunt it down and take care of it.
> >
> > Jon.
> >
> > [1] https://builds.apache.org/job/HBase-TRUNK/6672/
> >
> > On Wed, Jul 22, 2015 at 1:16 PM, Jonathan Hsieh <jo...@cloudera.com>
> wrote:
> >
> >> I've merged the code in to master. Thanks for all the hard work
> >> Jingcheng and thanks to all who have been involved with reviews,
> >> discussion, and voting!
> >>
> >> Jon
> >>
> >> On Wed, Jul 22, 2015 at 12:45 AM, Jingcheng Du <ji...@intel.com>
> >> wrote:
> >>
> >>> Hi all,
> >>>
> >>> The vote passes with 8 +1s and no -1. Thanks all for guiding, helping
> and
> >>> voting!
> >>> We will work on the merge activities and will let guys know about the
> >>> detailed plan for merge time.
> >>> And thanks Jon for helping merge this branch to trunk!
> >>>
> >>> Regards,
> >>> Jingcheng
> >>>
> >>>
> >>>
> >>> --
> >>> View this message in context:
> >>>
> http://apache-hbase.679495.n3.nabble.com/RESULT-VOTE-Merge-branch-hbase-11339-HBase-MOB-to-trunk-tp4073446.html
> >>> Sent from the HBase Developer mailing list archive at Nabble.com.
> >>>
> >>
> >>
> >>
> >> --
> >> // Jonathan Hsieh (shay)
> >> // HBase Tech Lead, Software Engineer, Cloudera
> >> // jon@cloudera.com // @jmhsieh
> >>
> >>
> >
> >
> >
> > --
> > // Jonathan Hsieh (shay)
> > // HBase Tech Lead, Software Engineer, Cloudera
> > // jon@cloudera.com // @jmhsieh
> >
> >
>
>
>
> --
> // Jonathan Hsieh (shay)
> // HBase Tech Lead, Software Engineer, Cloudera
> // jon@cloudera.com // @jmhsieh
>
--
Best regards,
- Andy
Problems worthy of attack prove their worth by hitting back. - Piet Hein
(via Tom White)
Re: [RESULT][VOTE] Merge branch hbase-11339 HBase MOB to trunk
Posted by Jonathan Hsieh <jo...@cloudera.com>.
I had two clean full builds/unit test on my internal setup and the latest
build went back to ~4325 total tests and failures on Procedure relate tests
cases.
I don't think mob is responsible for these failures.
Jon.
On Wed, Jul 22, 2015 at 4:32 PM, Jonathan Hsieh <jo...@cloudera.com> wrote:
> Although the the precommit buiid passed, and the compilation and mob
> testing I ran after before the merge was commited passed, It looks like
> the first full build after the merge [1] failed. It looked like
> something hung along the way, and that most of the previous builds had
> failed for various reasons. :(
>
> I kicked it off again have it do another try. If it is mob related we'll
> take hunt it down and take care of it.
>
> Jon.
>
> [1] https://builds.apache.org/job/HBase-TRUNK/6672/
>
> On Wed, Jul 22, 2015 at 1:16 PM, Jonathan Hsieh <jo...@cloudera.com> wrote:
>
>> I've merged the code in to master. Thanks for all the hard work
>> Jingcheng and thanks to all who have been involved with reviews,
>> discussion, and voting!
>>
>> Jon
>>
>> On Wed, Jul 22, 2015 at 12:45 AM, Jingcheng Du <ji...@intel.com>
>> wrote:
>>
>>> Hi all,
>>>
>>> The vote passes with 8 +1s and no -1. Thanks all for guiding, helping and
>>> voting!
>>> We will work on the merge activities and will let guys know about the
>>> detailed plan for merge time.
>>> And thanks Jon for helping merge this branch to trunk!
>>>
>>> Regards,
>>> Jingcheng
>>>
>>>
>>>
>>> --
>>> View this message in context:
>>> http://apache-hbase.679495.n3.nabble.com/RESULT-VOTE-Merge-branch-hbase-11339-HBase-MOB-to-trunk-tp4073446.html
>>> Sent from the HBase Developer mailing list archive at Nabble.com.
>>>
>>
>>
>>
>> --
>> // Jonathan Hsieh (shay)
>> // HBase Tech Lead, Software Engineer, Cloudera
>> // jon@cloudera.com // @jmhsieh
>>
>>
>
>
>
> --
> // Jonathan Hsieh (shay)
> // HBase Tech Lead, Software Engineer, Cloudera
> // jon@cloudera.com // @jmhsieh
>
>
--
// Jonathan Hsieh (shay)
// HBase Tech Lead, Software Engineer, Cloudera
// jon@cloudera.com // @jmhsieh
Re: [RESULT][VOTE] Merge branch hbase-11339 HBase MOB to trunk
Posted by Jonathan Hsieh <jo...@cloudera.com>.
Although the the precommit buiid passed, and the compilation and mob
testing I ran after before the merge was commited passed, It looks like the
first full build after the merge [1] failed. It looked like something hung
along the way, and that most of the previous builds had failed for various
reasons. :(
I kicked it off again have it do another try. If it is mob related we'll
take hunt it down and take care of it.
Jon.
[1] https://builds.apache.org/job/HBase-TRUNK/6672/
On Wed, Jul 22, 2015 at 1:16 PM, Jonathan Hsieh <jo...@cloudera.com> wrote:
> I've merged the code in to master. Thanks for all the hard work Jingcheng
> and thanks to all who have been involved with reviews, discussion, and
> voting!
>
> Jon
>
> On Wed, Jul 22, 2015 at 12:45 AM, Jingcheng Du <ji...@intel.com>
> wrote:
>
>> Hi all,
>>
>> The vote passes with 8 +1s and no -1. Thanks all for guiding, helping and
>> voting!
>> We will work on the merge activities and will let guys know about the
>> detailed plan for merge time.
>> And thanks Jon for helping merge this branch to trunk!
>>
>> Regards,
>> Jingcheng
>>
>>
>>
>> --
>> View this message in context:
>> http://apache-hbase.679495.n3.nabble.com/RESULT-VOTE-Merge-branch-hbase-11339-HBase-MOB-to-trunk-tp4073446.html
>> Sent from the HBase Developer mailing list archive at Nabble.com.
>>
>
>
>
> --
> // Jonathan Hsieh (shay)
> // HBase Tech Lead, Software Engineer, Cloudera
> // jon@cloudera.com // @jmhsieh
>
>
--
// Jonathan Hsieh (shay)
// HBase Tech Lead, Software Engineer, Cloudera
// jon@cloudera.com // @jmhsieh
Re: [RESULT][VOTE] Merge branch hbase-11339 HBase MOB to trunk
Posted by Jonathan Hsieh <jo...@cloudera.com>.
I've merged the code in to master. Thanks for all the hard work Jingcheng
and thanks to all who have been involved with reviews, discussion, and
voting!
Jon
On Wed, Jul 22, 2015 at 12:45 AM, Jingcheng Du <ji...@intel.com>
wrote:
> Hi all,
>
> The vote passes with 8 +1s and no -1. Thanks all for guiding, helping and
> voting!
> We will work on the merge activities and will let guys know about the
> detailed plan for merge time.
> And thanks Jon for helping merge this branch to trunk!
>
> Regards,
> Jingcheng
>
>
>
> --
> View this message in context:
> http://apache-hbase.679495.n3.nabble.com/RESULT-VOTE-Merge-branch-hbase-11339-HBase-MOB-to-trunk-tp4073446.html
> Sent from the HBase Developer mailing list archive at Nabble.com.
>
--
// Jonathan Hsieh (shay)
// HBase Tech Lead, Software Engineer, Cloudera
// jon@cloudera.com // @jmhsieh