From common-dev-return-100076-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Fri Jul 6 19:42:54 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 4D348180674 for ; Fri, 6 Jul 2018 19:42:54 +0200 (CEST) Received: (qmail 88350 invoked by uid 500); 6 Jul 2018 17:42:52 -0000 Mailing-List: contact common-dev-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-dev@hadoop.apache.org Received: (qmail 88302 invoked by uid 99); 6 Jul 2018 17:42:52 -0000 Received: from mail-relay.apache.org (HELO mailrelay1-lw-us.apache.org) (207.244.88.152) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jul 2018 17:42:52 +0000 Received: from [10.22.9.10] (unknown [192.175.27.10]) by mailrelay1-lw-us.apache.org (ASF Mail Server at mailrelay1-lw-us.apache.org) with ESMTPSA id 90ACB6F1; Fri, 6 Jul 2018 17:42:50 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 11.4 \(3445.8.2\)) Subject: Re: [VOTE] reset/force push to clean up inadvertent merge commit pushed to trunk From: Vinod Kumar Vavilapalli In-Reply-To: Date: Fri, 6 Jul 2018 10:42:47 -0700 Cc: Arpit Agarwal , "subru@apache.org" , "yarn-dev@hadoop.apache.org" , "hdfs-dev@hadoop.apache.org" , "common-dev@hadoop.apache.org" , "mapreduce-dev@hadoop.apache.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: To: Anu Engineer X-Mailer: Apple Mail (2.3445.8.2) 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 = wrote: >=20 > Hi All, >=20 > [ Thanks to Arpit for working offline and verifying that branch is = indeed good.] >=20 > I want to summarize what I know of this issue and also solicit other = points of view. >=20 > 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. >=20 > We used the following command to revert=20 > git revert -c c163d1797ade0f47d35b4a44381b8ef1dfec5b60 -m 1 >=20 > Giovanni's branch had three commits + merge, The JIRAs he had were = YARN-7451, YARN-7556, YARN-8435. >=20 > 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.=20 > 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. >=20 > 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. >=20 > Based on what I know so far, I am -1 on the force push. >=20 > 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. >=20 >=20 > Thanks > Anu >=20 >=20 > On 7/6/18, 10:24 AM, "Arpit Agarwal" wrote: >=20 > -1 for the force push. Nothing is broken in trunk. The history = looks ugly for two commits and we can live with it. >=20 > 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). >=20 > 39ad989 2018-07-05 aengineer@ o {apache/trunk} Revert "Merge branch = 't... > c163d17 2018-07-05 gifuma@apa M=E2=94=80=E2=94=90 Merge branch = 'trunk' of https://git-... > 99febe7 2018-07-05 rkanter@ap =E2=94=82 o YARN-7451. Add missing = tests to veri... > 1726247 2018-07-05 haibochen@ =E2=94=82 o YARN-7556. Fair scheduler = configurat... > 0d9804d 2018-07-05 gifuma@apa o =E2=94=82 YARN-8435. Fix NPE when = the same cli... > 71df8c2 2018-07-05 nanda@apac o=E2=94=80=E2=94=98 HDDS-212. = Introduce NodeStateManager... >=20 > Regards, > Arpit >=20 >=20 > On 7/5/18, 2:37 PM, "Subru Krishnan" wrote: >=20 > Folks, >=20 > There was a merge commit accidentally pushed to trunk, you can = find the > details in the mail thread [1]. >=20 > I have raised an INFRA ticket [2] to reset/force push to clean = up trunk. >=20 > Can we have a quick vote for INFRA sign-off to proceed as this = is blocking > all commits? >=20 > Thanks, > Subru >=20 > [1] > = http://mail-archives.apache.org/mod_mbox/hadoop-yarn-dev/201807.mbox/%3CCA= HqguubKBqwfUMwhtJuSD7X1Bgfro_P6FV%2BhhFhMMYRaxFsF9Q%40mail.gmail.com%3E > [2] https://issues.apache.org/jira/browse/INFRA-16727 >=20 >=20 >=20 > = --------------------------------------------------------------------- > To unsubscribe, e-mail: common-dev-unsubscribe@hadoop.apache.org > For additional commands, e-mail: common-dev-help@hadoop.apache.org >=20 >=20 >=20 > --------------------------------------------------------------------- > To unsubscribe, e-mail: common-dev-unsubscribe@hadoop.apache.org > For additional commands, e-mail: common-dev-help@hadoop.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: common-dev-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-dev-help@hadoop.apache.org