Return-Path: X-Original-To: apmail-infrastructure-dev-archive@minotaur.apache.org Delivered-To: apmail-infrastructure-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 011992F01 for ; Fri, 29 Apr 2011 13:39:58 +0000 (UTC) Received: (qmail 54927 invoked by uid 500); 29 Apr 2011 13:39:58 -0000 Delivered-To: apmail-infrastructure-dev-archive@apache.org Received: (qmail 54820 invoked by uid 500); 29 Apr 2011 13:39:58 -0000 Mailing-List: contact infrastructure-dev-help@apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: infrastructure-dev@apache.org Delivered-To: mailing list infrastructure-dev@apache.org Delivered-To: moderator for infrastructure-dev@apache.org Received: (qmail 82570 invoked by uid 99); 29 Apr 2011 06:25:31 -0000 X-ASF-Spam-Status: No, hits=1.5 required=10 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of todd@cloudera.com designates 209.85.214.50 as permitted sender) MIME-Version: 1.0 In-Reply-To: <83FF361E-EA96-4E82-9084-19D91BCEB608@mac.com> References: <4112B27D-7DCF-4C8E-AD61-6884BA7E738C@mac.com> <844F39DC-0A5D-4AAE-AF8D-EFD4CC83C18A@mac.com> <9B529359-B589-4229-BA96-188C762A8E31@apache.org> <522E7C8B-C159-4520-A758-6E994195D0DC@mac.com> <83FF361E-EA96-4E82-9084-19D91BCEB608@mac.com> From: Todd Lipcon Date: Thu, 28 Apr 2011 23:24:43 -0700 Message-ID: Subject: Re: HADOOP-7106: Re-organize hadoop subversion layout To: Nigel Daley Cc: general@hadoop.apache.org, "Owen O'Malley" , Suresh Srinivas , Ian Holsman , infrastructure-dev@apache.org Content-Type: multipart/alternative; boundary=bcaec5555712ed806104a208bb3a X-Virus-Checked: Checked by ClamAV on apache.org --bcaec5555712ed806104a208bb3a Content-Type: text/plain; charset=ISO-8859-1 On Thu, Apr 28, 2011 at 10:06 PM, Nigel Daley wrote: > As announced last week, I'm planning to do this at 2pm PDT tomorrow > (Friday) April 29. > > Suresh, when do you plan to commit HFS-1052? That should be done first. > > Owen or Todd, did you want to follow Paul's advice: > > If you're really wanting to make sure to keep the history in Git > > intact my suggestion would be to setup a temporary svn server locally > > and test our mirroring scripts against the commands you intend to run. > If so, how much more time do you need? > Wasn't sure how to go about doing that. I guess we need to talk to infra about it? Do you know how we might clone the SVN repos themselves to test with? -Todd On Apr 20, 2011, at 9:42 PM, Nigel Daley wrote: > > > Owen, I'll admit I'm not familiar with all the git details/issues in your > proposal, but I think the layout change you propose is fine and seems to > solve the git issues with very minimal impact on the layout. > > > > Let's shoot for doing this next Friday, April 29 at 2pm PDT. I'll update > the patch and send out a reminder about this later next week. > > > > Thanks, > > Nige > > > > On Apr 20, 2011, at 8:00 AM, Owen O'Malley wrote: > > > >> > >> On Apr 19, 2011, at 10:58 PM, Todd Lipcon wrote: > >> > >>> On Tue, Apr 19, 2011 at 10:20 PM, Todd Lipcon > wrote: > >>> > >>>> > >>>> I'm currently looking into how the git mirrors are setup in > Apache-land. > >> > >> Uh, why isn't infra-dev on this thread? > >> > >> For those on infra-dev, the context is that Nigel is trying to merge > together the source trees of the Hadoop sub-projects that were split apart 2 > years ago. So he is taking: > >> > >> prefix = http://svn.apache.org/repos/asf/hadoop/ > >> > >> $prefix/common/trunk -> $prefix/trunk/common > >> $prefix/hdfs/trunk -> $prefix/trunk/hdfs > >> $prefix/mapreduce/trunk -> $prefix/trunk/mapreduce > >> > >> and play similar games with the rest of the branches and tags. For more > details look at HADOOP-7106. > >> > >> From the project split, subversion was able to track the history across > the subversion moves between projects, but not git. > >> > >> Four questions: > >> 1. Is there anything we can do to minimize the history loss in git? > >> 2. Are we going to be able to preserve our sha's or are they going to > change again? > >> 3. What changes do we need to make to the subversion notification file? > >> 4. Are there any other changes that need to be coordinated? > >> > >> After considering it this morning, I believe that the least disruptive > move is to leave common at the same url and merge hdfs and mapreduce back > in: > >> > >> $prefix/common/trunk/* -> $prefix/common/trunk/common/* > >> $prefix/hdfs/trunk -> $prefix/common/trunk/hdfs > >> $prefix/mapreduce/trunk -> $prefix/common/trunk/mapreduce > >> > >> This will preserve the hashes and history for common (and the 20 > branches). We'll still need to play git voodoo to get git history for hdfs > and mapreduce, but it is far better than starting a brand new git clone. > >> > >> -- Owen > >> > >> > > > > -- Todd Lipcon Software Engineer, Cloudera --bcaec5555712ed806104a208bb3a--