See <https://builds.apache.org/job/Hadoop-Hdfs-trunk/1595/changes>
Changes: [umamahesh] HDFS-5568. Support includeSnapshots option with Fsck command. Contributed by Vinay [cmccabe] HDFS-5565. CacheAdmin help should match against non-dashed commands (wang via cmccabe) [jing9] HDFS-5561. FSNameSystem#getNameJournalStatus() in JMX should return plain text instead of HTML. Contributed by Haohui Mai. [szetszwo] HDFS-5286. Flatten INodeDirectory hierarchy: Replace INodeDirectoryWithQuota with DirectoryWithQuotaFeature. [brandonli] HDFS-5548. Use ConcurrentHashMap in portmap. Contributed by Haohui Mai ------------------------------------------ [...truncated 11587 lines...] Running org.apache.hadoop.hdfs.TestSetrepIncreasing Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 26.649 sec - in org.apache.hadoop.hdfs.TestSetrepIncreasing Running org.apache.hadoop.hdfs.TestEncryptedTransfer Tests run: 12, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 84 sec - in org.apache.hadoop.hdfs.TestEncryptedTransfer Running org.apache.hadoop.hdfs.TestDFSUpgrade Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 34.546 sec - in org.apache.hadoop.hdfs.TestDFSUpgrade Running org.apache.hadoop.hdfs.TestCrcCorruption Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 35.519 sec - in org.apache.hadoop.hdfs.TestCrcCorruption Running org.apache.hadoop.hdfs.TestHFlush Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 26.426 sec - in org.apache.hadoop.hdfs.TestHFlush Running org.apache.hadoop.hdfs.TestFileAppendRestart Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.189 sec - in org.apache.hadoop.hdfs.TestFileAppendRestart Running org.apache.hadoop.hdfs.TestDatanodeReport Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 19.544 sec - in org.apache.hadoop.hdfs.TestDatanodeReport Running org.apache.hadoop.hdfs.TestShortCircuitLocalRead Tests run: 10, Failures: 0, Errors: 0, Skipped: 10, Time elapsed: 0.201 sec - in org.apache.hadoop.hdfs.TestShortCircuitLocalRead Running org.apache.hadoop.hdfs.TestFileInputStreamCache Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.241 sec - in org.apache.hadoop.hdfs.TestFileInputStreamCache Running org.apache.hadoop.hdfs.TestRestartDFS Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.056 sec - in org.apache.hadoop.hdfs.TestRestartDFS Running org.apache.hadoop.hdfs.TestDFSUpgradeFromImage Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.396 sec - in org.apache.hadoop.hdfs.TestDFSUpgradeFromImage Running org.apache.hadoop.hdfs.TestDFSRemove Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.879 sec - in org.apache.hadoop.hdfs.TestDFSRemove Running org.apache.hadoop.hdfs.TestHDFSTrash Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.012 sec - in org.apache.hadoop.hdfs.TestHDFSTrash Running org.apache.hadoop.hdfs.TestClientReportBadBlock Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 59.912 sec - in org.apache.hadoop.hdfs.TestClientReportBadBlock Running org.apache.hadoop.hdfs.TestQuota Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.91 sec - in org.apache.hadoop.hdfs.TestQuota Running org.apache.hadoop.hdfs.TestFileLengthOnClusterRestart Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.976 sec - in org.apache.hadoop.hdfs.TestFileLengthOnClusterRestart Running org.apache.hadoop.hdfs.TestDatanodeRegistration Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.365 sec - in org.apache.hadoop.hdfs.TestDatanodeRegistration Running org.apache.hadoop.hdfs.TestAbandonBlock Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.046 sec - in org.apache.hadoop.hdfs.TestAbandonBlock Running org.apache.hadoop.hdfs.TestDFSShell Tests run: 23, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 25.393 sec - in org.apache.hadoop.hdfs.TestDFSShell Running org.apache.hadoop.hdfs.TestListFilesInDFS Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.418 sec - in org.apache.hadoop.hdfs.TestListFilesInDFS Running org.apache.hadoop.hdfs.TestParallelShortCircuitReadUnCached Tests run: 4, Failures: 0, Errors: 0, Skipped: 4, Time elapsed: 0.171 sec - in org.apache.hadoop.hdfs.TestParallelShortCircuitReadUnCached Running org.apache.hadoop.hdfs.TestPeerCache Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.323 sec - in org.apache.hadoop.hdfs.TestPeerCache Running org.apache.hadoop.hdfs.TestAppendDifferentChecksum Tests run: 3, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 8.418 sec - in org.apache.hadoop.hdfs.TestAppendDifferentChecksum Running org.apache.hadoop.hdfs.TestDFSClientExcludedNodes Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.203 sec - in org.apache.hadoop.hdfs.TestDFSClientExcludedNodes Running org.apache.hadoop.hdfs.TestDatanodeBlockScanner Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 113.97 sec - in org.apache.hadoop.hdfs.TestDatanodeBlockScanner Running org.apache.hadoop.hdfs.TestMultiThreadedHflush Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.138 sec - in org.apache.hadoop.hdfs.TestMultiThreadedHflush Running org.apache.hadoop.hdfs.TestDFSAddressConfig Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.89 sec - in org.apache.hadoop.hdfs.TestDFSAddressConfig Running org.apache.hadoop.hdfs.TestMiniDFSCluster Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.208 sec - in org.apache.hadoop.hdfs.TestMiniDFSCluster Running org.apache.hadoop.hdfs.TestLease Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.79 sec - in org.apache.hadoop.hdfs.TestLease Running org.apache.hadoop.hdfs.TestListFilesInFileContext Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.442 sec - in org.apache.hadoop.hdfs.TestListFilesInFileContext Running org.apache.hadoop.hdfs.TestDFSShellGenericOptions Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.386 sec - in org.apache.hadoop.hdfs.TestDFSShellGenericOptions Running org.apache.hadoop.hdfs.TestDFSClientFailover Tests run: 6, Failures: 0, Errors: 0, Skipped: 2, Time elapsed: 10.811 sec - in org.apache.hadoop.hdfs.TestDFSClientFailover Running org.apache.hadoop.hdfs.TestFileAppend2 Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.328 sec - in org.apache.hadoop.hdfs.TestFileAppend2 Running org.apache.hadoop.hdfs.TestLocalDFS Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.199 sec - in org.apache.hadoop.hdfs.TestLocalDFS Running org.apache.hadoop.hdfs.TestReadWhileWriting Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.818 sec - in org.apache.hadoop.hdfs.TestReadWhileWriting Running org.apache.hadoop.hdfs.TestSeekBug Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.915 sec - in org.apache.hadoop.hdfs.TestSeekBug Running org.apache.hadoop.hdfs.TestBlocksScheduledCounter Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.29 sec - in org.apache.hadoop.hdfs.TestBlocksScheduledCounter Running org.apache.hadoop.hdfs.util.TestChunkedArrayList Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.349 sec - in org.apache.hadoop.hdfs.util.TestChunkedArrayList Running org.apache.hadoop.hdfs.util.TestBestEffortLongFile Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.199 sec - in org.apache.hadoop.hdfs.util.TestBestEffortLongFile Running org.apache.hadoop.hdfs.util.TestAtomicFileOutputStream Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.177 sec - in org.apache.hadoop.hdfs.util.TestAtomicFileOutputStream Running org.apache.hadoop.hdfs.util.TestExactSizeInputStream Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.059 sec - in org.apache.hadoop.hdfs.util.TestExactSizeInputStream Running org.apache.hadoop.hdfs.util.TestDiff Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.351 sec - in org.apache.hadoop.hdfs.util.TestDiff Running org.apache.hadoop.hdfs.util.TestMD5FileUtils Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.233 sec - in org.apache.hadoop.hdfs.util.TestMD5FileUtils Running org.apache.hadoop.hdfs.util.TestDirectBufferPool Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.091 sec - in org.apache.hadoop.hdfs.util.TestDirectBufferPool Running org.apache.hadoop.hdfs.util.TestLightWeightHashSet Tests run: 13, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.183 sec - in org.apache.hadoop.hdfs.util.TestLightWeightHashSet Running org.apache.hadoop.hdfs.util.TestXMLUtils Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.058 sec - in org.apache.hadoop.hdfs.util.TestXMLUtils Running org.apache.hadoop.hdfs.util.TestCyclicIteration Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.059 sec - in org.apache.hadoop.hdfs.util.TestCyclicIteration Running org.apache.hadoop.hdfs.util.TestLightWeightLinkedSet Tests run: 17, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.165 sec - in org.apache.hadoop.hdfs.util.TestLightWeightLinkedSet Running org.apache.hadoop.hdfs.TestSetTimes Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.527 sec - in org.apache.hadoop.hdfs.TestSetTimes Running org.apache.hadoop.hdfs.TestParallelShortCircuitReadNoChecksum Tests run: 4, Failures: 0, Errors: 0, Skipped: 4, Time elapsed: 0.171 sec - in org.apache.hadoop.hdfs.TestParallelShortCircuitReadNoChecksum Running org.apache.hadoop.hdfs.TestBlockReaderLocal Tests run: 11, Failures: 0, Errors: 0, Skipped: 2, Time elapsed: 12.5 sec - in org.apache.hadoop.hdfs.TestBlockReaderLocal Running org.apache.hadoop.cli.TestCacheAdminCLI Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.706 sec - in org.apache.hadoop.cli.TestCacheAdminCLI Running org.apache.hadoop.cli.TestHDFSCLI Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 48.356 sec - in org.apache.hadoop.cli.TestHDFSCLI Running org.apache.hadoop.fs.TestHdfsNativeCodeLoader Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.133 sec - in org.apache.hadoop.fs.TestHdfsNativeCodeLoader Running org.apache.hadoop.fs.TestGlobPaths Tests run: 31, Failures: 0, Errors: 0, Skipped: 6, Time elapsed: 4.313 sec - in org.apache.hadoop.fs.TestGlobPaths Running org.apache.hadoop.fs.TestResolveHdfsSymlink Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.395 sec - in org.apache.hadoop.fs.TestResolveHdfsSymlink Running org.apache.hadoop.fs.TestFcHdfsSetUMask Tests run: 12, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.56 sec - in org.apache.hadoop.fs.TestFcHdfsSetUMask Running org.apache.hadoop.fs.TestFcHdfsPermission Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.485 sec - in org.apache.hadoop.fs.TestFcHdfsPermission Running org.apache.hadoop.fs.TestUrlStreamHandler Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.644 sec - in org.apache.hadoop.fs.TestUrlStreamHandler Running org.apache.hadoop.fs.viewfs.TestViewFsDefaultValue Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.058 sec - in org.apache.hadoop.fs.viewfs.TestViewFsDefaultValue Running org.apache.hadoop.fs.viewfs.TestViewFileSystemAtHdfsRoot Tests run: 39, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.729 sec - in org.apache.hadoop.fs.viewfs.TestViewFileSystemAtHdfsRoot Running org.apache.hadoop.fs.viewfs.TestViewFsHdfs Tests run: 42, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.968 sec - in org.apache.hadoop.fs.viewfs.TestViewFsHdfs Running org.apache.hadoop.fs.viewfs.TestViewFsAtHdfsRoot Tests run: 42, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.397 sec - in org.apache.hadoop.fs.viewfs.TestViewFsAtHdfsRoot Running org.apache.hadoop.fs.viewfs.TestViewFileSystemHdfs Tests run: 39, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.231 sec - in org.apache.hadoop.fs.viewfs.TestViewFileSystemHdfs Running org.apache.hadoop.fs.viewfs.TestViewFsFileStatusHdfs Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.137 sec - in org.apache.hadoop.fs.viewfs.TestViewFsFileStatusHdfs Running org.apache.hadoop.fs.permission.TestStickyBit Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.072 sec - in org.apache.hadoop.fs.permission.TestStickyBit Running org.apache.hadoop.fs.loadGenerator.TestLoadGenerator Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.303 sec - in org.apache.hadoop.fs.loadGenerator.TestLoadGenerator Running org.apache.hadoop.fs.TestSymlinkHdfsFileContext Tests run: 69, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.132 sec - in org.apache.hadoop.fs.TestSymlinkHdfsFileContext Running org.apache.hadoop.fs.shell.TestHdfsTextCommand Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.567 sec - in org.apache.hadoop.fs.shell.TestHdfsTextCommand Running org.apache.hadoop.fs.TestFcHdfsCreateMkdir Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.308 sec - in org.apache.hadoop.fs.TestFcHdfsCreateMkdir Running org.apache.hadoop.fs.TestHDFSFileContextMainOperations Tests run: 67, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.056 sec - in org.apache.hadoop.fs.TestHDFSFileContextMainOperations Running org.apache.hadoop.fs.TestEnhancedByteBufferAccess Tests run: 7, Failures: 0, Errors: 0, Skipped: 6, Time elapsed: 0.216 sec - in org.apache.hadoop.fs.TestEnhancedByteBufferAccess Running org.apache.hadoop.fs.TestSymlinkHdfsDisable Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.024 sec - in org.apache.hadoop.fs.TestSymlinkHdfsDisable Running org.apache.hadoop.fs.TestVolumeId Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.068 sec - in org.apache.hadoop.fs.TestVolumeId Running org.apache.hadoop.fs.TestSymlinkHdfsFileSystem Tests run: 72, Failures: 0, Errors: 0, Skipped: 2, Time elapsed: 8.295 sec - in org.apache.hadoop.fs.TestSymlinkHdfsFileSystem Results : Tests in error: TestFsDatasetCache.setUp:113 » Runtime Cannot start datanode because the confi... TestFsDatasetCache.setUp:113 » Runtime Cannot start datanode because the confi... TestFsDatasetCache.setUp:113 » Runtime Cannot start datanode because the confi... TestFsDatasetCache.setUp:113 » Runtime Cannot start datanode because the confi... TestFsDatasetCache.setUp:113 » Runtime Cannot start datanode because the confi... TestCacheDirectives.testWaitForCachedReplicas:710 » Runtime Cannot start datan... TestCacheDirectives.testAddingCacheDirectiveInfosWhenCachingIsDisabled:767 » Runtime TestCacheDirectives.testWaitForCachedReplicasInDirectory:813 » Runtime Cannot ... TestCacheDirectives.testReplicationFactor:897 » Runtime Cannot start datanode ... Tests run: 2206, Failures: 0, Errors: 9, Skipped: 51 [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Skipping Apache Hadoop HttpFS [INFO] This project has been banned from the build due to previous failures. [INFO] ------------------------------------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Skipping Apache Hadoop HDFS BookKeeper Journal [INFO] This project has been banned from the build due to previous failures. [INFO] ------------------------------------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Skipping Apache Hadoop HDFS-NFS [INFO] This project has been banned from the build due to previous failures. [INFO] ------------------------------------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Apache Hadoop HDFS Project 3.0.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ [WARNING] The POM for org.eclipse.m2e:lifecycle-mapping:jar:1.0.0 is missing, no dependency information available [WARNING] Failed to retrieve plugin descriptor for org.eclipse.m2e:lifecycle-mapping:1.0.0: Plugin org.eclipse.m2e:lifecycle-mapping:1.0.0 or one of its dependencies could not be resolved: Failed to read artifact descriptor for org.eclipse.m2e:lifecycle-mapping:jar:1.0.0 [INFO] [INFO] --- maven-clean-plugin:2.4.1:clean (default-clean) @ hadoop-hdfs-project --- [INFO] Deleting <https://builds.apache.org/job/Hadoop-Hdfs-trunk/ws/trunk/hadoop-hdfs-project/target> [INFO] [INFO] --- maven-antrun-plugin:1.7:run (create-testdirs) @ hadoop-hdfs-project --- [INFO] Executing tasks main: [mkdir] Created dir: <https://builds.apache.org/job/Hadoop-Hdfs-trunk/ws/trunk/hadoop-hdfs-project/target/test-dir> [INFO] Executed tasks [INFO] [INFO] --- maven-source-plugin:2.1.2:jar-no-fork (hadoop-java-sources) @ hadoop-hdfs-project --- [INFO] [INFO] --- maven-source-plugin:2.1.2:test-jar-no-fork (hadoop-java-sources) @ hadoop-hdfs-project --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (dist-enforce) @ hadoop-hdfs-project --- [INFO] [INFO] --- maven-site-plugin:3.0:attach-descriptor (attach-descriptor) @ hadoop-hdfs-project --- [INFO] [INFO] --- maven-javadoc-plugin:2.8.1:jar (module-javadocs) @ hadoop-hdfs-project --- [INFO] Not executing Javadoc as the project is not a Java classpath-capable package [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (depcheck) @ hadoop-hdfs-project --- [INFO] [INFO] --- maven-checkstyle-plugin:2.6:checkstyle (default-cli) @ hadoop-hdfs-project --- [INFO] [INFO] --- findbugs-maven-plugin:2.3.2:findbugs (default-cli) @ hadoop-hdfs-project --- [INFO] ****** FindBugsMojo execute ******* [INFO] canGenerate is false [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Apache Hadoop HDFS ................................ FAILURE [1:47:03.530s] [INFO] Apache Hadoop HttpFS .............................. SKIPPED [INFO] Apache Hadoop HDFS BookKeeper Journal ............. SKIPPED [INFO] Apache Hadoop HDFS-NFS ............................ SKIPPED [INFO] Apache Hadoop HDFS Project ........................ SUCCESS [3.417s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 1:47:08.317s [INFO] Finished at: Wed Nov 27 13:21:43 UTC 2013 [INFO] Final Memory: 37M/309M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.16:test (default-test) on project hadoop-hdfs: There are test failures. [ERROR] [ERROR] Please refer to <https://builds.apache.org/job/Hadoop-Hdfs-trunk/ws/trunk/hadoop-hdfs-project/hadoop-hdfs/target/surefire-reports> for the individual test results. [ERROR] -> [Help 1] [ERROR] [ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch. [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException Build step 'Execute shell' marked build as failure Archiving artifacts Recording test results Updating HDFS-5286 Updating HDFS-5565 Updating HDFS-5568 Updating HDFS-5548 Updating HDFS-5561