Repository: hbase-site Updated Branches: refs/heads/asf-site 5a9aefd52 -> a610f23a9
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/testdevapidocs/src-html/org/apache/hadoop/hbase/util/TestFSHDFSUtils.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/util/TestFSHDFSUtils.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/util/TestFSHDFSUtils.html index 4ac2a98..a1a3896 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/util/TestFSHDFSUtils.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/util/TestFSHDFSUtils.html @@ -160,30 +160,32 @@ <span class="sourceLineNo">152</span> public void testIsSameHdfs() throws IOException {<a name="line.152"></a> <span class="sourceLineNo">153</span> String hadoopVersion = org.apache.hadoop.util.VersionInfo.getVersion();<a name="line.153"></a> <span class="sourceLineNo">154</span> LOG.info("hadoop version is: " + hadoopVersion);<a name="line.154"></a> -<span class="sourceLineNo">155</span> boolean isHadoop3 = hadoopVersion.startsWith("3.");<a name="line.155"></a> -<span class="sourceLineNo">156</span> if (isHadoop3) {<a name="line.156"></a> -<span class="sourceLineNo">157</span> // Hadoop 3.0.0 alpha1+ change default nn port to 9820. See HDFS-9427<a name="line.157"></a> -<span class="sourceLineNo">158</span> testIsSameHdfs(9820);<a name="line.158"></a> -<span class="sourceLineNo">159</span> } else {<a name="line.159"></a> -<span class="sourceLineNo">160</span> // pre hadoop 3.0.0 defaults to port 8020<a name="line.160"></a> -<span class="sourceLineNo">161</span> testIsSameHdfs(8020);<a name="line.161"></a> -<span class="sourceLineNo">162</span> }<a name="line.162"></a> -<span class="sourceLineNo">163</span> }<a name="line.163"></a> -<span class="sourceLineNo">164</span><a name="line.164"></a> -<span class="sourceLineNo">165</span> /**<a name="line.165"></a> -<span class="sourceLineNo">166</span> * Version of DFS that has HDFS-4525 in it.<a name="line.166"></a> -<span class="sourceLineNo">167</span> */<a name="line.167"></a> -<span class="sourceLineNo">168</span> static class IsFileClosedDistributedFileSystem extends DistributedFileSystem {<a name="line.168"></a> -<span class="sourceLineNo">169</span> /**<a name="line.169"></a> -<span class="sourceLineNo">170</span> * Close status of a file. Copied over from HDFS-4525<a name="line.170"></a> -<span class="sourceLineNo">171</span> * @return true if file is already closed<a name="line.171"></a> -<span class="sourceLineNo">172</span> **/<a name="line.172"></a> -<span class="sourceLineNo">173</span> @Override<a name="line.173"></a> -<span class="sourceLineNo">174</span> public boolean isFileClosed(Path f) throws IOException{<a name="line.174"></a> -<span class="sourceLineNo">175</span> return false;<a name="line.175"></a> -<span class="sourceLineNo">176</span> }<a name="line.176"></a> -<span class="sourceLineNo">177</span> }<a name="line.177"></a> -<span class="sourceLineNo">178</span>}<a name="line.178"></a> +<span class="sourceLineNo">155</span> boolean isHadoop3_0_0 = hadoopVersion.startsWith("3.0.0");<a name="line.155"></a> +<span class="sourceLineNo">156</span> if (isHadoop3_0_0) {<a name="line.156"></a> +<span class="sourceLineNo">157</span> // Hadoop 3.0.0 alpha1+ ~ 3.0.0 GA changed default nn port to 9820.<a name="line.157"></a> +<span class="sourceLineNo">158</span> // See HDFS-9427<a name="line.158"></a> +<span class="sourceLineNo">159</span> testIsSameHdfs(9820);<a name="line.159"></a> +<span class="sourceLineNo">160</span> } else {<a name="line.160"></a> +<span class="sourceLineNo">161</span> // pre hadoop 3.0.0 defaults to port 8020<a name="line.161"></a> +<span class="sourceLineNo">162</span> // Hadoop 3.0.1 changed it back to port 8020. See HDFS-12990<a name="line.162"></a> +<span class="sourceLineNo">163</span> testIsSameHdfs(8020);<a name="line.163"></a> +<span class="sourceLineNo">164</span> }<a name="line.164"></a> +<span class="sourceLineNo">165</span> }<a name="line.165"></a> +<span class="sourceLineNo">166</span><a name="line.166"></a> +<span class="sourceLineNo">167</span> /**<a name="line.167"></a> +<span class="sourceLineNo">168</span> * Version of DFS that has HDFS-4525 in it.<a name="line.168"></a> +<span class="sourceLineNo">169</span> */<a name="line.169"></a> +<span class="sourceLineNo">170</span> static class IsFileClosedDistributedFileSystem extends DistributedFileSystem {<a name="line.170"></a> +<span class="sourceLineNo">171</span> /**<a name="line.171"></a> +<span class="sourceLineNo">172</span> * Close status of a file. Copied over from HDFS-4525<a name="line.172"></a> +<span class="sourceLineNo">173</span> * @return true if file is already closed<a name="line.173"></a> +<span class="sourceLineNo">174</span> **/<a name="line.174"></a> +<span class="sourceLineNo">175</span> @Override<a name="line.175"></a> +<span class="sourceLineNo">176</span> public boolean isFileClosed(Path f) throws IOException{<a name="line.176"></a> +<span class="sourceLineNo">177</span> return false;<a name="line.177"></a> +<span class="sourceLineNo">178</span> }<a name="line.178"></a> +<span class="sourceLineNo">179</span> }<a name="line.179"></a> +<span class="sourceLineNo">180</span>}<a name="line.180"></a>
