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 C48E1F49A for ; Fri, 31 May 2013 05:08:20 +0000 (UTC) Received: (qmail 32474 invoked by uid 500); 31 May 2013 05:08:20 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 32298 invoked by uid 500); 31 May 2013 05:08:20 -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 32289 invoked by uid 99); 31 May 2013 05:08:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 May 2013 05:08:20 +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; Fri, 31 May 2013 05:08:16 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3167B2388900; Fri, 31 May 2013 05:07:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1488093 - in /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: ./ src/main/java/ src/main/java/org/apache/hadoop/hdfs/ src/main/java/org/apache/hadoop/hdfs/server/namenode/ src/main/java/org/apache/hadoop/hdfs/tools/snapsho... Date: Fri, 31 May 2013 05:07:53 -0000 To: hdfs-commits@hadoop.apache.org From: szetszwo@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130531050755.3167B2388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: szetszwo Date: Fri May 31 05:07:52 2013 New Revision: 1488093 URL: http://svn.apache.org/r1488093 Log: svn merge -c 1487647 from trunk for HDFS-4846. Clean up snapshot CLI commands output stacktrace for invalid arguments. Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/ (props changed) hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/ (props changed) hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/snapshot/LsSnapshottableDir.java hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/snapshot/SnapshotDiff.java hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestNestedSnapshots.java hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotDeletion.java Propchange: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs:r1487647 Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1488093&r1=1488092&r2=1488093&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Fri May 31 05:07:52 2013 @@ -771,6 +771,9 @@ Release 2.0.5-beta - UNRELEASED HDFS-4842. Identify the correct prior snapshot when deleting a snapshot under a renamed subtree. (jing9) + HDFS-4846. Clean up snapshot CLI commands output stacktrace for invalid + arguments. (Jing Zhao via brandonli) + Release 2.0.4-alpha - 2013-04-25 INCOMPATIBLE CHANGES Propchange: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java:r1487647 Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java?rev=1488093&r1=1488092&r2=1488093&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java Fri May 31 05:07:52 2013 @@ -2152,11 +2152,7 @@ public class DFSClient implements java.i */ public void allowSnapshot(String snapshotRoot) throws IOException { checkOpen(); - try { - namenode.allowSnapshot(snapshotRoot); - } catch(RemoteException re) { - throw re.unwrapRemoteException(); - } + namenode.allowSnapshot(snapshotRoot); } /** @@ -2166,11 +2162,7 @@ public class DFSClient implements java.i */ public void disallowSnapshot(String snapshotRoot) throws IOException { checkOpen(); - try { - namenode.disallowSnapshot(snapshotRoot); - } catch(RemoteException re) { - throw re.unwrapRemoteException(); - } + namenode.disallowSnapshot(snapshotRoot); } /** Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java?rev=1488093&r1=1488092&r2=1488093&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java Fri May 31 05:07:52 2013 @@ -1433,7 +1433,7 @@ public class FSDirectory implements Clos INodeDirectorySnapshottable ssTargetDir = (INodeDirectorySnapshottable) targetDir; if (ssTargetDir.getNumSnapshots() > 0) { - throw new IOException("The direcotry " + ssTargetDir.getFullPathName() + throw new IOException("The directory " + ssTargetDir.getFullPathName() + " cannot be deleted since " + ssTargetDir.getFullPathName() + " is snapshottable and already has snapshots"); } else { Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/snapshot/LsSnapshottableDir.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/snapshot/LsSnapshottableDir.java?rev=1488093&r1=1488092&r2=1488093&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/snapshot/LsSnapshottableDir.java (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/snapshot/LsSnapshottableDir.java Fri May 31 05:07:52 2013 @@ -51,8 +51,13 @@ public class LsSnapshottableDir { } DistributedFileSystem dfs = (DistributedFileSystem) fs; - SnapshottableDirectoryStatus[] stats = dfs.getSnapshottableDirListing(); - SnapshottableDirectoryStatus.print(stats, System.out); + try { + SnapshottableDirectoryStatus[] stats = dfs.getSnapshottableDirListing(); + SnapshottableDirectoryStatus.print(stats, System.out); + } catch (IOException e) { + String[] content = e.getLocalizedMessage().split("\n"); + System.err.println("lsSnapshottableDir: " + content[0]); + } } } Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/snapshot/SnapshotDiff.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/snapshot/SnapshotDiff.java?rev=1488093&r1=1488092&r2=1488093&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/snapshot/SnapshotDiff.java (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/snapshot/SnapshotDiff.java Fri May 31 05:07:52 2013 @@ -82,9 +82,14 @@ public class SnapshotDiff { Path snapshotRoot = new Path(argv[0]); String fromSnapshot = getSnapshotName(argv[1]); String toSnapshot = getSnapshotName(argv[2]); - SnapshotDiffReport diffReport = dfs.getSnapshotDiffReport(snapshotRoot, - fromSnapshot, toSnapshot); - System.out.println(diffReport.toString()); + try { + SnapshotDiffReport diffReport = dfs.getSnapshotDiffReport(snapshotRoot, + fromSnapshot, toSnapshot); + System.out.println(diffReport.toString()); + } catch (IOException e) { + String[] content = e.getLocalizedMessage().split("\n"); + System.err.println("snapshotDiff: " + content[0]); + } } } Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestNestedSnapshots.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestNestedSnapshots.java?rev=1488093&r1=1488092&r2=1488093&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestNestedSnapshots.java (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestNestedSnapshots.java Fri May 31 05:07:52 2013 @@ -135,7 +135,7 @@ public class TestNestedSnapshots { try { hdfs.disallowSnapshot(rootPath); fail("Expect snapshot exception when disallowing snapshot on root again"); - } catch (SnapshotException e) { + } catch (RemoteException e) { GenericTestUtils.assertExceptionContains( "Root is not a snapshottable directory", e); } @@ -149,14 +149,16 @@ public class TestNestedSnapshots { try { hdfs.allowSnapshot(rootPath); Assert.fail(); - } catch(SnapshotException se) { - assertNestedSnapshotException(se, "subdirectory"); + } catch(RemoteException se) { + assertNestedSnapshotException( + (SnapshotException) se.unwrapRemoteException(), "subdirectory"); } try { hdfs.allowSnapshot(foo); Assert.fail(); - } catch(SnapshotException se) { - assertNestedSnapshotException(se, "subdirectory"); + } catch(RemoteException se) { + assertNestedSnapshotException( + (SnapshotException) se.unwrapRemoteException(), "subdirectory"); } final Path sub1Bar = new Path(bar, "sub1"); @@ -165,14 +167,16 @@ public class TestNestedSnapshots { try { hdfs.allowSnapshot(sub1Bar); Assert.fail(); - } catch(SnapshotException se) { - assertNestedSnapshotException(se, "ancestor"); + } catch(RemoteException se) { + assertNestedSnapshotException( + (SnapshotException) se.unwrapRemoteException(), "ancestor"); } try { hdfs.allowSnapshot(sub2Bar); Assert.fail(); - } catch(SnapshotException se) { - assertNestedSnapshotException(se, "ancestor"); + } catch(RemoteException se) { + assertNestedSnapshotException( + (SnapshotException) se.unwrapRemoteException(), "ancestor"); } } Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotDeletion.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotDeletion.java?rev=1488093&r1=1488092&r2=1488093&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotDeletion.java (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshotDeletion.java Fri May 31 05:07:52 2013 @@ -112,7 +112,7 @@ public class TestSnapshotDeletion { // Deleting a snapshottable dir with snapshots should fail exception.expect(RemoteException.class); - String error = "The direcotry " + sub.toString() + String error = "The directory " + sub.toString() + " cannot be deleted since " + sub.toString() + " is snapshottable and already has snapshots"; exception.expectMessage(error);