From hdfs-commits-return-1726-apmail-hadoop-hdfs-commits-archive=hadoop.apache.org@hadoop.apache.org Tue Jun 7 01:25:13 2011 Return-Path: X-Original-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BD66D4EE7 for ; Tue, 7 Jun 2011 01:25:13 +0000 (UTC) Received: (qmail 41995 invoked by uid 500); 7 Jun 2011 01:25:13 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 41964 invoked by uid 500); 7 Jun 2011 01:25:13 -0000 Mailing-List: contact hdfs-commits-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-commits@hadoop.apache.org Received: (qmail 41956 invoked by uid 99); 7 Jun 2011 01:25:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Jun 2011 01:25:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Jun 2011 01:25:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4E5F5238896F; Tue, 7 Jun 2011 01:24:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1132852 - in /hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs: protocol/ server/namenode/ tools/offlineEditsViewer/ tools/offlineImageViewer/ Date: Tue, 07 Jun 2011 01:24:49 -0000 To: hdfs-commits@hadoop.apache.org From: todd@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110607012449.4E5F5238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: todd Date: Tue Jun 7 01:24:48 2011 New Revision: 1132852 URL: http://svn.apache.org/viewvc?rev=1132852&view=rev Log: Cleanup post-merge to use LayoutVersion class instead of constants for 1073 version checks Modified: hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/protocol/FSConstants.java hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/tools/offlineEditsViewer/EditsLoaderCurrent.java hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageLoaderCurrent.java Modified: hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/protocol/FSConstants.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/protocol/FSConstants.java?rev=1132852&r1=1132851&r2=1132852&view=diff ============================================================================== --- hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/protocol/FSConstants.java (original) +++ hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/protocol/FSConstants.java Tue Jun 7 01:24:48 2011 @@ -92,11 +92,4 @@ public interface FSConstants { */ public static final int LAYOUT_VERSION = LayoutVersion.getCurrentLayoutVersion(); - - // TODO: remove these in favor of LayoutVersion calls - // Version where the edits log and image stored txn ID information - public static final int FIRST_STORED_TXIDS_VERSION = -37; - // Version where the edits log and image file names are based on txn IDs - public static final int FIRST_TXNID_BASED_LAYOUT_VERSION = -38; - } Modified: hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java?rev=1132852&r1=1132851&r2=1132852&view=diff ============================================================================== --- hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java (original) +++ hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java Tue Jun 7 01:24:48 2011 @@ -183,7 +183,7 @@ public class FSEditLogLoader { } recentOpcodeOffsets[numEdits % recentOpcodeOffsets.length] = tracker.getPos(); - if (logVersion <= FSConstants.FIRST_STORED_TXIDS_VERSION) { + if (LayoutVersion.supports(Feature.STORED_TXIDS, logVersion)) { // Read the txid long thisTxId = in.readLong(); if (thisTxId != txId + 1) { Modified: hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java?rev=1132852&r1=1132851&r2=1132852&view=diff ============================================================================== --- hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java (original) +++ hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java Tue Jun 7 01:24:48 2011 @@ -593,9 +593,9 @@ public class FSImage implements Closeabl // (ie edits_) then use the new inspector, which will ignore // the old format dirs. FSImageStorageInspector inspector; - if (minLayoutVersion <= FSConstants.FIRST_TXNID_BASED_LAYOUT_VERSION) { + if (LayoutVersion.supports(Feature.TXID_BASED_LAYOUT, minLayoutVersion)) { inspector = new FSImageTransactionalStorageInspector(); - if (maxLayoutVersion > FSConstants.FIRST_TXNID_BASED_LAYOUT_VERSION) { + if (!LayoutVersion.supports(Feature.TXID_BASED_LAYOUT, maxLayoutVersion)) { LOG.warn("Ignoring one or more storage directories with old layouts"); } } else { Modified: hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java?rev=1132852&r1=1132851&r2=1132852&view=diff ============================================================================== --- hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java (original) +++ hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java Tue Jun 7 01:24:48 2011 @@ -161,7 +161,7 @@ class FSImageFormat { // read the transaction ID of the last edit represented by // this image - if (imgVersion <= FSConstants.FIRST_STORED_TXIDS_VERSION) { + if (LayoutVersion.supports(Feature.STORED_TXIDS, imgVersion)) { imgTxId = in.readLong(); } else { imgTxId = 0; Modified: hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/tools/offlineEditsViewer/EditsLoaderCurrent.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/tools/offlineEditsViewer/EditsLoaderCurrent.java?rev=1132852&r1=1132851&r2=1132852&view=diff ============================================================================== --- hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/tools/offlineEditsViewer/EditsLoaderCurrent.java (original) +++ hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/tools/offlineEditsViewer/EditsLoaderCurrent.java Tue Jun 7 01:24:48 2011 @@ -70,7 +70,7 @@ class EditsLoaderCurrent implements Edit * Visit a transaction ID, if the log version supports it. */ private void visitTxId() throws IOException { - if (editsVersion <= FSConstants.FIRST_STORED_TXIDS_VERSION) { + if (LayoutVersion.supports(Feature.STORED_TXIDS, editsVersion)) { v.visitLong(EditsElement.TRANSACTION_ID); } } Modified: hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageLoaderCurrent.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageLoaderCurrent.java?rev=1132852&r1=1132851&r2=1132852&view=diff ============================================================================== --- hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageLoaderCurrent.java (original) +++ hadoop/hdfs/branches/HDFS-1073/src/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageLoaderCurrent.java Tue Jun 7 01:24:48 2011 @@ -158,8 +158,7 @@ class ImageLoaderCurrent implements Imag v.visit(ImageElement.GENERATION_STAMP, in.readLong()); - if (imageVersion <= FSConstants.FIRST_STORED_TXIDS_VERSION) { - // TODO use LayoutVersion class + if (LayoutVersion.supports(Feature.STORED_TXIDS, imageVersion)) { v.visit(ImageElement.TRANSACTION_ID, in.readLong()); }