[17/41] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/6fbeb554/devapidocs/src-html/org/apache/hadoop/hbase/security/token/TokenUtil.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/security/token/TokenUtil.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/security/token/TokenUtil.html
index 8af4410..ddcdd02 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/security/token/TokenUtil.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/security/token/TokenUtil.html
@@ -64,269 +64,268 @@
 <span class="sourceLineNo">056</span>  /**<a name="line.56"></a>
 <span class="sourceLineNo">057</span>   * Obtain and return an authentication 
token for the current user.<a name="line.57"></a>
 <span class="sourceLineNo">058</span>   * @param conn The HBase cluster 
connection<a name="line.58"></a>
-<span class="sourceLineNo">059</span>   * @return the authentication token 
instance<a name="line.59"></a>
-<span class="sourceLineNo">060</span>   */<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  public static 
Token&lt;AuthenticationTokenIdentifier&gt; obtainToken(<a name="line.61"></a>
-<span class="sourceLineNo">062</span>      Connection conn) throws IOException 
{<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    Table meta = null;<a 
name="line.63"></a>
-<span class="sourceLineNo">064</span>    try {<a name="line.64"></a>
-<span class="sourceLineNo">065</span>      meta = 
conn.getTable(TableName.META_TABLE_NAME);<a name="line.65"></a>
-<span class="sourceLineNo">066</span>      CoprocessorRpcChannel rpcChannel = 
meta.coprocessorService(HConstants.EMPTY_START_ROW);<a name="line.66"></a>
-<span class="sourceLineNo">067</span>      
AuthenticationProtos.AuthenticationService.BlockingInterface service =<a 
name="line.67"></a>
-<span class="sourceLineNo">068</span>          
AuthenticationProtos.AuthenticationService.newBlockingStub(rpcChannel);<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span>      
AuthenticationProtos.GetAuthenticationTokenResponse response = 
service.getAuthenticationToken(null,<a name="line.69"></a>
-<span class="sourceLineNo">070</span>          
AuthenticationProtos.GetAuthenticationTokenRequest.getDefaultInstance());<a 
name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span>      return 
toToken(response.getToken());<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    } catch (ServiceException se) {<a 
name="line.73"></a>
-<span class="sourceLineNo">074</span>      
ProtobufUtil.handleRemoteException(se);<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    } finally {<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      if (meta != null) {<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>        meta.close();<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>      }<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    }<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    // dummy return for ServiceException 
block<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    return null;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  }<a name="line.82"></a>
+<span class="sourceLineNo">059</span>   * @throws IOException if a remote 
error or serialization problem occurs.<a name="line.59"></a>
+<span class="sourceLineNo">060</span>   * @return the authentication token 
instance<a name="line.60"></a>
+<span class="sourceLineNo">061</span>   */<a name="line.61"></a>
+<span class="sourceLineNo">062</span>  public static 
Token&lt;AuthenticationTokenIdentifier&gt; obtainToken(<a name="line.62"></a>
+<span class="sourceLineNo">063</span>      Connection conn) throws IOException 
{<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    Table meta = null;<a 
name="line.64"></a>
+<span class="sourceLineNo">065</span>    try {<a name="line.65"></a>
+<span class="sourceLineNo">066</span>      meta = 
conn.getTable(TableName.META_TABLE_NAME);<a name="line.66"></a>
+<span class="sourceLineNo">067</span>      CoprocessorRpcChannel rpcChannel = 
meta.coprocessorService(HConstants.EMPTY_START_ROW);<a name="line.67"></a>
+<span class="sourceLineNo">068</span>      
AuthenticationProtos.AuthenticationService.BlockingInterface service =<a 
name="line.68"></a>
+<span class="sourceLineNo">069</span>          
AuthenticationProtos.AuthenticationService.newBlockingStub(rpcChannel);<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span>      
AuthenticationProtos.GetAuthenticationTokenResponse response = 
service.getAuthenticationToken(null,<a name="line.70"></a>
+<span class="sourceLineNo">071</span>          
AuthenticationProtos.GetAuthenticationTokenRequest.getDefaultInstance());<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span>      return 
toToken(response.getToken());<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    } catch (ServiceException se) {<a 
name="line.74"></a>
+<span class="sourceLineNo">075</span>      throw 
ProtobufUtil.handleRemoteException(se);<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    } finally {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>      if (meta != null) {<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>        meta.close();<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>      }<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    }<a name="line.80"></a>
+<span class="sourceLineNo">081</span>  }<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
 <span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span>  /**<a name="line.85"></a>
-<span class="sourceLineNo">086</span>   * Converts a Token instance (with 
embedded identifier) to the protobuf representation.<a name="line.86"></a>
-<span class="sourceLineNo">087</span>   *<a name="line.87"></a>
-<span class="sourceLineNo">088</span>   * @param token the Token instance to 
copy<a name="line.88"></a>
-<span class="sourceLineNo">089</span>   * @return the protobuf Token message<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>   */<a name="line.90"></a>
-<span class="sourceLineNo">091</span>  public static 
AuthenticationProtos.Token toToken(Token&lt;AuthenticationTokenIdentifier&gt; 
token) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    AuthenticationProtos.Token.Builder 
builder = AuthenticationProtos.Token.newBuilder();<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    
builder.setIdentifier(ByteStringer.wrap(token.getIdentifier()));<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>    
builder.setPassword(ByteStringer.wrap(token.getPassword()));<a 
name="line.94"></a>
-<span class="sourceLineNo">095</span>    if (token.getService() != null) {<a 
name="line.95"></a>
-<span class="sourceLineNo">096</span>      
builder.setService(ByteString.copyFromUtf8(token.getService().toString()));<a 
name="line.96"></a>
-<span class="sourceLineNo">097</span>    }<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    return builder.build();<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>  }<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span>  /**<a name="line.101"></a>
-<span class="sourceLineNo">102</span>   * Obtain and return an authentication 
token for the current user.<a name="line.102"></a>
-<span class="sourceLineNo">103</span>   * @param conn The HBase cluster 
connection<a name="line.103"></a>
-<span class="sourceLineNo">104</span>   * @return the authentication token 
instance<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   */<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  public static 
Token&lt;AuthenticationTokenIdentifier&gt; obtainToken(<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      final Connection conn, User user) 
throws IOException, InterruptedException {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    return user.runAs(new 
PrivilegedExceptionAction&lt;Token&lt;AuthenticationTokenIdentifier&gt;&gt;() 
{<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      @Override<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      public 
Token&lt;AuthenticationTokenIdentifier&gt; run() throws Exception {<a 
name="line.110"></a>
-<span class="sourceLineNo">111</span>        return obtainToken(conn);<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span>      }<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    });<a name="line.113"></a>
-<span class="sourceLineNo">114</span>  }<a name="line.114"></a>
+<span class="sourceLineNo">084</span>  /**<a name="line.84"></a>
+<span class="sourceLineNo">085</span>   * Converts a Token instance (with 
embedded identifier) to the protobuf representation.<a name="line.85"></a>
+<span class="sourceLineNo">086</span>   *<a name="line.86"></a>
+<span class="sourceLineNo">087</span>   * @param token the Token instance to 
copy<a name="line.87"></a>
+<span class="sourceLineNo">088</span>   * @return the protobuf Token message<a 
name="line.88"></a>
+<span class="sourceLineNo">089</span>   */<a name="line.89"></a>
+<span class="sourceLineNo">090</span>  public static 
AuthenticationProtos.Token toToken(Token&lt;AuthenticationTokenIdentifier&gt; 
token) {<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    AuthenticationProtos.Token.Builder 
builder = AuthenticationProtos.Token.newBuilder();<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    
builder.setIdentifier(ByteStringer.wrap(token.getIdentifier()));<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>    
builder.setPassword(ByteStringer.wrap(token.getPassword()));<a 
name="line.93"></a>
+<span class="sourceLineNo">094</span>    if (token.getService() != null) {<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>      
builder.setService(ByteString.copyFromUtf8(token.getService().toString()));<a 
name="line.95"></a>
+<span class="sourceLineNo">096</span>    }<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    return builder.build();<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>  }<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span>  /**<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   * Obtain and return an authentication 
token for the current user.<a name="line.101"></a>
+<span class="sourceLineNo">102</span>   * @param conn The HBase cluster 
connection<a name="line.102"></a>
+<span class="sourceLineNo">103</span>   * @return the authentication token 
instance<a name="line.103"></a>
+<span class="sourceLineNo">104</span>   */<a name="line.104"></a>
+<span class="sourceLineNo">105</span>  public static 
Token&lt;AuthenticationTokenIdentifier&gt; obtainToken(<a name="line.105"></a>
+<span class="sourceLineNo">106</span>      final Connection conn, User user) 
throws IOException, InterruptedException {<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    return user.runAs(new 
PrivilegedExceptionAction&lt;Token&lt;AuthenticationTokenIdentifier&gt;&gt;() 
{<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      @Override<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      public 
Token&lt;AuthenticationTokenIdentifier&gt; run() throws Exception {<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>        return obtainToken(conn);<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>      }<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    });<a name="line.112"></a>
+<span class="sourceLineNo">113</span>  }<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
 <span class="sourceLineNo">115</span><a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>  private static Text 
