hadoop-hdfs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Arpit Agarwal <aagar...@hortonworks.com>
Subject Re: [VOTE] reset/force push to clean up inadvertent merge commit pushed to trunk
Date Fri, 06 Jul 2018 18:10:21 GMT
afaict YARN-8435 is still in trunk. YARN-7556 and YARN-7451 are not.


From: Giovanni Matteo Fumarola <giovanni.fumarola@gmail.com>
Date: Friday, July 6, 2018 at 10:59 AM
To: Vinod Kumar Vavilapalli <vinodkv@apache.org>
Cc: Anu Engineer <aengineer@hortonworks.com>, Arpit Agarwal <aagarwal@hortonworks.com>,
"subru@apache.org" <subru@apache.org>, "yarn-dev@hadoop.apache.org" <yarn-dev@hadoop.apache.org>,
"hdfs-dev@hadoop.apache.org" <hdfs-dev@hadoop.apache.org>, "common-dev@hadoop.apache.org"
<common-dev@hadoop.apache.org>, "mapreduce-dev@hadoop.apache.org" <mapreduce-dev@hadoop.apache.org>
Subject: Re: [VOTE] reset/force push to clean up inadvertent merge commit pushed to trunk

Everything seems ok except the 3 commits: YARN-8435, YARN-7556, YARN-7451 are not anymore
in trunk due to the revert.

Haibo/Robert if you can recommit your patches I will commit mine subsequently to preserve
the original order.

(My apology for the mess I did with the merge commit)

On Fri, Jul 6, 2018 at 10:42 AM, Vinod Kumar Vavilapalli <vinodkv@apache.org<mailto:vinodkv@apache.org>>
wrote:
I will add that the branch also successfully compiles.

Let's just move forward as is, unblock commits and just fix things if anything is broken.

+Vinod

> On Jul 6, 2018, at 10:30 AM, Anu Engineer <aengineer@hortonworks.com<mailto:aengineer@hortonworks.com>>
wrote:
>
> Hi All,
>
> [ Thanks to Arpit for working offline and verifying that branch is indeed good.]
>
> I want to summarize what I know of this issue and also solicit other points of view.
>
> We reverted the commit(c163d1797) from the branch, as soon as we noticed it. That is,
we have made no other commits after the merge commit.
>
> We used the following command to revert
> git revert -c c163d1797ade0f47d35b4a44381b8ef1dfec5b60 -m 1
>
> Giovanni's branch had three commits + merge, The JIRAs he had were YARN-7451, YARN-7556,
YARN-8435.
>
> The issue seems to be the revert of merge has some diffs. I am not a YARN developer,
so the only problem is to look at the revert and see if there were any spurious edits in Giovanni's
original commit + merge.
> If there are none, we don't need a reset/force push.  But if we find an issue I am more
than willing to go the force commit route.
>
> The revert takes the trunk back to the point of the first commit from Giovanni which
is YARN-8435. His branch was also rewriting the order of commits which we have lost due to
the revert.
>
> Based on what I know so far, I am -1 on the force push.
>
> In other words, I am trying to understand why we need the force push. I have left a similar
comment in JIRA (https://issues.apache.org/jira/browse/INFRA-16727) too.
>
>
> Thanks
> Anu
>
>
> On 7/6/18, 10:24 AM, "Arpit Agarwal" <aagarwal@hortonworks.com<mailto:aagarwal@hortonworks.com>>
wrote:
>
>    -1 for the force push. Nothing is broken in trunk. The history looks ugly for two
commits and we can live with it.
>
>    The revert restored the branch to Giovanni's intent. i.e. only YARN-8435 is applied.
Verified there is no delta between hashes 0d9804d and 39ad989 (HEAD).
>
>    39ad989 2018-07-05 aengineer@ o {apache/trunk} Revert "Merge branch 't...
>    c163d17 2018-07-05 gifuma@apa M─┐ Merge branch 'trunk' of https://git-...
>    99febe7 2018-07-05 rkanter@ap │ o YARN-7451. Add missing tests to veri...
>    1726247 2018-07-05 haibochen@ │ o YARN-7556. Fair scheduler configurat...
>    0d9804d 2018-07-05 gifuma@apa o │ YARN-8435. Fix NPE when the same cli...
>    71df8c2 2018-07-05 nanda@apac o─┘ HDDS-212. Introduce NodeStateManager...
>
>    Regards,
>    Arpit
>
>
>    On 7/5/18, 2:37 PM, "Subru Krishnan" <subru@apache.org<mailto:subru@apache.org>>
wrote:
>
>        Folks,
>
>        There was a merge commit accidentally pushed to trunk, you can find the
>        details in the mail thread [1].
>
>        I have raised an INFRA ticket [2] to reset/force push to clean up trunk.
>
>        Can we have a quick vote for INFRA sign-off to proceed as this is blocking
>        all commits?
>
>        Thanks,
>        Subru
>
>        [1]
>        http://mail-archives.apache.org/mod_mbox/hadoop-yarn-dev/201807.mbox/%3CCAHqguubKBqwfUMwhtJuSD7X1Bgfro_P6FV%2BhhFhMMYRaxFsF9Q%40mail.gmail.com%3E
>        [2] https://issues.apache.org/jira/browse/INFRA-16727
>
>
>
>    ---------------------------------------------------------------------
>    To unsubscribe, e-mail: common-dev-unsubscribe@hadoop.apache.org<mailto:common-dev-unsubscribe@hadoop.apache.org>
>    For additional commands, e-mail: common-dev-help@hadoop.apache.org<mailto:common-dev-help@hadoop.apache.org>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: common-dev-unsubscribe@hadoop.apache.org<mailto:common-dev-unsubscribe@hadoop.apache.org>
> For additional commands, e-mail: common-dev-help@hadoop.apache.org<mailto:common-dev-help@hadoop.apache.org>

---------------------------------------------------------------------
To unsubscribe, e-mail: yarn-dev-unsubscribe@hadoop.apache.org<mailto:yarn-dev-unsubscribe@hadoop.apache.org>
For additional commands, e-mail: yarn-dev-help@hadoop.apache.org<mailto:yarn-dev-help@hadoop.apache.org>

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