http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/RowCounter.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/RowCounter.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/RowCounter.html
index 56ec3ac..8f4cacb 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/RowCounter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/RowCounter.html
@@ -229,9 +229,9 @@
 <span class="sourceLineNo">221</span>   * Note that we don't document 
--expected-count, because it's intended for test.<a name="line.221"></a>
 <span class="sourceLineNo">222</span>   */<a name="line.222"></a>
 <span class="sourceLineNo">223</span>  private static void printUsage() {<a 
name="line.223"></a>
-<span class="sourceLineNo">224</span>    System.err.println("Usage: RowCounter 
[options] &lt;tablename&gt; " +<a name="line.224"></a>
-<span class="sourceLineNo">225</span>        "[--starttime=[start] 
--endtime=[end] " +<a name="line.225"></a>
-<span class="sourceLineNo">226</span>        
"[--range=[startKey],[endKey][;[startKey],[endKey]...]] [&lt;column1&gt; 
&lt;column2&gt;...]");<a name="line.226"></a>
+<span class="sourceLineNo">224</span>    System.err.println("Usage: hbase 
rowcounter [options] &lt;tablename&gt; "<a name="line.224"></a>
+<span class="sourceLineNo">225</span>        + "[--starttime=&lt;start&gt; 
--endtime=&lt;end&gt;] "<a name="line.225"></a>
+<span class="sourceLineNo">226</span>        + 
"[--range=[startKey],[endKey][;[startKey],[endKey]...]] [&lt;column1&gt; 
&lt;column2&gt;...]");<a name="line.226"></a>
 <span class="sourceLineNo">227</span>    System.err.println("For performance 
consider the following options:\n"<a name="line.227"></a>
 <span class="sourceLineNo">228</span>        + 
"-Dhbase.client.scanner.caching=100\n"<a name="line.228"></a>
 <span class="sourceLineNo">229</span>        + 
"-Dmapreduce.map.speculative=false");<a name="line.229"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALKeyValueMapper.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALKeyValueMapper.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALKeyValueMapper.html
index a5477ac..9501e97 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALKeyValueMapper.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALKeyValueMapper.html
@@ -357,46 +357,51 @@
 <span class="sourceLineNo">349</span>      System.err.println("ERROR: " + 
errorMsg);<a name="line.349"></a>
 <span class="sourceLineNo">350</span>    }<a name="line.350"></a>
 <span class="sourceLineNo">351</span>    System.err.println("Usage: " + NAME + 
" [options] &lt;wal inputdir&gt; &lt;tables&gt; [&lt;tableMappings&gt;]");<a 
name="line.351"></a>
-<span class="sourceLineNo">352</span>    System.err.println("Read all WAL 
entries for &lt;tables&gt;.");<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    System.err.println("If no tables 
(\"\") are specific, all tables are imported.");<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    System.err.println("(Careful, even 
hbase:meta entries will be imported" + " in that case.)");<a 
name="line.354"></a>
-<span class="sourceLineNo">355</span>    System.err.println("Otherwise 
&lt;tables&gt; is a comma separated list of tables.\n");<a name="line.355"></a>
-<span class="sourceLineNo">356</span>    System.err.println("The WAL entries 
can be mapped to new set of tables via &lt;tableMapping&gt;.");<a 
name="line.356"></a>
-<span class="sourceLineNo">357</span>    
System.err.println("&lt;tableMapping&gt; is a command separated list of 
targettables.");<a name="line.357"></a>
+<span class="sourceLineNo">352</span>    System.err.println("Replay all WAL 
files into HBase.");<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    System.err.println("&lt;tables&gt; is 
a comma separated list of tables.");<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    System.err.println("If no tables 
(\"\") are specified, all tables are imported.");<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    System.err.println("(Be careful, 
hbase:meta entries will be imported in this case.)\n");<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    System.err.println("WAL entries can 
be mapped to new set of tables via &lt;tableMappings&gt;.");<a 
name="line.356"></a>
+<span class="sourceLineNo">357</span>    
System.err.println("&lt;tableMappings&gt; is a comma separated list of target 
tables.");<a name="line.357"></a>
 <span class="sourceLineNo">358</span>    System.err.println("If specified, 
each table in &lt;tables&gt; must have a mapping.\n");<a name="line.358"></a>
 <span class="sourceLineNo">359</span>    System.err.println("By default " + 
NAME + " will load data directly into HBase.");<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    System.err.println("To generate 
HFiles for a bulk data load instead, pass the option:");<a name="line.360"></a>
+<span class="sourceLineNo">360</span>    System.err.println("To generate 
HFiles for a bulk data load instead, pass the following option:");<a 
name="line.360"></a>
 <span class="sourceLineNo">361</span>    System.err.println("  -D" + 
BULK_OUTPUT_CONF_KEY + "=/path/for/output");<a name="line.361"></a>
 <span class="sourceLineNo">362</span>    System.err.println("  (Only one table 
can be specified, and no mapping is allowed!)");<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    System.err.println("Other options: 
(specify time range to WAL edit to consider)");<a name="line.363"></a>
+<span class="sourceLineNo">363</span>    System.err.println("Time range 
options:");<a name="line.363"></a>
 <span class="sourceLineNo">364</span>    System.err.println("  -D" + 
WALInputFormat.START_TIME_KEY + "=[date|ms]");<a name="line.364"></a>
 <span class="sourceLineNo">365</span>    System.err.println("  -D" + 
WALInputFormat.END_TIME_KEY + "=[date|ms]");<a name="line.365"></a>
-<span class="sourceLineNo">366</span>    System.err.println("   -D " + 
JOB_NAME_CONF_KEY<a name="line.366"></a>
-<span class="sourceLineNo">367</span>        + "=jobName - use the specified 
mapreduce job name for the wal player");<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    System.err.println("For performance 
also consider the following options:\n"<a name="line.368"></a>
-<span class="sourceLineNo">369</span>        + "  
-Dmapreduce.map.speculative=false\n" + "  
-Dmapreduce.reduce.speculative=false");<a name="line.369"></a>
-<span class="sourceLineNo">370</span>  }<a name="line.370"></a>
-<span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span>  /**<a name="line.372"></a>
-<span class="sourceLineNo">373</span>   * Main entry point.<a 
name="line.373"></a>
-<span class="sourceLineNo">374</span>   * @param args The command line 
parameters.<a name="line.374"></a>
-<span class="sourceLineNo">375</span>   * @throws Exception When running the 
job fails.<a name="line.375"></a>
-<span class="sourceLineNo">376</span>   */<a name="line.376"></a>
-<span class="sourceLineNo">377</span>  public static void main(String[] args) 
throws Exception {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>    int ret = ToolRunner.run(new 
WALPlayer(HBaseConfiguration.create()), args);<a name="line.378"></a>
-<span class="sourceLineNo">379</span>    System.exit(ret);<a 
name="line.379"></a>
-<span class="sourceLineNo">380</span>  }<a name="line.380"></a>
-<span class="sourceLineNo">381</span><a name="line.381"></a>
-<span class="sourceLineNo">382</span>  @Override<a name="line.382"></a>
-<span class="sourceLineNo">383</span>  public int run(String[] args) throws 
Exception {<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    if (args.length &lt; 2) {<a 
name="line.384"></a>
-<span class="sourceLineNo">385</span>      usage("Wrong number of arguments: " 
+ args.length);<a name="line.385"></a>
-<span class="sourceLineNo">386</span>      System.exit(-1);<a 
name="line.386"></a>
-<span class="sourceLineNo">387</span>    }<a name="line.387"></a>
-<span class="sourceLineNo">388</span>    Job job = 
createSubmittableJob(args);<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    return job.waitForCompletion(true) ? 
0 : 1;<a name="line.389"></a>
-<span class="sourceLineNo">390</span>  }<a name="line.390"></a>
-<span class="sourceLineNo">391</span>}<a name="line.391"></a>
+<span class="sourceLineNo">366</span>    System.err.println("  (The start and 
the end date of timerange. The dates can be expressed");<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    System.err.println("  in milliseconds 
since epoch or in yyyy-MM-dd'T'HH:mm:ss.SS format.");<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    System.err.println("  E.g. 
1234567890120 or 2009-02-13T23:32:30.12)");<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    System.err.println("Other 
options:");<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    System.err.println("  -D" + 
JOB_NAME_CONF_KEY + "=jobName");<a name="line.370"></a>
+<span class="sourceLineNo">371</span>    System.err.println("  Use the 
specified mapreduce job name for the wal player");<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    System.err.println("For performance 
also consider the following options:\n"<a name="line.372"></a>
+<span class="sourceLineNo">373</span>        + "  
-Dmapreduce.map.speculative=false\n"<a name="line.373"></a>
+<span class="sourceLineNo">374</span>        + "  
-Dmapreduce.reduce.speculative=false");<a name="line.374"></a>
+<span class="sourceLineNo">375</span>  }<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span>  /**<a name="line.377"></a>
+<span class="sourceLineNo">378</span>   * Main entry point.<a 
name="line.378"></a>
+<span class="sourceLineNo">379</span>   * @param args The command line 
parameters.<a name="line.379"></a>
+<span class="sourceLineNo">380</span>   * @throws Exception When running the 
job fails.<a name="line.380"></a>
+<span class="sourceLineNo">381</span>   */<a name="line.381"></a>
+<span class="sourceLineNo">382</span>  public static void main(String[] args) 
throws Exception {<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    int ret = ToolRunner.run(new 
WALPlayer(HBaseConfiguration.create()), args);<a name="line.383"></a>
+<span class="sourceLineNo">384</span>    System.exit(ret);<a 
name="line.384"></a>
+<span class="sourceLineNo">385</span>  }<a name="line.385"></a>
+<span class="sourceLineNo">386</span><a name="line.386"></a>
+<span class="sourceLineNo">387</span>  @Override<a name="line.387"></a>
+<span class="sourceLineNo">388</span>  public int run(String[] args) throws 
Exception {<a name="line.388"></a>
+<span class="sourceLineNo">389</span>    if (args.length &lt; 2) {<a 
name="line.389"></a>
+<span class="sourceLineNo">390</span>      usage("Wrong number of arguments: " 
+ args.length);<a name="line.390"></a>
+<span class="sourceLineNo">391</span>      System.exit(-1);<a 
name="line.391"></a>
+<span class="sourceLineNo">392</span>    }<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    Job job = 
createSubmittableJob(args);<a name="line.393"></a>
+<span class="sourceLineNo">394</span>    return job.waitForCompletion(true) ? 
0 : 1;<a name="line.394"></a>
+<span class="sourceLineNo">395</span>  }<a name="line.395"></a>
+<span class="sourceLineNo">396</span>}<a name="line.396"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html
index a5477ac..9501e97 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.WALMapper.html
@@ -357,46 +357,51 @@
 <span class="sourceLineNo">349</span>      System.err.println("ERROR: " + 
errorMsg);<a name="line.349"></a>
 <span class="sourceLineNo">350</span>    }<a name="line.350"></a>
 <span class="sourceLineNo">351</span>    System.err.println("Usage: " + NAME + 
" [options] &lt;wal inputdir&gt; &lt;tables&gt; [&lt;tableMappings&gt;]");<a 
name="line.351"></a>
-<span class="sourceLineNo">352</span>    System.err.println("Read all WAL 
entries for &lt;tables&gt;.");<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    System.err.println("If no tables 
(\"\") are specific, all tables are imported.");<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    System.err.println("(Careful, even 
hbase:meta entries will be imported" + " in that case.)");<a 
name="line.354"></a>
-<span class="sourceLineNo">355</span>    System.err.println("Otherwise 
&lt;tables&gt; is a comma separated list of tables.\n");<a name="line.355"></a>
-<span class="sourceLineNo">356</span>    System.err.println("The WAL entries 
can be mapped to new set of tables via &lt;tableMapping&gt;.");<a 
name="line.356"></a>
-<span class="sourceLineNo">357</span>    
System.err.println("&lt;tableMapping&gt; is a command separated list of 
targettables.");<a name="line.357"></a>
+<span class="sourceLineNo">352</span>    System.err.println("Replay all WAL 
files into HBase.");<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    System.err.println("&lt;tables&gt; is 
a comma separated list of tables.");<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    System.err.println("If no tables 
(\"\") are specified, all tables are imported.");<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    System.err.println("(Be careful, 
hbase:meta entries will be imported in this case.)\n");<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    System.err.println("WAL entries can 
be mapped to new set of tables via &lt;tableMappings&gt;.");<a 
name="line.356"></a>
+<span class="sourceLineNo">357</span>    
System.err.println("&lt;tableMappings&gt; is a comma separated list of target 
tables.");<a name="line.357"></a>
 <span class="sourceLineNo">358</span>    System.err.println("If specified, 
each table in &lt;tables&gt; must have a mapping.\n");<a name="line.358"></a>
 <span class="sourceLineNo">359</span>    System.err.println("By default " + 
NAME + " will load data directly into HBase.");<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    System.err.println("To generate 
HFiles for a bulk data load instead, pass the option:");<a name="line.360"></a>
+<span class="sourceLineNo">360</span>    System.err.println("To generate 
HFiles for a bulk data load instead, pass the following option:");<a 
name="line.360"></a>
 <span class="sourceLineNo">361</span>    System.err.println("  -D" + 
BULK_OUTPUT_CONF_KEY + "=/path/for/output");<a name="line.361"></a>
 <span class="sourceLineNo">362</span>    System.err.println("  (Only one table 
can be specified, and no mapping is allowed!)");<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    System.err.println("Other options: 
(specify time range to WAL edit to consider)");<a name="line.363"></a>
+<span class="sourceLineNo">363</span>    System.err.println("Time range 
options:");<a name="line.363"></a>
 <span class="sourceLineNo">364</span>    System.err.println("  -D" + 
WALInputFormat.START_TIME_KEY + "=[date|ms]");<a name="line.364"></a>
 <span class="sourceLineNo">365</span>    System.err.println("  -D" + 
WALInputFormat.END_TIME_KEY + "=[date|ms]");<a name="line.365"></a>
-<span class="sourceLineNo">366</span>    System.err.println("   -D " + 
JOB_NAME_CONF_KEY<a name="line.366"></a>
-<span class="sourceLineNo">367</span>        + "=jobName - use the specified 
mapreduce job name for the wal player");<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    System.err.println("For performance 
also consider the following options:\n"<a name="line.368"></a>
-<span class="sourceLineNo">369</span>        + "  
-Dmapreduce.map.speculative=false\n" + "  
-Dmapreduce.reduce.speculative=false");<a name="line.369"></a>
-<span class="sourceLineNo">370</span>  }<a name="line.370"></a>
-<span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span>  /**<a name="line.372"></a>
-<span class="sourceLineNo">373</span>   * Main entry point.<a 
name="line.373"></a>
-<span class="sourceLineNo">374</span>   * @param args The command line 
parameters.<a name="line.374"></a>
-<span class="sourceLineNo">375</span>   * @throws Exception When running the 
job fails.<a name="line.375"></a>
-<span class="sourceLineNo">376</span>   */<a name="line.376"></a>
-<span class="sourceLineNo">377</span>  public static void main(String[] args) 
throws Exception {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>    int ret = ToolRunner.run(new 
WALPlayer(HBaseConfiguration.create()), args);<a name="line.378"></a>
-<span class="sourceLineNo">379</span>    System.exit(ret);<a 
name="line.379"></a>
-<span class="sourceLineNo">380</span>  }<a name="line.380"></a>
-<span class="sourceLineNo">381</span><a name="line.381"></a>
-<span class="sourceLineNo">382</span>  @Override<a name="line.382"></a>
-<span class="sourceLineNo">383</span>  public int run(String[] args) throws 
Exception {<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    if (args.length &lt; 2) {<a 
name="line.384"></a>
-<span class="sourceLineNo">385</span>      usage("Wrong number of arguments: " 
+ args.length);<a name="line.385"></a>
-<span class="sourceLineNo">386</span>      System.exit(-1);<a 
name="line.386"></a>
-<span class="sourceLineNo">387</span>    }<a name="line.387"></a>
-<span class="sourceLineNo">388</span>    Job job = 
createSubmittableJob(args);<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    return job.waitForCompletion(true) ? 
0 : 1;<a name="line.389"></a>
-<span class="sourceLineNo">390</span>  }<a name="line.390"></a>
-<span class="sourceLineNo">391</span>}<a name="line.391"></a>
+<span class="sourceLineNo">366</span>    System.err.println("  (The start and 
the end date of timerange. The dates can be expressed");<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    System.err.println("  in milliseconds 
since epoch or in yyyy-MM-dd'T'HH:mm:ss.SS format.");<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    System.err.println("  E.g. 
1234567890120 or 2009-02-13T23:32:30.12)");<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    System.err.println("Other 
options:");<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    System.err.println("  -D" + 
JOB_NAME_CONF_KEY + "=jobName");<a name="line.370"></a>
+<span class="sourceLineNo">371</span>    System.err.println("  Use the 
specified mapreduce job name for the wal player");<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    System.err.println("For performance 
also consider the following options:\n"<a name="line.372"></a>
+<span class="sourceLineNo">373</span>        + "  
-Dmapreduce.map.speculative=false\n"<a name="line.373"></a>
+<span class="sourceLineNo">374</span>        + "  
-Dmapreduce.reduce.speculative=false");<a name="line.374"></a>
+<span class="sourceLineNo">375</span>  }<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span>  /**<a name="line.377"></a>
+<span class="sourceLineNo">378</span>   * Main entry point.<a 
name="line.378"></a>
+<span class="sourceLineNo">379</span>   * @param args The command line 
parameters.<a name="line.379"></a>
+<span class="sourceLineNo">380</span>   * @throws Exception When running the 
job fails.<a name="line.380"></a>
+<span class="sourceLineNo">381</span>   */<a name="line.381"></a>
+<span class="sourceLineNo">382</span>  public static void main(String[] args) 
throws Exception {<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    int ret = ToolRunner.run(new 
WALPlayer(HBaseConfiguration.create()), args);<a name="line.383"></a>
+<span class="sourceLineNo">384</span>    System.exit(ret);<a 
name="line.384"></a>
+<span class="sourceLineNo">385</span>  }<a name="line.385"></a>
+<span class="sourceLineNo">386</span><a name="line.386"></a>
+<span class="sourceLineNo">387</span>  @Override<a name="line.387"></a>
+<span class="sourceLineNo">388</span>  public int run(String[] args) throws 
Exception {<a name="line.388"></a>
+<span class="sourceLineNo">389</span>    if (args.length &lt; 2) {<a 
name="line.389"></a>
+<span class="sourceLineNo">390</span>      usage("Wrong number of arguments: " 
+ args.length);<a name="line.390"></a>
+<span class="sourceLineNo">391</span>      System.exit(-1);<a 
name="line.391"></a>
+<span class="sourceLineNo">392</span>    }<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    Job job = 
createSubmittableJob(args);<a name="line.393"></a>
+<span class="sourceLineNo">394</span>    return job.waitForCompletion(true) ? 
0 : 1;<a name="line.394"></a>
+<span class="sourceLineNo">395</span>  }<a name="line.395"></a>
+<span class="sourceLineNo">396</span>}<a name="line.396"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
index a5477ac..9501e97 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/WALPlayer.html
@@ -357,46 +357,51 @@
 <span class="sourceLineNo">349</span>      System.err.println("ERROR: " + 
errorMsg);<a name="line.349"></a>
 <span class="sourceLineNo">350</span>    }<a name="line.350"></a>
 <span class="sourceLineNo">351</span>    System.err.println("Usage: " + NAME + 
" [options] &lt;wal inputdir&gt; &lt;tables&gt; [&lt;tableMappings&gt;]");<a 
name="line.351"></a>
-<span class="sourceLineNo">352</span>    System.err.println("Read all WAL 
entries for &lt;tables&gt;.");<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    System.err.println("If no tables 
(\"\") are specific, all tables are imported.");<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    System.err.println("(Careful, even 
hbase:meta entries will be imported" + " in that case.)");<a 
name="line.354"></a>
-<span class="sourceLineNo">355</span>    System.err.println("Otherwise 
&lt;tables&gt; is a comma separated list of tables.\n");<a name="line.355"></a>
-<span class="sourceLineNo">356</span>    System.err.println("The WAL entries 
can be mapped to new set of tables via &lt;tableMapping&gt;.");<a 
name="line.356"></a>
-<span class="sourceLineNo">357</span>    
System.err.println("&lt;tableMapping&gt; is a command separated list of 
targettables.");<a name="line.357"></a>
+<span class="sourceLineNo">352</span>    System.err.println("Replay all WAL 
files into HBase.");<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    System.err.println("&lt;tables&gt; is 
a comma separated list of tables.");<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    System.err.println("If no tables 
(\"\") are specified, all tables are imported.");<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    System.err.println("(Be careful, 
hbase:meta entries will be imported in this case.)\n");<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    System.err.println("WAL entries can 
be mapped to new set of tables via &lt;tableMappings&gt;.");<a 
name="line.356"></a>
+<span class="sourceLineNo">357</span>    
System.err.println("&lt;tableMappings&gt; is a comma separated list of target 
tables.");<a name="line.357"></a>
 <span class="sourceLineNo">358</span>    System.err.println("If specified, 
each table in &lt;tables&gt; must have a mapping.\n");<a name="line.358"></a>
 <span class="sourceLineNo">359</span>    System.err.println("By default " + 
NAME + " will load data directly into HBase.");<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    System.err.println("To generate 
HFiles for a bulk data load instead, pass the option:");<a name="line.360"></a>
+<span class="sourceLineNo">360</span>    System.err.println("To generate 
HFiles for a bulk data load instead, pass the following option:");<a 
name="line.360"></a>
 <span class="sourceLineNo">361</span>    System.err.println("  -D" + 
BULK_OUTPUT_CONF_KEY + "=/path/for/output");<a name="line.361"></a>
 <span class="sourceLineNo">362</span>    System.err.println("  (Only one table 
can be specified, and no mapping is allowed!)");<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    System.err.println("Other options: 
(specify time range to WAL edit to consider)");<a name="line.363"></a>
+<span class="sourceLineNo">363</span>    System.err.println("Time range 
options:");<a name="line.363"></a>
 <span class="sourceLineNo">364</span>    System.err.println("  -D" + 
WALInputFormat.START_TIME_KEY + "=[date|ms]");<a name="line.364"></a>
 <span class="sourceLineNo">365</span>    System.err.println("  -D" + 
WALInputFormat.END_TIME_KEY + "=[date|ms]");<a name="line.365"></a>
-<span class="sourceLineNo">366</span>    System.err.println("   -D " + 
JOB_NAME_CONF_KEY<a name="line.366"></a>
-<span class="sourceLineNo">367</span>        + "=jobName - use the specified 
mapreduce job name for the wal player");<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    System.err.println("For performance 
also consider the following options:\n"<a name="line.368"></a>
-<span class="sourceLineNo">369</span>        + "  
-Dmapreduce.map.speculative=false\n" + "  
-Dmapreduce.reduce.speculative=false");<a name="line.369"></a>
-<span class="sourceLineNo">370</span>  }<a name="line.370"></a>
-<span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span>  /**<a name="line.372"></a>
-<span class="sourceLineNo">373</span>   * Main entry point.<a 
name="line.373"></a>
-<span class="sourceLineNo">374</span>   * @param args The command line 
parameters.<a name="line.374"></a>
-<span class="sourceLineNo">375</span>   * @throws Exception When running the 
job fails.<a name="line.375"></a>
-<span class="sourceLineNo">376</span>   */<a name="line.376"></a>
-<span class="sourceLineNo">377</span>  public static void main(String[] args) 
throws Exception {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>    int ret = ToolRunner.run(new 
WALPlayer(HBaseConfiguration.create()), args);<a name="line.378"></a>
-<span class="sourceLineNo">379</span>    System.exit(ret);<a 
name="line.379"></a>
-<span class="sourceLineNo">380</span>  }<a name="line.380"></a>
-<span class="sourceLineNo">381</span><a name="line.381"></a>
-<span class="sourceLineNo">382</span>  @Override<a name="line.382"></a>
-<span class="sourceLineNo">383</span>  public int run(String[] args) throws 
Exception {<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    if (args.length &lt; 2) {<a 
name="line.384"></a>
-<span class="sourceLineNo">385</span>      usage("Wrong number of arguments: " 
+ args.length);<a name="line.385"></a>
-<span class="sourceLineNo">386</span>      System.exit(-1);<a 
name="line.386"></a>
-<span class="sourceLineNo">387</span>    }<a name="line.387"></a>
-<span class="sourceLineNo">388</span>    Job job = 
createSubmittableJob(args);<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    return job.waitForCompletion(true) ? 
0 : 1;<a name="line.389"></a>
-<span class="sourceLineNo">390</span>  }<a name="line.390"></a>
-<span class="sourceLineNo">391</span>}<a name="line.391"></a>
+<span class="sourceLineNo">366</span>    System.err.println("  (The start and 
the end date of timerange. The dates can be expressed");<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    System.err.println("  in milliseconds 
since epoch or in yyyy-MM-dd'T'HH:mm:ss.SS format.");<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    System.err.println("  E.g. 
1234567890120 or 2009-02-13T23:32:30.12)");<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    System.err.println("Other 
options:");<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    System.err.println("  -D" + 
JOB_NAME_CONF_KEY + "=jobName");<a name="line.370"></a>
+<span class="sourceLineNo">371</span>    System.err.println("  Use the 
specified mapreduce job name for the wal player");<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    System.err.println("For performance 
also consider the following options:\n"<a name="line.372"></a>
+<span class="sourceLineNo">373</span>        + "  
-Dmapreduce.map.speculative=false\n"<a name="line.373"></a>
+<span class="sourceLineNo">374</span>        + "  
-Dmapreduce.reduce.speculative=false");<a name="line.374"></a>
+<span class="sourceLineNo">375</span>  }<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span>  /**<a name="line.377"></a>
+<span class="sourceLineNo">378</span>   * Main entry point.<a 
name="line.378"></a>
+<span class="sourceLineNo">379</span>   * @param args The command line 
parameters.<a name="line.379"></a>
+<span class="sourceLineNo">380</span>   * @throws Exception When running the 
job fails.<a name="line.380"></a>
+<span class="sourceLineNo">381</span>   */<a name="line.381"></a>
+<span class="sourceLineNo">382</span>  public static void main(String[] args) 
throws Exception {<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    int ret = ToolRunner.run(new 
WALPlayer(HBaseConfiguration.create()), args);<a name="line.383"></a>
+<span class="sourceLineNo">384</span>    System.exit(ret);<a 
name="line.384"></a>
+<span class="sourceLineNo">385</span>  }<a name="line.385"></a>
+<span class="sourceLineNo">386</span><a name="line.386"></a>
+<span class="sourceLineNo">387</span>  @Override<a name="line.387"></a>
+<span class="sourceLineNo">388</span>  public int run(String[] args) throws 
Exception {<a name="line.388"></a>
+<span class="sourceLineNo">389</span>    if (args.length &lt; 2) {<a 
name="line.389"></a>
+<span class="sourceLineNo">390</span>      usage("Wrong number of arguments: " 
+ args.length);<a name="line.390"></a>
+<span class="sourceLineNo">391</span>      System.exit(-1);<a 
name="line.391"></a>
+<span class="sourceLineNo">392</span>    }<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    Job job = 
createSubmittableJob(args);<a name="line.393"></a>
+<span class="sourceLineNo">394</span>    return job.waitForCompletion(true) ? 
0 : 1;<a name="line.394"></a>
+<span class="sourceLineNo">395</span>  }<a name="line.395"></a>
+<span class="sourceLineNo">396</span>}<a name="line.396"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/master/RegionPlan.RegionPlanComparator.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/RegionPlan.RegionPlanComparator.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/RegionPlan.RegionPlanComparator.html
index ffeb691..98de5e7 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/RegionPlan.RegionPlanComparator.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/RegionPlan.RegionPlanComparator.html
@@ -197,7 +197,7 @@
 <span class="sourceLineNo">189</span><a name="line.189"></a>
 <span class="sourceLineNo">190</span>  @Override<a name="line.190"></a>
 <span class="sourceLineNo">191</span>  public String toString() {<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>    return "hri=" + 
this.hri.getRegionNameAsString() + ", source=" +<a name="line.192"></a>
+<span class="sourceLineNo">192</span>    return "hri=" + 
this.hri.getEncodedName() + ", source=" +<a name="line.192"></a>
 <span class="sourceLineNo">193</span>      (this.source == null? "": 
this.source.toString()) +<a name="line.193"></a>
 <span class="sourceLineNo">194</span>      ", destination=" + (this.dest == 
null? "": this.dest.toString());<a name="line.194"></a>
 <span class="sourceLineNo">195</span>  }<a name="line.195"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/master/RegionPlan.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/RegionPlan.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/RegionPlan.html
index ffeb691..98de5e7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/RegionPlan.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/RegionPlan.html
@@ -197,7 +197,7 @@
 <span class="sourceLineNo">189</span><a name="line.189"></a>
 <span class="sourceLineNo">190</span>  @Override<a name="line.190"></a>
 <span class="sourceLineNo">191</span>  public String toString() {<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>    return "hri=" + 
this.hri.getRegionNameAsString() + ", source=" +<a name="line.192"></a>
+<span class="sourceLineNo">192</span>    return "hri=" + 
this.hri.getEncodedName() + ", source=" +<a name="line.192"></a>
 <span class="sourceLineNo">193</span>      (this.source == null? "": 
this.source.toString()) +<a name="line.193"></a>
 <span class="sourceLineNo">194</span>      ", destination=" + (this.dest == 
null? "": this.dest.toString());<a name="line.194"></a>
 <span class="sourceLineNo">195</span>  }<a name="line.195"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionChore.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionChore.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionChore.html
index 1ca82d8..078e4b1 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionChore.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionChore.html
@@ -872,7 +872,7 @@
 <span class="sourceLineNo">864</span>    final ServerStateNode serverNode = 
regionStates.getOrCreateServer(serverName);<a name="line.864"></a>
 <span class="sourceLineNo">865</span>    if (!reportTransition(regionNode, 
serverNode, state, seqId)) {<a name="line.865"></a>
 <span class="sourceLineNo">866</span>      // Don't log if shutting down 
cluster; during shutdown.<a name="line.866"></a>
-<span class="sourceLineNo">867</span>      LOG.warn("No matchin procedure 
found for {} to transition to {}", regionNode, state);<a name="line.867"></a>
+<span class="sourceLineNo">867</span>      LOG.warn("No matching procedure 
found for {} transition to {}", regionNode, state);<a name="line.867"></a>
 <span class="sourceLineNo">868</span>    }<a name="line.868"></a>
 <span class="sourceLineNo">869</span>  }<a name="line.869"></a>
 <span class="sourceLineNo">870</span><a name="line.870"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionStat.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionStat.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionStat.html
index 1ca82d8..078e4b1 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionStat.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionStat.html
@@ -872,7 +872,7 @@
 <span class="sourceLineNo">864</span>    final ServerStateNode serverNode = 
regionStates.getOrCreateServer(serverName);<a name="line.864"></a>
 <span class="sourceLineNo">865</span>    if (!reportTransition(regionNode, 
serverNode, state, seqId)) {<a name="line.865"></a>
 <span class="sourceLineNo">866</span>      // Don't log if shutting down 
cluster; during shutdown.<a name="line.866"></a>
-<span class="sourceLineNo">867</span>      LOG.warn("No matchin procedure 
found for {} to transition to {}", regionNode, state);<a name="line.867"></a>
+<span class="sourceLineNo">867</span>      LOG.warn("No matching procedure 
found for {} transition to {}", regionNode, state);<a name="line.867"></a>
 <span class="sourceLineNo">868</span>    }<a name="line.868"></a>
 <span class="sourceLineNo">869</span>  }<a name="line.869"></a>
 <span class="sourceLineNo">870</span><a name="line.870"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.html
index 1ca82d8..078e4b1 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.html
@@ -872,7 +872,7 @@
 <span class="sourceLineNo">864</span>    final ServerStateNode serverNode = 
regionStates.getOrCreateServer(serverName);<a name="line.864"></a>
 <span class="sourceLineNo">865</span>    if (!reportTransition(regionNode, 
serverNode, state, seqId)) {<a name="line.865"></a>
 <span class="sourceLineNo">866</span>      // Don't log if shutting down 
cluster; during shutdown.<a name="line.866"></a>
-<span class="sourceLineNo">867</span>      LOG.warn("No matchin procedure 
found for {} to transition to {}", regionNode, state);<a name="line.867"></a>
+<span class="sourceLineNo">867</span>      LOG.warn("No matching procedure 
found for {} transition to {}", regionNode, state);<a name="line.867"></a>
 <span class="sourceLineNo">868</span>    }<a name="line.868"></a>
 <span class="sourceLineNo">869</span>  }<a name="line.869"></a>
 <span class="sourceLineNo">870</span><a name="line.870"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStateStore.RegionStateVisitor.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStateStore.RegionStateVisitor.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStateStore.RegionStateVisitor.html
index cdb80a0..b442170 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStateStore.RegionStateVisitor.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStateStore.RegionStateVisitor.html
@@ -126,227 +126,226 @@
 <span class="sourceLineNo">118</span>      final long openSeqNum = -1;<a 
name="line.118"></a>
 <span class="sourceLineNo">119</span><a name="line.119"></a>
 <span class="sourceLineNo">120</span>      // TODO: move under trace, now is 
visible for debugging<a name="line.120"></a>
-<span class="sourceLineNo">121</span>      LOG.info(String.format("Load 
hbase:meta entry region=%s regionState=%s lastHost=%s regionLocation=%s",<a 
name="line.121"></a>
-<span class="sourceLineNo">122</span>        regionInfo, state, lastHost, 
regionLocation));<a name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>      
visitor.visitRegionState(regionInfo, state, regionLocation, lastHost, 
openSeqNum);<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    }<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 void 
updateRegionLocation(RegionStates.RegionStateNode regionStateNode)<a 
name="line.128"></a>
-<span class="sourceLineNo">129</span>      throws IOException {<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>    if 
(regionStateNode.getRegionInfo().isMetaRegion()) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      
updateMetaLocation(regionStateNode.getRegionInfo(), 
regionStateNode.getRegionLocation());<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    } else {<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      long openSeqNum = 
regionStateNode.getState() == State.OPEN ?<a name="line.133"></a>
-<span class="sourceLineNo">134</span>          regionStateNode.getOpenSeqNum() 
: HConstants.NO_SEQNUM;<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      
updateUserRegionLocation(regionStateNode.getRegionInfo(), 
regionStateNode.getState(),<a name="line.135"></a>
-<span class="sourceLineNo">136</span>          
regionStateNode.getRegionLocation(), regionStateNode.getLastHost(), 
openSeqNum,<a name="line.136"></a>
-<span class="sourceLineNo">137</span>          
regionStateNode.getProcedure().getProcId());<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><a name="line.140"></a>
-<span class="sourceLineNo">141</span>  private void updateMetaLocation(final 
RegionInfo regionInfo, final ServerName serverName)<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      throws IOException {<a 
name="line.142"></a>
-<span class="sourceLineNo">143</span>    try {<a name="line.143"></a>
-<span class="sourceLineNo">144</span>      
MetaTableLocator.setMetaLocation(master.getZooKeeper(), serverName,<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>        regionInfo.getReplicaId(), 
State.OPEN);<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    } catch (KeeperException e) {<a 
name="line.146"></a>
-<span class="sourceLineNo">147</span>      throw new IOException(e);<a 
name="line.147"></a>
-<span class="sourceLineNo">148</span>    }<a name="line.148"></a>
-<span class="sourceLineNo">149</span>  }<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span>  private void 
updateUserRegionLocation(final RegionInfo regionInfo, final State state,<a 
name="line.151"></a>
-<span class="sourceLineNo">152</span>      final ServerName regionLocation, 
final ServerName lastHost, final long openSeqNum,<a name="line.152"></a>
-<span class="sourceLineNo">153</span>      final long pid)<a 
name="line.153"></a>
-<span class="sourceLineNo">154</span>      throws IOException {<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>    long time = 
EnvironmentEdgeManager.currentTime();<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    final int replicaId = 
regionInfo.getReplicaId();<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    final Put put = new 
Put(MetaTableAccessor.getMetaKeyForRegion(regionInfo), time);<a 
name="line.157"></a>
-<span class="sourceLineNo">158</span>    MetaTableAccessor.addRegionInfo(put, 
regionInfo);<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    final StringBuilder info =<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>      new 
StringBuilder("pid=").append(pid).append(" updating hbase:meta row=")<a 
name="line.160"></a>
-<span class="sourceLineNo">161</span>        
.append(regionInfo.getRegionNameAsString()).append(", 
regionState=").append(state);<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    if (openSeqNum &gt;= 0) {<a 
name="line.162"></a>
-<span class="sourceLineNo">163</span>      Preconditions.checkArgument(state 
== State.OPEN &amp;&amp; regionLocation != null,<a name="line.163"></a>
-<span class="sourceLineNo">164</span>          "Open region should be on a 
server");<a name="line.164"></a>
-<span class="sourceLineNo">165</span>      MetaTableAccessor.addLocation(put, 
regionLocation, openSeqNum, replicaId);<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      // only update replication barrier 
for default replica<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      if (regionInfo.getReplicaId() == 
RegionInfo.DEFAULT_REPLICA_ID &amp;&amp;<a name="line.167"></a>
-<span class="sourceLineNo">168</span>        
hasGlobalReplicationScope(regionInfo.getTable())) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>        
MetaTableAccessor.addReplicationBarrier(put, openSeqNum);<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      }<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      info.append(", 
openSeqNum=").append(openSeqNum);<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      info.append(", 
regionLocation=").append(regionLocation);<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    } else if (regionLocation != null 
&amp;&amp; !regionLocation.equals(lastHost)) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span>      // Ideally, if no regionLocation, 
write null to the hbase:meta but this will confuse clients<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>      // currently; they want a server to 
hit. TODO: Make clients wait if no location.<a name="line.175"></a>
-<span class="sourceLineNo">176</span>      
put.add(CellBuilderFactory.create(CellBuilderType.SHALLOW_COPY)<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span>          .setRow(put.getRow())<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span>          
.setFamily(HConstants.CATALOG_FAMILY)<a name="line.178"></a>
-<span class="sourceLineNo">179</span>          
.setQualifier(getServerNameColumn(replicaId))<a name="line.179"></a>
-<span class="sourceLineNo">180</span>          
.setTimestamp(put.getTimestamp())<a name="line.180"></a>
-<span class="sourceLineNo">181</span>          .setType(Cell.Type.Put)<a 
name="line.181"></a>
-<span class="sourceLineNo">182</span>          
.setValue(Bytes.toBytes(regionLocation.getServerName()))<a name="line.182"></a>
-<span class="sourceLineNo">183</span>          .build());<a 
name="line.183"></a>
-<span class="sourceLineNo">184</span>      info.append(", 
regionLocation=").append(regionLocation);<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    }<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    
put.add(CellBuilderFactory.create(CellBuilderType.SHALLOW_COPY)<a 
name="line.186"></a>
-<span class="sourceLineNo">187</span>        .setRow(put.getRow())<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>        
.setFamily(HConstants.CATALOG_FAMILY)<a name="line.188"></a>
-<span class="sourceLineNo">189</span>        
.setQualifier(getStateColumn(replicaId))<a name="line.189"></a>
-<span class="sourceLineNo">190</span>        
.setTimestamp(put.getTimestamp())<a name="line.190"></a>
-<span class="sourceLineNo">191</span>        .setType(Cell.Type.Put)<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>        
.setValue(Bytes.toBytes(state.name()))<a name="line.192"></a>
-<span class="sourceLineNo">193</span>        .build());<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    LOG.info(info.toString());<a 
name="line.194"></a>
-<span class="sourceLineNo">195</span>    updateRegionLocation(regionInfo, 
state, put);<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>  private void 
updateRegionLocation(RegionInfo regionInfo, State state, Put put)<a 
name="line.198"></a>
-<span class="sourceLineNo">199</span>      throws IOException {<a 
name="line.199"></a>
-<span class="sourceLineNo">200</span>    try (Table table = 
master.getConnection().getTable(TableName.META_TABLE_NAME)) {<a 
name="line.200"></a>
-<span class="sourceLineNo">201</span>      table.put(put);<a 
name="line.201"></a>
-<span class="sourceLineNo">202</span>    } catch (IOException e) {<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>      // TODO: Revist!!!! Means that if a 
server is loaded, then we will abort our host!<a name="line.203"></a>
-<span class="sourceLineNo">204</span>      // In tests we abort the Master!<a 
name="line.204"></a>
-<span class="sourceLineNo">205</span>      String msg = String.format("FAILED 
persisting region=%s state=%s",<a name="line.205"></a>
-<span class="sourceLineNo">206</span>        regionInfo.getShortNameToLog(), 
state);<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      LOG.error(msg, e);<a 
name="line.207"></a>
-<span class="sourceLineNo">208</span>      master.abort(msg, e);<a 
name="line.208"></a>
-<span class="sourceLineNo">209</span>      throw e;<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><a name="line.212"></a>
-<span class="sourceLineNo">213</span>  private long 
getOpenSeqNumForParentRegion(RegionInfo region) throws IOException {<a 
name="line.213"></a>
-<span class="sourceLineNo">214</span>    MasterFileSystem mfs = 
master.getMasterFileSystem();<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    long maxSeqId =<a name="line.215"></a>
-<span class="sourceLineNo">216</span>        
WALSplitter.getMaxRegionSequenceId(mfs.getFileSystem(), 
mfs.getRegionDir(region));<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    return maxSeqId &gt; 0 ? maxSeqId + 1 
: HConstants.NO_SEQNUM;<a name="line.217"></a>
-<span class="sourceLineNo">218</span>  }<a name="line.218"></a>
-<span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span>  // 
============================================================================================<a
 name="line.220"></a>
-<span class="sourceLineNo">221</span>  //  Update Region Splitting State 
helpers<a name="line.221"></a>
-<span class="sourceLineNo">222</span>  // 
============================================================================================<a
 name="line.222"></a>
-<span class="sourceLineNo">223</span>  public void splitRegion(RegionInfo 
parent, RegionInfo hriA, RegionInfo hriB,<a name="line.223"></a>
-<span class="sourceLineNo">224</span>      ServerName serverName) throws 
IOException {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    TableDescriptor htd = 
getTableDescriptor(parent.getTable());<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    long parentOpenSeqNum = 
HConstants.NO_SEQNUM;<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    if (htd.hasGlobalReplicationScope()) 
{<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      parentOpenSeqNum = 
getOpenSeqNumForParentRegion(parent);<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    }<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    
MetaTableAccessor.splitRegion(master.getConnection(), parent, parentOpenSeqNum, 
hriA, hriB,<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      serverName, 
getRegionReplication(htd));<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>
-<span class="sourceLineNo">234</span>  // 
============================================================================================<a
 name="line.234"></a>
-<span class="sourceLineNo">235</span>  //  Update Region Merging State 
helpers<a name="line.235"></a>
-<span class="sourceLineNo">236</span>  // 
============================================================================================<a
 name="line.236"></a>
-<span class="sourceLineNo">237</span>  public void mergeRegions(RegionInfo 
child, RegionInfo hriA, RegionInfo hriB,<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      ServerName serverName) throws 
IOException {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    TableDescriptor htd = 
getTableDescriptor(child.getTable());<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    long regionAOpenSeqNum = -1L;<a 
name="line.240"></a>
-<span class="sourceLineNo">241</span>    long regionBOpenSeqNum = -1L;<a 
name="line.241"></a>
-<span class="sourceLineNo">242</span>    if (htd.hasGlobalReplicationScope()) 
{<a name="line.242"></a>
-<span class="sourceLineNo">243</span>      regionAOpenSeqNum = 
getOpenSeqNumForParentRegion(hriA);<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      regionBOpenSeqNum = 
getOpenSeqNumForParentRegion(hriB);<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    }<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    
MetaTableAccessor.mergeRegions(master.getConnection(), child, hriA, 
regionAOpenSeqNum, hriB,<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      regionBOpenSeqNum, serverName, 
getRegionReplication(htd));<a name="line.247"></a>
-<span class="sourceLineNo">248</span>  }<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span>  // 
============================================================================================<a
 name="line.250"></a>
-<span class="sourceLineNo">251</span>  //  Delete Region State helpers<a 
name="line.251"></a>
-<span class="sourceLineNo">252</span>  // 
============================================================================================<a
 name="line.252"></a>
-<span class="sourceLineNo">253</span>  public void deleteRegion(final 
RegionInfo regionInfo) throws IOException {<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    
deleteRegions(Collections.singletonList(regionInfo));<a name="line.254"></a>
-<span class="sourceLineNo">255</span>  }<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span>  public void deleteRegions(final 
List&lt;RegionInfo&gt; regions) throws IOException {<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    
MetaTableAccessor.deleteRegions(master.getConnection(), regions);<a 
name="line.258"></a>
-<span class="sourceLineNo">259</span>  }<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span>  // 
==========================================================================<a 
name="line.261"></a>
-<span class="sourceLineNo">262</span>  //  Table Descriptors helpers<a 
name="line.262"></a>
-<span class="sourceLineNo">263</span>  // 
==========================================================================<a 
name="line.263"></a>
-<span class="sourceLineNo">264</span>  private boolean 
hasGlobalReplicationScope(TableName tableName) throws IOException {<a 
name="line.264"></a>
-<span class="sourceLineNo">265</span>    return 
hasGlobalReplicationScope(getTableDescriptor(tableName));<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>  private boolean 
hasGlobalReplicationScope(TableDescriptor htd) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    return htd != null ? 
htd.hasGlobalReplicationScope() : false;<a name="line.269"></a>
-<span class="sourceLineNo">270</span>  }<a name="line.270"></a>
-<span class="sourceLineNo">271</span><a name="line.271"></a>
-<span class="sourceLineNo">272</span>  private int 
getRegionReplication(TableDescriptor htd) {<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    return htd != null ? 
htd.getRegionReplication() : 1;<a name="line.273"></a>
-<span class="sourceLineNo">274</span>  }<a name="line.274"></a>
-<span class="sourceLineNo">275</span><a name="line.275"></a>
-<span class="sourceLineNo">276</span>  private TableDescriptor 
getTableDescriptor(TableName tableName) throws IOException {<a 
name="line.276"></a>
-<span class="sourceLineNo">277</span>    return 
master.getTableDescriptors().get(tableName);<a name="line.277"></a>
-<span class="sourceLineNo">278</span>  }<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span>  // 
==========================================================================<a 
name="line.280"></a>
-<span class="sourceLineNo">281</span>  //  Server Name<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>  /**<a name="line.284"></a>
-<span class="sourceLineNo">285</span>   * Returns the {@link ServerName} from 
catalog table {@link Result}<a name="line.285"></a>
-<span class="sourceLineNo">286</span>   * where the region is transitioning. 
It should be the same as<a name="line.286"></a>
-<span class="sourceLineNo">287</span>   * {@link 
MetaTableAccessor#getServerName(Result,int)} if the server is at OPEN state.<a 
name="line.287"></a>
-<span class="sourceLineNo">288</span>   * @param r Result to pull the 
transitioning server name from<a name="line.288"></a>
-<span class="sourceLineNo">289</span>   * @return A ServerName instance or 
{@link MetaTableAccessor#getServerName(Result,int)}<a name="line.289"></a>
-<span class="sourceLineNo">290</span>   * if necessary fields not found or 
empty.<a name="line.290"></a>
-<span class="sourceLineNo">291</span>   */<a name="line.291"></a>
-<span class="sourceLineNo">292</span>  static ServerName getRegionServer(final 
Result r, int replicaId) {<a name="line.292"></a>
-<span class="sourceLineNo">293</span>    final Cell cell = 
r.getColumnLatestCell(HConstants.CATALOG_FAMILY,<a name="line.293"></a>
-<span class="sourceLineNo">294</span>        
getServerNameColumn(replicaId));<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    if (cell == null || 
cell.getValueLength() == 0) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      RegionLocations locations = 
MetaTableAccessor.getRegionLocations(r);<a name="line.296"></a>
-<span class="sourceLineNo">297</span>      if (locations != null) {<a 
name="line.297"></a>
-<span class="sourceLineNo">298</span>        HRegionLocation location = 
locations.getRegionLocation(replicaId);<a name="line.298"></a>
-<span class="sourceLineNo">299</span>        if (location != null) {<a 
name="line.299"></a>
-<span class="sourceLineNo">300</span>          return 
location.getServerName();<a name="line.300"></a>
-<span class="sourceLineNo">301</span>        }<a name="line.301"></a>
-<span class="sourceLineNo">302</span>      }<a name="line.302"></a>
-<span class="sourceLineNo">303</span>      return null;<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    }<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    return 
ServerName.parseServerName(Bytes.toString(cell.getValueArray(),<a 
name="line.305"></a>
-<span class="sourceLineNo">306</span>      cell.getValueOffset(), 
cell.getValueLength()));<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>  private static byte[] 
getServerNameColumn(int replicaId) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    return replicaId == 0<a 
name="line.310"></a>
-<span class="sourceLineNo">311</span>        ? 
HConstants.SERVERNAME_QUALIFIER<a name="line.311"></a>
-<span class="sourceLineNo">312</span>        : 
Bytes.toBytes(HConstants.SERVERNAME_QUALIFIER_STR + META_REPLICA_ID_DELIMITER<a 
name="line.312"></a>
-<span class="sourceLineNo">313</span>          + 
String.format(RegionInfo.REPLICA_ID_FORMAT, replicaId));<a name="line.313"></a>
-<span class="sourceLineNo">314</span>  }<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span>  // 
==========================================================================<a 
name="line.316"></a>
-<span class="sourceLineNo">317</span>  //  Region State<a name="line.317"></a>
-<span class="sourceLineNo">318</span>  // 
==========================================================================<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>
-<span class="sourceLineNo">321</span>   * Pull the region state from a catalog 
table {@link Result}.<a name="line.321"></a>
-<span class="sourceLineNo">322</span>   * @param r Result to pull the region 
state from<a name="line.322"></a>
-<span class="sourceLineNo">323</span>   * @return the region state, or null if 
unknown.<a name="line.323"></a>
-<span class="sourceLineNo">324</span>   */<a name="line.324"></a>
-<span class="sourceLineNo">325</span>  @VisibleForTesting<a 
name="line.325"></a>
-<span class="sourceLineNo">326</span>  public static State 
getRegionState(final Result r, int replicaId) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    Cell cell = 
r.getColumnLatestCell(HConstants.CATALOG_FAMILY, getStateColumn(replicaId));<a 
name="line.327"></a>
-<span class="sourceLineNo">328</span>    if (cell == null || 
cell.getValueLength() == 0) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      return null;<a name="line.329"></a>
-<span class="sourceLineNo">330</span>    }<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    return 
State.valueOf(Bytes.toString(cell.getValueArray(), cell.getValueOffset(),<a 
name="line.331"></a>
-<span class="sourceLineNo">332</span>        cell.getValueLength()));<a 
name="line.332"></a>
-<span class="sourceLineNo">333</span>  }<a name="line.333"></a>
-<span class="sourceLineNo">334</span><a name="line.334"></a>
-<span class="sourceLineNo">335</span>  private static byte[] 
getStateColumn(int replicaId) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    return replicaId == 0<a 
name="line.336"></a>
-<span class="sourceLineNo">337</span>        ? HConstants.STATE_QUALIFIER<a 
name="line.337"></a>
-<span class="sourceLineNo">338</span>        : 
Bytes.toBytes(HConstants.STATE_QUALIFIER_STR + META_REPLICA_ID_DELIMITER<a 
name="line.338"></a>
-<span class="sourceLineNo">339</span>          + 
String.format(RegionInfo.REPLICA_ID_FORMAT, replicaId));<a name="line.339"></a>
-<span class="sourceLineNo">340</span>  }<a name="line.340"></a>
-<span class="sourceLineNo">341</span>}<a name="line.341"></a>
+<span class="sourceLineNo">121</span>      LOG.info("Load hbase:meta entry 
region={}, regionState={}, lastHost={}, " +<a name="line.121"></a>
+<span class="sourceLineNo">122</span>          "regionLocation={}", 
regionInfo.getEncodedName(), state, lastHost, regionLocation);<a 
name="line.122"></a>
+<span class="sourceLineNo">123</span>      
visitor.visitRegionState(regionInfo, state, regionLocation, lastHost, 
openSeqNum);<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    }<a name="line.124"></a>
+<span class="sourceLineNo">125</span>  }<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span>  public void 
updateRegionLocation(RegionStates.RegionStateNode regionStateNode)<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>      throws IOException {<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>    if 
(regionStateNode.getRegionInfo().isMetaRegion()) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      
updateMetaLocation(regionStateNode.getRegionInfo(), 
regionStateNode.getRegionLocation());<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    } else {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      long openSeqNum = 
regionStateNode.getState() == State.OPEN ?<a name="line.132"></a>
+<span class="sourceLineNo">133</span>          regionStateNode.getOpenSeqNum() 
: HConstants.NO_SEQNUM;<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      
updateUserRegionLocation(regionStateNode.getRegionInfo(), 
regionStateNode.getState(),<a name="line.134"></a>
+<span class="sourceLineNo">135</span>          
regionStateNode.getRegionLocation(), regionStateNode.getLastHost(), 
openSeqNum,<a name="line.135"></a>
+<span class="sourceLineNo">136</span>          
regionStateNode.getProcedure().getProcId());<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    }<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>  private void updateMetaLocation(final 
RegionInfo regionInfo, final ServerName serverName)<a name="line.140"></a>
+<span class="sourceLineNo">141</span>      throws IOException {<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span>    try {<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      
MetaTableLocator.setMetaLocation(master.getZooKeeper(), serverName,<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span>        regionInfo.getReplicaId(), 
State.OPEN);<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    } catch (KeeperException e) {<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>      throw new IOException(e);<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><a name="line.149"></a>
+<span class="sourceLineNo">150</span>  private void 
updateUserRegionLocation(final RegionInfo regionInfo, final State state,<a 
name="line.150"></a>
+<span class="sourceLineNo">151</span>      final ServerName regionLocation, 
final ServerName lastHost, final long openSeqNum,<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      final long pid)<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span>      throws IOException {<a 
name="line.153"></a>
+<span class="sourceLineNo">154</span>    long time = 
EnvironmentEdgeManager.currentTime();<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    final int replicaId = 
regionInfo.getReplicaId();<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    final Put put = new 
Put(MetaTableAccessor.getMetaKeyForRegion(regionInfo), time);<a 
name="line.156"></a>
+<span class="sourceLineNo">157</span>    MetaTableAccessor.addRegionInfo(put, 
regionInfo);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    final StringBuilder info =<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>      new 
StringBuilder("pid=").append(pid).append(" updating hbase:meta row=")<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>        
.append(regionInfo.getEncodedName()).append(", regionState=").append(state);<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>    if (openSeqNum &gt;= 0) {<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>      Preconditions.checkArgument(state 
== State.OPEN &amp;&amp; regionLocation != null,<a name="line.162"></a>
+<span class="sourceLineNo">163</span>          "Open region should be on a 
server");<a name="line.163"></a>
+<span class="sourceLineNo">164</span>      MetaTableAccessor.addLocation(put, 
regionLocation, openSeqNum, replicaId);<a name="line.164"></a>
+<span class="sourceLineNo">165</span>      // only update replication barrier 
for default replica<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      if (regionInfo.getReplicaId() == 
RegionInfo.DEFAULT_REPLICA_ID &amp;&amp;<a name="line.166"></a>
+<span class="sourceLineNo">167</span>        
hasGlobalReplicationScope(regionInfo.getTable())) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span>        
MetaTableAccessor.addReplicationBarrier(put, openSeqNum);<a name="line.168"></a>
+<span class="sourceLineNo">169</span>      }<a name="line.169"></a>
+<span class="sourceLineNo">170</span>      info.append(", 
openSeqNum=").append(openSeqNum);<a name="line.170"></a>
+<span class="sourceLineNo">171</span>      info.append(", 
regionLocation=").append(regionLocation);<a name="line.171"></a>
+<span class="sourceLineNo">172</span>    } else if (regionLocation != null 
&amp;&amp; !regionLocation.equals(lastHost)) {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>      // Ideally, if no regionLocation, 
write null to the hbase:meta but this will confuse clients<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span>      // currently; they want a server to 
hit. TODO: Make clients wait if no location.<a name="line.174"></a>
+<span class="sourceLineNo">175</span>      
put.add(CellBuilderFactory.create(CellBuilderType.SHALLOW_COPY)<a 
name="line.175"></a>
+<span class="sourceLineNo">176</span>          .setRow(put.getRow())<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>          
.setFamily(HConstants.CATALOG_FAMILY)<a name="line.177"></a>
+<span class="sourceLineNo">178</span>          
.setQualifier(getServerNameColumn(replicaId))<a name="line.178"></a>
+<span class="sourceLineNo">179</span>          
.setTimestamp(put.getTimestamp())<a name="line.179"></a>
+<span class="sourceLineNo">180</span>          .setType(Cell.Type.Put)<a 
name="line.180"></a>
+<span class="sourceLineNo">181</span>          
.setValue(Bytes.toBytes(regionLocation.getServerName()))<a name="line.181"></a>
+<span class="sourceLineNo">182</span>          .build());<a 
name="line.182"></a>
+<span class="sourceLineNo">183</span>      info.append(", 
regionLocation=").append(regionLocation);<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    }<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    
put.add(CellBuilderFactory.create(CellBuilderType.SHALLOW_COPY)<a 
name="line.185"></a>
+<span class="sourceLineNo">186</span>        .setRow(put.getRow())<a 
name="line.186"></a>
+<span class="sourceLineNo">187</span>        
.setFamily(HConstants.CATALOG_FAMILY)<a name="line.187"></a>
+<span class="sourceLineNo">188</span>        
.setQualifier(getStateColumn(replicaId))<a name="line.188"></a>
+<span class="sourceLineNo">189</span>        
.setTimestamp(put.getTimestamp())<a name="line.189"></a>
+<span class="sourceLineNo">190</span>        .setType(Cell.Type.Put)<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span>        
.setValue(Bytes.toBytes(state.name()))<a name="line.191"></a>
+<span class="sourceLineNo">192</span>        .build());<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    LOG.info(info.toString());<a 
name="line.193"></a>
+<span class="sourceLineNo">194</span>    updateRegionLocation(regionInfo, 
state, put);<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>  private void 
updateRegionLocation(RegionInfo regionInfo, State state, Put put)<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>      throws IOException {<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>    try (Table table = 
master.getConnection().getTable(TableName.META_TABLE_NAME)) {<a 
name="line.199"></a>
+<span class="sourceLineNo">200</span>      table.put(put);<a 
name="line.200"></a>
+<span class="sourceLineNo">201</span>    } catch (IOException e) {<a 
name="line.201"></a>
+<span class="sourceLineNo">202</span>      // TODO: Revist!!!! Means that if a 
server is loaded, then we will abort our host!<a name="line.202"></a>
+<span class="sourceLineNo">203</span>      // In tests we abort the Master!<a 
name="line.203"></a>
+<span class="sourceLineNo">204</span>      String msg = String.format("FAILED 
persisting region=%s state=%s",<a name="line.204"></a>
+<span class="sourceLineNo">205</span>        regionInfo.getShortNameToLog(), 
state);<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      LOG.error(msg, e);<a 
name="line.206"></a>
+<span class="sourceLineNo">207</span>      master.abort(msg, e);<a 
name="line.207"></a>
+<span class="sourceLineNo">208</span>      throw e;<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    }<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>  private long 
getOpenSeqNumForParentRegion(RegionInfo region) throws IOException {<a 
name="line.212"></a>
+<span class="sourceLineNo">213</span>    MasterFileSystem mfs = 
master.getMasterFileSystem();<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    long maxSeqId =<a name="line.214"></a>
+<span class="sourceLineNo">215</span>        
WALSplitter.getMaxRegionSequenceId(mfs.getFileSystem(), 
mfs.getRegionDir(region));<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    return maxSeqId &gt; 0 ? maxSeqId + 1 
: HConstants.NO_SEQNUM;<a name="line.216"></a>
+<span class="sourceLineNo">217</span>  }<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span>  // 
============================================================================================<a
 name="line.219"></a>
+<span class="sourceLineNo">220</span>  //  Update Region Splitting State 
helpers<a name="line.220"></a>
+<span class="sourceLineNo">221</span>  // 
============================================================================================<a
 name="line.221"></a>
+<span class="sourceLineNo">222</span>  public void splitRegion(RegionInfo 
parent, RegionInfo hriA, RegionInfo hriB,<a name="line.222"></a>
+<span class="sourceLineNo">223</span>      ServerName serverName) throws 
IOException {<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    TableDescriptor htd = 
getTableDescriptor(parent.getTable());<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    long parentOpenSeqNum = 
HConstants.NO_SEQNUM;<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    if (htd.hasGlobalReplicationScope()) 
{<a name="line.226"></a>
+<span class="sourceLineNo">227</span>      parentOpenSeqNum = 
getOpenSeqNumForParentRegion(parent);<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    }<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    
MetaTableAccessor.splitRegion(master.getConnection(), parent, parentOpenSeqNum, 
hriA, hriB,<a name="line.229"></a>
+<span class="sourceLineNo">230</span>      serverName, 
getRegionReplication(htd));<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>
+<span class="sourceLineNo">234</span>  //  Update Region Merging State 
helpers<a name="line.234"></a>
+<span class="sourceLineNo">235</span>  // 
============================================================================================<a
 name="line.235"></a>
+<span class="sourceLineNo">236</span>  public void mergeRegions(RegionInfo 
child, RegionInfo hriA, RegionInfo hriB,<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      ServerName serverName) throws 
IOException {<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    TableDescriptor htd = 
getTableDescriptor(child.getTable());<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    long regionAOpenSeqNum = -1L;<a 
name="line.239"></a>
+<span class="sourceLineNo">240</span>    long regionBOpenSeqNum = -1L;<a 
name="line.240"></a>
+<span class="sourceLineNo">241</span>    if (htd.hasGlobalReplicationScope()) 
{<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      regionAOpenSeqNum = 
getOpenSeqNumForParentRegion(hriA);<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      regionBOpenSeqNum = 
getOpenSeqNumForParentRegion(hriB);<a name="line.243"></a>
+<span class="sourceLineNo">244</span>    }<a name="line.244"></a>
+<span class="sourceLineNo">245</span>    
MetaTableAccessor.mergeRegions(master.getConnection(), child, hriA, 
regionAOpenSeqNum, hriB,<a name="line.245"></a>
+<span class="sourceLineNo">246</span>      regionBOpenSeqNum, serverName, 
getRegionReplication(htd));<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>  // 
============================================================================================<a
 name="line.249"></a>
+<span class="sourceLineNo">250</span>  //  Delete Region State helpers<a 
name="line.250"></a>
+<span class="sourceLineNo">251</span>  // 
============================================================================================<a
 name="line.251"></a>
+<span class="sourceLineNo">252</span>  public void deleteRegion(final 
RegionInfo regionInfo) throws IOException {<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    
deleteRegions(Collections.singletonList(regionInfo));<a name="line.253"></a>
+<span class="sourceLineNo">254</span>  }<a name="line.254"></a>
+<span class="sourceLineNo">255</span><a name="line.255"></a>
+<span class="sourceLineNo">256</span>  public void deleteRegions(final 
List&lt;RegionInfo&gt; regions) throws IOException {<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    
MetaTableAccessor.deleteRegions(master.getConnection(), regions);<a 
name="line.257"></a>
+<span class="sourceLineNo">258</span>  }<a name="line.258"></a>
+<span class="sourceLineNo">259</span><a name="line.259"></a>
+<span class="sourceLineNo">260</span>  // 
==========================================================================<a 
name="line.260"></a>
+<span class="sourceLineNo">261</span>  //  Table Descriptors helpers<a 
name="line.261"></a>
+<span class="sourceLineNo">262</span>  // 
==========================================================================<a 
name="line.262"></a>
+<span class="sourceLineNo">263</span>  private boolean 
hasGlobalReplicationScope(TableName tableName) throws IOException {<a 
name="line.263"></a>
+<span class="sourceLineNo">264</span>    return 
hasGlobalReplicationScope(getTableDescriptor(tableName));<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>  private boolean 
hasGlobalReplicationScope(TableDescriptor htd) {<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    return htd != null ? 
htd.hasGlobalReplicationScope() : false;<a name="line.268"></a>
+<span class="sourceLineNo">269</span>  }<a name="line.269"></a>
+<span class="sourceLineNo">270</span><a name="line.270"></a>
+<span class="sourceLineNo">271</span>  private int 
getRegionReplication(TableDescriptor htd) {<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    return htd != null ? 
htd.getRegionReplication() : 1;<a name="line.272"></a>
+<span class="sourceLineNo">273</span>  }<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span>  private TableDescriptor 
getTableDescriptor(TableName tableName) throws IOException {<a 
name="line.275"></a>
+<span class="sourceLineNo">276</span>    return 
master.getTableDescriptors().get(tableName);<a name="line.276"></a>
+<span class="sourceLineNo">277</span>  }<a name="line.277"></a>
+<span class="sourceLineNo">278</span><a name="line.278"></a>
+<span class="sourceLineNo">279</span>  // 
==========================================================================<a 
name="line.279"></a>
+<span class="sourceLineNo">280</span>  //  Server Name<a name="line.280"></a>
+<span class="sourceLineNo">281</span>  // 
==========================================================================<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>   * Returns the {@link ServerName} from 
catalog table {@link Result}<a name="line.284"></a>
+<span class="sourceLineNo">285</span>   * where the region is transitioning. 
It should be the same as<a name="line.285"></a>
+<span class="sourceLineNo">286</span>   * {@link 
MetaTableAccessor#getServerName(Result,int)} if the server is at OPEN state.<a 
name="line.286"></a>
+<span class="sourceLineNo">287</span>   * @param r Result to pull the 
transitioning server name from<a name="line.287"></a>
+<span class="sourceLineNo">288</span>   * @return A ServerName instance or 
{@link MetaTableAccessor#getServerName(Result,int)}<a name="line.288"></a>
+<span class="sourceLineNo">289</span>   * if necessary fields not found or 
empty.<a name="line.289"></a>
+<span class="sourceLineNo">290</span>   */<a name="line.290"></a>
+<span class="sourceLineNo">291</span>  static ServerName getRegionServer(final 
Result r, int replicaId) {<a name="line.291"></a>
+<span class="sourceLineNo">292</span>    final Cell cell = 
r.getColumnLatestCell(HConstants.CATALOG_FAMILY,<a name="line.292"></a>
+<span class="sourceLineNo">293</span>        
getServerNameColumn(replicaId));<a name="line.293"></a>
+<span class="sourceLineNo">294</span>    if (cell == null || 
cell.getValueLength() == 0) {<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      RegionLocations locations = 
MetaTableAccessor.getRegionLocations(r);<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      if (locations != null) {<a 
name="line.296"></a>
+<span class="sourceLineNo">297</span>        HRegionLocation location = 
locations.getRegionLocation(replicaId);<a name="line.297"></a>
+<span class="sourceLineNo">298</span>        if (location != null) {<a 
name="line.298"></a>
+<span class="sourceLineNo">299</span>          return 
location.getServerName();<a name="line.299"></a>
+<span class="sourceLineNo">300</span>        }<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      }<a name="line.301"></a>
+<span class="sourceLineNo">302</span>      return null;<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    }<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    return 
ServerName.parseServerName(Bytes.toString(cell.getValueArray(),<a 
name="line.304"></a>
+<span class="sourceLineNo">305</span>      cell.getValueOffset(), 
cell.getValueLength()));<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>  private static byte[] 
getServerNameColumn(int replicaId) {<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    return replicaId == 0<a 
name="line.309"></a>
+<span class="sourceLineNo">310</span>        ? 
HConstants.SERVERNAME_QUALIFIER<a name="line.310"></a>
+<span class="sourceLineNo">311</span>        : 
Bytes.toBytes(HConstants.SERVERNAME_QUALIFIER_STR + META_REPLICA_ID_DELIMITER<a 
name="line.311"></a>
+<span class="sourceLineNo">312</span>          + 
String.format(RegionInfo.REPLICA_ID_FORMAT, replicaId));<a name="line.312"></a>
+<span class="sourceLineNo">313</span>  }<a name="line.313"></a>
+<span class="sourceLineNo">314</span><a name="line.314"></a>
+<span class="sourceLineNo">315</span>  // 
==========================================================================<a 
name="line.315"></a>
+<span class="sourceLineNo">316</span>  //  Region State<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>  /**<a name="line.319"></a>
+<span class="sourceLineNo">320</span>   * Pull the region state from a catalog 
table {@link Result}.<a name="line.320"></a>
+<span class="sourceLineNo">321</span>   * @param r Result to pull the region 
state from<a name="line.321"></a>
+<span class="sourceLineNo">322</span>   * @return the region state, or null if 
unknown.<a name="line.322"></a>
+<span class="sourceLineNo">323</span>   */<a name="line.323"></a>
+<span class="sourceLineNo">324</span>  @VisibleForTesting<a 
name="line.324"></a>
+<span class="sourceLineNo">325</span>  public static State 
getRegionState(final Result r, int replicaId) {<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    Cell cell = 
r.getColumnLatestCell(HConstants.CATALOG_FAMILY, getStateColumn(replicaId));<a 
name="line.326"></a>
+<span class="sourceLineNo">327</span>    if (cell == null || 
cell.getValueLength() == 0) {<a name="line.327"></a>
+<span class="sourceLineNo">328</span>      return null;<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    }<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    return 
State.valueOf(Bytes.toString(cell.getValueArray(), cell.getValueOffset(),<a 
name="line.330"></a>
+<span class="sourceLineNo">331</span>        cell.getValueLength()));<a 
name="line.331"></a>
+<span class="sourceLineNo">332</span>  }<a name="line.332"></a>
+<span class="sourceLineNo">333</span><a name="line.333"></a>
+<span class="sourceLineNo">334</span>  private static byte[] 
getStateColumn(int replicaId) {<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    return replicaId == 0<a 
name="line.335"></a>
+<span class="sourceLineNo">336</span>        ? HConstants.STATE_QUALIFIER<a 
name="line.336"></a>
+<span class="sourceLineNo">337</span>        : 
Bytes.toBytes(HConstants.STATE_QUALIFIER_STR + META_REPLICA_ID_DELIMITER<a 
name="line.337"></a>
+<span class="sourceLineNo">338</span>          + 
String.format(RegionInfo.REPLICA_ID_FORMAT, replicaId));<a name="line.338"></a>
+<span class="sourceLineNo">339</span>  }<a name="line.339"></a>
+<span class="sourceLineNo">340</span>}<a name="line.340"></a>
 
 
 

Reply via email to