getClusterId(Token&lt;AuthenticationTokenIdentifier&gt; token)<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>      throws IOException {<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>    return token.getService() != null<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>        ? token.getService() : new 
Text("default");<a name="line.120"></a>
-<span class="sourceLineNo">121</span>  }<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span>  /**<a name="line.123"></a>
-<span class="sourceLineNo">124</span>   * Obtain an authentication token for 
the given user and add it to the<a name="line.124"></a>
-<span class="sourceLineNo">125</span>   * user's credentials.<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span>   * @param conn The HBase cluster 
connection<a name="line.126"></a>
-<span class="sourceLineNo">127</span>   * @param user The user for whom to 
obtain the token<a name="line.127"></a>
-<span class="sourceLineNo">128</span>   * @throws IOException If making a 
remote call to the authentication service fails<a name="line.128"></a>
-<span class="sourceLineNo">129</span>   * @throws InterruptedException If 
executing as the given user is interrupted<a name="line.129"></a>
-<span class="sourceLineNo">130</span>   */<a name="line.130"></a>
-<span class="sourceLineNo">131</span>  public static void 
obtainAndCacheToken(final Connection conn,<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      User user)<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      throws IOException, 
InterruptedException {<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    try {<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      
Token&lt;AuthenticationTokenIdentifier&gt; token = obtainToken(conn, user);<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span>      if (token == null) {<a 
name="line.137"></a>
-<span class="sourceLineNo">138</span>        throw new IOException("No token 
returned for user " + user.getName());<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      }<a name="line.139"></a>
-<span class="sourceLineNo">140</span>      if (LOG.isDebugEnabled()) {<a 
name="line.140"></a>
-<span class="sourceLineNo">141</span>        LOG.debug("Obtained token " + 
token.getKind().toString() + " for user " +<a name="line.141"></a>
-<span class="sourceLineNo">142</span>            user.getName());<a 
name="line.142"></a>
-<span class="sourceLineNo">143</span>      }<a name="line.143"></a>
-<span class="sourceLineNo">144</span>      user.addToken(token);<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>    } catch (IOException ioe) {<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>      throw ioe;<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    } catch (InterruptedException ie) {<a 
name="line.147"></a>
-<span class="sourceLineNo">148</span>      throw ie;<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    } catch (RuntimeException re) {<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>      throw re;<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    } catch (Exception e) {<a 
name="line.151"></a>
-<span class="sourceLineNo">152</span>      throw new 
UndeclaredThrowableException(e,<a name="line.152"></a>
-<span class="sourceLineNo">153</span>          "Unexpected exception obtaining 
token for user " + user.getName());<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    }<a name="line.154"></a>
-<span class="sourceLineNo">155</span>  }<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span>  /**<a name="line.157"></a>
-<span class="sourceLineNo">158</span>   * Obtain an authentication token on 
behalf of the given user and add it to<a name="line.158"></a>
-<span class="sourceLineNo">159</span>   * the credentials for the given map 
reduce job.<a name="line.159"></a>
-<span class="sourceLineNo">160</span>   * @param conn The HBase cluster 
connection<a name="line.160"></a>
-<span class="sourceLineNo">161</span>   * @param user The user for whom to 
obtain the token<a name="line.161"></a>
-<span class="sourceLineNo">162</span>   * @param job The job instance in which 
the token should be stored<a name="line.162"></a>
-<span class="sourceLineNo">163</span>   * @throws IOException If making a 
remote call to the authentication service fails<a name="line.163"></a>
-<span class="sourceLineNo">164</span>   * @throws InterruptedException If 
executing as the given user is interrupted<a name="line.164"></a>
-<span class="sourceLineNo">165</span>   */<a name="line.165"></a>
-<span class="sourceLineNo">166</span>  public static void 
obtainTokenForJob(final Connection conn,<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      User user, Job job)<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>      throws IOException, 
InterruptedException {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    try {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      
Token&lt;AuthenticationTokenIdentifier&gt; token = obtainToken(conn, user);<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span>      if (token == null) {<a 
name="line.172"></a>
-<span class="sourceLineNo">173</span>        throw new IOException("No token 
returned for user " + user.getName());<a name="line.173"></a>
-<span class="sourceLineNo">174</span>      }<a name="line.174"></a>
-<span class="sourceLineNo">175</span>      Text clusterId = 
getClusterId(token);<a name="line.175"></a>
-<span class="sourceLineNo">176</span>      if (LOG.isDebugEnabled()) {<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span>        LOG.debug("Obtained token " + 
token.getKind().toString() + " for user " +<a name="line.177"></a>
-<span class="sourceLineNo">178</span>            user.getName() + " on cluster 
" + clusterId.toString());<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      }<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      
job.getCredentials().addToken(clusterId, token);<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    } catch (IOException ioe) {<a 
name="line.181"></a>
-<span class="sourceLineNo">182</span>      throw ioe;<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    } catch (InterruptedException ie) {<a 
name="line.183"></a>
-<span class="sourceLineNo">184</span>      throw ie;<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    } catch (RuntimeException re) {<a 
name="line.185"></a>
-<span class="sourceLineNo">186</span>      throw re;<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    } catch (Exception e) {<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>      throw new 
UndeclaredThrowableException(e,<a name="line.188"></a>
-<span class="sourceLineNo">189</span>          "Unexpected exception obtaining 
token for user " + user.getName());<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    }<a name="line.190"></a>
-<span class="sourceLineNo">191</span>  }<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span>  /**<a name="line.193"></a>
-<span class="sourceLineNo">194</span>   * Obtain an authentication token on 
behalf of the given user and add it to<a name="line.194"></a>
-<span class="sourceLineNo">195</span>   * the credentials for the given map 
reduce job.<a name="line.195"></a>
-<span class="sourceLineNo">196</span>   * @param conn The HBase cluster 
connection<a name="line.196"></a>
-<span class="sourceLineNo">197</span>   * @param user The user for whom to 
obtain the token<a name="line.197"></a>
-<span class="sourceLineNo">198</span>   * @param job The job configuration in 
which the token should be stored<a name="line.198"></a>
-<span class="sourceLineNo">199</span>   * @throws IOException If making a 
remote call to the authentication service fails<a name="line.199"></a>
-<span class="sourceLineNo">200</span>   * @throws InterruptedException If 
executing as the given user is interrupted<a name="line.200"></a>
-<span class="sourceLineNo">201</span>   */<a name="line.201"></a>
-<span class="sourceLineNo">202</span>  public static void 
obtainTokenForJob(final Connection conn, final JobConf job, User user)<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>      throws IOException, 
InterruptedException {<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    try {<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      
Token&lt;AuthenticationTokenIdentifier&gt; token = obtainToken(conn, user);<a 
name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span>      if (token == null) {<a 
name="line.207"></a>
-<span class="sourceLineNo">208</span>        throw new IOException("No token 
returned for user " + user.getName());<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      }<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      Text clusterId = 
getClusterId(token);<a name="line.210"></a>
-<span class="sourceLineNo">211</span>      if (LOG.isDebugEnabled()) {<a 
name="line.211"></a>
-<span class="sourceLineNo">212</span>        LOG.debug("Obtained token " + 
token.getKind().toString() + " for user " +<a name="line.212"></a>
-<span class="sourceLineNo">213</span>            user.getName() + " on cluster 
" + clusterId.toString());<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      }<a name="line.214"></a>
-<span class="sourceLineNo">215</span>      
job.getCredentials().addToken(clusterId, token);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    } catch (IOException ioe) {<a 
name="line.216"></a>
-<span class="sourceLineNo">217</span>      throw ioe;<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    } catch (InterruptedException ie) {<a 
name="line.218"></a>
-<span class="sourceLineNo">219</span>      throw ie;<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    } catch (RuntimeException re) {<a 
name="line.220"></a>
-<span class="sourceLineNo">221</span>      throw re;<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    } catch (Exception e) {<a 
name="line.222"></a>
-<span class="sourceLineNo">223</span>      throw new 
UndeclaredThrowableException(e,<a name="line.223"></a>
-<span class="sourceLineNo">224</span>          "Unexpected exception obtaining 
token for user "+user.getName());<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    }<a name="line.225"></a>
-<span class="sourceLineNo">226</span>  }<a name="line.226"></a>
-<span class="sourceLineNo">227</span><a name="line.227"></a>
-<span class="sourceLineNo">228</span>  /**<a name="line.228"></a>
-<span class="sourceLineNo">229</span>   * Checks for an authentication token 
for the given user, obtaining a new token if necessary,<a name="line.229"></a>
-<span class="sourceLineNo">230</span>   * and adds it to the credentials for 
the given map reduce job.<a name="line.230"></a>
-<span class="sourceLineNo">231</span>   *<a name="line.231"></a>
-<span class="sourceLineNo">232</span>   * @param conn The HBase cluster 
connection<a name="line.232"></a>
-<span class="sourceLineNo">233</span>   * @param user The user for whom to 
obtain the token<a name="line.233"></a>
-<span class="sourceLineNo">234</span>   * @param job The job configuration in 
which the token should be stored<a name="line.234"></a>
-<span class="sourceLineNo">235</span>   * @throws IOException If making a 
remote call to the authentication service fails<a name="line.235"></a>
-<span class="sourceLineNo">236</span>   * @throws InterruptedException If 
executing as the given user is interrupted<a name="line.236"></a>
-<span class="sourceLineNo">237</span>   */<a name="line.237"></a>
-<span class="sourceLineNo">238</span>  public static void addTokenForJob(final 
Connection conn, final JobConf job, User user)<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      throws IOException, 
InterruptedException {<a name="line.239"></a>
-<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span>    
Token&lt;AuthenticationTokenIdentifier&gt; token = 
getAuthToken(conn.getConfiguration(), user);<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    if (token == null) {<a 
name="line.242"></a>
-<span class="sourceLineNo">243</span>      token = obtainToken(conn, user);<a 
name="line.243"></a>
-<span class="sourceLineNo">244</span>    }<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    
job.getCredentials().addToken(token.getService(), token);<a name="line.245"></a>
-<span class="sourceLineNo">246</span>  }<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span>  /**<a name="line.248"></a>
-<span class="sourceLineNo">249</span>   * Checks for an authentication token 
for the given user, obtaining a new token if necessary,<a name="line.249"></a>
-<span class="sourceLineNo">250</span>   * and adds it to the credentials for 
the given map reduce job.<a name="line.250"></a>
-<span class="sourceLineNo">251</span>   *<a name="line.251"></a>
-<span class="sourceLineNo">252</span>   * @param conn The HBase cluster 
connection<a name="line.252"></a>
-<span class="sourceLineNo">253</span>   * @param user The user for whom to 
obtain the token<a name="line.253"></a>
-<span class="sourceLineNo">254</span>   * @param job The job instance in which 
the token should be stored<a name="line.254"></a>
-<span class="sourceLineNo">255</span>   * @throws IOException If making a 
remote call to the authentication service fails<a name="line.255"></a>
-<span class="sourceLineNo">256</span>   * @throws InterruptedException If 
executing as the given user is interrupted<a name="line.256"></a>
-<span class="sourceLineNo">257</span>   */<a name="line.257"></a>
-<span class="sourceLineNo">258</span>  public static void addTokenForJob(final 
Connection conn, User user, Job job)<a name="line.258"></a>
-<span class="sourceLineNo">259</span>      throws IOException, 
InterruptedException {<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    
Token&lt;AuthenticationTokenIdentifier&gt; token = 
getAuthToken(conn.getConfiguration(), user);<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    if (token == null) {<a 
name="line.261"></a>
-<span class="sourceLineNo">262</span>      token = obtainToken(conn, user);<a 
name="line.262"></a>
-<span class="sourceLineNo">263</span>    }<a name="line.263"></a>
-<span class="sourceLineNo">264</span>    
job.getCredentials().addToken(token.getService(), token);<a name="line.264"></a>
-<span class="sourceLineNo">265</span>  }<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span>  /**<a name="line.267"></a>
-<span class="sourceLineNo">268</span>   * Checks if an authentication tokens 
exists for the connected cluster,<a name="line.268"></a>
-<span class="sourceLineNo">269</span>   * obtaining one if needed and adding 
it to the user's credentials.<a name="line.269"></a>
-<span class="sourceLineNo">270</span>   *<a name="line.270"></a>
-<span class="sourceLineNo">271</span>   * @param conn The HBase cluster 
connection<a name="line.271"></a>
-<span class="sourceLineNo">272</span>   * @param user The user for whom to 
obtain the token<a name="line.272"></a>
-<span class="sourceLineNo">273</span>   * @throws IOException If making a 
remote call to the authentication service fails<a name="line.273"></a>
-<span class="sourceLineNo">274</span>   * @throws InterruptedException If 
executing as the given user is interrupted<a name="line.274"></a>
-<span class="sourceLineNo">275</span>   * @return true if the token was added, 
false if it already existed<a name="line.275"></a>
-<span class="sourceLineNo">276</span>   */<a name="line.276"></a>
-<span class="sourceLineNo">277</span>  public static boolean 
addTokenIfMissing(Connection conn, User user)<a name="line.277"></a>
-<span class="sourceLineNo">278</span>      throws IOException, 
InterruptedException {<a name="line.278"></a>
-<span class="sourceLineNo">279</span>    
Token&lt;AuthenticationTokenIdentifier&gt; token = 
getAuthToken(conn.getConfiguration(), user);<a name="line.279"></a>
-<span class="sourceLineNo">280</span>    if (token == null) {<a 
name="line.280"></a>
-<span class="sourceLineNo">281</span>      token = obtainToken(conn, user);<a 
name="line.281"></a>
-<span class="sourceLineNo">282</span>      
user.getUGI().addToken(token.getService(), token);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>      return true;<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    }<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    return false;<a name="line.285"></a>
-<span class="sourceLineNo">286</span>  }<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>   * Get the authentication token of the 
user for the cluster specified in the configuration<a name="line.289"></a>
-<span class="sourceLineNo">290</span>   * @return null if the user does not 
have the token, otherwise the auth token for the cluster.<a name="line.290"></a>
-<span class="sourceLineNo">291</span>   */<a name="line.291"></a>
-<span class="sourceLineNo">292</span>  private static 
Token&lt;AuthenticationTokenIdentifier&gt; getAuthToken(Configuration conf, 
User user)<a name="line.292"></a>
-<span class="sourceLineNo">293</span>      throws IOException, 
InterruptedException {<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    ZooKeeperWatcher zkw = new 
ZooKeeperWatcher(conf, "TokenUtil-getAuthToken", null);<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    try {<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      String clusterId = 
ZKClusterId.readClusterIdZNode(zkw);<a name="line.296"></a>
-<span class="sourceLineNo">297</span>      if (clusterId == null) {<a 
name="line.297"></a>
-<span class="sourceLineNo">298</span>        throw new IOException("Failed to 
get cluster ID");<a name="line.298"></a>
-<span class="sourceLineNo">299</span>      }<a name="line.299"></a>
-<span class="sourceLineNo">300</span>      return new 
AuthenticationTokenSelector().selectToken(new Text(clusterId), 
user.getTokens());<a name="line.300"></a>
-<span class="sourceLineNo">301</span>    } catch (KeeperException e) {<a 
name="line.301"></a>
-<span class="sourceLineNo">302</span>      throw new IOException(e);<a 
name="line.302"></a>
-<span class="sourceLineNo">303</span>    } finally {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>      zkw.close();<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    }<a name="line.305"></a>
-<span class="sourceLineNo">306</span>  }<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>   * Converts a protobuf Token message 
back into a Token instance.<a name="line.309"></a>
-<span class="sourceLineNo">310</span>   *<a name="line.310"></a>
-<span class="sourceLineNo">311</span>   * @param proto the protobuf Token 
message<a name="line.311"></a>
-<span class="sourceLineNo">312</span>   * @return the Token instance<a 
name="line.312"></a>
-<span class="sourceLineNo">313</span>   */<a name="line.313"></a>
-<span class="sourceLineNo">314</span>  public static 
Token&lt;AuthenticationTokenIdentifier&gt; toToken(AuthenticationProtos.Token 
proto) {<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    return new Token&lt;&gt;(<a 
name="line.315"></a>
-<span class="sourceLineNo">316</span>        proto.hasIdentifier() ? 
proto.getIdentifier().toByteArray() : null,<a name="line.316"></a>
-<span class="sourceLineNo">317</span>        proto.hasPassword() ? 
proto.getPassword().toByteArray() : null,<a name="line.317"></a>
-<span class="sourceLineNo">318</span>        
AuthenticationTokenIdentifier.AUTH_TOKEN_TYPE,<a name="line.318"></a>
-<span class="sourceLineNo">319</span>        proto.hasService() ? new 
Text(proto.getService().toStringUtf8()) : null);<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">116</span>  private static Text 
getClusterId(Token&lt;AuthenticationTokenIdentifier&gt; token)<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>      throws IOException {<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>    return token.getService() != null<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>        ? token.getService() : new 
Text("default");<a name="line.119"></a>
+<span class="sourceLineNo">120</span>  }<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span>  /**<a name="line.122"></a>
+<span class="sourceLineNo">123</span>   * Obtain an authentication token for 
the given user and add it to the<a name="line.123"></a>
+<span class="sourceLineNo">124</span>   * user's credentials.<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>   * @param conn The HBase cluster 
connection<a name="line.125"></a>
+<span class="sourceLineNo">126</span>   * @param user The user for whom to 
obtain the token<a name="line.126"></a>
+<span class="sourceLineNo">127</span>   * @throws IOException If making a 
remote call to the authentication service fails<a name="line.127"></a>
+<span class="sourceLineNo">128</span>   * @throws InterruptedException If 
executing as the given user is interrupted<a name="line.128"></a>
+<span class="sourceLineNo">129</span>   */<a name="line.129"></a>
+<span class="sourceLineNo">130</span>  public static void 
obtainAndCacheToken(final Connection conn,<a name="line.130"></a>
+<span class="sourceLineNo">131</span>      User user)<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      throws IOException, 
InterruptedException {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    try {<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      
Token&lt;AuthenticationTokenIdentifier&gt; token = obtainToken(conn, user);<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span>      if (token == null) {<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>        throw new IOException("No token 
returned for user " + user.getName());<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      }<a name="line.138"></a>
+<span class="sourceLineNo">139</span>      if (LOG.isDebugEnabled()) {<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span>        LOG.debug("Obtained token " + 
token.getKind().toString() + " for user " +<a name="line.140"></a>
+<span class="sourceLineNo">141</span>            user.getName());<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span>      }<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      user.addToken(token);<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span>    } catch (IOException ioe) {<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>      throw ioe;<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    } catch (InterruptedException ie) {<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span>      throw ie;<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    } catch (RuntimeException re) {<a 
name="line.148"></a>
+<span class="sourceLineNo">149</span>      throw re;<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    } catch (Exception e) {<a 
name="line.150"></a>
+<span class="sourceLineNo">151</span>      throw new 
UndeclaredThrowableException(e,<a name="line.151"></a>
+<span class="sourceLineNo">152</span>          "Unexpected exception obtaining 
token for user " + user.getName());<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    }<a name="line.153"></a>
+<span class="sourceLineNo">154</span>  }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span>  /**<a name="line.156"></a>
+<span class="sourceLineNo">157</span>   * Obtain an authentication token on 
behalf of the given user and add it to<a name="line.157"></a>
+<span class="sourceLineNo">158</span>   * the credentials for the given map 
reduce job.<a name="line.158"></a>
+<span class="sourceLineNo">159</span>   * @param conn The HBase cluster 
connection<a name="line.159"></a>
+<span class="sourceLineNo">160</span>   * @param user The user for whom to 
obtain the token<a name="line.160"></a>
+<span class="sourceLineNo">161</span>   * @param job The job instance in which 
the token should be stored<a name="line.161"></a>
+<span class="sourceLineNo">162</span>   * @throws IOException If making a 
remote call to the authentication service fails<a name="line.162"></a>
+<span class="sourceLineNo">163</span>   * @throws InterruptedException If 
executing as the given user is interrupted<a name="line.163"></a>
+<span class="sourceLineNo">164</span>   */<a name="line.164"></a>
+<span class="sourceLineNo">165</span>  public static void 
obtainTokenForJob(final Connection conn,<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      User user, Job job)<a 
name="line.166"></a>
+<span class="sourceLineNo">167</span>      throws IOException, 
InterruptedException {<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    try {<a name="line.168"></a>
+<span class="sourceLineNo">169</span>      
Token&lt;AuthenticationTokenIdentifier&gt; token = obtainToken(conn, user);<a 
name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span>      if (token == null) {<a 
name="line.171"></a>
+<span class="sourceLineNo">172</span>        throw new IOException("No token 
returned for user " + user.getName());<a name="line.172"></a>
+<span class="sourceLineNo">173</span>      }<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      Text clusterId = 
getClusterId(token);<a name="line.174"></a>
+<span class="sourceLineNo">175</span>      if (LOG.isDebugEnabled()) {<a 
name="line.175"></a>
+<span class="sourceLineNo">176</span>        LOG.debug("Obtained token " + 
token.getKind().toString() + " for user " +<a name="line.176"></a>
+<span class="sourceLineNo">177</span>            user.getName() + " on cluster 
" + clusterId.toString());<a name="line.177"></a>
+<span class="sourceLineNo">178</span>      }<a name="line.178"></a>
+<span class="sourceLineNo">179</span>      
job.getCredentials().addToken(clusterId, token);<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    } catch (IOException ioe) {<a 
name="line.180"></a>
+<span class="sourceLineNo">181</span>      throw ioe;<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    } catch (InterruptedException ie) {<a 
name="line.182"></a>
+<span class="sourceLineNo">183</span>      throw ie;<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    } catch (RuntimeException re) {<a 
name="line.184"></a>
+<span class="sourceLineNo">185</span>      throw re;<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    } catch (Exception e) {<a 
name="line.186"></a>
+<span class="sourceLineNo">187</span>      throw new 
UndeclaredThrowableException(e,<a name="line.187"></a>
+<span class="sourceLineNo">188</span>          "Unexpected exception obtaining 
token for user " + user.getName());<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    }<a name="line.189"></a>
+<span class="sourceLineNo">190</span>  }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span>  /**<a name="line.192"></a>
+<span class="sourceLineNo">193</span>   * Obtain an authentication token on 
behalf of the given user and add it to<a name="line.193"></a>
+<span class="sourceLineNo">194</span>   * the credentials for the given map 
reduce job.<a name="line.194"></a>
+<span class="sourceLineNo">195</span>   * @param conn The HBase cluster 
connection<a name="line.195"></a>
+<span class="sourceLineNo">196</span>   * @param user The user for whom to 
obtain the token<a name="line.196"></a>
+<span class="sourceLineNo">197</span>   * @param job The job configuration in 
which the token should be stored<a name="line.197"></a>
+<span class="sourceLineNo">198</span>   * @throws IOException If making a 
remote call to the authentication service fails<a name="line.198"></a>
+<span class="sourceLineNo">199</span>   * @throws InterruptedException If 
executing as the given user is interrupted<a name="line.199"></a>
+<span class="sourceLineNo">200</span>   */<a name="line.200"></a>
+<span class="sourceLineNo">201</span>  public static void 
obtainTokenForJob(final Connection conn, final JobConf job, User user)<a 
name="line.201"></a>
+<span class="sourceLineNo">202</span>      throws IOException, 
InterruptedException {<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    try {<a name="line.203"></a>
+<span class="sourceLineNo">204</span>      
Token&lt;AuthenticationTokenIdentifier&gt; token = obtainToken(conn, user);<a 
name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span>      if (token == null) {<a 
name="line.206"></a>
+<span class="sourceLineNo">207</span>        throw new IOException("No token 
returned for user " + user.getName());<a name="line.207"></a>
+<span class="sourceLineNo">208</span>      }<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      Text clusterId = 
getClusterId(token);<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      if (LOG.isDebugEnabled()) {<a 
name="line.210"></a>
+<span class="sourceLineNo">211</span>        LOG.debug("Obtained token " + 
token.getKind().toString() + " for user " +<a name="line.211"></a>
+<span class="sourceLineNo">212</span>            user.getName() + " on cluster 
" + clusterId.toString());<a name="line.212"></a>
+<span class="sourceLineNo">213</span>      }<a name="line.213"></a>
+<span class="sourceLineNo">214</span>      
job.getCredentials().addToken(clusterId, token);<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    } catch (IOException ioe) {<a 
name="line.215"></a>
+<span class="sourceLineNo">216</span>      throw ioe;<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    } catch (InterruptedException ie) {<a 
name="line.217"></a>
+<span class="sourceLineNo">218</span>      throw ie;<a name="line.218"></a>
+<span class="sourceLineNo">219</span>    } catch (RuntimeException re) {<a 
name="line.219"></a>
+<span class="sourceLineNo">220</span>      throw re;<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    } catch (Exception e) {<a 
name="line.221"></a>
+<span class="sourceLineNo">222</span>      throw new 
UndeclaredThrowableException(e,<a name="line.222"></a>
+<span class="sourceLineNo">223</span>          "Unexpected exception obtaining 
token for user "+user.getName());<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    }<a name="line.224"></a>
+<span class="sourceLineNo">225</span>  }<a name="line.225"></a>
+<span class="sourceLineNo">226</span><a name="line.226"></a>
+<span class="sourceLineNo">227</span>  /**<a name="line.227"></a>
+<span class="sourceLineNo">228</span>   * Checks for an authentication token 
for the given user, obtaining a new token if necessary,<a name="line.228"></a>
+<span class="sourceLineNo">229</span>   * and adds it to the credentials for 
the given map reduce job.<a name="line.229"></a>
+<span class="sourceLineNo">230</span>   *<a name="line.230"></a>
+<span class="sourceLineNo">231</span>   * @param conn The HBase cluster 
connection<a name="line.231"></a>
+<span class="sourceLineNo">232</span>   * @param user The user for whom to 
obtain the token<a name="line.232"></a>
+<span class="sourceLineNo">233</span>   * @param job The job configuration in 
which the token should be stored<a name="line.233"></a>
+<span class="sourceLineNo">234</span>   * @throws IOException If making a 
remote call to the authentication service fails<a name="line.234"></a>
+<span class="sourceLineNo">235</span>   * @throws InterruptedException If 
executing as the given user is interrupted<a name="line.235"></a>
+<span class="sourceLineNo">236</span>   */<a name="line.236"></a>
+<span class="sourceLineNo">237</span>  public static void addTokenForJob(final 
Connection conn, final JobConf job, User user)<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      throws IOException, 
InterruptedException {<a name="line.238"></a>
+<span class="sourceLineNo">239</span><a name="line.239"></a>
+<span class="sourceLineNo">240</span>    
Token&lt;AuthenticationTokenIdentifier&gt; token = 
getAuthToken(conn.getConfiguration(), user);<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    if (token == null) {<a 
name="line.241"></a>
+<span class="sourceLineNo">242</span>      token = obtainToken(conn, user);<a 
name="line.242"></a>
+<span class="sourceLineNo">243</span>    }<a name="line.243"></a>
+<span class="sourceLineNo">244</span>    
job.getCredentials().addToken(token.getService(), token);<a name="line.244"></a>
+<span class="sourceLineNo">245</span>  }<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span>  /**<a name="line.247"></a>
+<span class="sourceLineNo">248</span>   * Checks for an authentication token 
for the given user, obtaining a new token if necessary,<a name="line.248"></a>
+<span class="sourceLineNo">249</span>   * and adds it to the credentials for 
the given map reduce job.<a name="line.249"></a>
+<span class="sourceLineNo">250</span>   *<a name="line.250"></a>
+<span class="sourceLineNo">251</span>   * @param conn The HBase cluster 
connection<a name="line.251"></a>
+<span class="sourceLineNo">252</span>   * @param user The user for whom to 
obtain the token<a name="line.252"></a>
+<span class="sourceLineNo">253</span>   * @param job The job instance in which 
the token should be stored<a name="line.253"></a>
+<span class="sourceLineNo">254</span>   * @throws IOException If making a 
remote call to the authentication service fails<a name="line.254"></a>
+<span class="sourceLineNo">255</span>   * @throws InterruptedException If 
executing as the given user is interrupted<a name="line.255"></a>
+<span class="sourceLineNo">256</span>   */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>  public static void addTokenForJob(final 
Connection conn, User user, Job job)<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      throws IOException, 
InterruptedException {<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    
Token&lt;AuthenticationTokenIdentifier&gt; token = 
getAuthToken(conn.getConfiguration(), user);<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    if (token == null) {<a 
name="line.260"></a>
+<span class="sourceLineNo">261</span>      token = obtainToken(conn, user);<a 
name="line.261"></a>
+<span class="sourceLineNo">262</span>    }<a name="line.262"></a>
+<span class="sourceLineNo">263</span>    
job.getCredentials().addToken(token.getService(), token);<a name="line.263"></a>
+<span class="sourceLineNo">264</span>  }<a name="line.264"></a>
+<span class="sourceLineNo">265</span><a name="line.265"></a>
+<span class="sourceLineNo">266</span>  /**<a name="line.266"></a>
+<span class="sourceLineNo">267</span>   * Checks if an authentication tokens 
exists for the connected cluster,<a name="line.267"></a>
+<span class="sourceLineNo">268</span>   * obtaining one if needed and adding 
it to the user's credentials.<a name="line.268"></a>
+<span class="sourceLineNo">269</span>   *<a name="line.269"></a>
+<span class="sourceLineNo">270</span>   * @param conn The HBase cluster 
connection<a name="line.270"></a>
+<span class="sourceLineNo">271</span>   * @param user The user for whom to 
obtain the token<a name="line.271"></a>
+<span class="sourceLineNo">272</span>   * @throws IOException If making a 
remote call to the authentication service fails<a name="line.272"></a>
+<span class="sourceLineNo">273</span>   * @throws InterruptedException If 
executing as the given user is interrupted<a name="line.273"></a>
+<span class="sourceLineNo">274</span>   * @return true if the token was added, 
false if it already existed<a name="line.274"></a>
+<span class="sourceLineNo">275</span>   */<a name="line.275"></a>
+<span class="sourceLineNo">276</span>  public static boolean 
addTokenIfMissing(Connection conn, User user)<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      throws IOException, 
InterruptedException {<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    
Token&lt;AuthenticationTokenIdentifier&gt; token = 
getAuthToken(conn.getConfiguration(), user);<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    if (token == null) {<a 
name="line.279"></a>
+<span class="sourceLineNo">280</span>      token = obtainToken(conn, user);<a 
name="line.280"></a>
+<span class="sourceLineNo">281</span>      
user.getUGI().addToken(token.getService(), token);<a name="line.281"></a>
+<span class="sourceLineNo">282</span>      return true;<a name="line.282"></a>
+<span class="sourceLineNo">283</span>    }<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    return false;<a name="line.284"></a>
+<span class="sourceLineNo">285</span>  }<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span>  /**<a name="line.287"></a>
+<span class="sourceLineNo">288</span>   * Get the authentication token of the 
user for the cluster specified in the configuration<a name="line.288"></a>
+<span class="sourceLineNo">289</span>   * @return null if the user does not 
have the token, otherwise the auth token for the cluster.<a name="line.289"></a>
+<span class="sourceLineNo">290</span>   */<a name="line.290"></a>
+<span class="sourceLineNo">291</span>  private static 
Token&lt;AuthenticationTokenIdentifier&gt; getAuthToken(Configuration conf, 
User user)<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      throws IOException, 
InterruptedException {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    ZooKeeperWatcher zkw = new 
ZooKeeperWatcher(conf, "TokenUtil-getAuthToken", null);<a name="line.293"></a>
+<span class="sourceLineNo">294</span>    try {<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      String clusterId = 
ZKClusterId.readClusterIdZNode(zkw);<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      if (clusterId == null) {<a 
name="line.296"></a>
+<span class="sourceLineNo">297</span>        throw new IOException("Failed to 
get cluster ID");<a name="line.297"></a>
+<span class="sourceLineNo">298</span>      }<a name="line.298"></a>
+<span class="sourceLineNo">299</span>      return new 
AuthenticationTokenSelector().selectToken(new Text(clusterId), 
user.getTokens());<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    } catch (KeeperException e) {<a 
name="line.300"></a>
+<span class="sourceLineNo">301</span>      throw new IOException(e);<a 
name="line.301"></a>
+<span class="sourceLineNo">302</span>    } finally {<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      zkw.close();<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><a name="line.306"></a>
+<span class="sourceLineNo">307</span>  /**<a name="line.307"></a>
+<span class="sourceLineNo">308</span>   * Converts a protobuf Token message 
back into a Token instance.<a name="line.308"></a>
+<span class="sourceLineNo">309</span>   *<a name="line.309"></a>
+<span class="sourceLineNo">310</span>   * @param proto the protobuf Token 
message<a name="line.310"></a>
+<span class="sourceLineNo">311</span>   * @return the Token instance<a 
name="line.311"></a>
+<span class="sourceLineNo">312</span>   */<a name="line.312"></a>
+<span class="sourceLineNo">313</span>  public static 
Token&lt;AuthenticationTokenIdentifier&gt; toToken(AuthenticationProtos.Token 
proto) {<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    return new Token&lt;&gt;(<a 
name="line.314"></a>
+<span class="sourceLineNo">315</span>        proto.hasIdentifier() ? 
proto.getIdentifier().toByteArray() : null,<a name="line.315"></a>
+<span class="sourceLineNo">316</span>        proto.hasPassword() ? 
proto.getPassword().toByteArray() : null,<a name="line.316"></a>
+<span class="sourceLineNo">317</span>        
AuthenticationTokenIdentifier.AUTH_TOKEN_TYPE,<a name="line.317"></a>
+<span class="sourceLineNo">318</span>        proto.hasService() ? new 
Text(proto.getService().toStringUtf8()) : null);<a name="line.318"></a>
+<span class="sourceLineNo">319</span>  }<a name="line.319"></a>
+<span class="sourceLineNo">320</span>}<a name="line.320"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/6fbeb554/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 1b5d817..d74a0b8 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
@@ -69,15 +69,15 @@
 <span class="sourceLineNo">061</span>  requiredArguments = {<a 
name="line.61"></a>
 <span class="sourceLineNo">062</span>    @org.jamon.annotations.Argument(name 
= "master", type = "HMaster")},<a name="line.62"></a>
 <span class="sourceLineNo">063</span>  optionalArguments = {<a 
name="line.63"></a>
-<span class="sourceLineNo">064</span>    @org.jamon.annotations.Argument(name 
= "filter", type = "String"),<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    @org.jamon.annotations.Argument(name 
= "deadServers", type = "Set&lt;ServerName&gt;"),<a name="line.65"></a>
+<span class="sourceLineNo">064</span>    @org.jamon.annotations.Argument(name 
= "catalogJanitorEnabled", type = "boolean"),<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    @org.jamon.annotations.Argument(name 
= "servers", type = "List&lt;ServerName&gt;"),<a name="line.65"></a>
 <span class="sourceLineNo">066</span>    @org.jamon.annotations.Argument(name 
= "frags", type = "Map&lt;String,Integer&gt;"),<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">067</span>    @org.jamon.annotations.Argument(name 
= "serverManager", type = "ServerManager"),<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 
= "catalogJanitorEnabled", type = "boolean"),<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    @org.jamon.annotations.Argument(name 
= "servers", type = "List&lt;ServerName&gt;"),<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    @org.jamon.annotations.Argument(name 
= "format", type = "String")})<a name="line.72"></a>
+<span class="sourceLineNo">069</span>    @org.jamon.annotations.Argument(name 
= "format", type = "String"),<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    @org.jamon.annotations.Argument(name 
= "deadServers", type = "Set&lt;ServerName&gt;"),<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    @org.jamon.annotations.Argument(name 
= "metaLocation", type = "ServerName"),<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    @org.jamon.annotations.Argument(name 
= "filter", type = "String")})<a name="line.72"></a>
 <span class="sourceLineNo">073</span>public class MasterStatusTmpl<a 
name="line.73"></a>
 <span class="sourceLineNo">074</span>  extends 
org.jamon.AbstractTemplateProxy<a name="line.74"></a>
 <span class="sourceLineNo">075</span>{<a name="line.75"></a>
@@ -118,40 +118,40 @@
 <span class="sourceLineNo">110</span>      return m_master;<a 
name="line.110"></a>
 <span class="sourceLineNo">111</span>    }<a name="line.111"></a>
 <span class="sourceLineNo">112</span>    private HMaster m_master;<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>    // 26, 1<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    public void setFilter(String 
filter)<a name="line.114"></a>
+<span class="sourceLineNo">113</span>    // 25, 1<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    public void 
setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.114"></a>
 <span class="sourceLineNo">115</span>    {<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      // 26, 1<a name="line.116"></a>
-<span class="sourceLineNo">117</span>      m_filter = filter;<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>      m_filter__IsNotDefault = true;<a 
name="line.118"></a>
+<span class="sourceLineNo">116</span>      // 25, 1<a name="line.116"></a>
+<span class="sourceLineNo">117</span>      m_catalogJanitorEnabled = 
catalogJanitorEnabled;<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      
m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.118"></a>
 <span class="sourceLineNo">119</span>    }<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    public String getFilter()<a 
name="line.120"></a>
+<span class="sourceLineNo">120</span>    public boolean 
getCatalogJanitorEnabled()<a name="line.120"></a>
 <span class="sourceLineNo">121</span>    {<a name="line.121"></a>
-<span class="sourceLineNo">122</span>      return m_filter;<a 
name="line.122"></a>
+<span class="sourceLineNo">122</span>      return m_catalogJanitorEnabled;<a 
name="line.122"></a>
 <span class="sourceLineNo">123</span>    }<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    private String m_filter;<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>    public boolean 
getFilter__IsNotDefault()<a name="line.125"></a>
+<span class="sourceLineNo">124</span>    private boolean 
m_catalogJanitorEnabled;<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    public boolean 
getCatalogJanitorEnabled__IsNotDefault()<a name="line.125"></a>
 <span class="sourceLineNo">126</span>    {<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      return m_filter__IsNotDefault;<a 
name="line.127"></a>
+<span class="sourceLineNo">127</span>      return 
m_catalogJanitorEnabled__IsNotDefault;<a name="line.127"></a>
 <span class="sourceLineNo">128</span>    }<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    private boolean 
m_filter__IsNotDefault;<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    // 24, 1<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    public void 
setDeadServers(Set&lt;ServerName&gt; deadServers)<a name="line.131"></a>
+<span class="sourceLineNo">129</span>    private boolean 
m_catalogJanitorEnabled__IsNotDefault;<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    // 23, 1<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    public void 
setServers(List&lt;ServerName&gt; servers)<a name="line.131"></a>
 <span class="sourceLineNo">132</span>    {<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      // 24, 1<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      m_deadServers = deadServers;<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>      m_deadServers__IsNotDefault = 
true;<a name="line.135"></a>
+<span class="sourceLineNo">133</span>      // 23, 1<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      m_servers = servers;<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span>      m_servers__IsNotDefault = true;<a 
name="line.135"></a>
 <span class="sourceLineNo">136</span>    }<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    public Set&lt;ServerName&gt; 
getDeadServers()<a name="line.137"></a>
+<span class="sourceLineNo">137</span>    public List&lt;ServerName&gt; 
getServers()<a name="line.137"></a>
 <span class="sourceLineNo">138</span>    {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      return m_deadServers;<a 
name="line.139"></a>
+<span class="sourceLineNo">139</span>      return m_servers;<a 
name="line.139"></a>
 <span class="sourceLineNo">140</span>    }<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    private Set&lt;ServerName&gt; 
m_deadServers;<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    public boolean 
getDeadServers__IsNotDefault()<a name="line.142"></a>
+<span class="sourceLineNo">141</span>    private List&lt;ServerName&gt; 
m_servers;<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    public boolean 
getServers__IsNotDefault()<a name="line.142"></a>
 <span class="sourceLineNo">143</span>    {<a name="line.143"></a>
-<span class="sourceLineNo">144</span>      return 
m_deadServers__IsNotDefault;<a name="line.144"></a>
+<span class="sourceLineNo">144</span>      return m_servers__IsNotDefault;<a 
name="line.144"></a>
 <span class="sourceLineNo">145</span>    }<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    private boolean 
m_deadServers__IsNotDefault;<a name="line.146"></a>
+<span class="sourceLineNo">146</span>    private boolean 
m_servers__IsNotDefault;<a name="line.146"></a>
 <span class="sourceLineNo">147</span>    // 21, 1<a name="line.147"></a>
 <span class="sourceLineNo">148</span>    public void 
setFrags(Map&lt;String,Integer&gt; frags)<a name="line.148"></a>
 <span class="sourceLineNo">149</span>    {<a name="line.149"></a>
@@ -169,23 +169,23 @@
 <span class="sourceLineNo">161</span>      return m_frags__IsNotDefault;<a 
name="line.161"></a>
 <span class="sourceLineNo">162</span>    }<a name="line.162"></a>
 <span class="sourceLineNo">163</span>    private boolean 
m_frags__IsNotDefault;<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    // 22, 1<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    public void 
setMetaLocation(ServerName metaLocation)<a name="line.165"></a>
+<span class="sourceLineNo">164</span>    // 28, 1<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    public void 
setServerManager(ServerManager serverManager)<a name="line.165"></a>
 <span class="sourceLineNo">166</span>    {<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      // 22, 1<a name="line.167"></a>
-<span class="sourceLineNo">168</span>      m_metaLocation = metaLocation;<a 
name="line.168"></a>
-<span class="sourceLineNo">169</span>      m_metaLocation__IsNotDefault = 
true;<a name="line.169"></a>
+<span class="sourceLineNo">167</span>      // 28, 1<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      m_serverManager = serverManager;<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span>      m_serverManager__IsNotDefault = 
true;<a name="line.169"></a>
 <span class="sourceLineNo">170</span>    }<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    public ServerName getMetaLocation()<a 
name="line.171"></a>
+<span class="sourceLineNo">171</span>    public ServerManager 
getServerManager()<a name="line.171"></a>
 <span class="sourceLineNo">172</span>    {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      return m_metaLocation;<a 
name="line.173"></a>
+<span class="sourceLineNo">173</span>      return m_serverManager;<a 
name="line.173"></a>
 <span class="sourceLineNo">174</span>    }<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    private ServerName m_metaLocation;<a 
name="line.175"></a>
-<span class="sourceLineNo">176</span>    public boolean 
getMetaLocation__IsNotDefault()<a name="line.176"></a>
+<span class="sourceLineNo">175</span>    private ServerManager 
m_serverManager;<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    public boolean 
getServerManager__IsNotDefault()<a name="line.176"></a>
 <span class="sourceLineNo">177</span>    {<a name="line.177"></a>
-<span class="sourceLineNo">178</span>      return 
m_metaLocation__IsNotDefault;<a name="line.178"></a>
+<span class="sourceLineNo">178</span>      return 
m_serverManager__IsNotDefault;<a name="line.178"></a>
 <span class="sourceLineNo">179</span>    }<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    private boolean 
m_metaLocation__IsNotDefault;<a name="line.180"></a>
+<span class="sourceLineNo">180</span>    private boolean 
m_serverManager__IsNotDefault;<a name="line.180"></a>
 <span class="sourceLineNo">181</span>    // 29, 1<a name="line.181"></a>
 <span class="sourceLineNo">182</span>    public void 
setAssignmentManager(AssignmentManager assignmentManager)<a name="line.182"></a>
 <span class="sourceLineNo">183</span>    {<a name="line.183"></a>
@@ -203,74 +203,74 @@
 <span class="sourceLineNo">195</span>      return 
m_assignmentManager__IsNotDefault;<a name="line.195"></a>
 <span class="sourceLineNo">196</span>    }<a name="line.196"></a>
 <span class="sourceLineNo">197</span>    private boolean 
m_assignmentManager__IsNotDefault;<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    // 28, 1<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    public void 
setServerManager(ServerManager serverManager)<a name="line.199"></a>
+<span class="sourceLineNo">198</span>    // 27, 1<a name="line.198"></a>
+<span class="sourceLineNo">199</span>    public void setFormat(String 
format)<a name="line.199"></a>
 <span class="sourceLineNo">200</span>    {<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      // 28, 1<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      m_serverManager = serverManager;<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>      m_serverManager__IsNotDefault = 
true;<a name="line.203"></a>
+<span class="sourceLineNo">201</span>      // 27, 1<a name="line.201"></a>
+<span class="sourceLineNo">202</span>      m_format = format;<a 
name="line.202"></a>
+<span class="sourceLineNo">203</span>      m_format__IsNotDefault = true;<a 
name="line.203"></a>
 <span class="sourceLineNo">204</span>    }<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    public ServerManager 
getServerManager()<a name="line.205"></a>
+<span class="sourceLineNo">205</span>    public String getFormat()<a 
name="line.205"></a>
 <span class="sourceLineNo">206</span>    {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      return m_serverManager;<a 
name="line.207"></a>
+<span class="sourceLineNo">207</span>      return m_format;<a 
name="line.207"></a>
 <span class="sourceLineNo">208</span>    }<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    private ServerManager 
m_serverManager;<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    public boolean 
getServerManager__IsNotDefault()<a name="line.210"></a>
+<span class="sourceLineNo">209</span>    private String m_format;<a 
name="line.209"></a>
+<span class="sourceLineNo">210</span>    public boolean 
getFormat__IsNotDefault()<a name="line.210"></a>
 <span class="sourceLineNo">211</span>    {<a name="line.211"></a>
-<span class="sourceLineNo">212</span>      return 
m_serverManager__IsNotDefault;<a name="line.212"></a>
+<span class="sourceLineNo">212</span>      return m_format__IsNotDefault;<a 
name="line.212"></a>
 <span class="sourceLineNo">213</span>    }<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    private boolean 
m_serverManager__IsNotDefault;<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    // 25, 1<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    public void 
setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.216"></a>
+<span class="sourceLineNo">214</span>    private boolean 
m_format__IsNotDefault;<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    // 24, 1<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    public void 
setDeadServers(Set&lt;ServerName&gt; deadServers)<a name="line.216"></a>
 <span class="sourceLineNo">217</span>    {<a name="line.217"></a>
-<span class="sourceLineNo">218</span>      // 25, 1<a name="line.218"></a>
-<span class="sourceLineNo">219</span>      m_catalogJanitorEnabled = 
catalogJanitorEnabled;<a name="line.219"></a>
-<span class="sourceLineNo">220</span>      
m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.220"></a>
+<span class="sourceLineNo">218</span>      // 24, 1<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      m_deadServers = deadServers;<a 
name="line.219"></a>
+<span class="sourceLineNo">220</span>      m_deadServers__IsNotDefault = 
true;<a name="line.220"></a>
 <span class="sourceLineNo">221</span>    }<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    public boolean 
getCatalogJanitorEnabled()<a name="line.222"></a>
+<span class="sourceLineNo">222</span>    public Set&lt;ServerName&gt; 
getDeadServers()<a name="line.222"></a>
 <span class="sourceLineNo">223</span>    {<a name="line.223"></a>
-<span class="sourceLineNo">224</span>      return m_catalogJanitorEnabled;<a 
name="line.224"></a>
+<span class="sourceLineNo">224</span>      return m_deadServers;<a 
name="line.224"></a>
 <span class="sourceLineNo">225</span>    }<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    private boolean 
m_catalogJanitorEnabled;<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    public boolean 
getCatalogJanitorEnabled__IsNotDefault()<a name="line.227"></a>
+<span class="sourceLineNo">226</span>    private Set&lt;ServerName&gt; 
m_deadServers;<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    public boolean 
getDeadServers__IsNotDefault()<a name="line.227"></a>
 <span class="sourceLineNo">228</span>    {<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      return 
m_catalogJanitorEnabled__IsNotDefault;<a name="line.229"></a>
+<span class="sourceLineNo">229</span>      return 
m_deadServers__IsNotDefault;<a name="line.229"></a>
 <span class="sourceLineNo">230</span>    }<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    private boolean 
m_catalogJanitorEnabled__IsNotDefault;<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    // 23, 1<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    public void 
setServers(List&lt;ServerName&gt; servers)<a name="line.233"></a>
+<span class="sourceLineNo">231</span>    private boolean 
m_deadServers__IsNotDefault;<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    // 22, 1<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    public void 
setMetaLocation(ServerName metaLocation)<a name="line.233"></a>
 <span class="sourceLineNo">234</span>    {<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      // 23, 1<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      m_servers = servers;<a 
name="line.236"></a>
-<span class="sourceLineNo">237</span>      m_servers__IsNotDefault = true;<a 
name="line.237"></a>
+<span class="sourceLineNo">235</span>      // 22, 1<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      m_metaLocation = metaLocation;<a 
name="line.236"></a>
+<span class="sourceLineNo">237</span>      m_metaLocation__IsNotDefault = 
true;<a name="line.237"></a>
 <span class="sourceLineNo">238</span>    }<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    public List&lt;ServerName&gt; 
getServers()<a name="line.239"></a>
+<span class="sourceLineNo">239</span>    public ServerName getMetaLocation()<a 
name="line.239"></a>
 <span class="sourceLineNo">240</span>    {<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      return m_servers;<a 
name="line.241"></a>
+<span class="sourceLineNo">241</span>      return m_metaLocation;<a 
name="line.241"></a>
 <span class="sourceLineNo">242</span>    }<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    private List&lt;ServerName&gt; 
m_servers;<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    public boolean 
getServers__IsNotDefault()<a name="line.244"></a>
+<span class="sourceLineNo">243</span>    private ServerName m_metaLocation;<a 
name="line.243"></a>
+<span class="sourceLineNo">244</span>    public boolean 
getMetaLocation__IsNotDefault()<a name="line.244"></a>
 <span class="sourceLineNo">245</span>    {<a name="line.245"></a>
-<span class="sourceLineNo">246</span>      return m_servers__IsNotDefault;<a 
name="line.246"></a>
+<span class="sourceLineNo">246</span>      return 
m_metaLocation__IsNotDefault;<a name="line.246"></a>
 <span class="sourceLineNo">247</span>    }<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    private boolean 
m_servers__IsNotDefault;<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    // 27, 1<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    public void setFormat(String 
format)<a name="line.250"></a>
+<span class="sourceLineNo">248</span>    private boolean 
m_metaLocation__IsNotDefault;<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    // 26, 1<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    public void setFilter(String 
filter)<a name="line.250"></a>
 <span class="sourceLineNo">251</span>    {<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      // 27, 1<a name="line.252"></a>
-<span class="sourceLineNo">253</span>      m_format = format;<a 
name="line.253"></a>
-<span class="sourceLineNo">254</span>      m_format__IsNotDefault = true;<a 
name="line.254"></a>
+<span class="sourceLineNo">252</span>      // 26, 1<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      m_filter = filter;<a 
name="line.253"></a>
+<span class="sourceLineNo">254</span>      m_filter__IsNotDefault = true;<a 
name="line.254"></a>
 <span class="sourceLineNo">255</span>    }<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    public String getFormat()<a 
name="line.256"></a>
+<span class="sourceLineNo">256</span>    public String getFilter()<a 
name="line.256"></a>
 <span class="sourceLineNo">257</span>    {<a name="line.257"></a>
-<span class="sourceLineNo">258</span>      return m_format;<a 
name="line.258"></a>
+<span class="sourceLineNo">258</span>      return m_filter;<a 
name="line.258"></a>
 <span class="sourceLineNo">259</span>    }<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    private String m_format;<a 
name="line.260"></a>
-<span class="sourceLineNo">261</span>    public boolean 
getFormat__IsNotDefault()<a name="line.261"></a>
+<span class="sourceLineNo">260</span>    private String m_filter;<a 
name="line.260"></a>
+<span class="sourceLineNo">261</span>    public boolean 
getFilter__IsNotDefault()<a name="line.261"></a>
 <span class="sourceLineNo">262</span>    {<a name="line.262"></a>
-<span class="sourceLineNo">263</span>      return m_format__IsNotDefault;<a 
name="line.263"></a>
+<span class="sourceLineNo">263</span>      return m_filter__IsNotDefault;<a 
name="line.263"></a>
 <span class="sourceLineNo">264</span>    }<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    private boolean 
m_format__IsNotDefault;<a name="line.265"></a>
+<span class="sourceLineNo">265</span>    private boolean 
m_filter__IsNotDefault;<a name="line.265"></a>
 <span class="sourceLineNo">266</span>  }<a name="line.266"></a>
 <span class="sourceLineNo">267</span>  @Override<a name="line.267"></a>
 <span class="sourceLineNo">268</span>  protected 
org.jamon.AbstractTemplateProxy.ImplData makeImplData()<a name="line.268"></a>
@@ -282,17 +282,17 @@
 <span class="sourceLineNo">274</span>    return (ImplData) 
super.getImplData();<a name="line.274"></a>
 <span class="sourceLineNo">275</span>  }<a name="line.275"></a>
 <span class="sourceLineNo">276</span>  <a name="line.276"></a>
-<span class="sourceLineNo">277</span>  protected String filter;<a 
name="line.277"></a>
-<span class="sourceLineNo">278</span>  public final 
org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String 
p_filter)<a name="line.278"></a>
+<span class="sourceLineNo">277</span>  protected boolean 
catalogJanitorEnabled;<a name="line.277"></a>
+<span class="sourceLineNo">278</span>  public final 
org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl 
setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.278"></a>
 <span class="sourceLineNo">279</span>  {<a name="line.279"></a>
-<span class="sourceLineNo">280</span>    
(getImplData()).setFilter(p_filter);<a name="line.280"></a>
+<span class="sourceLineNo">280</span>    
(getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a 
name="line.280"></a>
 <span class="sourceLineNo">281</span>    return this;<a name="line.281"></a>
 <span class="sourceLineNo">282</span>  }<a name="line.282"></a>
 <span class="sourceLineNo">283</span>  <a name="line.283"></a>
-<span class="sourceLineNo">284</span>  protected Set&lt;ServerName&gt; 
deadServers;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>  public final 
org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl 
setDeadServers(Set&lt;ServerName&gt; p_deadServers)<a name="line.285"></a>
+<span class="sourceLineNo">284</span>  protected List&lt;ServerName&gt; 
servers;<a name="line.284"></a>
+<span class="sourceLineNo">285</span>  public final 
org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl 
setServers(List&lt;ServerName&gt; p_servers)<a name="line.285"></a>
 <span class="sourceLineNo">286</span>  {<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    
(getImplData()).setDeadServers(p_deadServers);<a name="line.287"></a>
+<span class="sourceLineNo">287</span>    
(getImplData()).setServers(p_servers);<a name="line.287"></a>
 <span class="sourceLineNo">288</span>    return this;<a name="line.288"></a>
 <span class="sourceLineNo">289</span>  }<a name="line.289"></a>
 <span class="sourceLineNo">290</span>  <a name="line.290"></a>
@@ -303,10 +303,10 @@
 <span class="sourceLineNo">295</span>    return this;<a name="line.295"></a>
 <span class="sourceLineNo">296</span>  }<a name="line.296"></a>
 <span class="sourceLineNo">297</span>  <a name="line.297"></a>
-<span class="sourceLineNo">298</span>  protected ServerName metaLocation;<a 
name="line.298"></a>
-<span class="sourceLineNo">299</span>  public final 
org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName 
p_metaLocation)<a name="line.299"></a>
+<span class="sourceLineNo">298</span>  protected ServerManager 
serverManager;<a name="line.298"></a>
+<span class="sourceLineNo">299</span>  public final 
org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl 
setServerManager(ServerManager p_serverManager)<a name="line.299"></a>
 <span class="sourceLineNo">300</span>  {<a name="line.300"></a>
-<span class="sourceLineNo">301</span>    
(getImplData()).setMetaLocation(p_metaLocation);<a name="line.301"></a>
+<span class="sourceLineNo">301</span>    
(getImplData()).setServerManager(p_serverManager);<a name="line.301"></a>
 <span class="sourceLineNo">302</span>    return this;<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>
@@ -317,31 +317,31 @@
 <span class="sourceLineNo">309</span>    return this;<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>  protected ServerManager 
serverManager;<a name="line.312"></a>
-<span class="sourceLineNo">313</span>  public final 
org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl 
setServerManager(ServerManager p_serverManager)<a name="line.313"></a>
+<span class="sourceLineNo">312</span>  protected String format;<a 
name="line.312"></a>
+<span class="sourceLineNo">313</span>  public final 
org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String 
p_format)<a name="line.313"></a>
 <span class="sourceLineNo">314</span>  {<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    
(getImplData()).setServerManager(p_serverManager);<a name="line.315"></a>
+<span class="sourceLineNo">315</span>    
(getImplData()).setFormat(p_format);<a name="line.315"></a>
 <span class="sourceLineNo">316</span>    return this;<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>  protected boolean 
catalogJanitorEnabled;<a name="line.319"></a>
-<span class="sourceLineNo">320</span>  public final 
org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl 
setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.320"></a>
+<span class="sourceLineNo">319</span>  protected Set&lt;ServerName&gt; 
deadServers;<a name="line.319"></a>
+<span class="sourceLineNo">320</span>  public final 
org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl 
setDeadServers(Set&lt;ServerName&gt; p_deadServers)<a name="line.320"></a>
 <span class="sourceLineNo">321</span>  {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    
(getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a 
name="line.322"></a>
+<span class="sourceLineNo">322</span>    
(getImplData()).setDeadServers(p_deadServers);<a name="line.322"></a>
 <span class="sourceLineNo">323</span>    return this;<a name="line.323"></a>
 <span class="sourceLineNo">324</span>  }<a name="line.324"></a>
 <span class="sourceLineNo">325</span>  <a name="line.325"></a>
-<span class="sourceLineNo">326</span>  protected List&lt;ServerName&gt; 
servers;<a name="line.326"></a>
-<span class="sourceLineNo">327</span>  public final 
org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl 
setServers(List&lt;ServerName&gt; p_servers)<a name="line.327"></a>
+<span class="sourceLineNo">326</span>  protected ServerName metaLocation;<a 
name="line.326"></a>
+<span class="sourceLineNo">327</span>  public final 
org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName 
p_metaLocation)<a name="line.327"></a>
 <span class="sourceLineNo">328</span>  {<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    
(getImplData()).setServers(p_servers);<a name="line.329"></a>
+<span class="sourceLineNo">329</span>    
(getImplData()).setMetaLocation(p_metaLocation);<a name="line.329"></a>
 <span class="sourceLineNo">330</span>    return this;<a name="line.330"></a>
 <span class="sourceLineNo">331</span>  }<a name="line.331"></a>
 <span class="sourceLineNo">332</span>  <a name="line.332"></a>
-<span class="sourceLineNo">333</span>  protected String format;<a 
name="line.333"></a>
-<span class="sourceLineNo">334</span>  public final 
org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String 
p_format)<a name="line.334"></a>
+<span class="sourceLineNo">333</span>  protected String filter;<a 
name="line.333"></a>
+<span class="sourceLineNo">334</span>  public final 
org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String 
p_filter)<a name="line.334"></a>
 <span class="sourceLineNo">335</span>  {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    
(getImplData()).setFormat(p_format);<a name="line.336"></a>
+<span class="sourceLineNo">336</span>    
(getImplData()).setFilter(p_filter);<a name="line.336"></a>
 <span class="sourceLineNo">337</span>    return this;<a name="line.337"></a>
 <span class="sourceLineNo">338</span>  }<a name="line.338"></a>
 <span class="sourceLineNo">339</span>  <a name="line.339"></a>