You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2016/03/03 18:17:12 UTC
[26/49] hbase-site git commit: Published site at
4b3e38705cb24aee82615b1b9af47ed549ea1358.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4ce8323f/devapidocs/src-html/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.html b/devapidocs/src-html/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.html
index d0873aa..03578e8 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/security/access/SecureBulkLoadEndpoint.html
@@ -300,183 +300,173 @@
<span class="sourceLineNo">292</span> new SecureBulkLoadListener(fs, bulkToken, conf));<a name="line.292"></a>
<span class="sourceLineNo">293</span> } catch (Exception e) {<a name="line.293"></a>
<span class="sourceLineNo">294</span> LOG.error("Failed to complete bulk load", e);<a name="line.294"></a>
-<span class="sourceLineNo">295</span> } finally {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> if (fs != null) {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> try {<a name="line.297"></a>
-<span class="sourceLineNo">298</span> if(!UserGroupInformation.getCurrentUser().equals(ugi)) {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> FileSystem.closeAllForUGI(ugi);<a name="line.299"></a>
-<span class="sourceLineNo">300</span> }<a name="line.300"></a>
-<span class="sourceLineNo">301</span> } catch (IOException e) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span> LOG.error("Failed to close FileSystem for " + ugi.getUserName(), e);<a name="line.302"></a>
-<span class="sourceLineNo">303</span> }<a name="line.303"></a>
-<span class="sourceLineNo">304</span> }<a name="line.304"></a>
-<span class="sourceLineNo">305</span> }<a name="line.305"></a>
-<span class="sourceLineNo">306</span> return false;<a name="line.306"></a>
-<span class="sourceLineNo">307</span> }<a name="line.307"></a>
-<span class="sourceLineNo">308</span> });<a name="line.308"></a>
-<span class="sourceLineNo">309</span> }<a name="line.309"></a>
-<span class="sourceLineNo">310</span> if (region.getCoprocessorHost() != null) {<a name="line.310"></a>
-<span class="sourceLineNo">311</span> try {<a name="line.311"></a>
-<span class="sourceLineNo">312</span> loaded = region.getCoprocessorHost().postBulkLoadHFile(familyPaths, loaded);<a name="line.312"></a>
-<span class="sourceLineNo">313</span> } catch (IOException e) {<a name="line.313"></a>
-<span class="sourceLineNo">314</span> ResponseConverter.setControllerException(controller, e);<a name="line.314"></a>
-<span class="sourceLineNo">315</span> done.run(SecureBulkLoadHFilesResponse.newBuilder().setLoaded(false).build());<a name="line.315"></a>
-<span class="sourceLineNo">316</span> return;<a name="line.316"></a>
-<span class="sourceLineNo">317</span> }<a name="line.317"></a>
-<span class="sourceLineNo">318</span> }<a name="line.318"></a>
-<span class="sourceLineNo">319</span> done.run(SecureBulkLoadHFilesResponse.newBuilder().setLoaded(loaded).build());<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> private List<BulkLoadObserver> getBulkLoadObservers() {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> List<BulkLoadObserver> coprocessorList =<a name="line.323"></a>
-<span class="sourceLineNo">324</span> this.env.getRegion().getCoprocessorHost().findCoprocessors(BulkLoadObserver.class);<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span> return coprocessorList;<a name="line.326"></a>
-<span class="sourceLineNo">327</span> }<a name="line.327"></a>
-<span class="sourceLineNo">328</span><a name="line.328"></a>
-<span class="sourceLineNo">329</span> private Path createStagingDir(Path baseDir,<a name="line.329"></a>
-<span class="sourceLineNo">330</span> User user,<a name="line.330"></a>
-<span class="sourceLineNo">331</span> TableName tableName) throws IOException {<a name="line.331"></a>
-<span class="sourceLineNo">332</span> String tblName = tableName.getNameAsString().replace(":", "_");<a name="line.332"></a>
-<span class="sourceLineNo">333</span> String randomDir = user.getShortName()+"__"+ tblName +"__"+<a name="line.333"></a>
-<span class="sourceLineNo">334</span> (new BigInteger(RANDOM_WIDTH, random).toString(RANDOM_RADIX));<a name="line.334"></a>
-<span class="sourceLineNo">335</span> return createStagingDir(baseDir, user, randomDir);<a name="line.335"></a>
-<span class="sourceLineNo">336</span> }<a name="line.336"></a>
-<span class="sourceLineNo">337</span><a name="line.337"></a>
-<span class="sourceLineNo">338</span> private Path createStagingDir(Path baseDir,<a name="line.338"></a>
-<span class="sourceLineNo">339</span> User user,<a name="line.339"></a>
-<span class="sourceLineNo">340</span> String randomDir) throws IOException {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> Path p = new Path(baseDir, randomDir);<a name="line.341"></a>
-<span class="sourceLineNo">342</span> fs.mkdirs(p, PERM_ALL_ACCESS);<a name="line.342"></a>
-<span class="sourceLineNo">343</span> fs.setPermission(p, PERM_ALL_ACCESS);<a name="line.343"></a>
-<span class="sourceLineNo">344</span> return p;<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span> private User getActiveUser() {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> User user = RpcServer.getRequestUser();<a name="line.348"></a>
-<span class="sourceLineNo">349</span> if (user == null) {<a name="line.349"></a>
-<span class="sourceLineNo">350</span> return null;<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> //this is for testing<a name="line.353"></a>
-<span class="sourceLineNo">354</span> if (userProvider.isHadoopSecurityEnabled()<a name="line.354"></a>
-<span class="sourceLineNo">355</span> && "simple".equalsIgnoreCase(conf.get(User.HBASE_SECURITY_CONF_KEY))) {<a name="line.355"></a>
-<span class="sourceLineNo">356</span> return User.createUserForTesting(conf, user.getShortName(), new String[]{});<a name="line.356"></a>
-<span class="sourceLineNo">357</span> }<a name="line.357"></a>
-<span class="sourceLineNo">358</span><a name="line.358"></a>
-<span class="sourceLineNo">359</span> return user;<a name="line.359"></a>
-<span class="sourceLineNo">360</span> }<a name="line.360"></a>
-<span class="sourceLineNo">361</span><a name="line.361"></a>
-<span class="sourceLineNo">362</span> @Override<a name="line.362"></a>
-<span class="sourceLineNo">363</span> public Service getService() {<a name="line.363"></a>
-<span class="sourceLineNo">364</span> return this;<a name="line.364"></a>
-<span class="sourceLineNo">365</span> }<a name="line.365"></a>
-<span class="sourceLineNo">366</span><a name="line.366"></a>
-<span class="sourceLineNo">367</span> private static class SecureBulkLoadListener implements BulkLoadListener {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> // Target filesystem<a name="line.368"></a>
-<span class="sourceLineNo">369</span> private FileSystem fs;<a name="line.369"></a>
-<span class="sourceLineNo">370</span> private String stagingDir;<a name="line.370"></a>
-<span class="sourceLineNo">371</span> private Configuration conf;<a name="line.371"></a>
-<span class="sourceLineNo">372</span> // Source filesystem<a name="line.372"></a>
-<span class="sourceLineNo">373</span> private FileSystem srcFs = null;<a name="line.373"></a>
-<span class="sourceLineNo">374</span> private Map<String, FsPermission> origPermissions = null;<a name="line.374"></a>
-<span class="sourceLineNo">375</span><a name="line.375"></a>
-<span class="sourceLineNo">376</span> public SecureBulkLoadListener(FileSystem fs, String stagingDir, Configuration conf) {<a name="line.376"></a>
-<span class="sourceLineNo">377</span> this.fs = fs;<a name="line.377"></a>
-<span class="sourceLineNo">378</span> this.stagingDir = stagingDir;<a name="line.378"></a>
-<span class="sourceLineNo">379</span> this.conf = conf;<a name="line.379"></a>
-<span class="sourceLineNo">380</span> this.origPermissions = new HashMap<String, FsPermission>();<a name="line.380"></a>
-<span class="sourceLineNo">381</span> }<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span> @Override<a name="line.383"></a>
-<span class="sourceLineNo">384</span> public String prepareBulkLoad(final byte[] family, final String srcPath) throws IOException {<a name="line.384"></a>
-<span class="sourceLineNo">385</span> Path p = new Path(srcPath);<a name="line.385"></a>
-<span class="sourceLineNo">386</span> Path stageP = new Path(stagingDir, new Path(Bytes.toString(family), p.getName()));<a name="line.386"></a>
-<span class="sourceLineNo">387</span><a name="line.387"></a>
-<span class="sourceLineNo">388</span> // In case of Replication for bulk load files, hfiles are already copied in staging directory<a name="line.388"></a>
-<span class="sourceLineNo">389</span> if (p.equals(stageP)) {<a name="line.389"></a>
-<span class="sourceLineNo">390</span> LOG.debug(p.getName()<a name="line.390"></a>
-<span class="sourceLineNo">391</span> + " is already available in staging directory. Skipping copy or rename.");<a name="line.391"></a>
-<span class="sourceLineNo">392</span> return stageP.toString();<a name="line.392"></a>
-<span class="sourceLineNo">393</span> }<a name="line.393"></a>
-<span class="sourceLineNo">394</span><a name="line.394"></a>
-<span class="sourceLineNo">395</span> if (srcFs == null) {<a name="line.395"></a>
-<span class="sourceLineNo">396</span> srcFs = FileSystem.get(p.toUri(), conf);<a name="line.396"></a>
-<span class="sourceLineNo">397</span> }<a name="line.397"></a>
-<span class="sourceLineNo">398</span><a name="line.398"></a>
-<span class="sourceLineNo">399</span> if(!isFile(p)) {<a name="line.399"></a>
-<span class="sourceLineNo">400</span> throw new IOException("Path does not reference a file: " + p);<a name="line.400"></a>
-<span class="sourceLineNo">401</span> }<a name="line.401"></a>
-<span class="sourceLineNo">402</span><a name="line.402"></a>
-<span class="sourceLineNo">403</span> // Check to see if the source and target filesystems are the same<a name="line.403"></a>
-<span class="sourceLineNo">404</span> if (!FSHDFSUtils.isSameHdfs(conf, srcFs, fs)) {<a name="line.404"></a>
-<span class="sourceLineNo">405</span> LOG.debug("Bulk-load file " + srcPath + " is on different filesystem than " +<a name="line.405"></a>
-<span class="sourceLineNo">406</span> "the destination filesystem. Copying file over to destination staging dir.");<a name="line.406"></a>
-<span class="sourceLineNo">407</span> FileUtil.copy(srcFs, p, fs, stageP, false, conf);<a name="line.407"></a>
-<span class="sourceLineNo">408</span> } else {<a name="line.408"></a>
-<span class="sourceLineNo">409</span> LOG.debug("Moving " + p + " to " + stageP);<a name="line.409"></a>
-<span class="sourceLineNo">410</span> FileStatus origFileStatus = fs.getFileStatus(p);<a name="line.410"></a>
-<span class="sourceLineNo">411</span> origPermissions.put(srcPath, origFileStatus.getPermission());<a name="line.411"></a>
-<span class="sourceLineNo">412</span> if(!fs.rename(p, stageP)) {<a name="line.412"></a>
-<span class="sourceLineNo">413</span> throw new IOException("Failed to move HFile: " + p + " to " + stageP);<a name="line.413"></a>
-<span class="sourceLineNo">414</span> }<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span> fs.setPermission(stageP, PERM_ALL_ACCESS);<a name="line.416"></a>
-<span class="sourceLineNo">417</span> return stageP.toString();<a name="line.417"></a>
-<span class="sourceLineNo">418</span> }<a name="line.418"></a>
-<span class="sourceLineNo">419</span><a name="line.419"></a>
-<span class="sourceLineNo">420</span> @Override<a name="line.420"></a>
-<span class="sourceLineNo">421</span> public void doneBulkLoad(byte[] family, String srcPath) throws IOException {<a name="line.421"></a>
-<span class="sourceLineNo">422</span> LOG.debug("Bulk Load done for: " + srcPath);<a name="line.422"></a>
-<span class="sourceLineNo">423</span> }<a name="line.423"></a>
+<span class="sourceLineNo">295</span> }<a name="line.295"></a>
+<span class="sourceLineNo">296</span> return false;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span> });<a name="line.298"></a>
+<span class="sourceLineNo">299</span> }<a name="line.299"></a>
+<span class="sourceLineNo">300</span> if (region.getCoprocessorHost() != null) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span> try {<a name="line.301"></a>
+<span class="sourceLineNo">302</span> loaded = region.getCoprocessorHost().postBulkLoadHFile(familyPaths, loaded);<a name="line.302"></a>
+<span class="sourceLineNo">303</span> } catch (IOException e) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span> ResponseConverter.setControllerException(controller, e);<a name="line.304"></a>
+<span class="sourceLineNo">305</span> done.run(SecureBulkLoadHFilesResponse.newBuilder().setLoaded(false).build());<a name="line.305"></a>
+<span class="sourceLineNo">306</span> return;<a name="line.306"></a>
+<span class="sourceLineNo">307</span> }<a name="line.307"></a>
+<span class="sourceLineNo">308</span> }<a name="line.308"></a>
+<span class="sourceLineNo">309</span> done.run(SecureBulkLoadHFilesResponse.newBuilder().setLoaded(loaded).build());<a name="line.309"></a>
+<span class="sourceLineNo">310</span> }<a name="line.310"></a>
+<span class="sourceLineNo">311</span><a name="line.311"></a>
+<span class="sourceLineNo">312</span> private List<BulkLoadObserver> getBulkLoadObservers() {<a name="line.312"></a>
+<span class="sourceLineNo">313</span> List<BulkLoadObserver> coprocessorList =<a name="line.313"></a>
+<span class="sourceLineNo">314</span> this.env.getRegion().getCoprocessorHost().findCoprocessors(BulkLoadObserver.class);<a name="line.314"></a>
+<span class="sourceLineNo">315</span><a name="line.315"></a>
+<span class="sourceLineNo">316</span> return coprocessorList;<a name="line.316"></a>
+<span class="sourceLineNo">317</span> }<a name="line.317"></a>
+<span class="sourceLineNo">318</span><a name="line.318"></a>
+<span class="sourceLineNo">319</span> private Path createStagingDir(Path baseDir,<a name="line.319"></a>
+<span class="sourceLineNo">320</span> User user,<a name="line.320"></a>
+<span class="sourceLineNo">321</span> TableName tableName) throws IOException {<a name="line.321"></a>
+<span class="sourceLineNo">322</span> String tblName = tableName.getNameAsString().replace(":", "_");<a name="line.322"></a>
+<span class="sourceLineNo">323</span> String randomDir = user.getShortName()+"__"+ tblName +"__"+<a name="line.323"></a>
+<span class="sourceLineNo">324</span> (new BigInteger(RANDOM_WIDTH, random).toString(RANDOM_RADIX));<a name="line.324"></a>
+<span class="sourceLineNo">325</span> return createStagingDir(baseDir, user, randomDir);<a name="line.325"></a>
+<span class="sourceLineNo">326</span> }<a name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span> private Path createStagingDir(Path baseDir,<a name="line.328"></a>
+<span class="sourceLineNo">329</span> User user,<a name="line.329"></a>
+<span class="sourceLineNo">330</span> String randomDir) throws IOException {<a name="line.330"></a>
+<span class="sourceLineNo">331</span> Path p = new Path(baseDir, randomDir);<a name="line.331"></a>
+<span class="sourceLineNo">332</span> fs.mkdirs(p, PERM_ALL_ACCESS);<a name="line.332"></a>
+<span class="sourceLineNo">333</span> fs.setPermission(p, PERM_ALL_ACCESS);<a name="line.333"></a>
+<span class="sourceLineNo">334</span> return p;<a name="line.334"></a>
+<span class="sourceLineNo">335</span> }<a name="line.335"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span> private User getActiveUser() {<a name="line.337"></a>
+<span class="sourceLineNo">338</span> User user = RpcServer.getRequestUser();<a name="line.338"></a>
+<span class="sourceLineNo">339</span> if (user == null) {<a name="line.339"></a>
+<span class="sourceLineNo">340</span> return null;<a name="line.340"></a>
+<span class="sourceLineNo">341</span> }<a name="line.341"></a>
+<span class="sourceLineNo">342</span><a name="line.342"></a>
+<span class="sourceLineNo">343</span> //this is for testing<a name="line.343"></a>
+<span class="sourceLineNo">344</span> if (userProvider.isHadoopSecurityEnabled()<a name="line.344"></a>
+<span class="sourceLineNo">345</span> && "simple".equalsIgnoreCase(conf.get(User.HBASE_SECURITY_CONF_KEY))) {<a name="line.345"></a>
+<span class="sourceLineNo">346</span> return User.createUserForTesting(conf, user.getShortName(), new String[]{});<a name="line.346"></a>
+<span class="sourceLineNo">347</span> }<a name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
+<span class="sourceLineNo">349</span> return user;<a name="line.349"></a>
+<span class="sourceLineNo">350</span> }<a name="line.350"></a>
+<span class="sourceLineNo">351</span><a name="line.351"></a>
+<span class="sourceLineNo">352</span> @Override<a name="line.352"></a>
+<span class="sourceLineNo">353</span> public Service getService() {<a name="line.353"></a>
+<span class="sourceLineNo">354</span> return this;<a name="line.354"></a>
+<span class="sourceLineNo">355</span> }<a name="line.355"></a>
+<span class="sourceLineNo">356</span><a name="line.356"></a>
+<span class="sourceLineNo">357</span> private static class SecureBulkLoadListener implements BulkLoadListener {<a name="line.357"></a>
+<span class="sourceLineNo">358</span> // Target filesystem<a name="line.358"></a>
+<span class="sourceLineNo">359</span> private FileSystem fs;<a name="line.359"></a>
+<span class="sourceLineNo">360</span> private String stagingDir;<a name="line.360"></a>
+<span class="sourceLineNo">361</span> private Configuration conf;<a name="line.361"></a>
+<span class="sourceLineNo">362</span> // Source filesystem<a name="line.362"></a>
+<span class="sourceLineNo">363</span> private FileSystem srcFs = null;<a name="line.363"></a>
+<span class="sourceLineNo">364</span> private Map<String, FsPermission> origPermissions = null;<a name="line.364"></a>
+<span class="sourceLineNo">365</span><a name="line.365"></a>
+<span class="sourceLineNo">366</span> public SecureBulkLoadListener(FileSystem fs, String stagingDir, Configuration conf) {<a name="line.366"></a>
+<span class="sourceLineNo">367</span> this.fs = fs;<a name="line.367"></a>
+<span class="sourceLineNo">368</span> this.stagingDir = stagingDir;<a name="line.368"></a>
+<span class="sourceLineNo">369</span> this.conf = conf;<a name="line.369"></a>
+<span class="sourceLineNo">370</span> this.origPermissions = new HashMap<String, FsPermission>();<a name="line.370"></a>
+<span class="sourceLineNo">371</span> }<a name="line.371"></a>
+<span class="sourceLineNo">372</span><a name="line.372"></a>
+<span class="sourceLineNo">373</span> @Override<a name="line.373"></a>
+<span class="sourceLineNo">374</span> public String prepareBulkLoad(final byte[] family, final String srcPath) throws IOException {<a name="line.374"></a>
+<span class="sourceLineNo">375</span> Path p = new Path(srcPath);<a name="line.375"></a>
+<span class="sourceLineNo">376</span> Path stageP = new Path(stagingDir, new Path(Bytes.toString(family), p.getName()));<a name="line.376"></a>
+<span class="sourceLineNo">377</span><a name="line.377"></a>
+<span class="sourceLineNo">378</span> // In case of Replication for bulk load files, hfiles are already copied in staging directory<a name="line.378"></a>
+<span class="sourceLineNo">379</span> if (p.equals(stageP)) {<a name="line.379"></a>
+<span class="sourceLineNo">380</span> LOG.debug(p.getName()<a name="line.380"></a>
+<span class="sourceLineNo">381</span> + " is already available in staging directory. Skipping copy or rename.");<a name="line.381"></a>
+<span class="sourceLineNo">382</span> return stageP.toString();<a name="line.382"></a>
+<span class="sourceLineNo">383</span> }<a name="line.383"></a>
+<span class="sourceLineNo">384</span><a name="line.384"></a>
+<span class="sourceLineNo">385</span> if (srcFs == null) {<a name="line.385"></a>
+<span class="sourceLineNo">386</span> srcFs = FileSystem.get(p.toUri(), conf);<a name="line.386"></a>
+<span class="sourceLineNo">387</span> }<a name="line.387"></a>
+<span class="sourceLineNo">388</span><a name="line.388"></a>
+<span class="sourceLineNo">389</span> if(!isFile(p)) {<a name="line.389"></a>
+<span class="sourceLineNo">390</span> throw new IOException("Path does not reference a file: " + p);<a name="line.390"></a>
+<span class="sourceLineNo">391</span> }<a name="line.391"></a>
+<span class="sourceLineNo">392</span><a name="line.392"></a>
+<span class="sourceLineNo">393</span> // Check to see if the source and target filesystems are the same<a name="line.393"></a>
+<span class="sourceLineNo">394</span> if (!FSHDFSUtils.isSameHdfs(conf, srcFs, fs)) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span> LOG.debug("Bulk-load file " + srcPath + " is on different filesystem than " +<a name="line.395"></a>
+<span class="sourceLineNo">396</span> "the destination filesystem. Copying file over to destination staging dir.");<a name="line.396"></a>
+<span class="sourceLineNo">397</span> FileUtil.copy(srcFs, p, fs, stageP, false, conf);<a name="line.397"></a>
+<span class="sourceLineNo">398</span> } else {<a name="line.398"></a>
+<span class="sourceLineNo">399</span> LOG.debug("Moving " + p + " to " + stageP);<a name="line.399"></a>
+<span class="sourceLineNo">400</span> FileStatus origFileStatus = fs.getFileStatus(p);<a name="line.400"></a>
+<span class="sourceLineNo">401</span> origPermissions.put(srcPath, origFileStatus.getPermission());<a name="line.401"></a>
+<span class="sourceLineNo">402</span> if(!fs.rename(p, stageP)) {<a name="line.402"></a>
+<span class="sourceLineNo">403</span> throw new IOException("Failed to move HFile: " + p + " to " + stageP);<a name="line.403"></a>
+<span class="sourceLineNo">404</span> }<a name="line.404"></a>
+<span class="sourceLineNo">405</span> }<a name="line.405"></a>
+<span class="sourceLineNo">406</span> fs.setPermission(stageP, PERM_ALL_ACCESS);<a name="line.406"></a>
+<span class="sourceLineNo">407</span> return stageP.toString();<a name="line.407"></a>
+<span class="sourceLineNo">408</span> }<a name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span> @Override<a name="line.410"></a>
+<span class="sourceLineNo">411</span> public void doneBulkLoad(byte[] family, String srcPath) throws IOException {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> LOG.debug("Bulk Load done for: " + srcPath);<a name="line.412"></a>
+<span class="sourceLineNo">413</span> }<a name="line.413"></a>
+<span class="sourceLineNo">414</span><a name="line.414"></a>
+<span class="sourceLineNo">415</span> @Override<a name="line.415"></a>
+<span class="sourceLineNo">416</span> public void failedBulkLoad(final byte[] family, final String srcPath) throws IOException {<a name="line.416"></a>
+<span class="sourceLineNo">417</span> if (!FSHDFSUtils.isSameHdfs(conf, srcFs, fs)) {<a name="line.417"></a>
+<span class="sourceLineNo">418</span> // files are copied so no need to move them back<a name="line.418"></a>
+<span class="sourceLineNo">419</span> return;<a name="line.419"></a>
+<span class="sourceLineNo">420</span> }<a name="line.420"></a>
+<span class="sourceLineNo">421</span> Path p = new Path(srcPath);<a name="line.421"></a>
+<span class="sourceLineNo">422</span> Path stageP = new Path(stagingDir,<a name="line.422"></a>
+<span class="sourceLineNo">423</span> new Path(Bytes.toString(family), p.getName()));<a name="line.423"></a>
<span class="sourceLineNo">424</span><a name="line.424"></a>
-<span class="sourceLineNo">425</span> @Override<a name="line.425"></a>
-<span class="sourceLineNo">426</span> public void failedBulkLoad(final byte[] family, final String srcPath) throws IOException {<a name="line.426"></a>
-<span class="sourceLineNo">427</span> if (!FSHDFSUtils.isSameHdfs(conf, srcFs, fs)) {<a name="line.427"></a>
-<span class="sourceLineNo">428</span> // files are copied so no need to move them back<a name="line.428"></a>
+<span class="sourceLineNo">425</span> // In case of Replication for bulk load files, hfiles are not renamed by end point during<a name="line.425"></a>
+<span class="sourceLineNo">426</span> // prepare stage, so no need of rename here again<a name="line.426"></a>
+<span class="sourceLineNo">427</span> if (p.equals(stageP)) {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> LOG.debug(p.getName() + " is already available in source directory. Skipping rename.");<a name="line.428"></a>
<span class="sourceLineNo">429</span> return;<a name="line.429"></a>
<span class="sourceLineNo">430</span> }<a name="line.430"></a>
-<span class="sourceLineNo">431</span> Path p = new Path(srcPath);<a name="line.431"></a>
-<span class="sourceLineNo">432</span> Path stageP = new Path(stagingDir,<a name="line.432"></a>
-<span class="sourceLineNo">433</span> new Path(Bytes.toString(family), p.getName()));<a name="line.433"></a>
-<span class="sourceLineNo">434</span><a name="line.434"></a>
-<span class="sourceLineNo">435</span> // In case of Replication for bulk load files, hfiles are not renamed by end point during<a name="line.435"></a>
-<span class="sourceLineNo">436</span> // prepare stage, so no need of rename here again<a name="line.436"></a>
-<span class="sourceLineNo">437</span> if (p.equals(stageP)) {<a name="line.437"></a>
-<span class="sourceLineNo">438</span> LOG.debug(p.getName() + " is already available in source directory. Skipping rename.");<a name="line.438"></a>
-<span class="sourceLineNo">439</span> return;<a name="line.439"></a>
-<span class="sourceLineNo">440</span> }<a name="line.440"></a>
-<span class="sourceLineNo">441</span><a name="line.441"></a>
-<span class="sourceLineNo">442</span> LOG.debug("Moving " + stageP + " back to " + p);<a name="line.442"></a>
-<span class="sourceLineNo">443</span> if(!fs.rename(stageP, p))<a name="line.443"></a>
-<span class="sourceLineNo">444</span> throw new IOException("Failed to move HFile: " + stageP + " to " + p);<a name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span> // restore original permission<a name="line.446"></a>
-<span class="sourceLineNo">447</span> if (origPermissions.containsKey(srcPath)) {<a name="line.447"></a>
-<span class="sourceLineNo">448</span> fs.setPermission(p, origPermissions.get(srcPath));<a name="line.448"></a>
-<span class="sourceLineNo">449</span> } else {<a name="line.449"></a>
-<span class="sourceLineNo">450</span> LOG.warn("Can't find previous permission for path=" + srcPath);<a name="line.450"></a>
-<span class="sourceLineNo">451</span> }<a name="line.451"></a>
-<span class="sourceLineNo">452</span> }<a name="line.452"></a>
-<span class="sourceLineNo">453</span><a name="line.453"></a>
-<span class="sourceLineNo">454</span> /**<a name="line.454"></a>
-<span class="sourceLineNo">455</span> * Check if the path is referencing a file.<a name="line.455"></a>
-<span class="sourceLineNo">456</span> * This is mainly needed to avoid symlinks.<a name="line.456"></a>
-<span class="sourceLineNo">457</span> * @param p<a name="line.457"></a>
-<span class="sourceLineNo">458</span> * @return true if the p is a file<a name="line.458"></a>
-<span class="sourceLineNo">459</span> * @throws IOException<a name="line.459"></a>
-<span class="sourceLineNo">460</span> */<a name="line.460"></a>
-<span class="sourceLineNo">461</span> private boolean isFile(Path p) throws IOException {<a name="line.461"></a>
-<span class="sourceLineNo">462</span> FileStatus status = srcFs.getFileStatus(p);<a name="line.462"></a>
-<span class="sourceLineNo">463</span> boolean isFile = !status.isDirectory();<a name="line.463"></a>
-<span class="sourceLineNo">464</span> try {<a name="line.464"></a>
-<span class="sourceLineNo">465</span> isFile = isFile && !(Boolean)Methods.call(FileStatus.class, status, "isSymlink", null, null);<a name="line.465"></a>
-<span class="sourceLineNo">466</span> } catch (Exception e) {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> }<a name="line.467"></a>
-<span class="sourceLineNo">468</span> return isFile;<a name="line.468"></a>
-<span class="sourceLineNo">469</span> }<a name="line.469"></a>
-<span class="sourceLineNo">470</span> }<a name="line.470"></a>
-<span class="sourceLineNo">471</span>}<a name="line.471"></a>
+<span class="sourceLineNo">431</span><a name="line.431"></a>
+<span class="sourceLineNo">432</span> LOG.debug("Moving " + stageP + " back to " + p);<a name="line.432"></a>
+<span class="sourceLineNo">433</span> if(!fs.rename(stageP, p))<a name="line.433"></a>
+<span class="sourceLineNo">434</span> throw new IOException("Failed to move HFile: " + stageP + " to " + p);<a name="line.434"></a>
+<span class="sourceLineNo">435</span><a name="line.435"></a>
+<span class="sourceLineNo">436</span> // restore original permission<a name="line.436"></a>
+<span class="sourceLineNo">437</span> if (origPermissions.containsKey(srcPath)) {<a name="line.437"></a>
+<span class="sourceLineNo">438</span> fs.setPermission(p, origPermissions.get(srcPath));<a name="line.438"></a>
+<span class="sourceLineNo">439</span> } else {<a name="line.439"></a>
+<span class="sourceLineNo">440</span> LOG.warn("Can't find previous permission for path=" + srcPath);<a name="line.440"></a>
+<span class="sourceLineNo">441</span> }<a name="line.441"></a>
+<span class="sourceLineNo">442</span> }<a name="line.442"></a>
+<span class="sourceLineNo">443</span><a name="line.443"></a>
+<span class="sourceLineNo">444</span> /**<a name="line.444"></a>
+<span class="sourceLineNo">445</span> * Check if the path is referencing a file.<a name="line.445"></a>
+<span class="sourceLineNo">446</span> * This is mainly needed to avoid symlinks.<a name="line.446"></a>
+<span class="sourceLineNo">447</span> * @param p<a name="line.447"></a>
+<span class="sourceLineNo">448</span> * @return true if the p is a file<a name="line.448"></a>
+<span class="sourceLineNo">449</span> * @throws IOException<a name="line.449"></a>
+<span class="sourceLineNo">450</span> */<a name="line.450"></a>
+<span class="sourceLineNo">451</span> private boolean isFile(Path p) throws IOException {<a name="line.451"></a>
+<span class="sourceLineNo">452</span> FileStatus status = srcFs.getFileStatus(p);<a name="line.452"></a>
+<span class="sourceLineNo">453</span> boolean isFile = !status.isDirectory();<a name="line.453"></a>
+<span class="sourceLineNo">454</span> try {<a name="line.454"></a>
+<span class="sourceLineNo">455</span> isFile = isFile && !(Boolean)Methods.call(FileStatus.class, status, "isSymlink", null, null);<a name="line.455"></a>
+<span class="sourceLineNo">456</span> } catch (Exception e) {<a name="line.456"></a>
+<span class="sourceLineNo">457</span> }<a name="line.457"></a>
+<span class="sourceLineNo">458</span> return isFile;<a name="line.458"></a>
+<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">460</span> }<a name="line.460"></a>
+<span class="sourceLineNo">461</span>}<a name="line.461"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4ce8323f/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
index edcc3e1..7a57d8a 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
@@ -67,14 +67,14 @@
<span class="sourceLineNo">059</span> requiredArguments = {<a name="line.59"></a>
<span class="sourceLineNo">060</span> @org.jamon.annotations.Argument(name = "master", type = "HMaster")},<a name="line.60"></a>
<span class="sourceLineNo">061</span> optionalArguments = {<a name="line.61"></a>
-<span class="sourceLineNo">062</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.62"></a>
+<span class="sourceLineNo">062</span> @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.62"></a>
<span class="sourceLineNo">063</span> @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.63"></a>
-<span class="sourceLineNo">064</span> @org.jamon.annotations.Argument(name = "servers", type = "List<ServerName>"),<a name="line.64"></a>
-<span class="sourceLineNo">065</span> @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.65"></a>
-<span class="sourceLineNo">066</span> @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.66"></a>
-<span class="sourceLineNo">067</span> @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"),<a name="line.67"></a>
-<span class="sourceLineNo">068</span> @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),<a name="line.68"></a>
-<span class="sourceLineNo">069</span> @org.jamon.annotations.Argument(name = "deadServers", type = "Set<ServerName>"),<a name="line.69"></a>
+<span class="sourceLineNo">064</span> @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"),<a name="line.64"></a>
+<span class="sourceLineNo">065</span> @org.jamon.annotations.Argument(name = "servers", type = "List<ServerName>"),<a name="line.65"></a>
+<span class="sourceLineNo">066</span> @org.jamon.annotations.Argument(name = "deadServers", type = "Set<ServerName>"),<a name="line.66"></a>
+<span class="sourceLineNo">067</span> @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.67"></a>
+<span class="sourceLineNo">068</span> @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.68"></a>
+<span class="sourceLineNo">069</span> @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),<a name="line.69"></a>
<span class="sourceLineNo">070</span> @org.jamon.annotations.Argument(name = "frags", type = "Map<String,Integer>")})<a name="line.70"></a>
<span class="sourceLineNo">071</span>public class MasterStatusTmpl<a name="line.71"></a>
<span class="sourceLineNo">072</span> extends org.jamon.AbstractTemplateProxy<a name="line.72"></a>
@@ -116,23 +116,23 @@
<span class="sourceLineNo">108</span> return m_master;<a name="line.108"></a>
<span class="sourceLineNo">109</span> }<a name="line.109"></a>
<span class="sourceLineNo">110</span> private HMaster m_master;<a name="line.110"></a>
-<span class="sourceLineNo">111</span> // 26, 1<a name="line.111"></a>
-<span class="sourceLineNo">112</span> public void setFilter(String filter)<a name="line.112"></a>
+<span class="sourceLineNo">111</span> // 25, 1<a name="line.111"></a>
+<span class="sourceLineNo">112</span> public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.112"></a>
<span class="sourceLineNo">113</span> {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> // 26, 1<a name="line.114"></a>
-<span class="sourceLineNo">115</span> m_filter = filter;<a name="line.115"></a>
-<span class="sourceLineNo">116</span> m_filter__IsNotDefault = true;<a name="line.116"></a>
+<span class="sourceLineNo">114</span> // 25, 1<a name="line.114"></a>
+<span class="sourceLineNo">115</span> m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.115"></a>
+<span class="sourceLineNo">116</span> m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.116"></a>
<span class="sourceLineNo">117</span> }<a name="line.117"></a>
-<span class="sourceLineNo">118</span> public String getFilter()<a name="line.118"></a>
+<span class="sourceLineNo">118</span> public boolean getCatalogJanitorEnabled()<a name="line.118"></a>
<span class="sourceLineNo">119</span> {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> return m_filter;<a name="line.120"></a>
+<span class="sourceLineNo">120</span> return m_catalogJanitorEnabled;<a name="line.120"></a>
<span class="sourceLineNo">121</span> }<a name="line.121"></a>
-<span class="sourceLineNo">122</span> private String m_filter;<a name="line.122"></a>
-<span class="sourceLineNo">123</span> public boolean getFilter__IsNotDefault()<a name="line.123"></a>
+<span class="sourceLineNo">122</span> private boolean m_catalogJanitorEnabled;<a name="line.122"></a>
+<span class="sourceLineNo">123</span> public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.123"></a>
<span class="sourceLineNo">124</span> {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> return m_filter__IsNotDefault;<a name="line.125"></a>
+<span class="sourceLineNo">125</span> return m_catalogJanitorEnabled__IsNotDefault;<a name="line.125"></a>
<span class="sourceLineNo">126</span> }<a name="line.126"></a>
-<span class="sourceLineNo">127</span> private boolean m_filter__IsNotDefault;<a name="line.127"></a>
+<span class="sourceLineNo">127</span> private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.127"></a>
<span class="sourceLineNo">128</span> // 27, 1<a name="line.128"></a>
<span class="sourceLineNo">129</span> public void setFormat(String format)<a name="line.129"></a>
<span class="sourceLineNo">130</span> {<a name="line.130"></a>
@@ -150,108 +150,108 @@
<span class="sourceLineNo">142</span> return m_format__IsNotDefault;<a name="line.142"></a>
<span class="sourceLineNo">143</span> }<a name="line.143"></a>
<span class="sourceLineNo">144</span> private boolean m_format__IsNotDefault;<a name="line.144"></a>
-<span class="sourceLineNo">145</span> // 23, 1<a name="line.145"></a>
-<span class="sourceLineNo">146</span> public void setServers(List<ServerName> servers)<a name="line.146"></a>
+<span class="sourceLineNo">145</span> // 22, 1<a name="line.145"></a>
+<span class="sourceLineNo">146</span> public void setMetaLocation(ServerName metaLocation)<a name="line.146"></a>
<span class="sourceLineNo">147</span> {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> // 23, 1<a name="line.148"></a>
-<span class="sourceLineNo">149</span> m_servers = servers;<a name="line.149"></a>
-<span class="sourceLineNo">150</span> m_servers__IsNotDefault = true;<a name="line.150"></a>
+<span class="sourceLineNo">148</span> // 22, 1<a name="line.148"></a>
+<span class="sourceLineNo">149</span> m_metaLocation = metaLocation;<a name="line.149"></a>
+<span class="sourceLineNo">150</span> m_metaLocation__IsNotDefault = true;<a name="line.150"></a>
<span class="sourceLineNo">151</span> }<a name="line.151"></a>
-<span class="sourceLineNo">152</span> public List<ServerName> getServers()<a name="line.152"></a>
+<span class="sourceLineNo">152</span> public ServerName getMetaLocation()<a name="line.152"></a>
<span class="sourceLineNo">153</span> {<a name="line.153"></a>
-<span class="sourceLineNo">154</span> return m_servers;<a name="line.154"></a>
+<span class="sourceLineNo">154</span> return m_metaLocation;<a name="line.154"></a>
<span class="sourceLineNo">155</span> }<a name="line.155"></a>
-<span class="sourceLineNo">156</span> private List<ServerName> m_servers;<a name="line.156"></a>
-<span class="sourceLineNo">157</span> public boolean getServers__IsNotDefault()<a name="line.157"></a>
+<span class="sourceLineNo">156</span> private ServerName m_metaLocation;<a name="line.156"></a>
+<span class="sourceLineNo">157</span> public boolean getMetaLocation__IsNotDefault()<a name="line.157"></a>
<span class="sourceLineNo">158</span> {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> return m_servers__IsNotDefault;<a name="line.159"></a>
+<span class="sourceLineNo">159</span> return m_metaLocation__IsNotDefault;<a name="line.159"></a>
<span class="sourceLineNo">160</span> }<a name="line.160"></a>
-<span class="sourceLineNo">161</span> private boolean m_servers__IsNotDefault;<a name="line.161"></a>
-<span class="sourceLineNo">162</span> // 29, 1<a name="line.162"></a>
-<span class="sourceLineNo">163</span> public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.163"></a>
+<span class="sourceLineNo">161</span> private boolean m_metaLocation__IsNotDefault;<a name="line.161"></a>
+<span class="sourceLineNo">162</span> // 23, 1<a name="line.162"></a>
+<span class="sourceLineNo">163</span> public void setServers(List<ServerName> servers)<a name="line.163"></a>
<span class="sourceLineNo">164</span> {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> // 29, 1<a name="line.165"></a>
-<span class="sourceLineNo">166</span> m_assignmentManager = assignmentManager;<a name="line.166"></a>
-<span class="sourceLineNo">167</span> m_assignmentManager__IsNotDefault = true;<a name="line.167"></a>
+<span class="sourceLineNo">165</span> // 23, 1<a name="line.165"></a>
+<span class="sourceLineNo">166</span> m_servers = servers;<a name="line.166"></a>
+<span class="sourceLineNo">167</span> m_servers__IsNotDefault = true;<a name="line.167"></a>
<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span> public AssignmentManager getAssignmentManager()<a name="line.169"></a>
+<span class="sourceLineNo">169</span> public List<ServerName> getServers()<a name="line.169"></a>
<span class="sourceLineNo">170</span> {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> return m_assignmentManager;<a name="line.171"></a>
+<span class="sourceLineNo">171</span> return m_servers;<a name="line.171"></a>
<span class="sourceLineNo">172</span> }<a name="line.172"></a>
-<span class="sourceLineNo">173</span> private AssignmentManager m_assignmentManager;<a name="line.173"></a>
-<span class="sourceLineNo">174</span> public boolean getAssignmentManager__IsNotDefault()<a name="line.174"></a>
+<span class="sourceLineNo">173</span> private List<ServerName> m_servers;<a name="line.173"></a>
+<span class="sourceLineNo">174</span> public boolean getServers__IsNotDefault()<a name="line.174"></a>
<span class="sourceLineNo">175</span> {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> return m_assignmentManager__IsNotDefault;<a name="line.176"></a>
+<span class="sourceLineNo">176</span> return m_servers__IsNotDefault;<a name="line.176"></a>
<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span> private boolean m_assignmentManager__IsNotDefault;<a name="line.178"></a>
-<span class="sourceLineNo">179</span> // 25, 1<a name="line.179"></a>
-<span class="sourceLineNo">180</span> public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.180"></a>
+<span class="sourceLineNo">178</span> private boolean m_servers__IsNotDefault;<a name="line.178"></a>
+<span class="sourceLineNo">179</span> // 24, 1<a name="line.179"></a>
+<span class="sourceLineNo">180</span> public void setDeadServers(Set<ServerName> deadServers)<a name="line.180"></a>
<span class="sourceLineNo">181</span> {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> // 25, 1<a name="line.182"></a>
-<span class="sourceLineNo">183</span> m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.183"></a>
-<span class="sourceLineNo">184</span> m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.184"></a>
+<span class="sourceLineNo">182</span> // 24, 1<a name="line.182"></a>
+<span class="sourceLineNo">183</span> m_deadServers = deadServers;<a name="line.183"></a>
+<span class="sourceLineNo">184</span> m_deadServers__IsNotDefault = true;<a name="line.184"></a>
<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> public boolean getCatalogJanitorEnabled()<a name="line.186"></a>
+<span class="sourceLineNo">186</span> public Set<ServerName> getDeadServers()<a name="line.186"></a>
<span class="sourceLineNo">187</span> {<a name="line.187"></a>
-<span class="sourceLineNo">188</span> return m_catalogJanitorEnabled;<a name="line.188"></a>
+<span class="sourceLineNo">188</span> return m_deadServers;<a name="line.188"></a>
<span class="sourceLineNo">189</span> }<a name="line.189"></a>
-<span class="sourceLineNo">190</span> private boolean m_catalogJanitorEnabled;<a name="line.190"></a>
-<span class="sourceLineNo">191</span> public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.191"></a>
+<span class="sourceLineNo">190</span> private Set<ServerName> m_deadServers;<a name="line.190"></a>
+<span class="sourceLineNo">191</span> public boolean getDeadServers__IsNotDefault()<a name="line.191"></a>
<span class="sourceLineNo">192</span> {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> return m_catalogJanitorEnabled__IsNotDefault;<a name="line.193"></a>
+<span class="sourceLineNo">193</span> return m_deadServers__IsNotDefault;<a name="line.193"></a>
<span class="sourceLineNo">194</span> }<a name="line.194"></a>
-<span class="sourceLineNo">195</span> private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.195"></a>
-<span class="sourceLineNo">196</span> // 22, 1<a name="line.196"></a>
-<span class="sourceLineNo">197</span> public void setMetaLocation(ServerName metaLocation)<a name="line.197"></a>
+<span class="sourceLineNo">195</span> private boolean m_deadServers__IsNotDefault;<a name="line.195"></a>
+<span class="sourceLineNo">196</span> // 26, 1<a name="line.196"></a>
+<span class="sourceLineNo">197</span> public void setFilter(String filter)<a name="line.197"></a>
<span class="sourceLineNo">198</span> {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> // 22, 1<a name="line.199"></a>
-<span class="sourceLineNo">200</span> m_metaLocation = metaLocation;<a name="line.200"></a>
-<span class="sourceLineNo">201</span> m_metaLocation__IsNotDefault = true;<a name="line.201"></a>
+<span class="sourceLineNo">199</span> // 26, 1<a name="line.199"></a>
+<span class="sourceLineNo">200</span> m_filter = filter;<a name="line.200"></a>
+<span class="sourceLineNo">201</span> m_filter__IsNotDefault = true;<a name="line.201"></a>
<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span> public ServerName getMetaLocation()<a name="line.203"></a>
+<span class="sourceLineNo">203</span> public String getFilter()<a name="line.203"></a>
<span class="sourceLineNo">204</span> {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> return m_metaLocation;<a name="line.205"></a>
+<span class="sourceLineNo">205</span> return m_filter;<a name="line.205"></a>
<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> private ServerName m_metaLocation;<a name="line.207"></a>
-<span class="sourceLineNo">208</span> public boolean getMetaLocation__IsNotDefault()<a name="line.208"></a>
+<span class="sourceLineNo">207</span> private String m_filter;<a name="line.207"></a>
+<span class="sourceLineNo">208</span> public boolean getFilter__IsNotDefault()<a name="line.208"></a>
<span class="sourceLineNo">209</span> {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> return m_metaLocation__IsNotDefault;<a name="line.210"></a>
+<span class="sourceLineNo">210</span> return m_filter__IsNotDefault;<a name="line.210"></a>
<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span> private boolean m_metaLocation__IsNotDefault;<a name="line.212"></a>
-<span class="sourceLineNo">213</span> // 28, 1<a name="line.213"></a>
-<span class="sourceLineNo">214</span> public void setServerManager(ServerManager serverManager)<a name="line.214"></a>
+<span class="sourceLineNo">212</span> private boolean m_filter__IsNotDefault;<a name="line.212"></a>
+<span class="sourceLineNo">213</span> // 29, 1<a name="line.213"></a>
+<span class="sourceLineNo">214</span> public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.214"></a>
<span class="sourceLineNo">215</span> {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> // 28, 1<a name="line.216"></a>
-<span class="sourceLineNo">217</span> m_serverManager = serverManager;<a name="line.217"></a>
-<span class="sourceLineNo">218</span> m_serverManager__IsNotDefault = true;<a name="line.218"></a>
+<span class="sourceLineNo">216</span> // 29, 1<a name="line.216"></a>
+<span class="sourceLineNo">217</span> m_assignmentManager = assignmentManager;<a name="line.217"></a>
+<span class="sourceLineNo">218</span> m_assignmentManager__IsNotDefault = true;<a name="line.218"></a>
<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span> public ServerManager getServerManager()<a name="line.220"></a>
+<span class="sourceLineNo">220</span> public AssignmentManager getAssignmentManager()<a name="line.220"></a>
<span class="sourceLineNo">221</span> {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> return m_serverManager;<a name="line.222"></a>
+<span class="sourceLineNo">222</span> return m_assignmentManager;<a name="line.222"></a>
<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> private ServerManager m_serverManager;<a name="line.224"></a>
-<span class="sourceLineNo">225</span> public boolean getServerManager__IsNotDefault()<a name="line.225"></a>
+<span class="sourceLineNo">224</span> private AssignmentManager m_assignmentManager;<a name="line.224"></a>
+<span class="sourceLineNo">225</span> public boolean getAssignmentManager__IsNotDefault()<a name="line.225"></a>
<span class="sourceLineNo">226</span> {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> return m_serverManager__IsNotDefault;<a name="line.227"></a>
+<span class="sourceLineNo">227</span> return m_assignmentManager__IsNotDefault;<a name="line.227"></a>
<span class="sourceLineNo">228</span> }<a name="line.228"></a>
-<span class="sourceLineNo">229</span> private boolean m_serverManager__IsNotDefault;<a name="line.229"></a>
-<span class="sourceLineNo">230</span> // 24, 1<a name="line.230"></a>
-<span class="sourceLineNo">231</span> public void setDeadServers(Set<ServerName> deadServers)<a name="line.231"></a>
+<span class="sourceLineNo">229</span> private boolean m_assignmentManager__IsNotDefault;<a name="line.229"></a>
+<span class="sourceLineNo">230</span> // 28, 1<a name="line.230"></a>
+<span class="sourceLineNo">231</span> public void setServerManager(ServerManager serverManager)<a name="line.231"></a>
<span class="sourceLineNo">232</span> {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> // 24, 1<a name="line.233"></a>
-<span class="sourceLineNo">234</span> m_deadServers = deadServers;<a name="line.234"></a>
-<span class="sourceLineNo">235</span> m_deadServers__IsNotDefault = true;<a name="line.235"></a>
+<span class="sourceLineNo">233</span> // 28, 1<a name="line.233"></a>
+<span class="sourceLineNo">234</span> m_serverManager = serverManager;<a name="line.234"></a>
+<span class="sourceLineNo">235</span> m_serverManager__IsNotDefault = true;<a name="line.235"></a>
<span class="sourceLineNo">236</span> }<a name="line.236"></a>
-<span class="sourceLineNo">237</span> public Set<ServerName> getDeadServers()<a name="line.237"></a>
+<span class="sourceLineNo">237</span> public ServerManager getServerManager()<a name="line.237"></a>
<span class="sourceLineNo">238</span> {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> return m_deadServers;<a name="line.239"></a>
+<span class="sourceLineNo">239</span> return m_serverManager;<a name="line.239"></a>
<span class="sourceLineNo">240</span> }<a name="line.240"></a>
-<span class="sourceLineNo">241</span> private Set<ServerName> m_deadServers;<a name="line.241"></a>
-<span class="sourceLineNo">242</span> public boolean getDeadServers__IsNotDefault()<a name="line.242"></a>
+<span class="sourceLineNo">241</span> private ServerManager m_serverManager;<a name="line.241"></a>
+<span class="sourceLineNo">242</span> public boolean getServerManager__IsNotDefault()<a name="line.242"></a>
<span class="sourceLineNo">243</span> {<a name="line.243"></a>
-<span class="sourceLineNo">244</span> return m_deadServers__IsNotDefault;<a name="line.244"></a>
+<span class="sourceLineNo">244</span> return m_serverManager__IsNotDefault;<a name="line.244"></a>
<span class="sourceLineNo">245</span> }<a name="line.245"></a>
-<span class="sourceLineNo">246</span> private boolean m_deadServers__IsNotDefault;<a name="line.246"></a>
+<span class="sourceLineNo">246</span> private boolean m_serverManager__IsNotDefault;<a name="line.246"></a>
<span class="sourceLineNo">247</span> // 21, 1<a name="line.247"></a>
<span class="sourceLineNo">248</span> public void setFrags(Map<String,Integer> frags)<a name="line.248"></a>
<span class="sourceLineNo">249</span> {<a name="line.249"></a>
@@ -280,10 +280,10 @@
<span class="sourceLineNo">272</span> return (ImplData) super.getImplData();<a name="line.272"></a>
<span class="sourceLineNo">273</span> }<a name="line.273"></a>
<span class="sourceLineNo">274</span> <a name="line.274"></a>
-<span class="sourceLineNo">275</span> protected String filter;<a name="line.275"></a>
-<span class="sourceLineNo">276</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.276"></a>
+<span class="sourceLineNo">275</span> protected boolean catalogJanitorEnabled;<a name="line.275"></a>
+<span class="sourceLineNo">276</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.276"></a>
<span class="sourceLineNo">277</span> {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> (getImplData()).setFilter(p_filter);<a name="line.278"></a>
+<span class="sourceLineNo">278</span> (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a name="line.278"></a>
<span class="sourceLineNo">279</span> return this;<a name="line.279"></a>
<span class="sourceLineNo">280</span> }<a name="line.280"></a>
<span class="sourceLineNo">281</span> <a name="line.281"></a>
@@ -294,45 +294,45 @@
<span class="sourceLineNo">286</span> return this;<a name="line.286"></a>
<span class="sourceLineNo">287</span> }<a name="line.287"></a>
<span class="sourceLineNo">288</span> <a name="line.288"></a>
-<span class="sourceLineNo">289</span> protected List<ServerName> servers;<a name="line.289"></a>
-<span class="sourceLineNo">290</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List<ServerName> p_servers)<a name="line.290"></a>
+<span class="sourceLineNo">289</span> protected ServerName metaLocation;<a name="line.289"></a>
+<span class="sourceLineNo">290</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.290"></a>
<span class="sourceLineNo">291</span> {<a name="line.291"></a>
-<span class="sourceLineNo">292</span> (getImplData()).setServers(p_servers);<a name="line.292"></a>
+<span class="sourceLineNo">292</span> (getImplData()).setMetaLocation(p_metaLocation);<a name="line.292"></a>
<span class="sourceLineNo">293</span> return this;<a name="line.293"></a>
<span class="sourceLineNo">294</span> }<a name="line.294"></a>
<span class="sourceLineNo">295</span> <a name="line.295"></a>
-<span class="sourceLineNo">296</span> protected AssignmentManager assignmentManager;<a name="line.296"></a>
-<span class="sourceLineNo">297</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.297"></a>
+<span class="sourceLineNo">296</span> protected List<ServerName> servers;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List<ServerName> p_servers)<a name="line.297"></a>
<span class="sourceLineNo">298</span> {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.299"></a>
+<span class="sourceLineNo">299</span> (getImplData()).setServers(p_servers);<a name="line.299"></a>
<span class="sourceLineNo">300</span> return this;<a name="line.300"></a>
<span class="sourceLineNo">301</span> }<a name="line.301"></a>
<span class="sourceLineNo">302</span> <a name="line.302"></a>
-<span class="sourceLineNo">303</span> protected boolean catalogJanitorEnabled;<a name="line.303"></a>
-<span class="sourceLineNo">304</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.304"></a>
+<span class="sourceLineNo">303</span> protected Set<ServerName> deadServers;<a name="line.303"></a>
+<span class="sourceLineNo">304</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set<ServerName> p_deadServers)<a name="line.304"></a>
<span class="sourceLineNo">305</span> {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a name="line.306"></a>
+<span class="sourceLineNo">306</span> (getImplData()).setDeadServers(p_deadServers);<a name="line.306"></a>
<span class="sourceLineNo">307</span> return this;<a name="line.307"></a>
<span class="sourceLineNo">308</span> }<a name="line.308"></a>
<span class="sourceLineNo">309</span> <a name="line.309"></a>
-<span class="sourceLineNo">310</span> protected ServerName metaLocation;<a name="line.310"></a>
-<span class="sourceLineNo">311</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.311"></a>
+<span class="sourceLineNo">310</span> protected String filter;<a name="line.310"></a>
+<span class="sourceLineNo">311</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.311"></a>
<span class="sourceLineNo">312</span> {<a name="line.312"></a>
-<span class="sourceLineNo">313</span> (getImplData()).setMetaLocation(p_metaLocation);<a name="line.313"></a>
+<span class="sourceLineNo">313</span> (getImplData()).setFilter(p_filter);<a name="line.313"></a>
<span class="sourceLineNo">314</span> return this;<a name="line.314"></a>
<span class="sourceLineNo">315</span> }<a name="line.315"></a>
<span class="sourceLineNo">316</span> <a name="line.316"></a>
-<span class="sourceLineNo">317</span> protected ServerManager serverManager;<a name="line.317"></a>
-<span class="sourceLineNo">318</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.318"></a>
+<span class="sourceLineNo">317</span> protected AssignmentManager assignmentManager;<a name="line.317"></a>
+<span class="sourceLineNo">318</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.318"></a>
<span class="sourceLineNo">319</span> {<a name="line.319"></a>
-<span class="sourceLineNo">320</span> (getImplData()).setServerManager(p_serverManager);<a name="line.320"></a>
+<span class="sourceLineNo">320</span> (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.320"></a>
<span class="sourceLineNo">321</span> return this;<a name="line.321"></a>
<span class="sourceLineNo">322</span> }<a name="line.322"></a>
<span class="sourceLineNo">323</span> <a name="line.323"></a>
-<span class="sourceLineNo">324</span> protected Set<ServerName> deadServers;<a name="line.324"></a>
-<span class="sourceLineNo">325</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set<ServerName> p_deadServers)<a name="line.325"></a>
+<span class="sourceLineNo">324</span> protected ServerManager serverManager;<a name="line.324"></a>
+<span class="sourceLineNo">325</span> public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.325"></a>
<span class="sourceLineNo">326</span> {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> (getImplData()).setDeadServers(p_deadServers);<a name="line.327"></a>
+<span class="sourceLineNo">327</span> (getImplData()).setServerManager(p_serverManager);<a name="line.327"></a>
<span class="sourceLineNo">328</span> return this;<a name="line.328"></a>
<span class="sourceLineNo">329</span> }<a name="line.329"></a>
<span class="sourceLineNo">330</span> <a name="line.330"></a>