From hdfs-dev-return-3904-apmail-hadoop-hdfs-dev-archive=hadoop.apache.org@hadoop.apache.org Wed Sep 7 22:55:19 2011 Return-Path: X-Original-To: apmail-hadoop-hdfs-dev-archive@minotaur.apache.org Delivered-To: apmail-hadoop-hdfs-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 DE4318EFF for ; Wed, 7 Sep 2011 22:55:19 +0000 (UTC) Received: (qmail 66688 invoked by uid 500); 7 Sep 2011 22:55:19 -0000 Delivered-To: apmail-hadoop-hdfs-dev-archive@hadoop.apache.org Received: (qmail 66598 invoked by uid 500); 7 Sep 2011 22:55:18 -0000 Mailing-List: contact hdfs-dev-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-dev@hadoop.apache.org Delivered-To: mailing list hdfs-dev@hadoop.apache.org Received: (qmail 66590 invoked by uid 99); 7 Sep 2011 22:55:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Sep 2011 22:55:18 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of todd@cloudera.com designates 74.125.83.47 as permitted sender) Received: from [74.125.83.47] (HELO mail-gw0-f47.google.com) (74.125.83.47) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Sep 2011 22:55:14 +0000 Received: by gwb11 with SMTP id 11so221115gwb.34 for ; Wed, 07 Sep 2011 15:54:53 -0700 (PDT) Received: by 10.42.157.69 with SMTP id c5mr1130562icx.165.1315436092097; Wed, 07 Sep 2011 15:54:52 -0700 (PDT) MIME-Version: 1.0 Received: by 10.42.174.74 with HTTP; Wed, 7 Sep 2011 15:54:32 -0700 (PDT) In-Reply-To: References: From: Todd Lipcon Date: Wed, 7 Sep 2011 15:54:32 -0700 Message-ID: Subject: Re: Merging trunk, 0.23.0, HA? To: hdfs-dev@hadoop.apache.org Content-Type: text/plain; charset=ISO-8859-1 Assuming this is OK, I have a candidate merge here: https://github.com/toddlipcon/hadoop-common/tree/hdfs-1623-merged-trunk-20110907 This carries over Suresh's changes from HDFS-1974 into the refactored NameNodeRpcServer. Thanks, -Todd On Wed, Sep 7, 2011 at 3:03 PM, Todd Lipcon wrote: > Hey all, > > I'm trying to reconcile some of the recent changes in trunk, HA, and > 0.23. In particular, I'm hoping to merge HDFS-2197 back into both of > those branches. If we don't perform this merge, then any modification > to the RPC methods in the NameNode will require manual re-application. > > At this point, I'm thinking of doing the following: > - merge all of the recent trunk commits into HA branch > - cherry-pick just this commit from trunk into 0.23. > > Does that seem like the correct strategy? Does anyone object to > HDFS-2197 going in 0.23.0 branch? > > Thanks > -Todd > -- > Todd Lipcon > Software Engineer, Cloudera > -- Todd Lipcon Software Engineer, Cloudera