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 6C3E6104E2 for ; Thu, 10 Apr 2014 00:20:51 +0000 (UTC) Received: (qmail 42530 invoked by uid 500); 10 Apr 2014 00:20:50 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 42453 invoked by uid 500); 10 Apr 2014 00:20:50 -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 42445 invoked by uid 99); 10 Apr 2014 00:20:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Apr 2014 00:20:50 +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; Thu, 10 Apr 2014 00:20:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 05712238890D; Thu, 10 Apr 2014 00:20:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1586181 - in /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/main/java/org/apache/hadoop/hdfs/server/common/UpgradeStatusReport.java src/test/java/org/apache/hadoop/hdfs/server/common/TestJspHelper.java Date: Thu, 10 Apr 2014 00:20:28 -0000 To: hdfs-commits@hadoop.apache.org From: wheat9@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140410002029.05712238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wheat9 Date: Thu Apr 10 00:20:28 2014 New Revision: 1586181 URL: http://svn.apache.org/r1586181 Log: HDFS-6225. Remove the o.a.h.hdfs.server.common.UpgradeStatusReport. Contributed by Haohui Mai. Removed: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/UpgradeStatusReport.java Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/common/TestJspHelper.java Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1586181&r1=1586180&r2=1586181&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Thu Apr 10 00:20:28 2014 @@ -288,6 +288,9 @@ Release 2.5.0 - UNRELEASED HDFS-6170. Support GETFILESTATUS operation in WebImageViewer. (Akira Ajisaka via wheat9) + HDFS-6225. Remove the o.a.h.hdfs.server.common.UpgradeStatusReport. + (wheat9) + OPTIMIZATIONS BUG FIXES Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/common/TestJspHelper.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/common/TestJspHelper.java?rev=1586181&r1=1586180&r2=1586181&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/common/TestJspHelper.java (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/common/TestJspHelper.java Thu Apr 10 00:20:28 2014 @@ -616,33 +616,6 @@ public class TestJspHelper { } } - @Test - public void testUpgradeStatusReport() { - short status = 6; - int version = 15; - String EXPECTED__NOTF_PATTERN = "Upgrade for version {0} has been completed.\nUpgrade is not finalized."; - String EXPECTED_PATTERN = "Upgrade for version {0} is in progress. Status = {1}%"; - - UpgradeStatusReport upgradeStatusReport = new UpgradeStatusReport(version, - status, true); - assertTrue(upgradeStatusReport.getVersion() == version); - assertTrue(upgradeStatusReport.getUpgradeStatus() == status); - assertTrue(upgradeStatusReport.isFinalized()); - - assertEquals(MessageFormat.format(EXPECTED_PATTERN, version, status), - upgradeStatusReport.getStatusText(true)); - - status += 100; - upgradeStatusReport = new UpgradeStatusReport(version, status, false); - assertFalse(upgradeStatusReport.isFinalized()); - assertTrue(upgradeStatusReport.toString().equals( - MessageFormat.format(EXPECTED__NOTF_PATTERN, version))); - assertTrue(upgradeStatusReport.getStatusText(false).equals( - MessageFormat.format(EXPECTED__NOTF_PATTERN, version))); - assertTrue(upgradeStatusReport.getStatusText(true).equals( - MessageFormat.format(EXPECTED__NOTF_PATTERN, version))); - } - @Test public void testAuthority(){ DatanodeID dnWithIp = new DatanodeID("127.0.0.1", "hostName", null,