Hadoop HDFS
  1. Hadoop HDFS
  2. HDFS-6194

Create new tests for ByteRangeInputStream

    Details

    • Type: Bug Bug
    • Status: Closed
    • Priority: Major Major
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 2.5.0
    • Component/s: None
    • Labels:
      None
    • Hadoop Flags:
      Reviewed

      Description

      HDFS-5570 removes old tests for ByteRangeInputStream, because the tests only are tightly coupled with hftp / hsftp. New tests need to be written because the same class is also used by WebHdfsFileSystem.

      1. HDFS-6194.patch
        8 kB
        Akira AJISAKA
      2. HDFS-6194.2.patch
        7 kB
        Akira AJISAKA
      3. HDFS-6194.3.patch
        7 kB
        Akira AJISAKA
      4. HDFS-6194.4.patch
        8 kB
        Akira AJISAKA
      5. HDFS-6194.5.patch
        8 kB
        Akira AJISAKA

        Issue Links

          Activity

          Hide
          Akira AJISAKA added a comment -

          Attaching a patch.

          Show
          Akira AJISAKA added a comment - Attaching a patch.
          Hide
          Hadoop QA added a comment -

          +1 overall. Here are the results of testing the latest attachment
          http://issues.apache.org/jira/secure/attachment/12639355/HDFS-6194.patch
          against trunk revision .

          +1 @author. The patch does not contain any @author tags.

          +1 tests included. The patch appears to include 1 new or modified test files.

          +1 javac. The applied patch does not increase the total number of javac compiler warnings.

          +1 javadoc. There were no new javadoc warning messages.

          +1 eclipse:eclipse. The patch built with eclipse:eclipse.

          +1 findbugs. The patch does not introduce any new Findbugs (version 1.3.9) warnings.

          +1 release audit. The applied patch does not increase the total number of release audit warnings.

          +1 core tests. The patch passed unit tests in hadoop-hdfs-project/hadoop-hdfs.

          +1 contrib tests. The patch passed contrib unit tests.

          Test results: https://builds.apache.org/job/PreCommit-HDFS-Build/6628//testReport/
          Console output: https://builds.apache.org/job/PreCommit-HDFS-Build/6628//console

          This message is automatically generated.

          Show
          Hadoop QA added a comment - +1 overall . Here are the results of testing the latest attachment http://issues.apache.org/jira/secure/attachment/12639355/HDFS-6194.patch against trunk revision . +1 @author . The patch does not contain any @author tags. +1 tests included . The patch appears to include 1 new or modified test files. +1 javac . The applied patch does not increase the total number of javac compiler warnings. +1 javadoc . There were no new javadoc warning messages. +1 eclipse:eclipse . The patch built with eclipse:eclipse. +1 findbugs . The patch does not introduce any new Findbugs (version 1.3.9) warnings. +1 release audit . The applied patch does not increase the total number of release audit warnings. +1 core tests . The patch passed unit tests in hadoop-hdfs-project/hadoop-hdfs. +1 contrib tests . The patch passed contrib unit tests. Test results: https://builds.apache.org/job/PreCommit-HDFS-Build/6628//testReport/ Console output: https://builds.apache.org/job/PreCommit-HDFS-Build/6628//console This message is automatically generated.
          Hide
          Haohui Mai added a comment -
          +  @VisibleForTesting
          +  protected ByteRangeInputStream(URLOpener o, URLOpener r, boolean connect)
          +      throws IOException {
          +    this.originalURL = o;
          +    this.resolvedURL = r;
          +    if (connect) {
          +      getInputStream();
          +    }
          +  }
          +
          

          Please remove it. See the discussion in HDFS-6143 for more details.

          For MockByteRangeInputStream and MockHttpURLConnection, please write them with Mockito directly. The code should not need to use the spy() call at all.

          Show
          Haohui Mai added a comment - + @VisibleForTesting + protected ByteRangeInputStream(URLOpener o, URLOpener r, boolean connect) + throws IOException { + this .originalURL = o; + this .resolvedURL = r; + if (connect) { + getInputStream(); + } + } + Please remove it. See the discussion in HDFS-6143 for more details. For MockByteRangeInputStream and MockHttpURLConnection , please write them with Mockito directly. The code should not need to use the spy() call at all.
          Hide
          Akira AJISAKA added a comment -

          Thanks Haohui Mai for the comment! I updated the patch.

          Show
          Akira AJISAKA added a comment - Thanks Haohui Mai for the comment! I updated the patch.
          Hide
          Hadoop QA added a comment -

          +1 overall. Here are the results of testing the latest attachment
          http://issues.apache.org/jira/secure/attachment/12639543/HDFS-6194.2.patch
          against trunk revision .

          +1 @author. The patch does not contain any @author tags.

          +1 tests included. The patch appears to include 1 new or modified test files.

          +1 javac. The applied patch does not increase the total number of javac compiler warnings.

          +1 javadoc. There were no new javadoc warning messages.

          +1 eclipse:eclipse. The patch built with eclipse:eclipse.

          +1 findbugs. The patch does not introduce any new Findbugs (version 1.3.9) warnings.

          +1 release audit. The applied patch does not increase the total number of release audit warnings.

          +1 core tests. The patch passed unit tests in hadoop-hdfs-project/hadoop-hdfs.

          +1 contrib tests. The patch passed contrib unit tests.

          Test results: https://builds.apache.org/job/PreCommit-HDFS-Build/6638//testReport/
          Console output: https://builds.apache.org/job/PreCommit-HDFS-Build/6638//console

          This message is automatically generated.

          Show
          Hadoop QA added a comment - +1 overall . Here are the results of testing the latest attachment http://issues.apache.org/jira/secure/attachment/12639543/HDFS-6194.2.patch against trunk revision . +1 @author . The patch does not contain any @author tags. +1 tests included . The patch appears to include 1 new or modified test files. +1 javac . The applied patch does not increase the total number of javac compiler warnings. +1 javadoc . There were no new javadoc warning messages. +1 eclipse:eclipse . The patch built with eclipse:eclipse. +1 findbugs . The patch does not introduce any new Findbugs (version 1.3.9) warnings. +1 release audit . The applied patch does not increase the total number of release audit warnings. +1 core tests . The patch passed unit tests in hadoop-hdfs-project/hadoop-hdfs. +1 contrib tests . The patch passed contrib unit tests. Test results: https://builds.apache.org/job/PreCommit-HDFS-Build/6638//testReport/ Console output: https://builds.apache.org/job/PreCommit-HDFS-Build/6638//console This message is automatically generated.
          Hide
          Hadoop QA added a comment -

          -1 overall. Here are the results of testing the latest attachment
          http://issues.apache.org/jira/secure/attachment/12639551/HDFS-6194.2.patch
          against trunk revision .

          +1 @author. The patch does not contain any @author tags.

          +1 tests included. The patch appears to include 1 new or modified test files.

          +1 javac. The applied patch does not increase the total number of javac compiler warnings.

          +1 javadoc. There were no new javadoc warning messages.

          +1 eclipse:eclipse. The patch built with eclipse:eclipse.

          +1 findbugs. The patch does not introduce any new Findbugs (version 1.3.9) warnings.

          +1 release audit. The applied patch does not increase the total number of release audit warnings.

          -1 core tests. The patch failed these unit tests in hadoop-hdfs-project/hadoop-hdfs:

          org.apache.hadoop.hdfs.TestDistributedFileSystem
          org.apache.hadoop.hdfs.server.balancer.TestBalancerWithNodeGroup

          +1 contrib tests. The patch passed contrib unit tests.

          Test results: https://builds.apache.org/job/PreCommit-HDFS-Build/6639//testReport/
          Console output: https://builds.apache.org/job/PreCommit-HDFS-Build/6639//console

          This message is automatically generated.

          Show
          Hadoop QA added a comment - -1 overall . Here are the results of testing the latest attachment http://issues.apache.org/jira/secure/attachment/12639551/HDFS-6194.2.patch against trunk revision . +1 @author . The patch does not contain any @author tags. +1 tests included . The patch appears to include 1 new or modified test files. +1 javac . The applied patch does not increase the total number of javac compiler warnings. +1 javadoc . There were no new javadoc warning messages. +1 eclipse:eclipse . The patch built with eclipse:eclipse. +1 findbugs . The patch does not introduce any new Findbugs (version 1.3.9) warnings. +1 release audit . The applied patch does not increase the total number of release audit warnings. -1 core tests . The patch failed these unit tests in hadoop-hdfs-project/hadoop-hdfs: org.apache.hadoop.hdfs.TestDistributedFileSystem org.apache.hadoop.hdfs.server.balancer.TestBalancerWithNodeGroup +1 contrib tests . The patch passed contrib unit tests. Test results: https://builds.apache.org/job/PreCommit-HDFS-Build/6639//testReport/ Console output: https://builds.apache.org/job/PreCommit-HDFS-Build/6639//console This message is automatically generated.
          Hide
          Haohui Mai added a comment -
          +    doNothing().when(mockConnection).connect();
          +    doNothing().when(mockConnection).disconnect();
          

          They are no-ops.

          +    Whitebox.setInternalState(bris, "resolvedURL", rMock);
          +    Whitebox.setInternalState(bris, "startPos", 0);
          +    Whitebox.setInternalState(bris, "currentPos", 0);
          +    Whitebox.setInternalState(bris, "status",
          +                              ByteRangeInputStream.StreamStatus.SEEK);
          
          +    assertEquals("Initial call made incorrectly (offset check)",
          +        0, bris.startPos);
          

          The high level goal is to verify that the seek() method is written correctly. The test code should not depend on the internal state of the ByteRangeInputStream. Instead, it should verify seek() calls the methods underlying objects (i.e., URLOpener, URLConnection) correctly. Please see check how this is done before HDFS-5570.

          Show
          Haohui Mai added a comment - + doNothing().when(mockConnection).connect(); + doNothing().when(mockConnection).disconnect(); They are no-ops. + Whitebox.setInternalState(bris, "resolvedURL" , rMock); + Whitebox.setInternalState(bris, "startPos" , 0); + Whitebox.setInternalState(bris, "currentPos" , 0); + Whitebox.setInternalState(bris, "status" , + ByteRangeInputStream.StreamStatus.SEEK); + assertEquals( "Initial call made incorrectly (offset check)" , + 0, bris.startPos); The high level goal is to verify that the seek() method is written correctly. The test code should not depend on the internal state of the ByteRangeInputStream . Instead, it should verify seek() calls the methods underlying objects (i.e., URLOpener , URLConnection ) correctly. Please see check how this is done before HDFS-5570 .
          Hide
          Akira AJISAKA added a comment -

          Thanks for the comment.

          The test code should not depend on the internal state of the ByteRangeInputStream.

          Removed some initializations.

          +    Whitebox.setInternalState(bris, "status",
          +                              ByteRangeInputStream.StreamStatus.SEEK);
          

          This setting is required. If status is not initialized, getInputStream() will fail by NPE.

          Show
          Akira AJISAKA added a comment - Thanks for the comment. The test code should not depend on the internal state of the ByteRangeInputStream . Removed some initializations. + Whitebox.setInternalState(bris, "status" , + ByteRangeInputStream.StreamStatus.SEEK); This setting is required. If status is not initialized, getInputStream() will fail by NPE.
          Hide
          Hadoop QA added a comment -

          +1 overall. Here are the results of testing the latest attachment
          http://issues.apache.org/jira/secure/attachment/12640002/HDFS-6194.3.patch
          against trunk revision .

          +1 @author. The patch does not contain any @author tags.

          +1 tests included. The patch appears to include 1 new or modified test files.

          +1 javac. The applied patch does not increase the total number of javac compiler warnings.

          +1 javadoc. There were no new javadoc warning messages.

          +1 eclipse:eclipse. The patch built with eclipse:eclipse.

          +1 findbugs. The patch does not introduce any new Findbugs (version 1.3.9) warnings.

          +1 release audit. The applied patch does not increase the total number of release audit warnings.

          +1 core tests. The patch passed unit tests in hadoop-hdfs-project/hadoop-hdfs.

          +1 contrib tests. The patch passed contrib unit tests.

          Test results: https://builds.apache.org/job/PreCommit-HDFS-Build/6658//testReport/
          Console output: https://builds.apache.org/job/PreCommit-HDFS-Build/6658//console

          This message is automatically generated.

          Show
          Hadoop QA added a comment - +1 overall . Here are the results of testing the latest attachment http://issues.apache.org/jira/secure/attachment/12640002/HDFS-6194.3.patch against trunk revision . +1 @author . The patch does not contain any @author tags. +1 tests included . The patch appears to include 1 new or modified test files. +1 javac . The applied patch does not increase the total number of javac compiler warnings. +1 javadoc . There were no new javadoc warning messages. +1 eclipse:eclipse . The patch built with eclipse:eclipse. +1 findbugs . The patch does not introduce any new Findbugs (version 1.3.9) warnings. +1 release audit . The applied patch does not increase the total number of release audit warnings. +1 core tests . The patch passed unit tests in hadoop-hdfs-project/hadoop-hdfs. +1 contrib tests . The patch passed contrib unit tests. Test results: https://builds.apache.org/job/PreCommit-HDFS-Build/6658//testReport/ Console output: https://builds.apache.org/job/PreCommit-HDFS-Build/6658//console This message is automatically generated.
          Hide
          Hadoop QA added a comment -

          +1 overall. Here are the results of testing the latest attachment
          http://issues.apache.org/jira/secure/attachment/12640003/HDFS-6194.4.patch
          against trunk revision .

          +1 @author. The patch does not contain any @author tags.

          +1 tests included. The patch appears to include 1 new or modified test files.

          +1 javac. The applied patch does not increase the total number of javac compiler warnings.

          +1 javadoc. There were no new javadoc warning messages.

          +1 eclipse:eclipse. The patch built with eclipse:eclipse.

          +1 findbugs. The patch does not introduce any new Findbugs (version 1.3.9) warnings.

          +1 release audit. The applied patch does not increase the total number of release audit warnings.

          +1 core tests. The patch passed unit tests in hadoop-hdfs-project/hadoop-hdfs.

          +1 contrib tests. The patch passed contrib unit tests.

          Test results: https://builds.apache.org/job/PreCommit-HDFS-Build/6659//testReport/
          Console output: https://builds.apache.org/job/PreCommit-HDFS-Build/6659//console

          This message is automatically generated.

          Show
          Hadoop QA added a comment - +1 overall . Here are the results of testing the latest attachment http://issues.apache.org/jira/secure/attachment/12640003/HDFS-6194.4.patch against trunk revision . +1 @author . The patch does not contain any @author tags. +1 tests included . The patch appears to include 1 new or modified test files. +1 javac . The applied patch does not increase the total number of javac compiler warnings. +1 javadoc . There were no new javadoc warning messages. +1 eclipse:eclipse . The patch built with eclipse:eclipse. +1 findbugs . The patch does not introduce any new Findbugs (version 1.3.9) warnings. +1 release audit . The applied patch does not increase the total number of release audit warnings. +1 core tests . The patch passed unit tests in hadoop-hdfs-project/hadoop-hdfs. +1 contrib tests . The patch passed contrib unit tests. Test results: https://builds.apache.org/job/PreCommit-HDFS-Build/6659//testReport/ Console output: https://builds.apache.org/job/PreCommit-HDFS-Build/6659//console This message is automatically generated.
          Hide
          Haohui Mai added a comment -

          This setting is required. If status is not initialized, getInputStream() will fail by NPE.

          This is because the code mocked the class that is supposed to be tested:

          +    ByteRangeInputStream bris =
          +        mock(ByteRangeInputStream.class, CALLS_REAL_METHODS);
          

          What it should have done is to mock the dependency of ByteRangeInputStream, and to test the functionality of ByteRangeInputStream, but not to mock ByteRangeInputStream itself.

          Show
          Haohui Mai added a comment - This setting is required. If status is not initialized, getInputStream() will fail by NPE. This is because the code mocked the class that is supposed to be tested: + ByteRangeInputStream bris = + mock(ByteRangeInputStream.class, CALLS_REAL_METHODS); What it should have done is to mock the dependency of ByteRangeInputStream , and to test the functionality of ByteRangeInputStream , but not to mock ByteRangeInputStream itself.
          Hide
          Akira AJISAKA added a comment -

          but not to mock ByteRangeInputStream itself.

          Do you mean we should create the mock class extends ByteRangeInputStream and call the method of it? I updated the patch to remove the initialization from testByteRange().

          Show
          Akira AJISAKA added a comment - but not to mock ByteRangeInputStream itself. Do you mean we should create the mock class extends ByteRangeInputStream and call the method of it? I updated the patch to remove the initialization from testByteRange() .
          Hide
          Hadoop QA added a comment -

          +1 overall. Here are the results of testing the latest attachment
          http://issues.apache.org/jira/secure/attachment/12640219/HDFS-6194.5.patch
          against trunk revision .

          +1 @author. The patch does not contain any @author tags.

          +1 tests included. The patch appears to include 1 new or modified test files.

          +1 javac. The applied patch does not increase the total number of javac compiler warnings.

          +1 javadoc. There were no new javadoc warning messages.

          +1 eclipse:eclipse. The patch built with eclipse:eclipse.

          +1 findbugs. The patch does not introduce any new Findbugs (version 1.3.9) warnings.

          +1 release audit. The applied patch does not increase the total number of release audit warnings.

          +1 core tests. The patch passed unit tests in hadoop-hdfs-project/hadoop-hdfs.

          +1 contrib tests. The patch passed contrib unit tests.

          Test results: https://builds.apache.org/job/PreCommit-HDFS-Build/6667//testReport/
          Console output: https://builds.apache.org/job/PreCommit-HDFS-Build/6667//console

          This message is automatically generated.

          Show
          Hadoop QA added a comment - +1 overall . Here are the results of testing the latest attachment http://issues.apache.org/jira/secure/attachment/12640219/HDFS-6194.5.patch against trunk revision . +1 @author . The patch does not contain any @author tags. +1 tests included . The patch appears to include 1 new or modified test files. +1 javac . The applied patch does not increase the total number of javac compiler warnings. +1 javadoc . There were no new javadoc warning messages. +1 eclipse:eclipse . The patch built with eclipse:eclipse. +1 findbugs . The patch does not introduce any new Findbugs (version 1.3.9) warnings. +1 release audit . The applied patch does not increase the total number of release audit warnings. +1 core tests . The patch passed unit tests in hadoop-hdfs-project/hadoop-hdfs. +1 contrib tests . The patch passed contrib unit tests. Test results: https://builds.apache.org/job/PreCommit-HDFS-Build/6667//testReport/ Console output: https://builds.apache.org/job/PreCommit-HDFS-Build/6667//console This message is automatically generated.
          Hide
          Haohui Mai added a comment -

          +1

          Show
          Haohui Mai added a comment - +1
          Hide
          Haohui Mai added a comment -

          I've committed the patch to trunk and branch-2. Thanks Akira AJISAKA for the contribution.

          Show
          Haohui Mai added a comment - I've committed the patch to trunk and branch-2. Thanks Akira AJISAKA for the contribution.
          Hide
          Hudson added a comment -

          SUCCESS: Integrated in Hadoop-trunk-Commit #5520 (See https://builds.apache.org/job/Hadoop-trunk-Commit/5520/)
          HDFS-6194. Create new tests for ByteRangeInputStream. Contributed by Akira Ajisaka. (wheat9: http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN&view=rev&rev=1587660)

          • /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/web/TestByteRangeInputStream.java
          Show
          Hudson added a comment - SUCCESS: Integrated in Hadoop-trunk-Commit #5520 (See https://builds.apache.org/job/Hadoop-trunk-Commit/5520/ ) HDFS-6194 . Create new tests for ByteRangeInputStream. Contributed by Akira Ajisaka. (wheat9: http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN&view=rev&rev=1587660 ) /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/web/TestByteRangeInputStream.java
          Hide
          Akira AJISAKA added a comment -

          Thanks Haohui Mai for the reviews and the commit!

          Show
          Akira AJISAKA added a comment - Thanks Haohui Mai for the reviews and the commit!
          Hide
          Hudson added a comment -

          SUCCESS: Integrated in Hadoop-Yarn-trunk #542 (See https://builds.apache.org/job/Hadoop-Yarn-trunk/542/)
          HDFS-6194. Create new tests for ByteRangeInputStream. Contributed by Akira Ajisaka. (wheat9: http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN&view=rev&rev=1587660)

          • /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/web/TestByteRangeInputStream.java
          Show
          Hudson added a comment - SUCCESS: Integrated in Hadoop-Yarn-trunk #542 (See https://builds.apache.org/job/Hadoop-Yarn-trunk/542/ ) HDFS-6194 . Create new tests for ByteRangeInputStream. Contributed by Akira Ajisaka. (wheat9: http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN&view=rev&rev=1587660 ) /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/web/TestByteRangeInputStream.java
          Hide
          Hudson added a comment -

          SUCCESS: Integrated in Hadoop-Hdfs-trunk #1734 (See https://builds.apache.org/job/Hadoop-Hdfs-trunk/1734/)
          HDFS-6194. Create new tests for ByteRangeInputStream. Contributed by Akira Ajisaka. (wheat9: http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN&view=rev&rev=1587660)

          • /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/web/TestByteRangeInputStream.java
          Show
          Hudson added a comment - SUCCESS: Integrated in Hadoop-Hdfs-trunk #1734 (See https://builds.apache.org/job/Hadoop-Hdfs-trunk/1734/ ) HDFS-6194 . Create new tests for ByteRangeInputStream. Contributed by Akira Ajisaka. (wheat9: http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN&view=rev&rev=1587660 ) /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/web/TestByteRangeInputStream.java
          Hide
          Hudson added a comment -

          SUCCESS: Integrated in Hadoop-Mapreduce-trunk #1759 (See https://builds.apache.org/job/Hadoop-Mapreduce-trunk/1759/)
          HDFS-6194. Create new tests for ByteRangeInputStream. Contributed by Akira Ajisaka. (wheat9: http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN&view=rev&rev=1587660)

          • /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/web/TestByteRangeInputStream.java
          Show
          Hudson added a comment - SUCCESS: Integrated in Hadoop-Mapreduce-trunk #1759 (See https://builds.apache.org/job/Hadoop-Mapreduce-trunk/1759/ ) HDFS-6194 . Create new tests for ByteRangeInputStream. Contributed by Akira Ajisaka. (wheat9: http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN&view=rev&rev=1587660 ) /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/web/TestByteRangeInputStream.java
          Hide
          Juan Yu added a comment -

          Hi Haohui Mai, did you merge the new test to branch-2? the commit is there, but contains no code change, did I miss anything?
          $ git ll | grep HDFS-6194
          d7583e2 HDFS-6194. Merge r1587660 from trunk
          $ git show d7583e2
          commit d7583e206d59394510d62387bda688b9fa85d169
          Author: Haohui Mai <wheat9@apache.org>
          Date: Tue Apr 15 18:15:36 2014 +0000

          HDFS-6194. Merge r1587660 from trunk

          git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587665 13f79535-47bb-0310-9956-ffa450ed

          diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
          index c64fe75..1e7cea6 100644
          — a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
          +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
          @@ -46,6 +46,9 @@ Release 2.5.0 - UNRELEASED
          HDFS-6224. Add a unit test to TestAuditLogger for file permissions
          passed to logAuditEvent. (Charles Lamb via wang)

          + HDFS-6194. Create new tests for ByteRangeInputStream.
          + (Akira Ajisaka via wheat9)
          +
          OPTIMIZATIONS

          BUG FIXES

          Show
          Juan Yu added a comment - Hi Haohui Mai , did you merge the new test to branch-2? the commit is there, but contains no code change, did I miss anything? $ git ll | grep HDFS-6194 d7583e2 HDFS-6194 . Merge r1587660 from trunk $ git show d7583e2 commit d7583e206d59394510d62387bda688b9fa85d169 Author: Haohui Mai <wheat9@apache.org> Date: Tue Apr 15 18:15:36 2014 +0000 HDFS-6194 . Merge r1587660 from trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587665 13f79535-47bb-0310-9956-ffa450ed diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index c64fe75..1e7cea6 100644 — a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -46,6 +46,9 @@ Release 2.5.0 - UNRELEASED HDFS-6224 . Add a unit test to TestAuditLogger for file permissions passed to logAuditEvent. (Charles Lamb via wang) + HDFS-6194 . Create new tests for ByteRangeInputStream. + (Akira Ajisaka via wheat9) + OPTIMIZATIONS BUG FIXES
          Hide
          Akira AJISAKA added a comment -

          Thanks Juan Yu for the report. I think the patch should be committed to trunk only.
          Haohui Mai, would you please revert the commit in branch-2 and modify the fix version?

          Show
          Akira AJISAKA added a comment - Thanks Juan Yu for the report. I think the patch should be committed to trunk only. Haohui Mai , would you please revert the commit in branch-2 and modify the fix version?
          Hide
          Juan Yu added a comment -

          why not branch-2?
          btw, the old test that use HftpFileSystem fails in branch-2 due to fix of HDFS-6143

          Show
          Juan Yu added a comment - why not branch-2? btw, the old test that use HftpFileSystem fails in branch-2 due to fix of HDFS-6143
          Hide
          Haohui Mai added a comment -

          Sorry for the confusion.

          It looks like that the motivation of this jira was to reintroduce the tests removed by HDFS-5570 to trunk, making the test between trunk and branch-2 consistent. As a result, when merging to branch-2 svn skipped all the code changes (as they were identical) automatically.

          Show
          Haohui Mai added a comment - Sorry for the confusion. It looks like that the motivation of this jira was to reintroduce the tests removed by HDFS-5570 to trunk, making the test between trunk and branch-2 consistent. As a result, when merging to branch-2 svn skipped all the code changes (as they were identical) automatically.
          Hide
          Juan Yu added a comment -

          it's not just reintroduce, the tests are also re-written. they are different in trunk and branch-2.
          Anyway, the problem is the test fails in branch-2. Could we merge the new test to branch-2 to fix the test failure?

          Show
          Juan Yu added a comment - it's not just reintroduce, the tests are also re-written. they are different in trunk and branch-2. Anyway, the problem is the test fails in branch-2. Could we merge the new test to branch-2 to fix the test failure?
          Hide
          Haohui Mai added a comment -

          Sure. Please feel free to create a jira to track the issue.

          Show
          Haohui Mai added a comment - Sure. Please feel free to create a jira to track the issue.

            People

            • Assignee:
              Akira AJISAKA
              Reporter:
              Haohui Mai
            • Votes:
              0 Vote for this issue
              Watchers:
              5 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved:

                Development