If I had to guess, https://jenkins.impala.io/job/cherrypick-2.x-and-test/ will skip the revert, because it doesn't have a Change-Id. Since it hasn't happened, you can add 25218487533f6bf6959c32ff4ee38b77e0ab30b5 to the ignored commits list of 2.x (in branch 2.x) right now, and both commits will get ignored. If time passes and one commit gets cherry-picked, you'll just need to revert manually again on 2.x and push that.
-- Philip On Wed, Mar 28, 2018 at 3:44 PM, Michael Brown <[email protected]> wrote: > Hi, I accidentally pushed to refs/heads/master, and then immediately > reverted, though also to refs/heads. This means there is a commit out there > without a Change-Id again. What's the proper thing here to do for 2.x? > > Thanks, and sorry about that. > > commit 2c0926e2de22ecafafc460f2b31ca2423b8f7e98 > Author: Michael Brown <[email protected]> > Date: Wed Mar 28 15:28:48 2018 -0700 > > Revert "IMPALA-6759: align stress test memory estimation parse pattern" > > This reverts commit 25218487533f6bf6959c32ff4ee38b77e0ab30b5. > > commit 25218487533f6bf6959c32ff4ee38b77e0ab30b5 > Author: Michael Brown <[email protected]> > Date: Wed Mar 28 15:14:20 2018 -0700 > > IMPALA-6759: align stress test memory estimation parse pattern > > The stress test never expected to see memory estimates on the order of > PB. Apparently it can happen with TPC DS 10000, so update the pattern. > > It's not clear how to quickly write a test to catch this, because it > involves crossing language boundaries and possibly having a > massively-scaled dataset. I think leaving a comment in both places is > good enough for now. > > Change-Id: I08976f261582b379696fd0e81bc060577e552309 >
