http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.html
index ea3bf46..82a8fe6 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.html
@@ -162,82 +162,83 @@
 <span class="sourceLineNo">154</span>  @Override<a name="line.154"></a>
 <span class="sourceLineNo">155</span>  public boolean dispatch(CallRunner 
callTask) throws InterruptedException {<a name="line.155"></a>
 <span class="sourceLineNo">156</span>    RpcCall call = 
callTask.getRpcCall();<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    int level = 
priority.getPriority(call.getHeader(), call.getParam(), 
call.getRequestUser());<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    if (level == 
HConstants.PRIORITY_UNSET) {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>      level = HConstants.NORMAL_QOS;<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>    }<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    if (priorityExecutor != null 
&amp;&amp; level &gt; highPriorityLevel) {<a name="line.161"></a>
-<span class="sourceLineNo">162</span>      return 
priorityExecutor.dispatch(callTask);<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    } else if (replicationExecutor != 
null &amp;&amp; level == HConstants.REPLICATION_QOS) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span>      return 
replicationExecutor.dispatch(callTask);<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    } else {<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      return 
callExecutor.dispatch(callTask);<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    }<a name="line.167"></a>
-<span class="sourceLineNo">168</span>  }<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span>  @Override<a name="line.170"></a>
-<span class="sourceLineNo">171</span>  public int getGeneralQueueLength() {<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span>    return 
callExecutor.getQueueLength();<a name="line.172"></a>
-<span class="sourceLineNo">173</span>  }<a name="line.173"></a>
-<span class="sourceLineNo">174</span><a name="line.174"></a>
-<span class="sourceLineNo">175</span>  @Override<a name="line.175"></a>
-<span class="sourceLineNo">176</span>  public int getPriorityQueueLength() {<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span>    return priorityExecutor == null ? 0 : 
priorityExecutor.getQueueLength();<a name="line.177"></a>
-<span class="sourceLineNo">178</span>  }<a name="line.178"></a>
-<span class="sourceLineNo">179</span><a name="line.179"></a>
-<span class="sourceLineNo">180</span>  @Override<a name="line.180"></a>
-<span class="sourceLineNo">181</span>  public int getReplicationQueueLength() 
{<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    return replicationExecutor == null ? 
0 : replicationExecutor.getQueueLength();<a name="line.182"></a>
-<span class="sourceLineNo">183</span>  }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span>  @Override<a name="line.185"></a>
-<span class="sourceLineNo">186</span>  public int getActiveRpcHandlerCount() 
{<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    return 
callExecutor.getActiveHandlerCount() +<a name="line.187"></a>
-<span class="sourceLineNo">188</span>           (priorityExecutor == null ? 0 
: priorityExecutor.getActiveHandlerCount()) +<a name="line.188"></a>
-<span class="sourceLineNo">189</span>           (replicationExecutor == null ? 
0 : replicationExecutor.getActiveHandlerCount());<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>  @Override<a name="line.192"></a>
-<span class="sourceLineNo">193</span>  public long getNumGeneralCallsDropped() 
{<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    return 
callExecutor.getNumGeneralCallsDropped();<a name="line.194"></a>
-<span class="sourceLineNo">195</span>  }<a name="line.195"></a>
-<span class="sourceLineNo">196</span><a name="line.196"></a>
-<span class="sourceLineNo">197</span>  @Override<a name="line.197"></a>
-<span class="sourceLineNo">198</span>  public long getNumLifoModeSwitches() 
{<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    return 
callExecutor.getNumLifoModeSwitches();<a name="line.199"></a>
-<span class="sourceLineNo">200</span>  }<a name="line.200"></a>
-<span class="sourceLineNo">201</span><a name="line.201"></a>
-<span class="sourceLineNo">202</span>  @Override<a name="line.202"></a>
-<span class="sourceLineNo">203</span>  public int getWriteQueueLength() {<a 
name="line.203"></a>
-<span class="sourceLineNo">204</span>    return 
callExecutor.getWriteQueueLength();<a name="line.204"></a>
-<span class="sourceLineNo">205</span>  }<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span>  @Override<a name="line.207"></a>
-<span class="sourceLineNo">208</span>  public int getReadQueueLength() {<a 
name="line.208"></a>
-<span class="sourceLineNo">209</span>    return 
callExecutor.getReadQueueLength();<a name="line.209"></a>
-<span class="sourceLineNo">210</span>  }<a name="line.210"></a>
-<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span>  @Override<a name="line.212"></a>
-<span class="sourceLineNo">213</span>  public int getScanQueueLength() {<a 
name="line.213"></a>
-<span class="sourceLineNo">214</span>    return 
callExecutor.getScanQueueLength();<a name="line.214"></a>
-<span class="sourceLineNo">215</span>  }<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span>  @Override<a name="line.217"></a>
-<span class="sourceLineNo">218</span>  public int 
getActiveWriteRpcHandlerCount() {<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    return 
callExecutor.getActiveWriteHandlerCount();<a name="line.219"></a>
-<span class="sourceLineNo">220</span>  }<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span>  @Override<a name="line.222"></a>
-<span class="sourceLineNo">223</span>  public int 
getActiveReadRpcHandlerCount() {<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    return 
callExecutor.getActiveReadHandlerCount();<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>  @Override<a name="line.227"></a>
-<span class="sourceLineNo">228</span>  public int 
getActiveScanRpcHandlerCount() {<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    return 
callExecutor.getActiveScanHandlerCount();<a name="line.229"></a>
-<span class="sourceLineNo">230</span>  }<a name="line.230"></a>
-<span class="sourceLineNo">231</span>}<a name="line.231"></a>
-<span class="sourceLineNo">232</span><a name="line.232"></a>
+<span class="sourceLineNo">157</span>    int level = 
priority.getPriority(call.getHeader(), call.getParam(),<a name="line.157"></a>
+<span class="sourceLineNo">158</span>        
call.getRequestUser().orElse(null));<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    if (level == 
HConstants.PRIORITY_UNSET) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      level = HConstants.NORMAL_QOS;<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>    }<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    if (priorityExecutor != null 
&amp;&amp; level &gt; highPriorityLevel) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span>      return 
priorityExecutor.dispatch(callTask);<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    } else if (replicationExecutor != 
null &amp;&amp; level == HConstants.REPLICATION_QOS) {<a name="line.164"></a>
+<span class="sourceLineNo">165</span>      return 
replicationExecutor.dispatch(callTask);<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    } else {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      return 
callExecutor.dispatch(callTask);<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    }<a name="line.168"></a>
+<span class="sourceLineNo">169</span>  }<a name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span>  @Override<a name="line.171"></a>
+<span class="sourceLineNo">172</span>  public int getGeneralQueueLength() {<a 
name="line.172"></a>
+<span class="sourceLineNo">173</span>    return 
callExecutor.getQueueLength();<a name="line.173"></a>
+<span class="sourceLineNo">174</span>  }<a name="line.174"></a>
+<span class="sourceLineNo">175</span><a name="line.175"></a>
+<span class="sourceLineNo">176</span>  @Override<a name="line.176"></a>
+<span class="sourceLineNo">177</span>  public int getPriorityQueueLength() {<a 
name="line.177"></a>
+<span class="sourceLineNo">178</span>    return priorityExecutor == null ? 0 : 
priorityExecutor.getQueueLength();<a name="line.178"></a>
+<span class="sourceLineNo">179</span>  }<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span>  @Override<a name="line.181"></a>
+<span class="sourceLineNo">182</span>  public int getReplicationQueueLength() 
{<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    return replicationExecutor == null ? 
0 : replicationExecutor.getQueueLength();<a name="line.183"></a>
+<span class="sourceLineNo">184</span>  }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span>  @Override<a name="line.186"></a>
+<span class="sourceLineNo">187</span>  public int getActiveRpcHandlerCount() 
{<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    return 
callExecutor.getActiveHandlerCount() +<a name="line.188"></a>
+<span class="sourceLineNo">189</span>           (priorityExecutor == null ? 0 
: priorityExecutor.getActiveHandlerCount()) +<a name="line.189"></a>
+<span class="sourceLineNo">190</span>           (replicationExecutor == null ? 
0 : replicationExecutor.getActiveHandlerCount());<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>  @Override<a name="line.193"></a>
+<span class="sourceLineNo">194</span>  public long getNumGeneralCallsDropped() 
{<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    return 
callExecutor.getNumGeneralCallsDropped();<a name="line.195"></a>
+<span class="sourceLineNo">196</span>  }<a name="line.196"></a>
+<span class="sourceLineNo">197</span><a name="line.197"></a>
+<span class="sourceLineNo">198</span>  @Override<a name="line.198"></a>
+<span class="sourceLineNo">199</span>  public long getNumLifoModeSwitches() 
{<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    return 
callExecutor.getNumLifoModeSwitches();<a name="line.200"></a>
+<span class="sourceLineNo">201</span>  }<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span>  @Override<a name="line.203"></a>
+<span class="sourceLineNo">204</span>  public int getWriteQueueLength() {<a 
name="line.204"></a>
+<span class="sourceLineNo">205</span>    return 
callExecutor.getWriteQueueLength();<a name="line.205"></a>
+<span class="sourceLineNo">206</span>  }<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span>  @Override<a name="line.208"></a>
+<span class="sourceLineNo">209</span>  public int getReadQueueLength() {<a 
name="line.209"></a>
+<span class="sourceLineNo">210</span>    return 
callExecutor.getReadQueueLength();<a name="line.210"></a>
+<span class="sourceLineNo">211</span>  }<a name="line.211"></a>
+<span class="sourceLineNo">212</span><a name="line.212"></a>
+<span class="sourceLineNo">213</span>  @Override<a name="line.213"></a>
+<span class="sourceLineNo">214</span>  public int getScanQueueLength() {<a 
name="line.214"></a>
+<span class="sourceLineNo">215</span>    return 
callExecutor.getScanQueueLength();<a name="line.215"></a>
+<span class="sourceLineNo">216</span>  }<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span>  @Override<a name="line.218"></a>
+<span class="sourceLineNo">219</span>  public int 
getActiveWriteRpcHandlerCount() {<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    return 
callExecutor.getActiveWriteHandlerCount();<a name="line.220"></a>
+<span class="sourceLineNo">221</span>  }<a name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span>  @Override<a name="line.223"></a>
+<span class="sourceLineNo">224</span>  public int 
getActiveReadRpcHandlerCount() {<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    return 
callExecutor.getActiveReadHandlerCount();<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>  @Override<a name="line.228"></a>
+<span class="sourceLineNo">229</span>  public int 
getActiveScanRpcHandlerCount() {<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    return 
callExecutor.getActiveScanHandlerCount();<a name="line.230"></a>
+<span class="sourceLineNo">231</span>  }<a name="line.231"></a>
+<span class="sourceLineNo">232</span>}<a name="line.232"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.MasterProcedureStoreListener.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.MasterProcedureStoreListener.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.MasterProcedureStoreListener.html
index 67f0c15..0b9d890 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.MasterProcedureStoreListener.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.MasterProcedureStoreListener.html
@@ -118,74 +118,70 @@
 <span class="sourceLineNo">110</span>  }<a name="line.110"></a>
 <span class="sourceLineNo">111</span><a name="line.111"></a>
 <span class="sourceLineNo">112</span>  public User getRequestUser() {<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>    User user = 
RpcServer.getRequestUser();<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    if (user == null) {<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>      user = 
Superusers.getSystemUser();<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    }<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    return user;<a name="line.117"></a>
+<span class="sourceLineNo">113</span>    return 
RpcServer.getRequestUser().orElse(Superusers.getSystemUser());<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>  public MasterServices 
getMasterServices() {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    return master;<a name="line.117"></a>
 <span class="sourceLineNo">118</span>  }<a name="line.118"></a>
 <span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span>  public MasterServices 
getMasterServices() {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    return master;<a name="line.121"></a>
+<span class="sourceLineNo">120</span>  public Configuration 
getMasterConfiguration() {<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    return master.getConfiguration();<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>  public Configuration 
getMasterConfiguration() {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    return master.getConfiguration();<a 
name="line.125"></a>
+<span class="sourceLineNo">124</span>  public AssignmentManager 
getAssignmentManager() {<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    return 
master.getAssignmentManager();<a name="line.125"></a>
 <span class="sourceLineNo">126</span>  }<a name="line.126"></a>
 <span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span>  public AssignmentManager 
getAssignmentManager() {<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    return 
master.getAssignmentManager();<a name="line.129"></a>
+<span class="sourceLineNo">128</span>  public MasterCoprocessorHost 
getMasterCoprocessorHost() {<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    return 
master.getMasterCoprocessorHost();<a name="line.129"></a>
 <span class="sourceLineNo">130</span>  }<a name="line.130"></a>
 <span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span>  public MasterCoprocessorHost 
getMasterCoprocessorHost() {<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    return 
master.getMasterCoprocessorHost();<a name="line.133"></a>
+<span class="sourceLineNo">132</span>  public MasterProcedureScheduler 
getProcedureScheduler() {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    return procSched;<a 
name="line.133"></a>
 <span class="sourceLineNo">134</span>  }<a name="line.134"></a>
 <span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span>  public MasterProcedureScheduler 
getProcedureScheduler() {<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    return procSched;<a 
name="line.137"></a>
+<span class="sourceLineNo">136</span>  public RSProcedureDispatcher 
getRemoteDispatcher() {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    return remoteDispatcher;<a 
name="line.137"></a>
 <span class="sourceLineNo">138</span>  }<a name="line.138"></a>
 <span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span>  public RSProcedureDispatcher 
getRemoteDispatcher() {<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    return remoteDispatcher;<a 
name="line.141"></a>
-<span class="sourceLineNo">142</span>  }<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span>  public boolean isRunning() {<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>    if (this.master == null || 
this.master.getMasterProcedureExecutor() == null) return false;<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>    return 
master.getMasterProcedureExecutor().isRunning();<a name="line.146"></a>
+<span class="sourceLineNo">140</span>  public boolean isRunning() {<a 
name="line.140"></a>
+<span class="sourceLineNo">141</span>    if (this.master == null || 
this.master.getMasterProcedureExecutor() == null) return false;<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span>    return 
master.getMasterProcedureExecutor().isRunning();<a name="line.142"></a>
+<span class="sourceLineNo">143</span>  }<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span>  public boolean isInitialized() {<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>    return master.isInitialized();<a 
name="line.146"></a>
 <span class="sourceLineNo">147</span>  }<a name="line.147"></a>
 <span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span>  public boolean isInitialized() {<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>    return master.isInitialized();<a 
name="line.150"></a>
+<span class="sourceLineNo">149</span>  public boolean 
waitInitialized(Procedure proc) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    return 
procSched.waitEvent(master.getInitializedEvent(), proc);<a name="line.150"></a>
 <span class="sourceLineNo">151</span>  }<a name="line.151"></a>
 <span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span>  public boolean 
waitInitialized(Procedure proc) {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    return 
procSched.waitEvent(master.getInitializedEvent(), proc);<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>  public boolean 
waitServerCrashProcessingEnabled(Procedure proc) {<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    if (master instanceof HMaster) {<a 
name="line.158"></a>
-<span class="sourceLineNo">159</span>      return 
procSched.waitEvent(((HMaster)master).getServerCrashProcessingEnabledEvent(), 
proc);<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    }<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    return false;<a name="line.161"></a>
+<span class="sourceLineNo">153</span>  public boolean 
waitServerCrashProcessingEnabled(Procedure proc) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    if (master instanceof HMaster) {<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>      return 
procSched.waitEvent(((HMaster)master).getServerCrashProcessingEnabledEvent(), 
proc);<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    }<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    return false;<a name="line.157"></a>
+<span class="sourceLineNo">158</span>  }<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span>  public boolean 
waitFailoverCleanup(Procedure proc) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    return 
procSched.waitEvent(master.getAssignmentManager().getFailoverCleanupEvent(), 
proc);<a name="line.161"></a>
 <span class="sourceLineNo">162</span>  }<a name="line.162"></a>
 <span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>  public boolean 
waitFailoverCleanup(Procedure proc) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    return 
procSched.waitEvent(master.getAssignmentManager().getFailoverCleanupEvent(), 
proc);<a name="line.165"></a>
-<span class="sourceLineNo">166</span>  }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>  public void 
setEventReady(ProcedureEvent event, boolean isReady) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    if (isReady) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      procSched.wakeEvent(event);<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span>    } else {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      procSched.suspendEvent(event);<a 
name="line.172"></a>
-<span class="sourceLineNo">173</span>    }<a name="line.173"></a>
-<span class="sourceLineNo">174</span>  }<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span>  @Override<a name="line.176"></a>
-<span class="sourceLineNo">177</span>  public void 
onConfigurationChange(Configuration conf) {<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    
master.getMasterProcedureExecutor().refreshConfiguration(conf);<a 
name="line.178"></a>
-<span class="sourceLineNo">179</span>  }<a name="line.179"></a>
-<span class="sourceLineNo">180</span>}<a name="line.180"></a>
+<span class="sourceLineNo">164</span>  public void 
setEventReady(ProcedureEvent event, boolean isReady) {<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    if (isReady) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      procSched.wakeEvent(event);<a 
name="line.166"></a>
+<span class="sourceLineNo">167</span>    } else {<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      procSched.suspendEvent(event);<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span>    }<a name="line.169"></a>
+<span class="sourceLineNo">170</span>  }<a name="line.170"></a>
+<span class="sourceLineNo">171</span><a name="line.171"></a>
+<span class="sourceLineNo">172</span>  @Override<a name="line.172"></a>
+<span class="sourceLineNo">173</span>  public void 
onConfigurationChange(Configuration conf) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    
master.getMasterProcedureExecutor().refreshConfiguration(conf);<a 
name="line.174"></a>
+<span class="sourceLineNo">175</span>  }<a name="line.175"></a>
+<span class="sourceLineNo">176</span>}<a name="line.176"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.WALStoreLeaseRecovery.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.WALStoreLeaseRecovery.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.WALStoreLeaseRecovery.html
index 67f0c15..0b9d890 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.WALStoreLeaseRecovery.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.WALStoreLeaseRecovery.html
@@ -118,74 +118,70 @@
 <span class="sourceLineNo">110</span>  }<a name="line.110"></a>
 <span class="sourceLineNo">111</span><a name="line.111"></a>
 <span class="sourceLineNo">112</span>  public User getRequestUser() {<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>    User user = 
RpcServer.getRequestUser();<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    if (user == null) {<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>      user = 
Superusers.getSystemUser();<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    }<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    return user;<a name="line.117"></a>
+<span class="sourceLineNo">113</span>    return 
RpcServer.getRequestUser().orElse(Superusers.getSystemUser());<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>  public MasterServices 
getMasterServices() {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    return master;<a name="line.117"></a>
 <span class="sourceLineNo">118</span>  }<a name="line.118"></a>
 <span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span>  public MasterServices 
getMasterServices() {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    return master;<a name="line.121"></a>
+<span class="sourceLineNo">120</span>  public Configuration 
getMasterConfiguration() {<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    return master.getConfiguration();<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>  public Configuration 
getMasterConfiguration() {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    return master.getConfiguration();<a 
name="line.125"></a>
+<span class="sourceLineNo">124</span>  public AssignmentManager 
getAssignmentManager() {<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    return 
master.getAssignmentManager();<a name="line.125"></a>
 <span class="sourceLineNo">126</span>  }<a name="line.126"></a>
 <span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span>  public AssignmentManager 
getAssignmentManager() {<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    return 
master.getAssignmentManager();<a name="line.129"></a>
+<span class="sourceLineNo">128</span>  public MasterCoprocessorHost 
getMasterCoprocessorHost() {<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    return 
master.getMasterCoprocessorHost();<a name="line.129"></a>
 <span class="sourceLineNo">130</span>  }<a name="line.130"></a>
 <span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span>  public MasterCoprocessorHost 
getMasterCoprocessorHost() {<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    return 
master.getMasterCoprocessorHost();<a name="line.133"></a>
+<span class="sourceLineNo">132</span>  public MasterProcedureScheduler 
getProcedureScheduler() {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    return procSched;<a 
name="line.133"></a>
 <span class="sourceLineNo">134</span>  }<a name="line.134"></a>
 <span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span>  public MasterProcedureScheduler 
getProcedureScheduler() {<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    return procSched;<a 
name="line.137"></a>
+<span class="sourceLineNo">136</span>  public RSProcedureDispatcher 
getRemoteDispatcher() {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    return remoteDispatcher;<a 
name="line.137"></a>
 <span class="sourceLineNo">138</span>  }<a name="line.138"></a>
 <span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span>  public RSProcedureDispatcher 
getRemoteDispatcher() {<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    return remoteDispatcher;<a 
name="line.141"></a>
-<span class="sourceLineNo">142</span>  }<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span>  public boolean isRunning() {<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>    if (this.master == null || 
this.master.getMasterProcedureExecutor() == null) return false;<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>    return 
master.getMasterProcedureExecutor().isRunning();<a name="line.146"></a>
+<span class="sourceLineNo">140</span>  public boolean isRunning() {<a 
name="line.140"></a>
+<span class="sourceLineNo">141</span>    if (this.master == null || 
this.master.getMasterProcedureExecutor() == null) return false;<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span>    return 
master.getMasterProcedureExecutor().isRunning();<a name="line.142"></a>
+<span class="sourceLineNo">143</span>  }<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span>  public boolean isInitialized() {<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>    return master.isInitialized();<a 
name="line.146"></a>
 <span class="sourceLineNo">147</span>  }<a name="line.147"></a>
 <span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span>  public boolean isInitialized() {<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>    return master.isInitialized();<a 
name="line.150"></a>
+<span class="sourceLineNo">149</span>  public boolean 
waitInitialized(Procedure proc) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    return 
procSched.waitEvent(master.getInitializedEvent(), proc);<a name="line.150"></a>
 <span class="sourceLineNo">151</span>  }<a name="line.151"></a>
 <span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span>  public boolean 
waitInitialized(Procedure proc) {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    return 
procSched.waitEvent(master.getInitializedEvent(), proc);<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>  public boolean 
waitServerCrashProcessingEnabled(Procedure proc) {<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    if (master instanceof HMaster) {<a 
name="line.158"></a>
-<span class="sourceLineNo">159</span>      return 
procSched.waitEvent(((HMaster)master).getServerCrashProcessingEnabledEvent(), 
proc);<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    }<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    return false;<a name="line.161"></a>
+<span class="sourceLineNo">153</span>  public boolean 
waitServerCrashProcessingEnabled(Procedure proc) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    if (master instanceof HMaster) {<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>      return 
procSched.waitEvent(((HMaster)master).getServerCrashProcessingEnabledEvent(), 
proc);<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    }<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    return false;<a name="line.157"></a>
+<span class="sourceLineNo">158</span>  }<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span>  public boolean 
waitFailoverCleanup(Procedure proc) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    return 
procSched.waitEvent(master.getAssignmentManager().getFailoverCleanupEvent(), 
proc);<a name="line.161"></a>
 <span class="sourceLineNo">162</span>  }<a name="line.162"></a>
 <span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>  public boolean 
waitFailoverCleanup(Procedure proc) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    return 
procSched.waitEvent(master.getAssignmentManager().getFailoverCleanupEvent(), 
proc);<a name="line.165"></a>
-<span class="sourceLineNo">166</span>  }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>  public void 
setEventReady(ProcedureEvent event, boolean isReady) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    if (isReady) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      procSched.wakeEvent(event);<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span>    } else {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      procSched.suspendEvent(event);<a 
name="line.172"></a>
-<span class="sourceLineNo">173</span>    }<a name="line.173"></a>
-<span class="sourceLineNo">174</span>  }<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span>  @Override<a name="line.176"></a>
-<span class="sourceLineNo">177</span>  public void 
onConfigurationChange(Configuration conf) {<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    
master.getMasterProcedureExecutor().refreshConfiguration(conf);<a 
name="line.178"></a>
-<span class="sourceLineNo">179</span>  }<a name="line.179"></a>
-<span class="sourceLineNo">180</span>}<a name="line.180"></a>
+<span class="sourceLineNo">164</span>  public void 
setEventReady(ProcedureEvent event, boolean isReady) {<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    if (isReady) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      procSched.wakeEvent(event);<a 
name="line.166"></a>
+<span class="sourceLineNo">167</span>    } else {<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      procSched.suspendEvent(event);<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span>    }<a name="line.169"></a>
+<span class="sourceLineNo">170</span>  }<a name="line.170"></a>
+<span class="sourceLineNo">171</span><a name="line.171"></a>
+<span class="sourceLineNo">172</span>  @Override<a name="line.172"></a>
+<span class="sourceLineNo">173</span>  public void 
onConfigurationChange(Configuration conf) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    
master.getMasterProcedureExecutor().refreshConfiguration(conf);<a 
name="line.174"></a>
+<span class="sourceLineNo">175</span>  }<a name="line.175"></a>
+<span class="sourceLineNo">176</span>}<a name="line.176"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html
index 67f0c15..0b9d890 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureEnv.html
@@ -118,74 +118,70 @@
 <span class="sourceLineNo">110</span>  }<a name="line.110"></a>
 <span class="sourceLineNo">111</span><a name="line.111"></a>
 <span class="sourceLineNo">112</span>  public User getRequestUser() {<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>    User user = 
RpcServer.getRequestUser();<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    if (user == null) {<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>      user = 
Superusers.getSystemUser();<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    }<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    return user;<a name="line.117"></a>
+<span class="sourceLineNo">113</span>    return 
RpcServer.getRequestUser().orElse(Superusers.getSystemUser());<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>  public MasterServices 
getMasterServices() {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    return master;<a name="line.117"></a>
 <span class="sourceLineNo">118</span>  }<a name="line.118"></a>
 <span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span>  public MasterServices 
getMasterServices() {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    return master;<a name="line.121"></a>
+<span class="sourceLineNo">120</span>  public Configuration 
getMasterConfiguration() {<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    return master.getConfiguration();<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>  public Configuration 
getMasterConfiguration() {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    return master.getConfiguration();<a 
name="line.125"></a>
+<span class="sourceLineNo">124</span>  public AssignmentManager 
getAssignmentManager() {<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    return 
master.getAssignmentManager();<a name="line.125"></a>
 <span class="sourceLineNo">126</span>  }<a name="line.126"></a>
 <span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span>  public AssignmentManager 
getAssignmentManager() {<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    return 
master.getAssignmentManager();<a name="line.129"></a>
+<span class="sourceLineNo">128</span>  public MasterCoprocessorHost 
getMasterCoprocessorHost() {<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    return 
master.getMasterCoprocessorHost();<a name="line.129"></a>
 <span class="sourceLineNo">130</span>  }<a name="line.130"></a>
 <span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span>  public MasterCoprocessorHost 
getMasterCoprocessorHost() {<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    return 
master.getMasterCoprocessorHost();<a name="line.133"></a>
+<span class="sourceLineNo">132</span>  public MasterProcedureScheduler 
getProcedureScheduler() {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    return procSched;<a 
name="line.133"></a>
 <span class="sourceLineNo">134</span>  }<a name="line.134"></a>
 <span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span>  public MasterProcedureScheduler 
getProcedureScheduler() {<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    return procSched;<a 
name="line.137"></a>
+<span class="sourceLineNo">136</span>  public RSProcedureDispatcher 
getRemoteDispatcher() {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    return remoteDispatcher;<a 
name="line.137"></a>
 <span class="sourceLineNo">138</span>  }<a name="line.138"></a>
 <span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span>  public RSProcedureDispatcher 
getRemoteDispatcher() {<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    return remoteDispatcher;<a 
name="line.141"></a>
-<span class="sourceLineNo">142</span>  }<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span>  public boolean isRunning() {<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>    if (this.master == null || 
this.master.getMasterProcedureExecutor() == null) return false;<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>    return 
master.getMasterProcedureExecutor().isRunning();<a name="line.146"></a>
+<span class="sourceLineNo">140</span>  public boolean isRunning() {<a 
name="line.140"></a>
+<span class="sourceLineNo">141</span>    if (this.master == null || 
this.master.getMasterProcedureExecutor() == null) return false;<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span>    return 
master.getMasterProcedureExecutor().isRunning();<a name="line.142"></a>
+<span class="sourceLineNo">143</span>  }<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span>  public boolean isInitialized() {<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>    return master.isInitialized();<a 
name="line.146"></a>
 <span class="sourceLineNo">147</span>  }<a name="line.147"></a>
 <span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span>  public boolean isInitialized() {<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>    return master.isInitialized();<a 
name="line.150"></a>
+<span class="sourceLineNo">149</span>  public boolean 
waitInitialized(Procedure proc) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    return 
procSched.waitEvent(master.getInitializedEvent(), proc);<a name="line.150"></a>
 <span class="sourceLineNo">151</span>  }<a name="line.151"></a>
 <span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span>  public boolean 
waitInitialized(Procedure proc) {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    return 
procSched.waitEvent(master.getInitializedEvent(), proc);<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>  public boolean 
waitServerCrashProcessingEnabled(Procedure proc) {<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    if (master instanceof HMaster) {<a 
name="line.158"></a>
-<span class="sourceLineNo">159</span>      return 
procSched.waitEvent(((HMaster)master).getServerCrashProcessingEnabledEvent(), 
proc);<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    }<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    return false;<a name="line.161"></a>
+<span class="sourceLineNo">153</span>  public boolean 
waitServerCrashProcessingEnabled(Procedure proc) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    if (master instanceof HMaster) {<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>      return 
procSched.waitEvent(((HMaster)master).getServerCrashProcessingEnabledEvent(), 
proc);<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    }<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    return false;<a name="line.157"></a>
+<span class="sourceLineNo">158</span>  }<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span>  public boolean 
waitFailoverCleanup(Procedure proc) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    return 
procSched.waitEvent(master.getAssignmentManager().getFailoverCleanupEvent(), 
proc);<a name="line.161"></a>
 <span class="sourceLineNo">162</span>  }<a name="line.162"></a>
 <span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>  public boolean 
waitFailoverCleanup(Procedure proc) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    return 
procSched.waitEvent(master.getAssignmentManager().getFailoverCleanupEvent(), 
proc);<a name="line.165"></a>
-<span class="sourceLineNo">166</span>  }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>  public void 
setEventReady(ProcedureEvent event, boolean isReady) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    if (isReady) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      procSched.wakeEvent(event);<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span>    } else {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      procSched.suspendEvent(event);<a 
name="line.172"></a>
-<span class="sourceLineNo">173</span>    }<a name="line.173"></a>
-<span class="sourceLineNo">174</span>  }<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span>  @Override<a name="line.176"></a>
-<span class="sourceLineNo">177</span>  public void 
onConfigurationChange(Configuration conf) {<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    
master.getMasterProcedureExecutor().refreshConfiguration(conf);<a 
name="line.178"></a>
-<span class="sourceLineNo">179</span>  }<a name="line.179"></a>
-<span class="sourceLineNo">180</span>}<a name="line.180"></a>
+<span class="sourceLineNo">164</span>  public void 
setEventReady(ProcedureEvent event, boolean isReady) {<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    if (isReady) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      procSched.wakeEvent(event);<a 
name="line.166"></a>
+<span class="sourceLineNo">167</span>    } else {<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      procSched.suspendEvent(event);<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span>    }<a name="line.169"></a>
+<span class="sourceLineNo">170</span>  }<a name="line.170"></a>
+<span class="sourceLineNo">171</span><a name="line.171"></a>
+<span class="sourceLineNo">172</span>  @Override<a name="line.172"></a>
+<span class="sourceLineNo">173</span>  public void 
onConfigurationChange(Configuration conf) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    
master.getMasterProcedureExecutor().refreshConfiguration(conf);<a 
name="line.174"></a>
+<span class="sourceLineNo">175</span>  }<a name="line.175"></a>
+<span class="sourceLineNo">176</span>}<a name="line.176"></a>
 
 
 

Reply via email to