From common-dev-return-100081-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Fri Jul 6 20:12:56 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 D5E36180627 for ; Fri, 6 Jul 2018 20:12:55 +0200 (CEST) Received: (qmail 64965 invoked by uid 500); 6 Jul 2018 18:12: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 64924 invoked by uid 99); 6 Jul 2018 18:12: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 18:12:52 +0000 Received: from mail-it0-f46.google.com (mail-it0-f46.google.com [209.85.214.46]) by mailrelay1-lw-us.apache.org (ASF Mail Server at mailrelay1-lw-us.apache.org) with ESMTPSA id 6AABC6F1; Fri, 6 Jul 2018 18:12:51 +0000 (UTC) Received: by mail-it0-f46.google.com with SMTP id j185-v6so18052718ite.1; Fri, 06 Jul 2018 11:12:51 -0700 (PDT) X-Gm-Message-State: APt69E3+W27kkqjkPhiakjmRdt71sVewYV3I/bdSXpWhzKp/guzvdOIQ FcNIvujFZiZVVznqyk/4Fhwqiz7zOIMnpnlZHv8= X-Google-Smtp-Source: AAOMgpe6UCvtmyZgWA8Q6sgWt0j3gtCHYmFwQRrCry2qOAKJVaCxceNTKuTZD8AAYw7RzOXQ8VahlSt0fbm1ddS2beE= X-Received: by 2002:a24:144:: with SMTP id 65-v6mr8674394itk.62.1530900770736; Fri, 06 Jul 2018 11:12:50 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Sunil G Date: Fri, 6 Jul 2018 11:12:39 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [VOTE] reset/force push to clean up inadvertent merge commit pushed to trunk To: Arpit Agarwal Cc: Giovanni Matteo Fumarola , Vinod Kumar Vavilapalli , Anu Engineer , "subru@apache.org" , "yarn-dev@hadoop.apache.org" , "hdfs-dev@hadoop.apache.org" , "common-dev@hadoop.apache.org" , "mapreduce-dev@hadoop.apache.org" Content-Type: multipart/alternative; boundary="000000000000a052590570589c37" --000000000000a052590570589c37 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable I just checked. YARN-7556 and YARN-7451 can be cherry-picked. I cherry-picked in my local and compiled. Things are good. I can push this now which will restore trunk to its original. I can do this if there are no objection. - Sunil On Fri, Jul 6, 2018 at 11:10 AM Arpit Agarwal wrote: > afaict YARN-8435 is still in trunk. YARN-7556 and YARN-7451 are not. > > > From: Giovanni Matteo Fumarola > Date: Friday, July 6, 2018 at 10:59 AM > To: Vinod Kumar Vavilapalli > Cc: Anu Engineer , Arpit Agarwal < > aagarwal@hortonworks.com>, "subru@apache.org" , " > yarn-dev@hadoop.apache.org" , " > hdfs-dev@hadoop.apache.org" , " > common-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> 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 > 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 notice= d > 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>> 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 a= nd > 39ad989 (HEAD). > > > > 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 'trun= k' of > https://git-... > > 99febe7 2018-07-05 rkanter@ap =E2=94=82 o YARN-7451. Add missing tes= ts 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 th= e same > cli... > > 71df8c2 2018-07-05 nanda@apac o=E2=94=80=E2=94=98 HDDS-212. Introduc= e > NodeStateManager... > > > > Regards, > > Arpit > > > > > > On 7/5/18, 2:37 PM, "Subru Krishnan" 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 u= p > trunk. > > > > Can we have a quick vote for INFRA sign-off to proceed as this i= s > blocking > > all commits? > > > > Thanks, > > Subru > > > > [1] > > > http://mail-archives.apache.org/mod_mbox/hadoop-yarn-dev/201807.mbox/%3CC= AHqguubKBqwfUMwhtJuSD7X1Bgfro_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 > > > For additional commands, e-mail: common-dev-help@hadoop.apache.org > > > > > > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: common-dev-unsubscribe@hadoop.apache.org common-dev-unsubscribe@hadoop.apache.org> > > For additional commands, e-mail: common-dev-help@hadoop.apache.org > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: yarn-dev-unsubscribe@hadoop.apache.org yarn-dev-unsubscribe@hadoop.apache.org> > For additional commands, e-mail: yarn-dev-help@hadoop.apache.org yarn-dev-help@hadoop.apache.org> > > --000000000000a052590570589c37--