You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/04/16 14:46:26 UTC
[01/12] hbase-site git commit: Published site at
773aff90fdf9edf4687b373d1c7ba859d166a437.
Repository: hbase-site
Updated Branches:
refs/heads/asf-site e09c3da91 -> 5269c8776
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html
index 61c78d6..468ff43 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html
@@ -38,534 +38,591 @@
<span class="sourceLineNo">030</span>import java.util.NavigableMap;<a name="line.30"></a>
<span class="sourceLineNo">031</span>import java.util.OptionalLong;<a name="line.31"></a>
<span class="sourceLineNo">032</span>import java.util.TreeMap;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import java.util.concurrent.PriorityBlockingQueue;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import java.util.concurrent.atomic.AtomicLong;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.conf.Configuration;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.fs.FileSystem;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.fs.Path;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.Cell;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.HConstants;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.Server;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.TableName;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.Waiter.ExplainingPredicate;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.client.RegionInfoBuilder;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.regionserver.MultiVersionConcurrencyControl;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.regionserver.wal.WALActionsListener;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.replication.WALEntryFilter;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.testclassification.ReplicationTests;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.wal.WAL;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.wal.WAL.Entry;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.wal.WALEdit;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.wal.WALFactory;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.wal.WALKeyImpl;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.apache.hadoop.hdfs.MiniDFSCluster;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>import org.junit.After;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>import org.junit.AfterClass;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>import org.junit.Before;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>import org.junit.BeforeClass;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>import org.junit.ClassRule;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>import org.junit.Rule;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>import org.junit.Test;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>import org.junit.experimental.categories.Category;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>import org.junit.rules.TestName;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>import org.mockito.Mockito;<a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span>@Category({ ReplicationTests.class, LargeTests.class })<a name="line.71"></a>
-<span class="sourceLineNo">072</span>public class TestWALEntryStream {<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span> @ClassRule<a name="line.74"></a>
-<span class="sourceLineNo">075</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.75"></a>
-<span class="sourceLineNo">076</span> HBaseClassTestRule.forClass(TestWALEntryStream.class);<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span> private static HBaseTestingUtility TEST_UTIL;<a name="line.78"></a>
-<span class="sourceLineNo">079</span> private static Configuration CONF;<a name="line.79"></a>
-<span class="sourceLineNo">080</span> private static FileSystem fs;<a name="line.80"></a>
-<span class="sourceLineNo">081</span> private static MiniDFSCluster cluster;<a name="line.81"></a>
-<span class="sourceLineNo">082</span> private static final TableName tableName = TableName.valueOf("tablename");<a name="line.82"></a>
-<span class="sourceLineNo">083</span> private static final byte[] family = Bytes.toBytes("column");<a name="line.83"></a>
-<span class="sourceLineNo">084</span> private static final byte[] qualifier = Bytes.toBytes("qualifier");<a name="line.84"></a>
-<span class="sourceLineNo">085</span> private static final RegionInfo info = RegionInfoBuilder.newBuilder(tableName)<a name="line.85"></a>
-<span class="sourceLineNo">086</span> .setStartKey(HConstants.EMPTY_START_ROW).setEndKey(HConstants.LAST_ROW).build();<a name="line.86"></a>
-<span class="sourceLineNo">087</span> private static final NavigableMap<byte[], Integer> scopes = getScopes();<a name="line.87"></a>
-<span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span> private static NavigableMap<byte[], Integer> getScopes() {<a name="line.89"></a>
-<span class="sourceLineNo">090</span> NavigableMap<byte[], Integer> scopes = new TreeMap<>(Bytes.BYTES_COMPARATOR);<a name="line.90"></a>
-<span class="sourceLineNo">091</span> scopes.put(family, 1);<a name="line.91"></a>
-<span class="sourceLineNo">092</span> return scopes;<a name="line.92"></a>
-<span class="sourceLineNo">093</span> }<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span> private WAL log;<a name="line.95"></a>
-<span class="sourceLineNo">096</span> PriorityBlockingQueue<Path> walQueue;<a name="line.96"></a>
-<span class="sourceLineNo">097</span> private PathWatcher pathWatcher;<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span> @Rule<a name="line.99"></a>
-<span class="sourceLineNo">100</span> public TestName tn = new TestName();<a name="line.100"></a>
-<span class="sourceLineNo">101</span> private final MultiVersionConcurrencyControl mvcc = new MultiVersionConcurrencyControl();<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span> @BeforeClass<a name="line.103"></a>
-<span class="sourceLineNo">104</span> public static void setUpBeforeClass() throws Exception {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> TEST_UTIL = new HBaseTestingUtility();<a name="line.105"></a>
-<span class="sourceLineNo">106</span> CONF = TEST_UTIL.getConfiguration();<a name="line.106"></a>
-<span class="sourceLineNo">107</span> TEST_UTIL.startMiniDFSCluster(3);<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span> cluster = TEST_UTIL.getDFSCluster();<a name="line.109"></a>
-<span class="sourceLineNo">110</span> fs = cluster.getFileSystem();<a name="line.110"></a>
-<span class="sourceLineNo">111</span> }<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span> @AfterClass<a name="line.113"></a>
-<span class="sourceLineNo">114</span> public static void tearDownAfterClass() throws Exception {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> TEST_UTIL.shutdownMiniCluster();<a name="line.115"></a>
+<span class="sourceLineNo">033</span>import java.util.concurrent.ExecutionException;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import java.util.concurrent.ForkJoinPool;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import java.util.concurrent.Future;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import java.util.concurrent.PriorityBlockingQueue;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import java.util.concurrent.atomic.AtomicBoolean;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import java.util.concurrent.atomic.AtomicInteger;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import java.util.concurrent.atomic.AtomicLong;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.conf.Configuration;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.fs.FileSystem;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.fs.Path;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.Cell;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.HConstants;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.Server;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.TableName;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.Waiter.ExplainingPredicate;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.client.RegionInfoBuilder;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.regionserver.MultiVersionConcurrencyControl;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.regionserver.wal.WALActionsListener;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.replication.WALEntryFilter;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.testclassification.ReplicationTests;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.wal.WAL;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.wal.WAL.Entry;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.wal.WALEdit;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.wal.WALFactory;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>import org.apache.hadoop.hbase.wal.WALKeyImpl;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>import org.apache.hadoop.hdfs.MiniDFSCluster;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>import org.junit.After;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>import org.junit.AfterClass;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>import org.junit.Before;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>import org.junit.BeforeClass;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>import org.junit.ClassRule;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>import org.junit.Rule;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>import org.junit.Test;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>import org.junit.experimental.categories.Category;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>import org.junit.rules.TestName;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>import org.mockito.Mockito;<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span>@Category({ ReplicationTests.class, LargeTests.class })<a name="line.76"></a>
+<span class="sourceLineNo">077</span>public class TestWALEntryStream {<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span> @ClassRule<a name="line.79"></a>
+<span class="sourceLineNo">080</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.80"></a>
+<span class="sourceLineNo">081</span> HBaseClassTestRule.forClass(TestWALEntryStream.class);<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span> private static HBaseTestingUtility TEST_UTIL;<a name="line.83"></a>
+<span class="sourceLineNo">084</span> private static Configuration CONF;<a name="line.84"></a>
+<span class="sourceLineNo">085</span> private static FileSystem fs;<a name="line.85"></a>
+<span class="sourceLineNo">086</span> private static MiniDFSCluster cluster;<a name="line.86"></a>
+<span class="sourceLineNo">087</span> private static final TableName tableName = TableName.valueOf("tablename");<a name="line.87"></a>
+<span class="sourceLineNo">088</span> private static final byte[] family = Bytes.toBytes("column");<a name="line.88"></a>
+<span class="sourceLineNo">089</span> private static final byte[] qualifier = Bytes.toBytes("qualifier");<a name="line.89"></a>
+<span class="sourceLineNo">090</span> private static final RegionInfo info = RegionInfoBuilder.newBuilder(tableName)<a name="line.90"></a>
+<span class="sourceLineNo">091</span> .setStartKey(HConstants.EMPTY_START_ROW).setEndKey(HConstants.LAST_ROW).build();<a name="line.91"></a>
+<span class="sourceLineNo">092</span> private static final NavigableMap<byte[], Integer> scopes = getScopes();<a name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span> private static NavigableMap<byte[], Integer> getScopes() {<a name="line.94"></a>
+<span class="sourceLineNo">095</span> NavigableMap<byte[], Integer> scopes = new TreeMap<>(Bytes.BYTES_COMPARATOR);<a name="line.95"></a>
+<span class="sourceLineNo">096</span> scopes.put(family, 1);<a name="line.96"></a>
+<span class="sourceLineNo">097</span> return scopes;<a name="line.97"></a>
+<span class="sourceLineNo">098</span> }<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span> private WAL log;<a name="line.100"></a>
+<span class="sourceLineNo">101</span> PriorityBlockingQueue<Path> walQueue;<a name="line.101"></a>
+<span class="sourceLineNo">102</span> private PathWatcher pathWatcher;<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span> @Rule<a name="line.104"></a>
+<span class="sourceLineNo">105</span> public TestName tn = new TestName();<a name="line.105"></a>
+<span class="sourceLineNo">106</span> private final MultiVersionConcurrencyControl mvcc = new MultiVersionConcurrencyControl();<a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span> @BeforeClass<a name="line.108"></a>
+<span class="sourceLineNo">109</span> public static void setUpBeforeClass() throws Exception {<a name="line.109"></a>
+<span class="sourceLineNo">110</span> TEST_UTIL = new HBaseTestingUtility();<a name="line.110"></a>
+<span class="sourceLineNo">111</span> CONF = TEST_UTIL.getConfiguration();<a name="line.111"></a>
+<span class="sourceLineNo">112</span> TEST_UTIL.startMiniDFSCluster(3);<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span> cluster = TEST_UTIL.getDFSCluster();<a name="line.114"></a>
+<span class="sourceLineNo">115</span> fs = cluster.getFileSystem();<a name="line.115"></a>
<span class="sourceLineNo">116</span> }<a name="line.116"></a>
<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> @Before<a name="line.118"></a>
-<span class="sourceLineNo">119</span> public void setUp() throws Exception {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> walQueue = new PriorityBlockingQueue<>();<a name="line.120"></a>
-<span class="sourceLineNo">121</span> pathWatcher = new PathWatcher();<a name="line.121"></a>
-<span class="sourceLineNo">122</span> final WALFactory wals = new WALFactory(CONF, tn.getMethodName());<a name="line.122"></a>
-<span class="sourceLineNo">123</span> wals.getWALProvider().addWALActionsListener(pathWatcher);<a name="line.123"></a>
-<span class="sourceLineNo">124</span> log = wals.getWAL(info);<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> @After<a name="line.127"></a>
-<span class="sourceLineNo">128</span> public void tearDown() throws Exception {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> log.close();<a name="line.129"></a>
+<span class="sourceLineNo">118</span> @AfterClass<a name="line.118"></a>
+<span class="sourceLineNo">119</span> public static void tearDownAfterClass() throws Exception {<a name="line.119"></a>
+<span class="sourceLineNo">120</span> TEST_UTIL.shutdownMiniCluster();<a name="line.120"></a>
+<span class="sourceLineNo">121</span> }<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span> @Before<a name="line.123"></a>
+<span class="sourceLineNo">124</span> public void setUp() throws Exception {<a name="line.124"></a>
+<span class="sourceLineNo">125</span> walQueue = new PriorityBlockingQueue<>();<a name="line.125"></a>
+<span class="sourceLineNo">126</span> pathWatcher = new PathWatcher();<a name="line.126"></a>
+<span class="sourceLineNo">127</span> final WALFactory wals = new WALFactory(CONF, tn.getMethodName());<a name="line.127"></a>
+<span class="sourceLineNo">128</span> wals.getWALProvider().addWALActionsListener(pathWatcher);<a name="line.128"></a>
+<span class="sourceLineNo">129</span> log = wals.getWAL(info);<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> // Try out different combinations of row count and KeyValue count<a name="line.132"></a>
-<span class="sourceLineNo">133</span> @Test<a name="line.133"></a>
-<span class="sourceLineNo">134</span> public void testDifferentCounts() throws Exception {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> int[] NB_ROWS = { 1500, 60000 };<a name="line.135"></a>
-<span class="sourceLineNo">136</span> int[] NB_KVS = { 1, 100 };<a name="line.136"></a>
-<span class="sourceLineNo">137</span> // whether compression is used<a name="line.137"></a>
-<span class="sourceLineNo">138</span> Boolean[] BOOL_VALS = { false, true };<a name="line.138"></a>
-<span class="sourceLineNo">139</span> // long lastPosition = 0;<a name="line.139"></a>
-<span class="sourceLineNo">140</span> for (int nbRows : NB_ROWS) {<a name="line.140"></a>
-<span class="sourceLineNo">141</span> for (int walEditKVs : NB_KVS) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> for (boolean isCompressionEnabled : BOOL_VALS) {<a name="line.142"></a>
-<span class="sourceLineNo">143</span> TEST_UTIL.getConfiguration().setBoolean(HConstants.ENABLE_WAL_COMPRESSION,<a name="line.143"></a>
-<span class="sourceLineNo">144</span> isCompressionEnabled);<a name="line.144"></a>
-<span class="sourceLineNo">145</span> mvcc.advanceTo(1);<a name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span> for (int i = 0; i < nbRows; i++) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> appendToLogAndSync(walEditKVs);<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> log.rollWriter();<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span> try (WALEntryStream entryStream =<a name="line.153"></a>
-<span class="sourceLineNo">154</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> int i = 0;<a name="line.155"></a>
-<span class="sourceLineNo">156</span> while (entryStream.hasNext()) {<a name="line.156"></a>
-<span class="sourceLineNo">157</span> assertNotNull(entryStream.next());<a name="line.157"></a>
-<span class="sourceLineNo">158</span> i++;<a name="line.158"></a>
-<span class="sourceLineNo">159</span> }<a name="line.159"></a>
-<span class="sourceLineNo">160</span> assertEquals(nbRows, i);<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span> // should've read all entries<a name="line.162"></a>
-<span class="sourceLineNo">163</span> assertFalse(entryStream.hasNext());<a name="line.163"></a>
-<span class="sourceLineNo">164</span> }<a name="line.164"></a>
-<span class="sourceLineNo">165</span> // reset everything for next loop<a name="line.165"></a>
-<span class="sourceLineNo">166</span> log.close();<a name="line.166"></a>
-<span class="sourceLineNo">167</span> setUp();<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> }<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span> /**<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * Tests basic reading of log appends<a name="line.174"></a>
-<span class="sourceLineNo">175</span> */<a name="line.175"></a>
-<span class="sourceLineNo">176</span> @Test<a name="line.176"></a>
-<span class="sourceLineNo">177</span> public void testAppendsWithRolls() throws Exception {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> appendToLogAndSync();<a name="line.178"></a>
-<span class="sourceLineNo">179</span> long oldPos;<a name="line.179"></a>
-<span class="sourceLineNo">180</span> try (WALEntryStream entryStream =<a name="line.180"></a>
-<span class="sourceLineNo">181</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> // There's one edit in the log, read it. Reading past it needs to throw exception<a name="line.182"></a>
-<span class="sourceLineNo">183</span> assertTrue(entryStream.hasNext());<a name="line.183"></a>
-<span class="sourceLineNo">184</span> WAL.Entry entry = entryStream.peek();<a name="line.184"></a>
-<span class="sourceLineNo">185</span> assertSame(entry, entryStream.next());<a name="line.185"></a>
-<span class="sourceLineNo">186</span> assertNotNull(entry);<a name="line.186"></a>
-<span class="sourceLineNo">187</span> assertFalse(entryStream.hasNext());<a name="line.187"></a>
-<span class="sourceLineNo">188</span> assertNull(entryStream.peek());<a name="line.188"></a>
-<span class="sourceLineNo">189</span> assertNull(entryStream.next());<a name="line.189"></a>
-<span class="sourceLineNo">190</span> oldPos = entryStream.getPosition();<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> appendToLogAndSync();<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span> try (WALEntryStream entryStream = new WALEntryStream(walQueue, fs, CONF, oldPos,<a name="line.195"></a>
-<span class="sourceLineNo">196</span> log, null, new MetricsSource("1"))) {<a name="line.196"></a>
-<span class="sourceLineNo">197</span> // Read the newly added entry, make sure we made progress<a name="line.197"></a>
-<span class="sourceLineNo">198</span> WAL.Entry entry = entryStream.next();<a name="line.198"></a>
-<span class="sourceLineNo">199</span> assertNotEquals(oldPos, entryStream.getPosition());<a name="line.199"></a>
-<span class="sourceLineNo">200</span> assertNotNull(entry);<a name="line.200"></a>
-<span class="sourceLineNo">201</span> oldPos = entryStream.getPosition();<a name="line.201"></a>
-<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> // We rolled but we still should see the end of the first log and get that item<a name="line.204"></a>
-<span class="sourceLineNo">205</span> appendToLogAndSync();<a name="line.205"></a>
-<span class="sourceLineNo">206</span> log.rollWriter();<a name="line.206"></a>
-<span class="sourceLineNo">207</span> appendToLogAndSync();<a name="line.207"></a>
+<span class="sourceLineNo">132</span> @After<a name="line.132"></a>
+<span class="sourceLineNo">133</span> public void tearDown() throws Exception {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> log.close();<a name="line.134"></a>
+<span class="sourceLineNo">135</span> }<a name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span> // Try out different combinations of row count and KeyValue count<a name="line.137"></a>
+<span class="sourceLineNo">138</span> @Test<a name="line.138"></a>
+<span class="sourceLineNo">139</span> public void testDifferentCounts() throws Exception {<a name="line.139"></a>
+<span class="sourceLineNo">140</span> int[] NB_ROWS = { 1500, 60000 };<a name="line.140"></a>
+<span class="sourceLineNo">141</span> int[] NB_KVS = { 1, 100 };<a name="line.141"></a>
+<span class="sourceLineNo">142</span> // whether compression is used<a name="line.142"></a>
+<span class="sourceLineNo">143</span> Boolean[] BOOL_VALS = { false, true };<a name="line.143"></a>
+<span class="sourceLineNo">144</span> // long lastPosition = 0;<a name="line.144"></a>
+<span class="sourceLineNo">145</span> for (int nbRows : NB_ROWS) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> for (int walEditKVs : NB_KVS) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> for (boolean isCompressionEnabled : BOOL_VALS) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> TEST_UTIL.getConfiguration().setBoolean(HConstants.ENABLE_WAL_COMPRESSION,<a name="line.148"></a>
+<span class="sourceLineNo">149</span> isCompressionEnabled);<a name="line.149"></a>
+<span class="sourceLineNo">150</span> mvcc.advanceTo(1);<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span> for (int i = 0; i < nbRows; i++) {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> appendToLogAndSync(walEditKVs);<a name="line.153"></a>
+<span class="sourceLineNo">154</span> }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span> log.rollWriter();<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span> try (WALEntryStream entryStream =<a name="line.158"></a>
+<span class="sourceLineNo">159</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span> int i = 0;<a name="line.160"></a>
+<span class="sourceLineNo">161</span> while (entryStream.hasNext()) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span> assertNotNull(entryStream.next());<a name="line.162"></a>
+<span class="sourceLineNo">163</span> i++;<a name="line.163"></a>
+<span class="sourceLineNo">164</span> }<a name="line.164"></a>
+<span class="sourceLineNo">165</span> assertEquals(nbRows, i);<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span> // should've read all entries<a name="line.167"></a>
+<span class="sourceLineNo">168</span> assertFalse(entryStream.hasNext());<a name="line.168"></a>
+<span class="sourceLineNo">169</span> }<a name="line.169"></a>
+<span class="sourceLineNo">170</span> // reset everything for next loop<a name="line.170"></a>
+<span class="sourceLineNo">171</span> log.close();<a name="line.171"></a>
+<span class="sourceLineNo">172</span> setUp();<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> }<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span> /**<a name="line.178"></a>
+<span class="sourceLineNo">179</span> * Tests basic reading of log appends<a name="line.179"></a>
+<span class="sourceLineNo">180</span> */<a name="line.180"></a>
+<span class="sourceLineNo">181</span> @Test<a name="line.181"></a>
+<span class="sourceLineNo">182</span> public void testAppendsWithRolls() throws Exception {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> appendToLogAndSync();<a name="line.183"></a>
+<span class="sourceLineNo">184</span> long oldPos;<a name="line.184"></a>
+<span class="sourceLineNo">185</span> try (WALEntryStream entryStream =<a name="line.185"></a>
+<span class="sourceLineNo">186</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> // There's one edit in the log, read it. Reading past it needs to throw exception<a name="line.187"></a>
+<span class="sourceLineNo">188</span> assertTrue(entryStream.hasNext());<a name="line.188"></a>
+<span class="sourceLineNo">189</span> WAL.Entry entry = entryStream.peek();<a name="line.189"></a>
+<span class="sourceLineNo">190</span> assertSame(entry, entryStream.next());<a name="line.190"></a>
+<span class="sourceLineNo">191</span> assertNotNull(entry);<a name="line.191"></a>
+<span class="sourceLineNo">192</span> assertFalse(entryStream.hasNext());<a name="line.192"></a>
+<span class="sourceLineNo">193</span> assertNull(entryStream.peek());<a name="line.193"></a>
+<span class="sourceLineNo">194</span> assertNull(entryStream.next());<a name="line.194"></a>
+<span class="sourceLineNo">195</span> oldPos = entryStream.getPosition();<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> appendToLogAndSync();<a name="line.198"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span> try (WALEntryStream entryStream = new WALEntryStream(walQueue, fs, CONF, oldPos,<a name="line.200"></a>
+<span class="sourceLineNo">201</span> log, null, new MetricsSource("1"))) {<a name="line.201"></a>
+<span class="sourceLineNo">202</span> // Read the newly added entry, make sure we made progress<a name="line.202"></a>
+<span class="sourceLineNo">203</span> WAL.Entry entry = entryStream.next();<a name="line.203"></a>
+<span class="sourceLineNo">204</span> assertNotEquals(oldPos, entryStream.getPosition());<a name="line.204"></a>
+<span class="sourceLineNo">205</span> assertNotNull(entry);<a name="line.205"></a>
+<span class="sourceLineNo">206</span> oldPos = entryStream.getPosition();<a name="line.206"></a>
+<span class="sourceLineNo">207</span> }<a name="line.207"></a>
<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span> try (WALEntryStream entryStream = new WALEntryStream(walQueue, fs, CONF, oldPos,<a name="line.209"></a>
-<span class="sourceLineNo">210</span> log, null, new MetricsSource("1"))) {<a name="line.210"></a>
-<span class="sourceLineNo">211</span> WAL.Entry entry = entryStream.next();<a name="line.211"></a>
-<span class="sourceLineNo">212</span> assertNotEquals(oldPos, entryStream.getPosition());<a name="line.212"></a>
-<span class="sourceLineNo">213</span> assertNotNull(entry);<a name="line.213"></a>
-<span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span> // next item should come from the new log<a name="line.215"></a>
-<span class="sourceLineNo">216</span> entry = entryStream.next();<a name="line.216"></a>
+<span class="sourceLineNo">209</span> // We rolled but we still should see the end of the first log and get that item<a name="line.209"></a>
+<span class="sourceLineNo">210</span> appendToLogAndSync();<a name="line.210"></a>
+<span class="sourceLineNo">211</span> log.rollWriter();<a name="line.211"></a>
+<span class="sourceLineNo">212</span> appendToLogAndSync();<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span> try (WALEntryStream entryStream = new WALEntryStream(walQueue, fs, CONF, oldPos,<a name="line.214"></a>
+<span class="sourceLineNo">215</span> log, null, new MetricsSource("1"))) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> WAL.Entry entry = entryStream.next();<a name="line.216"></a>
<span class="sourceLineNo">217</span> assertNotEquals(oldPos, entryStream.getPosition());<a name="line.217"></a>
<span class="sourceLineNo">218</span> assertNotNull(entry);<a name="line.218"></a>
<span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span> // no more entries to read<a name="line.220"></a>
-<span class="sourceLineNo">221</span> assertFalse(entryStream.hasNext());<a name="line.221"></a>
-<span class="sourceLineNo">222</span> oldPos = entryStream.getPosition();<a name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> }<a name="line.224"></a>
-<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span> /**<a name="line.226"></a>
-<span class="sourceLineNo">227</span> * Tests that if after a stream is opened, more entries come in and then the log is rolled, we<a name="line.227"></a>
-<span class="sourceLineNo">228</span> * don't mistakenly dequeue the current log thinking we're done with it<a name="line.228"></a>
-<span class="sourceLineNo">229</span> */<a name="line.229"></a>
-<span class="sourceLineNo">230</span> @Test<a name="line.230"></a>
-<span class="sourceLineNo">231</span> public void testLogrollWhileStreaming() throws Exception {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> appendToLog("1");<a name="line.232"></a>
-<span class="sourceLineNo">233</span> appendToLog("2");// 2<a name="line.233"></a>
-<span class="sourceLineNo">234</span> try (WALEntryStream entryStream =<a name="line.234"></a>
-<span class="sourceLineNo">235</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.235"></a>
-<span class="sourceLineNo">236</span> assertEquals("1", getRow(entryStream.next()));<a name="line.236"></a>
-<span class="sourceLineNo">237</span><a name="line.237"></a>
-<span class="sourceLineNo">238</span> appendToLog("3"); // 3 - comes in after reader opened<a name="line.238"></a>
-<span class="sourceLineNo">239</span> log.rollWriter(); // log roll happening while we're reading<a name="line.239"></a>
-<span class="sourceLineNo">240</span> appendToLog("4"); // 4 - this append is in the rolled log<a name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span> assertEquals("2", getRow(entryStream.next()));<a name="line.242"></a>
-<span class="sourceLineNo">243</span> assertEquals(2, walQueue.size()); // we should not have dequeued yet since there's still an<a name="line.243"></a>
-<span class="sourceLineNo">244</span> // entry in first log<a name="line.244"></a>
-<span class="sourceLineNo">245</span> assertEquals("3", getRow(entryStream.next())); // if implemented improperly, this would be 4<a name="line.245"></a>
-<span class="sourceLineNo">246</span> // and 3 would be skipped<a name="line.246"></a>
-<span class="sourceLineNo">247</span> assertEquals("4", getRow(entryStream.next())); // 4<a name="line.247"></a>
-<span class="sourceLineNo">248</span> assertEquals(1, walQueue.size()); // now we've dequeued and moved on to next log properly<a name="line.248"></a>
-<span class="sourceLineNo">249</span> assertFalse(entryStream.hasNext());<a name="line.249"></a>
-<span class="sourceLineNo">250</span> }<a name="line.250"></a>
-<span class="sourceLineNo">251</span> }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span> /**<a name="line.253"></a>
-<span class="sourceLineNo">254</span> * Tests that if writes come in while we have a stream open, we shouldn't miss them<a name="line.254"></a>
-<span class="sourceLineNo">255</span> */<a name="line.255"></a>
-<span class="sourceLineNo">256</span> @Test<a name="line.256"></a>
-<span class="sourceLineNo">257</span> public void testNewEntriesWhileStreaming() throws Exception {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> appendToLog("1");<a name="line.258"></a>
-<span class="sourceLineNo">259</span> try (WALEntryStream entryStream =<a name="line.259"></a>
-<span class="sourceLineNo">260</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> entryStream.next(); // we've hit the end of the stream at this point<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span> // some new entries come in while we're streaming<a name="line.263"></a>
-<span class="sourceLineNo">264</span> appendToLog("2");<a name="line.264"></a>
-<span class="sourceLineNo">265</span> appendToLog("3");<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span> // don't see them<a name="line.267"></a>
-<span class="sourceLineNo">268</span> assertFalse(entryStream.hasNext());<a name="line.268"></a>
-<span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span> // But we do if we reset<a name="line.270"></a>
-<span class="sourceLineNo">271</span> entryStream.reset();<a name="line.271"></a>
-<span class="sourceLineNo">272</span> assertEquals("2", getRow(entryStream.next()));<a name="line.272"></a>
-<span class="sourceLineNo">273</span> assertEquals("3", getRow(entryStream.next()));<a name="line.273"></a>
-<span class="sourceLineNo">274</span> assertFalse(entryStream.hasNext());<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></a>
-<span class="sourceLineNo">277</span><a name="line.277"></a>
-<span class="sourceLineNo">278</span> @Test<a name="line.278"></a>
-<span class="sourceLineNo">279</span> public void testResumeStreamingFromPosition() throws Exception {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> long lastPosition = 0;<a name="line.280"></a>
-<span class="sourceLineNo">281</span> appendToLog("1");<a name="line.281"></a>
-<span class="sourceLineNo">282</span> try (WALEntryStream entryStream =<a name="line.282"></a>
-<span class="sourceLineNo">283</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> entryStream.next(); // we've hit the end of the stream at this point<a name="line.284"></a>
-<span class="sourceLineNo">285</span> appendToLog("2");<a name="line.285"></a>
-<span class="sourceLineNo">286</span> appendToLog("3");<a name="line.286"></a>
-<span class="sourceLineNo">287</span> lastPosition = entryStream.getPosition();<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span> // next stream should picks up where we left off<a name="line.289"></a>
-<span class="sourceLineNo">290</span> try (WALEntryStream entryStream =<a name="line.290"></a>
-<span class="sourceLineNo">291</span> new WALEntryStream(walQueue, fs, CONF, lastPosition, log, null, new MetricsSource("1"))) {<a name="line.291"></a>
-<span class="sourceLineNo">292</span> assertEquals("2", getRow(entryStream.next()));<a name="line.292"></a>
-<span class="sourceLineNo">293</span> assertEquals("3", getRow(entryStream.next()));<a name="line.293"></a>
-<span class="sourceLineNo">294</span> assertFalse(entryStream.hasNext()); // done<a name="line.294"></a>
-<span class="sourceLineNo">295</span> assertEquals(1, walQueue.size());<a name="line.295"></a>
-<span class="sourceLineNo">296</span> }<a name="line.296"></a>
-<span class="sourceLineNo">297</span> }<a name="line.297"></a>
-<span class="sourceLineNo">298</span><a name="line.298"></a>
-<span class="sourceLineNo">299</span> /**<a name="line.299"></a>
-<span class="sourceLineNo">300</span> * Tests that if we stop before hitting the end of a stream, we can continue where we left off<a name="line.300"></a>
-<span class="sourceLineNo">301</span> * using the last position<a name="line.301"></a>
-<span class="sourceLineNo">302</span> */<a name="line.302"></a>
-<span class="sourceLineNo">303</span> @Test<a name="line.303"></a>
-<span class="sourceLineNo">304</span> public void testPosition() throws Exception {<a name="line.304"></a>
-<span class="sourceLineNo">305</span> long lastPosition = 0;<a name="line.305"></a>
-<span class="sourceLineNo">306</span> appendEntriesToLogAndSync(3);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> // read only one element<a name="line.307"></a>
-<span class="sourceLineNo">308</span> try (WALEntryStream entryStream = new WALEntryStream(walQueue, fs, CONF, lastPosition,<a name="line.308"></a>
-<span class="sourceLineNo">309</span> log, null, new MetricsSource("1"))) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span> entryStream.next();<a name="line.310"></a>
-<span class="sourceLineNo">311</span> lastPosition = entryStream.getPosition();<a name="line.311"></a>
-<span class="sourceLineNo">312</span> }<a name="line.312"></a>
-<span class="sourceLineNo">313</span> // there should still be two more entries from where we left off<a name="line.313"></a>
-<span class="sourceLineNo">314</span> try (WALEntryStream entryStream =<a name="line.314"></a>
-<span class="sourceLineNo">315</span> new WALEntryStream(walQueue, fs, CONF, lastPosition, log, null, new MetricsSource("1"))) {<a name="line.315"></a>
-<span class="sourceLineNo">316</span> assertNotNull(entryStream.next());<a name="line.316"></a>
-<span class="sourceLineNo">317</span> assertNotNull(entryStream.next());<a name="line.317"></a>
-<span class="sourceLineNo">318</span> assertFalse(entryStream.hasNext());<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><a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span> @Test<a name="line.323"></a>
-<span class="sourceLineNo">324</span> public void testEmptyStream() throws Exception {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> try (WALEntryStream entryStream =<a name="line.325"></a>
-<span class="sourceLineNo">326</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> assertFalse(entryStream.hasNext());<a name="line.327"></a>
-<span class="sourceLineNo">328</span> }<a name="line.328"></a>
-<span class="sourceLineNo">329</span> }<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span> private ReplicationSourceWALReader createReader(boolean recovered, Configuration conf) {<a name="line.331"></a>
-<span class="sourceLineNo">332</span> ReplicationSourceManager mockSourceManager = Mockito.mock(ReplicationSourceManager.class);<a name="line.332"></a>
-<span class="sourceLineNo">333</span> when(mockSourceManager.getTotalBufferUsed()).thenReturn(new AtomicLong(0));<a name="line.333"></a>
-<span class="sourceLineNo">334</span> Server mockServer = Mockito.mock(Server.class);<a name="line.334"></a>
-<span class="sourceLineNo">335</span> ReplicationSource source = Mockito.mock(ReplicationSource.class);<a name="line.335"></a>
-<span class="sourceLineNo">336</span> when(source.getSourceManager()).thenReturn(mockSourceManager);<a name="line.336"></a>
-<span class="sourceLineNo">337</span> when(source.getSourceMetrics()).thenReturn(new MetricsSource("1"));<a name="line.337"></a>
-<span class="sourceLineNo">338</span> when(source.getWALFileLengthProvider()).thenReturn(log);<a name="line.338"></a>
-<span class="sourceLineNo">339</span> when(source.getServer()).thenReturn(mockServer);<a name="line.339"></a>
-<span class="sourceLineNo">340</span> when(source.isRecovered()).thenReturn(recovered);<a name="line.340"></a>
-<span class="sourceLineNo">341</span> ReplicationSourceWALReader reader =<a name="line.341"></a>
-<span class="sourceLineNo">342</span> new ReplicationSourceWALReader(fs, conf, walQueue, 0, getDummyFilter(), source);<a name="line.342"></a>
-<span class="sourceLineNo">343</span> reader.start();<a name="line.343"></a>
-<span class="sourceLineNo">344</span> return reader;<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span> @Test<a name="line.347"></a>
-<span class="sourceLineNo">348</span> public void testReplicationSourceWALReader() throws Exception {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> appendEntriesToLogAndSync(3);<a name="line.349"></a>
-<span class="sourceLineNo">350</span> // get ending position<a name="line.350"></a>
-<span class="sourceLineNo">351</span> long position;<a name="line.351"></a>
-<span class="sourceLineNo">352</span> try (WALEntryStream entryStream =<a name="line.352"></a>
-<span class="sourceLineNo">353</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> entryStream.next();<a name="line.354"></a>
-<span class="sourceLineNo">355</span> entryStream.next();<a name="line.355"></a>
-<span class="sourceLineNo">356</span> entryStream.next();<a name="line.356"></a>
-<span class="sourceLineNo">357</span> position = entryStream.getPosition();<a name="line.357"></a>
-<span class="sourceLineNo">358</span> }<a name="line.358"></a>
-<span class="sourceLineNo">359</span><a name="line.359"></a>
-<span class="sourceLineNo">360</span> // start up a reader<a name="line.360"></a>
-<span class="sourceLineNo">361</span> Path walPath = walQueue.peek();<a name="line.361"></a>
-<span class="sourceLineNo">362</span> ReplicationSourceWALReader reader = createReader(false, CONF);<a name="line.362"></a>
-<span class="sourceLineNo">363</span> WALEntryBatch entryBatch = reader.take();<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span> // should've batched up our entries<a name="line.365"></a>
-<span class="sourceLineNo">366</span> assertNotNull(entryBatch);<a name="line.366"></a>
-<span class="sourceLineNo">367</span> assertEquals(3, entryBatch.getWalEntries().size());<a name="line.367"></a>
-<span class="sourceLineNo">368</span> assertEquals(position, entryBatch.getLastWalPosition());<a name="line.368"></a>
-<span class="sourceLineNo">369</span> assertEquals(walPath, entryBatch.getLastWalPath());<a name="line.369"></a>
-<span class="sourceLineNo">370</span> assertEquals(3, entryBatch.getNbRowKeys());<a name="line.370"></a>
-<span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span> appendToLog("foo");<a name="line.372"></a>
-<span class="sourceLineNo">373</span> entryBatch = reader.take();<a name="line.373"></a>
-<span class="sourceLineNo">374</span> assertEquals(1, entryBatch.getNbEntries());<a name="line.374"></a>
-<span class="sourceLineNo">375</span> assertEquals("foo", getRow(entryBatch.getWalEntries().get(0)));<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> @Test<a name="line.378"></a>
-<span class="sourceLineNo">379</span> public void testReplicationSourceWALReaderRecovered() throws Exception {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> appendEntriesToLogAndSync(10);<a name="line.380"></a>
-<span class="sourceLineNo">381</span> Path walPath = walQueue.peek();<a name="line.381"></a>
-<span class="sourceLineNo">382</span> log.rollWriter();<a name="line.382"></a>
-<span class="sourceLineNo">383</span> appendEntriesToLogAndSync(5);<a name="line.383"></a>
-<span class="sourceLineNo">384</span> log.shutdown();<a name="line.384"></a>
-<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span> Configuration conf = new Configuration(CONF);<a name="line.386"></a>
-<span class="sourceLineNo">387</span> conf.setInt("replication.source.nb.capacity", 10);<a name="line.387"></a>
+<span class="sourceLineNo">220</span> // next item should come from the new log<a name="line.220"></a>
+<span class="sourceLineNo">221</span> entry = entryStream.next();<a name="line.221"></a>
+<span class="sourceLineNo">222</span> assertNotEquals(oldPos, entryStream.getPosition());<a name="line.222"></a>
+<span class="sourceLineNo">223</span> assertNotNull(entry);<a name="line.223"></a>
+<span class="sourceLineNo">224</span><a name="line.224"></a>
+<span class="sourceLineNo">225</span> // no more entries to read<a name="line.225"></a>
+<span class="sourceLineNo">226</span> assertFalse(entryStream.hasNext());<a name="line.226"></a>
+<span class="sourceLineNo">227</span> oldPos = entryStream.getPosition();<a name="line.227"></a>
+<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">229</span> }<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> * Tests that if after a stream is opened, more entries come in and then the log is rolled, we<a name="line.232"></a>
+<span class="sourceLineNo">233</span> * don't mistakenly dequeue the current log thinking we're done with it<a name="line.233"></a>
+<span class="sourceLineNo">234</span> */<a name="line.234"></a>
+<span class="sourceLineNo">235</span> @Test<a name="line.235"></a>
+<span class="sourceLineNo">236</span> public void testLogrollWhileStreaming() throws Exception {<a name="line.236"></a>
+<span class="sourceLineNo">237</span> appendToLog("1");<a name="line.237"></a>
+<span class="sourceLineNo">238</span> appendToLog("2");// 2<a name="line.238"></a>
+<span class="sourceLineNo">239</span> try (WALEntryStream entryStream =<a name="line.239"></a>
+<span class="sourceLineNo">240</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> assertEquals("1", getRow(entryStream.next()));<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span> appendToLog("3"); // 3 - comes in after reader opened<a name="line.243"></a>
+<span class="sourceLineNo">244</span> log.rollWriter(); // log roll happening while we're reading<a name="line.244"></a>
+<span class="sourceLineNo">245</span> appendToLog("4"); // 4 - this append is in the rolled log<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span> assertEquals("2", getRow(entryStream.next()));<a name="line.247"></a>
+<span class="sourceLineNo">248</span> assertEquals(2, walQueue.size()); // we should not have dequeued yet since there's still an<a name="line.248"></a>
+<span class="sourceLineNo">249</span> // entry in first log<a name="line.249"></a>
+<span class="sourceLineNo">250</span> assertEquals("3", getRow(entryStream.next())); // if implemented improperly, this would be 4<a name="line.250"></a>
+<span class="sourceLineNo">251</span> // and 3 would be skipped<a name="line.251"></a>
+<span class="sourceLineNo">252</span> assertEquals("4", getRow(entryStream.next())); // 4<a name="line.252"></a>
+<span class="sourceLineNo">253</span> assertEquals(1, walQueue.size()); // now we've dequeued and moved on to next log properly<a name="line.253"></a>
+<span class="sourceLineNo">254</span> assertFalse(entryStream.hasNext());<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><a name="line.257"></a>
+<span class="sourceLineNo">258</span> /**<a name="line.258"></a>
+<span class="sourceLineNo">259</span> * Tests that if writes come in while we have a stream open, we shouldn't miss them<a name="line.259"></a>
+<span class="sourceLineNo">260</span> */<a name="line.260"></a>
+<span class="sourceLineNo">261</span> @Test<a name="line.261"></a>
+<span class="sourceLineNo">262</span> public void testNewEntriesWhileStreaming() throws Exception {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> appendToLog("1");<a name="line.263"></a>
+<span class="sourceLineNo">264</span> try (WALEntryStream entryStream =<a name="line.264"></a>
+<span class="sourceLineNo">265</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> entryStream.next(); // we've hit the end of the stream at this point<a name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
+<span class="sourceLineNo">268</span> // some new entries come in while we're streaming<a name="line.268"></a>
+<span class="sourceLineNo">269</span> appendToLog("2");<a name="line.269"></a>
+<span class="sourceLineNo">270</span> appendToLog("3");<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span> // don't see them<a name="line.272"></a>
+<span class="sourceLineNo">273</span> assertFalse(entryStream.hasNext());<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span> // But we do if we reset<a name="line.275"></a>
+<span class="sourceLineNo">276</span> entryStream.reset();<a name="line.276"></a>
+<span class="sourceLineNo">277</span> assertEquals("2", getRow(entryStream.next()));<a name="line.277"></a>
+<span class="sourceLineNo">278</span> assertEquals("3", getRow(entryStream.next()));<a name="line.278"></a>
+<span class="sourceLineNo">279</span> assertFalse(entryStream.hasNext());<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span> }<a name="line.281"></a>
+<span class="sourceLineNo">282</span><a name="line.282"></a>
+<span class="sourceLineNo">283</span> @Test<a name="line.283"></a>
+<span class="sourceLineNo">284</span> public void testResumeStreamingFromPosition() throws Exception {<a name="line.284"></a>
+<span class="sourceLineNo">285</span> long lastPosition = 0;<a name="line.285"></a>
+<span class="sourceLineNo">286</span> appendToLog("1");<a name="line.286"></a>
+<span class="sourceLineNo">287</span> try (WALEntryStream entryStream =<a name="line.287"></a>
+<span class="sourceLineNo">288</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> entryStream.next(); // we've hit the end of the stream at this point<a name="line.289"></a>
+<span class="sourceLineNo">290</span> appendToLog("2");<a name="line.290"></a>
+<span class="sourceLineNo">291</span> appendToLog("3");<a name="line.291"></a>
+<span class="sourceLineNo">292</span> lastPosition = entryStream.getPosition();<a name="line.292"></a>
+<span class="sourceLineNo">293</span> }<a name="line.293"></a>
+<span class="sourceLineNo">294</span> // next stream should picks up where we left off<a name="line.294"></a>
+<span class="sourceLineNo">295</span> try (WALEntryStream entryStream =<a name="line.295"></a>
+<span class="sourceLineNo">296</span> new WALEntryStream(walQueue, fs, CONF, lastPosition, log, null, new MetricsSource("1"))) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> assertEquals("2", getRow(entryStream.next()));<a name="line.297"></a>
+<span class="sourceLineNo">298</span> assertEquals("3", getRow(entryStream.next()));<a name="line.298"></a>
+<span class="sourceLineNo">299</span> assertFalse(entryStream.hasNext()); // done<a name="line.299"></a>
+<span class="sourceLineNo">300</span> assertEquals(1, walQueue.size());<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><a name="line.303"></a>
+<span class="sourceLineNo">304</span> /**<a name="line.304"></a>
+<span class="sourceLineNo">305</span> * Tests that if we stop before hitting the end of a stream, we can continue where we left off<a name="line.305"></a>
+<span class="sourceLineNo">306</span> * using the last position<a name="line.306"></a>
+<span class="sourceLineNo">307</span> */<a name="line.307"></a>
+<span class="sourceLineNo">308</span> @Test<a name="line.308"></a>
+<span class="sourceLineNo">309</span> public void testPosition() throws Exception {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> long lastPosition = 0;<a name="line.310"></a>
+<span class="sourceLineNo">311</span> appendEntriesToLogAndSync(3);<a name="line.311"></a>
+<span class="sourceLineNo">312</span> // read only one element<a name="line.312"></a>
+<span class="sourceLineNo">313</span> try (WALEntryStream entryStream = new WALEntryStream(walQueue, fs, CONF, lastPosition,<a name="line.313"></a>
+<span class="sourceLineNo">314</span> log, null, new MetricsSource("1"))) {<a name="line.314"></a>
+<span class="sourceLineNo">315</span> entryStream.next();<a name="line.315"></a>
+<span class="sourceLineNo">316</span> lastPosition = entryStream.getPosition();<a name="line.316"></a>
+<span class="sourceLineNo">317</span> }<a name="line.317"></a>
+<span class="sourceLineNo">318</span> // there should still be two more entries from where we left off<a name="line.318"></a>
+<span class="sourceLineNo">319</span> try (WALEntryStream entryStream =<a name="line.319"></a>
+<span class="sourceLineNo">320</span> new WALEntryStream(walQueue, fs, CONF, lastPosition, log, null, new MetricsSource("1"))) {<a name="line.320"></a>
+<span class="sourceLineNo">321</span> assertNotNull(entryStream.next());<a name="line.321"></a>
+<span class="sourceLineNo">322</span> assertNotNull(entryStream.next());<a name="line.322"></a>
+<span class="sourceLineNo">323</span> assertFalse(entryStream.hasNext());<a name="line.323"></a>
+<span class="sourceLineNo">324</span> }<a name="line.324"></a>
+<span class="sourceLineNo">325</span> }<a name="line.325"></a>
+<span class="sourceLineNo">326</span><a name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span> @Test<a name="line.328"></a>
+<span class="sourceLineNo">329</span> public void testEmptyStream() throws Exception {<a name="line.329"></a>
+<span class="sourceLineNo">330</span> try (WALEntryStream entryStream =<a name="line.330"></a>
+<span class="sourceLineNo">331</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.331"></a>
+<span class="sourceLineNo">332</span> assertFalse(entryStream.hasNext());<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><a name="line.335"></a>
+<span class="sourceLineNo">336</span> private ReplicationSource mockReplicationSource(boolean recovered, Configuration conf) {<a name="line.336"></a>
+<span class="sourceLineNo">337</span> ReplicationSourceManager mockSourceManager = Mockito.mock(ReplicationSourceManager.class);<a name="line.337"></a>
+<span class="sourceLineNo">338</span> when(mockSourceManager.getTotalBufferUsed()).thenReturn(new AtomicLong(0));<a name="line.338"></a>
+<span class="sourceLineNo">339</span> Server mockServer = Mockito.mock(Server.class);<a name="line.339"></a>
+<span class="sourceLineNo">340</span> ReplicationSource source = Mockito.mock(ReplicationSource.class);<a name="line.340"></a>
+<span class="sourceLineNo">341</span> when(source.getSourceManager()).thenReturn(mockSourceManager);<a name="line.341"></a>
+<span class="sourceLineNo">342</span> when(source.getSourceMetrics()).thenReturn(new MetricsSource("1"));<a name="line.342"></a>
+<span class="sourceLineNo">343</span> when(source.getWALFileLengthProvider()).thenReturn(log);<a name="line.343"></a>
+<span class="sourceLineNo">344</span> when(source.getServer()).thenReturn(mockServer);<a name="line.344"></a>
+<span class="sourceLineNo">345</span> when(source.isRecovered()).thenReturn(recovered);<a name="line.345"></a>
+<span class="sourceLineNo">346</span> return source;<a name="line.346"></a>
+<span class="sourceLineNo">347</span> }<a name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
+<span class="sourceLineNo">349</span> private ReplicationSourceWALReader createReader(boolean recovered, Configuration conf) {<a name="line.349"></a>
+<span class="sourceLineNo">350</span> ReplicationSource source = mockReplicationSource(recovered, conf);<a name="line.350"></a>
+<span class="sourceLineNo">351</span> when(source.isPeerEnabled()).thenReturn(true);<a name="line.351"></a>
+<span class="sourceLineNo">352</span> ReplicationSourceWALReader reader =<a name="line.352"></a>
+<span class="sourceLineNo">353</span> new ReplicationSourceWALReader(fs, conf, walQueue, 0, getDummyFilter(), source);<a name="line.353"></a>
+<span class="sourceLineNo">354</span> reader.start();<a name="line.354"></a>
+<span class="sourceLineNo">355</span> return reader;<a name="line.355"></a>
+<span class="sourceLineNo">356</span> }<a name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span> @Test<a name="line.358"></a>
+<span class="sourceLineNo">359</span> public void testReplicationSourceWALReader() throws Exception {<a name="line.359"></a>
+<span class="sourceLineNo">360</span> appendEntriesToLogAndSync(3);<a name="line.360"></a>
+<span class="sourceLineNo">361</span> // get ending position<a name="line.361"></a>
+<span class="sourceLineNo">362</span> long position;<a name="line.362"></a>
+<span class="sourceLineNo">363</span> try (WALEntryStream entryStream =<a name="line.363"></a>
+<span class="sourceLineNo">364</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.364"></a>
+<span class="sourceLineNo">365</span> entryStream.next();<a name="line.365"></a>
+<span class="sourceLineNo">366</span> entryStream.next();<a name="line.366"></a>
+<span class="sourceLineNo">367</span> entryStream.next();<a name="line.367"></a>
+<span class="sourceLineNo">368</span> position = entryStream.getPosition();<a name="line.368"></a>
+<span class="sourceLineNo">369</span> }<a name="line.369"></a>
+<span class="sourceLineNo">370</span><a name="line.370"></a>
+<span class="sourceLineNo">371</span> // start up a reader<a name="line.371"></a>
+<span class="sourceLineNo">372</span> Path walPath = walQueue.peek();<a name="line.372"></a>
+<span class="sourceLineNo">373</span> ReplicationSourceWALReader reader = createReader(false, CONF);<a name="line.373"></a>
+<span class="sourceLineNo">374</span> WALEntryBatch entryBatch = reader.take();<a name="line.374"></a>
+<span class="sourceLineNo">375</span><a name="line.375"></a>
+<span class="sourceLineNo">376</span> // should've batched up our entries<a name="line.376"></a>
+<span class="sourceLineNo">377</span> assertNotNull(entryBatch);<a name="line.377"></a>
+<span class="sourceLineNo">378</span> assertEquals(3, entryBatch.getWalEntries().size());<a name="line.378"></a>
+<span class="sourceLineNo">379</span> assertEquals(position, entryBatch.getLastWalPosition());<a name="line.379"></a>
+<span class="sourceLineNo">380</span> assertEquals(walPath, entryBatch.getLastWalPath());<a name="line.380"></a>
+<span class="sourceLineNo">381</span> assertEquals(3, entryBatch.getNbRowKeys());<a name="line.381"></a>
+<span class="sourceLineNo">382</span><a name="line.382"></a>
+<span class="sourceLineNo">383</span> appendToLog("foo");<a name="line.383"></a>
+<span class="sourceLineNo">384</span> entryBatch = reader.take();<a name="line.384"></a>
+<span class="sourceLineNo">385</span> assertEquals(1, entryBatch.getNbEntries());<a name="line.385"></a>
+<span class="sourceLineNo">386</span> assertEquals("foo", getRow(entryBatch.getWalEntries().get(0)));<a name="line.386"></a>
+<span class="sourceLineNo">387</span> }<a name="line.387"></a>
<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span> ReplicationSourceWALReader reader = createReader(true, conf);<a name="line.389"></a>
-<span class="sourceLineNo">390</span><a name="line.390"></a>
-<span class="sourceLineNo">391</span> WALEntryBatch batch = reader.take();<a name="line.391"></a>
-<span class="sourceLineNo">392</span> assertEquals(walPath, batch.getLastWalPath());<a name="line.392"></a>
-<span class="sourceLineNo">393</span> assertEquals(10, batch.getNbEntries());<a name="line.393"></a>
-<span class="sourceLineNo">394</span> assertFalse(batch.isEndOfFile());<a name="line.394"></a>
-<span class="sourceLineNo">395</span><a name="line.395"></a>
-<span class="sourceLineNo">396</span> batch = reader.take();<a name="line.396"></a>
-<span class="sourceLineNo">397</span> assertEquals(walPath, batch.getLastWalPath());<a name="line.397"></a>
-<span class="sourceLineNo">398</span> assertEquals(0, batch.getNbEntries());<a name="line.398"></a>
-<span class="sourceLineNo">399</span> assertTrue(batch.isEndOfFile());<a name="line.399"></a>
-<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span> walPath = walQueue.peek();<a name="line.401"></a>
-<span class="sourceLineNo">402</span> batch = reader.take();<a name="line.402"></a>
+<span class="sourceLineNo">389</span> @Test<a name="line.389"></a>
+<span class="sourceLineNo">390</span> public void testReplicationSourceWALReaderRecovered() throws Exception {<a name="line.390"></a>
+<span class="sourceLineNo">391</span> appendEntriesToLogAndSync(10);<a name="line.391"></a>
+<span class="sourceLineNo">392</span> Path walPath = walQueue.peek();<a name="line.392"></a>
+<span class="sourceLineNo">393</span> log.rollWriter();<a name="line.393"></a>
+<span class="sourceLineNo">394</span> appendEntriesToLogAndSync(5);<a name="line.394"></a>
+<span class="sourceLineNo">395</span> log.shutdown();<a name="line.395"></a>
+<span class="sourceLineNo">396</span><a name="line.396"></a>
+<span class="sourceLineNo">397</span> Configuration conf = new Configuration(CONF);<a name="line.397"></a>
+<span class="sourceLineNo">398</span> conf.setInt("replication.source.nb.capacity", 10);<a name="line.398"></a>
+<span class="sourceLineNo">399</span><a name="line.399"></a>
+<span class="sourceLineNo">400</span> ReplicationSourceWALReader reader = createReader(true, conf);<a name="line.400"></a>
+<span class="sourceLineNo">401</span><a name="line.401"></a>
+<span class="sourceLineNo">402</span> WALEntryBatch batch = reader.take();<a name="line.402"></a>
<span class="sourceLineNo">403</span> assertEquals(walPath, batch.getLastWalPath());<a name="line.403"></a>
-<span class="sourceLineNo">404</span> assertEquals(5, batch.getNbEntries());<a name="line.404"></a>
-<span class="sourceLineNo">405</span> // Actually this should be true but we haven't handled this yet since for a normal queue the<a name="line.405"></a>
-<span class="sourceLineNo">406</span> // last one is always open... Not a big deal for now.<a name="line.406"></a>
-<span class="sourceLineNo">407</span> assertFalse(batch.isEndOfFile());<a name="line.407"></a>
-<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span> assertSame(WALEntryBatch.NO_MORE_DATA, reader.take());<a name="line.409"></a>
-<span class="sourceLineNo">410</span> }<a name="line.410"></a>
+<span class="sourceLineNo">404</span> assertEquals(10, batch.getNbEntries());<a name="line.404"></a>
+<span class="sourceLineNo">405</span> assertFalse(batch.isEndOfFile());<a name="line.405"></a>
+<span class="sourceLineNo">406</span><a name="line.406"></a>
+<span class="sourceLineNo">407</span> batch = reader.take();<a name="line.407"></a>
+<span class="sourceLineNo">408</span> assertEquals(walPath, batch.getLastWalPath());<a name="line.408"></a>
+<span class="sourceLineNo">409</span> assertEquals(0, batch.getNbEntries());<a name="line.409"></a>
+<span class="sourceLineNo">410</span> assertTrue(batch.isEndOfFile());<a name="line.410"></a>
<span class="sourceLineNo">411</span><a name="line.411"></a>
-<span class="sourceLineNo">412</span> // Testcase for HBASE-20206<a name="line.412"></a>
-<span class="sourceLineNo">413</span> @Test<a name="line.413"></a>
-<span class="sourceLineNo">414</span> public void testReplicationSourceWALReaderWrongPosition() throws Exception {<a name="line.414"></a>
-<span class="sourceLineNo">415</span> appendEntriesToLogAndSync(1);<a name="line.415"></a>
-<span class="sourceLineNo">416</span> Path walPath = walQueue.peek();<a name="line.416"></a>
-<span class="sourceLineNo">417</span> log.rollWriter();<a name="line.417"></a>
-<span class="sourceLineNo">418</span> appendEntriesToLogAndSync(20);<a name="line.418"></a>
-<span class="sourceLineNo">419</span> TEST_UTIL.waitFor(5000, new ExplainingPredicate<Exception>() {<a name="line.419"></a>
-<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span> @Override<a name="line.421"></a>
-<span class="sourceLineNo">422</span> public boolean evaluate() throws Exception {<a name="line.422"></a>
-<span class="sourceLineNo">423</span> return fs.getFileStatus(walPath).getLen() > 0;<a name="line.423"></a>
-<span class="sourceLineNo">424</span> }<a name="line.424"></a>
-<span class="sourceLineNo">425</span><a name="line.425"></a>
-<span class="sourceLineNo">426</span> @Override<a name="line.426"></a>
-<span class="sourceLineNo">427</span> public String explainFailure() throws Exception {<a name="line.427"></a>
-<span class="sourceLineNo">428</span> return walPath + " has not been closed yet";<a name="line.428"></a>
-<span class="sourceLineNo">429</span> }<a name="line.429"></a>
-<span class="sourceLineNo">430</span><a name="line.430"></a>
-<span class="sourceLineNo">431</span> });<a name="line.431"></a>
-<span class="sourceLineNo">432</span> long walLength = fs.getFileStatus(walPath).getLen();<a name="line.432"></a>
-<span class="sourceLineNo">433</span><a name="line.433"></a>
-<span class="sourceLineNo">434</span> ReplicationSourceWALReader reader = createReader(false, CONF);<a name="line.434"></a>
-<span class="sourceLineNo">435</span><a name="line.435"></a>
-<span class="sourceLineNo">436</span> WALEntryBatch entryBatch = reader.take();<a name="line.436"></a>
-<span class="sourceLineNo">437</span> assertEquals(walPath, entryBatch.getLastWalPath());<a name="line.437"></a>
-<span class="sourceLineNo">438</span> assertTrue("Position " + entryBatch.getLastWalPosition() + " is out of range, file length is " +<a name="line.438"></a>
-<span class="sourceLineNo">439</span> walLength, entryBatch.getLastWalPosition() <= walLength);<a name="line.439"></a>
-<span class="sourceLineNo">440</span> assertEquals(1, entryBatch.getNbEntries());<a name="line.440"></a>
-<span class="sourceLineNo">441</span> assertTrue(entryBatch.isEndOfFile());<a name="line.441"></a>
-<span class="sourceLineNo">442</span><a name="line.442"></a>
-<span class="sourceLineNo">443</span> Path walPath2 = walQueue.peek();<a name="line.443"></a>
-<span class="sourceLineNo">444</span> entryBatch = reader.take();<a name="line.444"></a>
-<span class="sourceLineNo">445</span> assertEquals(walPath2, entryBatch.getLastWalPath());<a name="line.445"></a>
-<span class="sourceLineNo">446</span> assertEquals(20, entryBatch.getNbEntries());<a name="line.446"></a>
-<span class="sourceLineNo">447</span> assertFalse(entryBatch.isEndOfFile());<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span> log.rollWriter();<a name="line.449"></a>
-<span class="sourceLineNo">450</span> appendEntriesToLogAndSync(10);<a name="line.450"></a>
-<span class="sourceLineNo">451</span> entryBatch = reader.take();<a name="line.451"></a>
-<span class="sourceLineNo">452</span> assertEquals(walPath2, entryBatch.getLastWalPath());<a name="line.452"></a>
-<span class="sourceLineNo">453</span> assertEquals(0, entryBatch.getNbEntries());<a name="line.453"></a>
-<span class="sourceLineNo">454</span> assertTrue(entryBatch.isEndOfFile());<a name="line.454"></a>
-<span class="sourceLineNo">455</span><a name="line.455"></a>
-<span class="sourceLineNo">456</span> Path walPath3 = walQueue.peek();<a name="line.456"></a>
-<span class="sourceLineNo">457</span> entryBatch = reader.take();<a name="line.457"></a>
-<span class="sourceLineNo">458</span> assertEquals(walPath3, entryBatch.getLastWalPath());<a name="line.458"></a>
-<span class="sourceLineNo">459</span> assertEquals(10, entryBatch.getNbEntries());<a name="line.459"></a>
-<span class="sourceLineNo">460</span> assertFalse(entryBatch.isEndOfFile());<a name="line.460"></a>
-<span class="sourceLineNo">461</span> }<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span> private String getRow(WAL.Entry entry) {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> Cell cell = entry.getEdit().getCells().get(0);<a name="line.464"></a>
-<span class="sourceLineNo">465</span> return Bytes.toString(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.465"></a>
-<span class="sourceLineNo">466</span> }<a name="line.466"></a>
-<span class="sourceLineNo">467</span><a name="line.467"></a>
-<span class="sourceLineNo">468</span> private void appendToLog(String key) throws IOException {<a name="line.468"></a>
-<span class="sourceLineNo">469</span> final long txid = log.append(info,<a name="line.469"></a>
-<span class="sourceLineNo">470</span> new WALKeyImpl(info.getEncodedNameAsBytes(), tableName, System.currentTimeMillis(),<a name="line.470"></a>
-<span class="sourceLineNo">471</span> mvcc, scopes), getWALEdit(key), true);<a name="line.471"></a>
-<span class="sourceLineNo">472</span> log.sync(txid);<a name="line.472"></a>
-<span class="sourceLineNo">473</span> }<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span> private void appendEntriesToLogAndSync(int count) throws IOException {<a name="line.475"></a>
-<span class="sourceLineNo">476</span> long txid = -1L;<a name="line.476"></a>
-<span class="sourceLineNo">477</span> for (int i = 0; i < count; i++) {<a name="line.477"></a>
-<span class="sourceLineNo">478</span> txid = appendToLog(1);<a name="line.478"></a>
-<span class="sourceLineNo">479</span> }<a name="line.479"></a>
-<span class="sourceLineNo">480</span> log.sync(txid);<a name="line.480"></a>
-<span class="sourceLineNo">481</span> }<a name="line.481"></a>
-<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span> private void appendToLogAndSync() throws IOException {<a name="line.483"></a>
-<span class="sourceLineNo">484</span> appendToLogAndSync(1);<a name="line.484"></a>
-<span class="sourceLineNo">485</span> }<a name="line.485"></a>
-<span class="sourceLineNo">486</span><a name="line.486"></a>
-<span class="sourceLineNo">487</span> private void appendToLogAndSync(int count) throws IOException {<a name="line.487"></a>
-<span class="sourceLineNo">488</span> long txid = appendToLog(count);<a name="line.488"></a>
-<span class="sourceLineNo">489</span> log.sync(txid);<a name="line.489"></a>
-<span class="sourceLineNo">490</span> }<a name="line.490"></a>
-<span class="sourceLineNo">491</span><a name="line.491"></a>
-<span class="sourceLineNo">492</span> private long appendToLog(int count) throws IOException {<a name="line.492"></a>
-<span class="sourceLineNo">493</span> return log.append(info, new WALKeyImpl(info.getEncodedNameAsBytes(), tableName,<a name="line.493"></a>
-<span class="sourceLineNo">494</span> System.currentTimeMillis(), mvcc, scopes), getWALEdits(count), true);<a name="line.494"></a>
-<span class="sourceLineNo">495</span> }<a name="line.495"></a>
-<span class="sourceLineNo">496</span><a name="line.496"></a>
-<span class="sourceLineNo">497</span> private WALEdit getWALEdits(int count) {<a name="line.497"></a>
-<span class="sourceLineNo">498</span> WALEdit edit = new WALEdit();<a name="line.498"></a>
-<span class="sourceLineNo">499</span> for (int i = 0; i < count; i++) {<a name="line.499"></a>
-<span class="sourceLineNo">500</span> edit.add(new KeyValue(Bytes.toBytes(System.currentTimeMillis()), family, qualifier,<a name="line.500"></a>
-<span class="sourceLineNo">501</span> System.currentTimeMillis(), qualifier));<a name="line.501"></a>
-<span class="sourceLineNo">502</span> }<a name="line.502"></a>
-<span class="sourceLineNo">503</span> return edit;<a name="line.503"></a>
-<span class="sourceLineNo">504</span> }<a name="line.504"></a>
-<span class="sourceLineNo">505</span><a name="line.505"></a>
-<span class="sourceLineNo">506</span> private WALEdit getWALEdit(String row) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span> WALEdit edit = new WALEdit();<a name="line.507"></a>
-<span class="sourceLineNo">508</span> edit.add(<a name="line.508"></a>
-<span class="sourceLineNo">509</span> new KeyValue(Bytes.toBytes(row), family, qualifier, System.currentTimeMillis(), qualifier));<a name="line.509"></a>
-<span class="sourceLineNo">510</span> return edit;<a name="line.510"></a>
-<span class="sourceLineNo">511</span> }<a name="line.511"></a>
-<span class="sourceLineNo">512</span><a name="line.512"></a>
-<span class="sourceLineNo">513</span> private WALEntryFilter getDummyFilter() {<a name="line.513"></a>
-<span class="sourceLineNo">514</span> return new WALEntryFilter() {<a name="line.514"></a>
-<span class="sourceLineNo">515</span><a name="line.515"></a>
-<span class="sourceLineNo">516</span> @Override<a name="line.516"></a>
-<span class="sourceLineNo">517</span> public Entry filter(Entry entry) {<a name="line.517"></a>
-<span class="sourceLineNo">518</span> return entry;<a name="line.518"></a>
-<span class="sourceLineNo">519</span> }<a name="line.519"></a>
-<span class="sourceLineNo">520</span> };<a name="line.520"></a>
-<span class="sourceLineNo">521</span> }<a name="line.521"></a>
-<span class="sourceLineNo">522</span><a name="line.522"></a>
-<span class="sourceLineNo">523</span> class PathWatcher implements WALActionsListener {<a name="line.523"></a>
+<span class="sourceLineNo">412</span> walPath = walQueue.peek();<a name="line.412"></a>
+<span class="sourceLineNo">413</span> batch = reader.take();<a name="line.413"></a>
+<span class="sourceLineNo">414</span> assertEquals(walPath, batch.getLastWalPath());<a name="line.414"></a>
+<span class="sourceLineNo">415</span> assertEquals(5, batch.getNbEntries());<a name="line.415"></a>
+<span class="sourceLineNo">416</span> // Actually this should be true but we haven't handled this yet since for a normal queue the<a name="line.416"></a>
+<span class="sourceLineNo">417</span> // last one is always open... Not a big deal for now.<a name="line.417"></a>
+<span class="sourceLineNo">418</span> assertFalse(batch.isEndOfFile());<a name="line.418"></a>
+<span class="sourceLineNo">419</span><a name="line.419"></a>
+<span class="sourceLineNo">420</span> assertSame(WALEntryBatch.NO_MORE_DATA, reader.take());<a name="line.420"></a>
+<span class="sourceLineNo">421</span> }<a name="line.421"></a>
+<span class="sourceLineNo">422</span><a name="line.422"></a>
+<span class="sourceLineNo">423</span> // Testcase for HBASE-20206<a name="line.423"></a>
+<span class="sourceLineNo">424</span> @Test<a name="line.424"></a>
+<span class="sourceLineNo">425</span> public void testReplicationSourceWALReaderWrongPosition() throws Exception {<a name="line.425"></a>
+<span class="sourceLineNo">426</span> appendEntriesToLogAndSync(1);<a name="line.426"></a>
+<span class="sourceLineNo">427</span> Path walPath = walQueue.peek();<a name="line.427"></a>
+<span class="sourceLineNo">428</span> log.rollWriter();<a name="line.428"></a>
+<span class="sourceLineNo">429</span> appendEntriesToLogAndSync(20);<a name="line.429"></a>
+<span class="sourceLineNo">430</span> TEST_UTIL.waitFor(5000, new ExplainingPredicate<Exception>() {<a name="line.430"></a>
+<span class="sourceLineNo">431</span><a name="line.431"></a>
+<span class="sourceLineNo">432</span> @Override<a name="line.432"></a>
+<span class="sourceLineNo">433</span> public boolean evaluate() throws Exception {<a name="line.433"></a>
+<span class="sourceLineNo">434</span> return fs.getFileStatus(walPath).getLen() > 0;<a name="line.434"></a>
+<span class="sourceLineNo">435</span> }<a name="line.435"></a>
+<span class="sourceLineNo">436</span><a name="line.436"></a>
+<span class="sourceLineNo">437</span> @Override<a name="line.437"></a>
+<span class="sourceLineNo">438</span> public String explainFailure() throws Exception {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> return walPath + " has not been closed yet";<a name="line.439"></a>
+<span class="sourceLineNo">440</span> }<a name="line.440"></a>
+<span class="sourceLineNo">441</span><a name="line.441"></a>
+<span class="sourceLineNo">442</span> });<a name="line.442"></a>
+<span class="sourceLineNo">443</span> long walLength = fs.getFileStatus(walPath).getLen();<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span> ReplicationSourceWALReader reader = createReader(false, CONF);<a name="line.445"></a>
+<span class="sourceLineNo">446</span><a name="line.446"></a>
+<span class="sourceLineNo">447</span> WALEntryBatch entryBatch = reader.take();<a name="line.447"></a>
+<span class="sourceLineNo">448</span> assertEquals(walPath, entryBatch.getLastWalPath());<a name="line.448"></a>
+<span class="sourceLineNo">449</span> assertTrue("Position " + entryBatch.getLastWalPosition() + " is out of range, file length is " +<a name="line.449"></a>
+<span class="sourceLineNo">450</span> walLength, entryBatch.getLastWalPosition() <= walLength);<a name="line.450"></a>
+<span class="sourceLineNo">451</span> assertEquals(1, entryBatch.getNbEntries());<a name="line.451"></a>
+<span class="sourceLineNo">452</span> assertTrue(entryBatch.isEndOfFile());<a name="line.452"></a>
+<span class="sourceLineNo">453</span><a name="line.453"></a>
+<span class="sourceLineNo">454</span> Path walPath2 = walQueue.peek();<a name="line.454"></a>
+<span class="sourceLineNo">455</span> entryBatch = reader.take();<a name="line.455"></a>
+<span class="sourceLineNo">456</span> assertEquals(walPath2, entryBatch.getLastWalPath());<a name="line.456"></a>
+<span class="sourceLineNo">457</span> assertEquals(20, entryBatch.getNbEntries());<a name="line.457"></a>
+<span class="sourceLineNo">458</span> assertFalse(entryBatch.isEndOfFile());<a name="line.458"></a>
+<span class="sourceLineNo">459</span><a name="line.459"></a>
+<span class="sourceLineNo">460</span> log.rollWriter();<a name="line.460"></a>
+<span class="sourceLineNo">461</span> appendEntriesToLogAndSync(10);<a name="line.461"></a>
+<span class="sourceLineNo">462</span> entryBatch = reader.take();<a name="line.462"></a>
+<span class="sourceLineNo">463</span> assertEquals(walPath2, entryBatch.getLastWalPath());<a name="line.463"></a>
+<span class="sourceLineNo">464</span> assertEquals(0, entryBatch.getNbEntries());<a name="line.464"></a>
+<span class="sourceLineNo">465</span> as
<TRUNCATED>
[07/12] hbase-site git commit: Published site at
773aff90fdf9edf4687b373d1c7ba859d166a437.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html b/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html
index 506f6cc..3ca913b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html
@@ -362,580 +362,584 @@
<span class="sourceLineNo">354</span> //Overwrite any info stored by table, this takes precedence<a name="line.354"></a>
<span class="sourceLineNo">355</span> try {<a name="line.355"></a>
<span class="sourceLineNo">356</span> if(ZKUtil.checkExists(watcher, groupBasePath) != -1) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span> for(String znode: ZKUtil.listChildrenAndWatchForNewChildren(watcher, groupBasePath)) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> byte[] data = ZKUtil.getData(watcher, ZNodePaths.joinZNode(groupBasePath, znode));<a name="line.358"></a>
-<span class="sourceLineNo">359</span> if(data.length > 0) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> ProtobufUtil.expectPBMagicPrefix(data);<a name="line.360"></a>
-<span class="sourceLineNo">361</span> ByteArrayInputStream bis = new ByteArrayInputStream(<a name="line.361"></a>
-<span class="sourceLineNo">362</span> data, ProtobufUtil.lengthOfPBMagic(), data.length);<a name="line.362"></a>
-<span class="sourceLineNo">363</span> RSGroupInfoList.add(RSGroupProtobufUtil.toGroupInfo(<a name="line.363"></a>
-<span class="sourceLineNo">364</span> RSGroupProtos.RSGroupInfo.parseFrom(bis)));<a name="line.364"></a>
-<span class="sourceLineNo">365</span> }<a name="line.365"></a>
-<span class="sourceLineNo">366</span> }<a name="line.366"></a>
-<span class="sourceLineNo">367</span> LOG.debug("Read ZK GroupInfo count:" + RSGroupInfoList.size());<a name="line.367"></a>
-<span class="sourceLineNo">368</span> }<a name="line.368"></a>
-<span class="sourceLineNo">369</span> } catch (KeeperException|DeserializationException|InterruptedException e) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span> throw new IOException("Failed to read rsGroupZNode",e);<a name="line.370"></a>
-<span class="sourceLineNo">371</span> }<a name="line.371"></a>
-<span class="sourceLineNo">372</span> return RSGroupInfoList;<a name="line.372"></a>
-<span class="sourceLineNo">373</span> }<a name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span> @Override<a name="line.375"></a>
-<span class="sourceLineNo">376</span> public void refresh() throws IOException {<a name="line.376"></a>
-<span class="sourceLineNo">377</span> refresh(false);<a name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span> /**<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * Read rsgroup info from the source of truth, the hbase:rsgroup table.<a name="line.381"></a>
-<span class="sourceLineNo">382</span> * Update zk cache. Called on startup of the manager.<a name="line.382"></a>
-<span class="sourceLineNo">383</span> */<a name="line.383"></a>
-<span class="sourceLineNo">384</span> private synchronized void refresh(boolean forceOnline) throws IOException {<a name="line.384"></a>
-<span class="sourceLineNo">385</span> List<RSGroupInfo> groupList = new LinkedList<>();<a name="line.385"></a>
-<span class="sourceLineNo">386</span><a name="line.386"></a>
-<span class="sourceLineNo">387</span> // Overwrite anything read from zk, group table is source of truth<a name="line.387"></a>
-<span class="sourceLineNo">388</span> // if online read from GROUP table<a name="line.388"></a>
-<span class="sourceLineNo">389</span> if (forceOnline || isOnline()) {<a name="line.389"></a>
-<span class="sourceLineNo">390</span> LOG.debug("Refreshing in Online mode.");<a name="line.390"></a>
-<span class="sourceLineNo">391</span> if (rsGroupTable == null) {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> rsGroupTable = conn.getTable(RSGROUP_TABLE_NAME);<a name="line.392"></a>
-<span class="sourceLineNo">393</span> }<a name="line.393"></a>
-<span class="sourceLineNo">394</span> groupList.addAll(retrieveGroupListFromGroupTable());<a name="line.394"></a>
-<span class="sourceLineNo">395</span> } else {<a name="line.395"></a>
-<span class="sourceLineNo">396</span> LOG.debug("Refreshing in Offline mode.");<a name="line.396"></a>
-<span class="sourceLineNo">397</span> groupList.addAll(retrieveGroupListFromZookeeper());<a name="line.397"></a>
-<span class="sourceLineNo">398</span> }<a name="line.398"></a>
-<span class="sourceLineNo">399</span><a name="line.399"></a>
-<span class="sourceLineNo">400</span> // refresh default group, prune<a name="line.400"></a>
-<span class="sourceLineNo">401</span> NavigableSet<TableName> orphanTables = new TreeSet<>();<a name="line.401"></a>
-<span class="sourceLineNo">402</span> for(String entry: masterServices.getTableDescriptors().getAll().keySet()) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span> orphanTables.add(TableName.valueOf(entry));<a name="line.403"></a>
-<span class="sourceLineNo">404</span> }<a name="line.404"></a>
-<span class="sourceLineNo">405</span><a name="line.405"></a>
-<span class="sourceLineNo">406</span> final List<TableName> specialTables = Arrays.asList(AccessControlLists.ACL_TABLE_NAME,<a name="line.406"></a>
-<span class="sourceLineNo">407</span> TableName.META_TABLE_NAME, TableName.NAMESPACE_TABLE_NAME, RSGROUP_TABLE_NAME);<a name="line.407"></a>
-<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span> for (TableName table : specialTables) {<a name="line.409"></a>
-<span class="sourceLineNo">410</span> orphanTables.add(table);<a name="line.410"></a>
-<span class="sourceLineNo">411</span> }<a name="line.411"></a>
-<span class="sourceLineNo">412</span> for (RSGroupInfo group: groupList) {<a name="line.412"></a>
-<span class="sourceLineNo">413</span> if(!group.getName().equals(RSGroupInfo.DEFAULT_GROUP)) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> orphanTables.removeAll(group.getTables());<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span> }<a name="line.416"></a>
-<span class="sourceLineNo">417</span><a name="line.417"></a>
-<span class="sourceLineNo">418</span> // This is added to the last of the list so it overwrites the 'default' rsgroup loaded<a name="line.418"></a>
-<span class="sourceLineNo">419</span> // from region group table or zk<a name="line.419"></a>
-<span class="sourceLineNo">420</span> groupList.add(new RSGroupInfo(RSGroupInfo.DEFAULT_GROUP, getDefaultServers(),<a name="line.420"></a>
-<span class="sourceLineNo">421</span> orphanTables));<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span> // populate the data<a name="line.423"></a>
-<span class="sourceLineNo">424</span> HashMap<String, RSGroupInfo> newGroupMap = Maps.newHashMap();<a name="line.424"></a>
-<span class="sourceLineNo">425</span> HashMap<TableName, String> newTableMap = Maps.newHashMap();<a name="line.425"></a>
-<span class="sourceLineNo">426</span> for (RSGroupInfo group : groupList) {<a name="line.426"></a>
-<span class="sourceLineNo">427</span> newGroupMap.put(group.getName(), group);<a name="line.427"></a>
-<span class="sourceLineNo">428</span> for(TableName table: group.getTables()) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span> newTableMap.put(table, group.getName());<a name="line.429"></a>
-<span class="sourceLineNo">430</span> }<a name="line.430"></a>
-<span class="sourceLineNo">431</span> }<a name="line.431"></a>
-<span class="sourceLineNo">432</span> resetRSGroupAndTableMaps(newGroupMap, newTableMap);<a name="line.432"></a>
-<span class="sourceLineNo">433</span> updateCacheOfRSGroups(rsGroupMap.keySet());<a name="line.433"></a>
-<span class="sourceLineNo">434</span> }<a name="line.434"></a>
-<span class="sourceLineNo">435</span><a name="line.435"></a>
-<span class="sourceLineNo">436</span> private synchronized Map<TableName,String> flushConfigTable(Map<String,RSGroupInfo> groupMap)<a name="line.436"></a>
-<span class="sourceLineNo">437</span> throws IOException {<a name="line.437"></a>
-<span class="sourceLineNo">438</span> Map<TableName,String> newTableMap = Maps.newHashMap();<a name="line.438"></a>
-<span class="sourceLineNo">439</span> List<Mutation> mutations = Lists.newArrayList();<a name="line.439"></a>
-<span class="sourceLineNo">440</span><a name="line.440"></a>
-<span class="sourceLineNo">441</span> // populate deletes<a name="line.441"></a>
-<span class="sourceLineNo">442</span> for(String groupName : prevRSGroups) {<a name="line.442"></a>
-<span class="sourceLineNo">443</span> if(!groupMap.containsKey(groupName)) {<a name="line.443"></a>
-<span class="sourceLineNo">444</span> Delete d = new Delete(Bytes.toBytes(groupName));<a name="line.444"></a>
-<span class="sourceLineNo">445</span> mutations.add(d);<a name="line.445"></a>
-<span class="sourceLineNo">446</span> }<a name="line.446"></a>
-<span class="sourceLineNo">447</span> }<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span> // populate puts<a name="line.449"></a>
-<span class="sourceLineNo">450</span> for(RSGroupInfo RSGroupInfo : groupMap.values()) {<a name="line.450"></a>
-<span class="sourceLineNo">451</span> RSGroupProtos.RSGroupInfo proto = RSGroupProtobufUtil.toProtoGroupInfo(RSGroupInfo);<a name="line.451"></a>
-<span class="sourceLineNo">452</span> Put p = new Put(Bytes.toBytes(RSGroupInfo.getName()));<a name="line.452"></a>
-<span class="sourceLineNo">453</span> p.addColumn(META_FAMILY_BYTES, META_QUALIFIER_BYTES, proto.toByteArray());<a name="line.453"></a>
-<span class="sourceLineNo">454</span> mutations.add(p);<a name="line.454"></a>
-<span class="sourceLineNo">455</span> for(TableName entry: RSGroupInfo.getTables()) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span> newTableMap.put(entry, RSGroupInfo.getName());<a name="line.456"></a>
-<span class="sourceLineNo">457</span> }<a name="line.457"></a>
-<span class="sourceLineNo">458</span> }<a name="line.458"></a>
-<span class="sourceLineNo">459</span><a name="line.459"></a>
-<span class="sourceLineNo">460</span> if(mutations.size() > 0) {<a name="line.460"></a>
-<span class="sourceLineNo">461</span> multiMutate(mutations);<a name="line.461"></a>
+<span class="sourceLineNo">357</span> List<String> children = ZKUtil.listChildrenAndWatchForNewChildren(watcher, groupBasePath);<a name="line.357"></a>
+<span class="sourceLineNo">358</span> if (children == null) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span> return RSGroupInfoList;<a name="line.359"></a>
+<span class="sourceLineNo">360</span> }<a name="line.360"></a>
+<span class="sourceLineNo">361</span> for(String znode: children) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span> byte[] data = ZKUtil.getData(watcher, ZNodePaths.joinZNode(groupBasePath, znode));<a name="line.362"></a>
+<span class="sourceLineNo">363</span> if(data.length > 0) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span> ProtobufUtil.expectPBMagicPrefix(data);<a name="line.364"></a>
+<span class="sourceLineNo">365</span> ByteArrayInputStream bis = new ByteArrayInputStream(<a name="line.365"></a>
+<span class="sourceLineNo">366</span> data, ProtobufUtil.lengthOfPBMagic(), data.length);<a name="line.366"></a>
+<span class="sourceLineNo">367</span> RSGroupInfoList.add(RSGroupProtobufUtil.toGroupInfo(<a name="line.367"></a>
+<span class="sourceLineNo">368</span> RSGroupProtos.RSGroupInfo.parseFrom(bis)));<a name="line.368"></a>
+<span class="sourceLineNo">369</span> }<a name="line.369"></a>
+<span class="sourceLineNo">370</span> }<a name="line.370"></a>
+<span class="sourceLineNo">371</span> LOG.debug("Read ZK GroupInfo count:" + RSGroupInfoList.size());<a name="line.371"></a>
+<span class="sourceLineNo">372</span> }<a name="line.372"></a>
+<span class="sourceLineNo">373</span> } catch (KeeperException|DeserializationException|InterruptedException e) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> throw new IOException("Failed to read rsGroupZNode",e);<a name="line.374"></a>
+<span class="sourceLineNo">375</span> }<a name="line.375"></a>
+<span class="sourceLineNo">376</span> return RSGroupInfoList;<a name="line.376"></a>
+<span class="sourceLineNo">377</span> }<a name="line.377"></a>
+<span class="sourceLineNo">378</span><a name="line.378"></a>
+<span class="sourceLineNo">379</span> @Override<a name="line.379"></a>
+<span class="sourceLineNo">380</span> public void refresh() throws IOException {<a name="line.380"></a>
+<span class="sourceLineNo">381</span> refresh(false);<a name="line.381"></a>
+<span class="sourceLineNo">382</span> }<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span> /**<a name="line.384"></a>
+<span class="sourceLineNo">385</span> * Read rsgroup info from the source of truth, the hbase:rsgroup table.<a name="line.385"></a>
+<span class="sourceLineNo">386</span> * Update zk cache. Called on startup of the manager.<a name="line.386"></a>
+<span class="sourceLineNo">387</span> */<a name="line.387"></a>
+<span class="sourceLineNo">388</span> private synchronized void refresh(boolean forceOnline) throws IOException {<a name="line.388"></a>
+<span class="sourceLineNo">389</span> List<RSGroupInfo> groupList = new LinkedList<>();<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span> // Overwrite anything read from zk, group table is source of truth<a name="line.391"></a>
+<span class="sourceLineNo">392</span> // if online read from GROUP table<a name="line.392"></a>
+<span class="sourceLineNo">393</span> if (forceOnline || isOnline()) {<a name="line.393"></a>
+<span class="sourceLineNo">394</span> LOG.debug("Refreshing in Online mode.");<a name="line.394"></a>
+<span class="sourceLineNo">395</span> if (rsGroupTable == null) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span> rsGroupTable = conn.getTable(RSGROUP_TABLE_NAME);<a name="line.396"></a>
+<span class="sourceLineNo">397</span> }<a name="line.397"></a>
+<span class="sourceLineNo">398</span> groupList.addAll(retrieveGroupListFromGroupTable());<a name="line.398"></a>
+<span class="sourceLineNo">399</span> } else {<a name="line.399"></a>
+<span class="sourceLineNo">400</span> LOG.debug("Refreshing in Offline mode.");<a name="line.400"></a>
+<span class="sourceLineNo">401</span> groupList.addAll(retrieveGroupListFromZookeeper());<a name="line.401"></a>
+<span class="sourceLineNo">402</span> }<a name="line.402"></a>
+<span class="sourceLineNo">403</span><a name="line.403"></a>
+<span class="sourceLineNo">404</span> // refresh default group, prune<a name="line.404"></a>
+<span class="sourceLineNo">405</span> NavigableSet<TableName> orphanTables = new TreeSet<>();<a name="line.405"></a>
+<span class="sourceLineNo">406</span> for(String entry: masterServices.getTableDescriptors().getAll().keySet()) {<a name="line.406"></a>
+<span class="sourceLineNo">407</span> orphanTables.add(TableName.valueOf(entry));<a name="line.407"></a>
+<span class="sourceLineNo">408</span> }<a name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span> final List<TableName> specialTables = Arrays.asList(AccessControlLists.ACL_TABLE_NAME,<a name="line.410"></a>
+<span class="sourceLineNo">411</span> TableName.META_TABLE_NAME, TableName.NAMESPACE_TABLE_NAME, RSGROUP_TABLE_NAME);<a name="line.411"></a>
+<span class="sourceLineNo">412</span><a name="line.412"></a>
+<span class="sourceLineNo">413</span> for (TableName table : specialTables) {<a name="line.413"></a>
+<span class="sourceLineNo">414</span> orphanTables.add(table);<a name="line.414"></a>
+<span class="sourceLineNo">415</span> }<a name="line.415"></a>
+<span class="sourceLineNo">416</span> for (RSGroupInfo group: groupList) {<a name="line.416"></a>
+<span class="sourceLineNo">417</span> if(!group.getName().equals(RSGroupInfo.DEFAULT_GROUP)) {<a name="line.417"></a>
+<span class="sourceLineNo">418</span> orphanTables.removeAll(group.getTables());<a name="line.418"></a>
+<span class="sourceLineNo">419</span> }<a name="line.419"></a>
+<span class="sourceLineNo">420</span> }<a name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span> // This is added to the last of the list so it overwrites the 'default' rsgroup loaded<a name="line.422"></a>
+<span class="sourceLineNo">423</span> // from region group table or zk<a name="line.423"></a>
+<span class="sourceLineNo">424</span> groupList.add(new RSGroupInfo(RSGroupInfo.DEFAULT_GROUP, getDefaultServers(),<a name="line.424"></a>
+<span class="sourceLineNo">425</span> orphanTables));<a name="line.425"></a>
+<span class="sourceLineNo">426</span><a name="line.426"></a>
+<span class="sourceLineNo">427</span> // populate the data<a name="line.427"></a>
+<span class="sourceLineNo">428</span> HashMap<String, RSGroupInfo> newGroupMap = Maps.newHashMap();<a name="line.428"></a>
+<span class="sourceLineNo">429</span> HashMap<TableName, String> newTableMap = Maps.newHashMap();<a name="line.429"></a>
+<span class="sourceLineNo">430</span> for (RSGroupInfo group : groupList) {<a name="line.430"></a>
+<span class="sourceLineNo">431</span> newGroupMap.put(group.getName(), group);<a name="line.431"></a>
+<span class="sourceLineNo">432</span> for(TableName table: group.getTables()) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span> newTableMap.put(table, group.getName());<a name="line.433"></a>
+<span class="sourceLineNo">434</span> }<a name="line.434"></a>
+<span class="sourceLineNo">435</span> }<a name="line.435"></a>
+<span class="sourceLineNo">436</span> resetRSGroupAndTableMaps(newGroupMap, newTableMap);<a name="line.436"></a>
+<span class="sourceLineNo">437</span> updateCacheOfRSGroups(rsGroupMap.keySet());<a name="line.437"></a>
+<span class="sourceLineNo">438</span> }<a name="line.438"></a>
+<span class="sourceLineNo">439</span><a name="line.439"></a>
+<span class="sourceLineNo">440</span> private synchronized Map<TableName,String> flushConfigTable(Map<String,RSGroupInfo> groupMap)<a name="line.440"></a>
+<span class="sourceLineNo">441</span> throws IOException {<a name="line.441"></a>
+<span class="sourceLineNo">442</span> Map<TableName,String> newTableMap = Maps.newHashMap();<a name="line.442"></a>
+<span class="sourceLineNo">443</span> List<Mutation> mutations = Lists.newArrayList();<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span> // populate deletes<a name="line.445"></a>
+<span class="sourceLineNo">446</span> for(String groupName : prevRSGroups) {<a name="line.446"></a>
+<span class="sourceLineNo">447</span> if(!groupMap.containsKey(groupName)) {<a name="line.447"></a>
+<span class="sourceLineNo">448</span> Delete d = new Delete(Bytes.toBytes(groupName));<a name="line.448"></a>
+<span class="sourceLineNo">449</span> mutations.add(d);<a name="line.449"></a>
+<span class="sourceLineNo">450</span> }<a name="line.450"></a>
+<span class="sourceLineNo">451</span> }<a name="line.451"></a>
+<span class="sourceLineNo">452</span><a name="line.452"></a>
+<span class="sourceLineNo">453</span> // populate puts<a name="line.453"></a>
+<span class="sourceLineNo">454</span> for(RSGroupInfo RSGroupInfo : groupMap.values()) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span> RSGroupProtos.RSGroupInfo proto = RSGroupProtobufUtil.toProtoGroupInfo(RSGroupInfo);<a name="line.455"></a>
+<span class="sourceLineNo">456</span> Put p = new Put(Bytes.toBytes(RSGroupInfo.getName()));<a name="line.456"></a>
+<span class="sourceLineNo">457</span> p.addColumn(META_FAMILY_BYTES, META_QUALIFIER_BYTES, proto.toByteArray());<a name="line.457"></a>
+<span class="sourceLineNo">458</span> mutations.add(p);<a name="line.458"></a>
+<span class="sourceLineNo">459</span> for(TableName entry: RSGroupInfo.getTables()) {<a name="line.459"></a>
+<span class="sourceLineNo">460</span> newTableMap.put(entry, RSGroupInfo.getName());<a name="line.460"></a>
+<span class="sourceLineNo">461</span> }<a name="line.461"></a>
<span class="sourceLineNo">462</span> }<a name="line.462"></a>
-<span class="sourceLineNo">463</span> return newTableMap;<a name="line.463"></a>
-<span class="sourceLineNo">464</span> }<a name="line.464"></a>
-<span class="sourceLineNo">465</span><a name="line.465"></a>
-<span class="sourceLineNo">466</span> private synchronized void flushConfig()<a name="line.466"></a>
-<span class="sourceLineNo">467</span> throws IOException {<a name="line.467"></a>
-<span class="sourceLineNo">468</span> flushConfig(this.rsGroupMap);<a name="line.468"></a>
-<span class="sourceLineNo">469</span> }<a name="line.469"></a>
-<span class="sourceLineNo">470</span><a name="line.470"></a>
-<span class="sourceLineNo">471</span> private synchronized void flushConfig(Map<String, RSGroupInfo> newGroupMap)<a name="line.471"></a>
-<span class="sourceLineNo">472</span> throws IOException {<a name="line.472"></a>
-<span class="sourceLineNo">473</span> Map<TableName, String> newTableMap;<a name="line.473"></a>
+<span class="sourceLineNo">463</span><a name="line.463"></a>
+<span class="sourceLineNo">464</span> if(mutations.size() > 0) {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> multiMutate(mutations);<a name="line.465"></a>
+<span class="sourceLineNo">466</span> }<a name="line.466"></a>
+<span class="sourceLineNo">467</span> return newTableMap;<a name="line.467"></a>
+<span class="sourceLineNo">468</span> }<a name="line.468"></a>
+<span class="sourceLineNo">469</span><a name="line.469"></a>
+<span class="sourceLineNo">470</span> private synchronized void flushConfig()<a name="line.470"></a>
+<span class="sourceLineNo">471</span> throws IOException {<a name="line.471"></a>
+<span class="sourceLineNo">472</span> flushConfig(this.rsGroupMap);<a name="line.472"></a>
+<span class="sourceLineNo">473</span> }<a name="line.473"></a>
<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span> // For offline mode persistence is still unavailable<a name="line.475"></a>
-<span class="sourceLineNo">476</span> // We're refreshing in-memory state but only for default servers<a name="line.476"></a>
-<span class="sourceLineNo">477</span> if (!isOnline()) {<a name="line.477"></a>
-<span class="sourceLineNo">478</span> Map<String, RSGroupInfo> m = Maps.newHashMap(rsGroupMap);<a name="line.478"></a>
-<span class="sourceLineNo">479</span> RSGroupInfo oldDefaultGroup = m.remove(RSGroupInfo.DEFAULT_GROUP);<a name="line.479"></a>
-<span class="sourceLineNo">480</span> RSGroupInfo newDefaultGroup = newGroupMap.remove(RSGroupInfo.DEFAULT_GROUP);<a name="line.480"></a>
-<span class="sourceLineNo">481</span> if (!m.equals(newGroupMap) ||<a name="line.481"></a>
-<span class="sourceLineNo">482</span> !oldDefaultGroup.getTables().equals(newDefaultGroup.getTables())) {<a name="line.482"></a>
-<span class="sourceLineNo">483</span> throw new IOException("Only default servers can be updated during offline mode");<a name="line.483"></a>
-<span class="sourceLineNo">484</span> }<a name="line.484"></a>
-<span class="sourceLineNo">485</span> newGroupMap.put(RSGroupInfo.DEFAULT_GROUP, newDefaultGroup);<a name="line.485"></a>
-<span class="sourceLineNo">486</span> rsGroupMap = newGroupMap;<a name="line.486"></a>
-<span class="sourceLineNo">487</span> return;<a name="line.487"></a>
-<span class="sourceLineNo">488</span> }<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span> newTableMap = flushConfigTable(newGroupMap);<a name="line.490"></a>
-<span class="sourceLineNo">491</span><a name="line.491"></a>
-<span class="sourceLineNo">492</span> // Make changes visible after having been persisted to the source of truth<a name="line.492"></a>
-<span class="sourceLineNo">493</span> resetRSGroupAndTableMaps(newGroupMap, newTableMap);<a name="line.493"></a>
-<span class="sourceLineNo">494</span><a name="line.494"></a>
-<span class="sourceLineNo">495</span> try {<a name="line.495"></a>
-<span class="sourceLineNo">496</span> String groupBasePath = ZNodePaths.joinZNode(watcher.znodePaths.baseZNode, rsGroupZNode);<a name="line.496"></a>
-<span class="sourceLineNo">497</span> ZKUtil.createAndFailSilent(watcher, groupBasePath, ProtobufMagic.PB_MAGIC);<a name="line.497"></a>
+<span class="sourceLineNo">475</span> private synchronized void flushConfig(Map<String, RSGroupInfo> newGroupMap)<a name="line.475"></a>
+<span class="sourceLineNo">476</span> throws IOException {<a name="line.476"></a>
+<span class="sourceLineNo">477</span> Map<TableName, String> newTableMap;<a name="line.477"></a>
+<span class="sourceLineNo">478</span><a name="line.478"></a>
+<span class="sourceLineNo">479</span> // For offline mode persistence is still unavailable<a name="line.479"></a>
+<span class="sourceLineNo">480</span> // We're refreshing in-memory state but only for default servers<a name="line.480"></a>
+<span class="sourceLineNo">481</span> if (!isOnline()) {<a name="line.481"></a>
+<span class="sourceLineNo">482</span> Map<String, RSGroupInfo> m = Maps.newHashMap(rsGroupMap);<a name="line.482"></a>
+<span class="sourceLineNo">483</span> RSGroupInfo oldDefaultGroup = m.remove(RSGroupInfo.DEFAULT_GROUP);<a name="line.483"></a>
+<span class="sourceLineNo">484</span> RSGroupInfo newDefaultGroup = newGroupMap.remove(RSGroupInfo.DEFAULT_GROUP);<a name="line.484"></a>
+<span class="sourceLineNo">485</span> if (!m.equals(newGroupMap) ||<a name="line.485"></a>
+<span class="sourceLineNo">486</span> !oldDefaultGroup.getTables().equals(newDefaultGroup.getTables())) {<a name="line.486"></a>
+<span class="sourceLineNo">487</span> throw new IOException("Only default servers can be updated during offline mode");<a name="line.487"></a>
+<span class="sourceLineNo">488</span> }<a name="line.488"></a>
+<span class="sourceLineNo">489</span> newGroupMap.put(RSGroupInfo.DEFAULT_GROUP, newDefaultGroup);<a name="line.489"></a>
+<span class="sourceLineNo">490</span> rsGroupMap = newGroupMap;<a name="line.490"></a>
+<span class="sourceLineNo">491</span> return;<a name="line.491"></a>
+<span class="sourceLineNo">492</span> }<a name="line.492"></a>
+<span class="sourceLineNo">493</span><a name="line.493"></a>
+<span class="sourceLineNo">494</span> newTableMap = flushConfigTable(newGroupMap);<a name="line.494"></a>
+<span class="sourceLineNo">495</span><a name="line.495"></a>
+<span class="sourceLineNo">496</span> // Make changes visible after having been persisted to the source of truth<a name="line.496"></a>
+<span class="sourceLineNo">497</span> resetRSGroupAndTableMaps(newGroupMap, newTableMap);<a name="line.497"></a>
<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span> List<ZKUtil.ZKUtilOp> zkOps = new ArrayList<>(newGroupMap.size());<a name="line.499"></a>
-<span class="sourceLineNo">500</span> for(String groupName : prevRSGroups) {<a name="line.500"></a>
-<span class="sourceLineNo">501</span> if(!newGroupMap.containsKey(groupName)) {<a name="line.501"></a>
-<span class="sourceLineNo">502</span> String znode = ZNodePaths.joinZNode(groupBasePath, groupName);<a name="line.502"></a>
-<span class="sourceLineNo">503</span> zkOps.add(ZKUtil.ZKUtilOp.deleteNodeFailSilent(znode));<a name="line.503"></a>
-<span class="sourceLineNo">504</span> }<a name="line.504"></a>
-<span class="sourceLineNo">505</span> }<a name="line.505"></a>
-<span class="sourceLineNo">506</span><a name="line.506"></a>
-<span class="sourceLineNo">507</span><a name="line.507"></a>
-<span class="sourceLineNo">508</span> for (RSGroupInfo RSGroupInfo : newGroupMap.values()) {<a name="line.508"></a>
-<span class="sourceLineNo">509</span> String znode = ZNodePaths.joinZNode(groupBasePath, RSGroupInfo.getName());<a name="line.509"></a>
-<span class="sourceLineNo">510</span> RSGroupProtos.RSGroupInfo proto = RSGroupProtobufUtil.toProtoGroupInfo(RSGroupInfo);<a name="line.510"></a>
-<span class="sourceLineNo">511</span> LOG.debug("Updating znode: "+znode);<a name="line.511"></a>
-<span class="sourceLineNo">512</span> ZKUtil.createAndFailSilent(watcher, znode);<a name="line.512"></a>
-<span class="sourceLineNo">513</span> zkOps.add(ZKUtil.ZKUtilOp.deleteNodeFailSilent(znode));<a name="line.513"></a>
-<span class="sourceLineNo">514</span> zkOps.add(ZKUtil.ZKUtilOp.createAndFailSilent(znode,<a name="line.514"></a>
-<span class="sourceLineNo">515</span> ProtobufUtil.prependPBMagic(proto.toByteArray())));<a name="line.515"></a>
-<span class="sourceLineNo">516</span> }<a name="line.516"></a>
-<span class="sourceLineNo">517</span> LOG.debug("Writing ZK GroupInfo count: " + zkOps.size());<a name="line.517"></a>
-<span class="sourceLineNo">518</span><a name="line.518"></a>
-<span class="sourceLineNo">519</span> ZKUtil.multiOrSequential(watcher, zkOps, false);<a name="line.519"></a>
-<span class="sourceLineNo">520</span> } catch (KeeperException e) {<a name="line.520"></a>
-<span class="sourceLineNo">521</span> LOG.error("Failed to write to rsGroupZNode", e);<a name="line.521"></a>
-<span class="sourceLineNo">522</span> masterServices.abort("Failed to write to rsGroupZNode", e);<a name="line.522"></a>
-<span class="sourceLineNo">523</span> throw new IOException("Failed to write to rsGroupZNode",e);<a name="line.523"></a>
-<span class="sourceLineNo">524</span> }<a name="line.524"></a>
-<span class="sourceLineNo">525</span> updateCacheOfRSGroups(newGroupMap.keySet());<a name="line.525"></a>
-<span class="sourceLineNo">526</span> }<a name="line.526"></a>
-<span class="sourceLineNo">527</span><a name="line.527"></a>
-<span class="sourceLineNo">528</span> /**<a name="line.528"></a>
-<span class="sourceLineNo">529</span> * Make changes visible.<a name="line.529"></a>
-<span class="sourceLineNo">530</span> * Caller must be synchronized on 'this'.<a name="line.530"></a>
-<span class="sourceLineNo">531</span> */<a name="line.531"></a>
-<span class="sourceLineNo">532</span> private void resetRSGroupAndTableMaps(Map<String, RSGroupInfo> newRSGroupMap,<a name="line.532"></a>
-<span class="sourceLineNo">533</span> Map<TableName, String> newTableMap) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span> // Make maps Immutable.<a name="line.534"></a>
-<span class="sourceLineNo">535</span> this.rsGroupMap = Collections.unmodifiableMap(newRSGroupMap);<a name="line.535"></a>
-<span class="sourceLineNo">536</span> this.tableMap = Collections.unmodifiableMap(newTableMap);<a name="line.536"></a>
-<span class="sourceLineNo">537</span> }<a name="line.537"></a>
-<span class="sourceLineNo">538</span><a name="line.538"></a>
-<span class="sourceLineNo">539</span> /**<a name="line.539"></a>
-<span class="sourceLineNo">540</span> * Update cache of rsgroups.<a name="line.540"></a>
-<span class="sourceLineNo">541</span> * Caller must be synchronized on 'this'.<a name="line.541"></a>
-<span class="sourceLineNo">542</span> * @param currentGroups Current list of Groups.<a name="line.542"></a>
-<span class="sourceLineNo">543</span> */<a name="line.543"></a>
-<span class="sourceLineNo">544</span> private void updateCacheOfRSGroups(final Set<String> currentGroups) {<a name="line.544"></a>
-<span class="sourceLineNo">545</span> this.prevRSGroups.clear();<a name="line.545"></a>
-<span class="sourceLineNo">546</span> this.prevRSGroups.addAll(currentGroups);<a name="line.546"></a>
-<span class="sourceLineNo">547</span> }<a name="line.547"></a>
-<span class="sourceLineNo">548</span><a name="line.548"></a>
-<span class="sourceLineNo">549</span> // Called by getDefaultServers. Presume it has lock in place.<a name="line.549"></a>
-<span class="sourceLineNo">550</span> private List<ServerName> getOnlineRS() throws IOException {<a name="line.550"></a>
-<span class="sourceLineNo">551</span> if (masterServices != null) {<a name="line.551"></a>
-<span class="sourceLineNo">552</span> return masterServices.getServerManager().getOnlineServersList();<a name="line.552"></a>
-<span class="sourceLineNo">553</span> }<a name="line.553"></a>
-<span class="sourceLineNo">554</span> LOG.debug("Reading online RS from zookeeper");<a name="line.554"></a>
-<span class="sourceLineNo">555</span> List<ServerName> servers = new LinkedList<>();<a name="line.555"></a>
-<span class="sourceLineNo">556</span> try {<a name="line.556"></a>
-<span class="sourceLineNo">557</span> for (String el: ZKUtil.listChildrenNoWatch(watcher, watcher.znodePaths.rsZNode)) {<a name="line.557"></a>
-<span class="sourceLineNo">558</span> servers.add(ServerName.parseServerName(el));<a name="line.558"></a>
-<span class="sourceLineNo">559</span> }<a name="line.559"></a>
-<span class="sourceLineNo">560</span> } catch (KeeperException e) {<a name="line.560"></a>
-<span class="sourceLineNo">561</span> throw new IOException("Failed to retrieve server list from zookeeper", e);<a name="line.561"></a>
-<span class="sourceLineNo">562</span> }<a name="line.562"></a>
-<span class="sourceLineNo">563</span> return servers;<a name="line.563"></a>
-<span class="sourceLineNo">564</span> }<a name="line.564"></a>
-<span class="sourceLineNo">565</span><a name="line.565"></a>
-<span class="sourceLineNo">566</span> // Called by ServerEventsListenerThread. Presume it has lock on this manager when it runs.<a name="line.566"></a>
-<span class="sourceLineNo">567</span> private SortedSet<Address> getDefaultServers() throws IOException {<a name="line.567"></a>
-<span class="sourceLineNo">568</span> SortedSet<Address> defaultServers = Sets.newTreeSet();<a name="line.568"></a>
-<span class="sourceLineNo">569</span> for (ServerName serverName : getOnlineRS()) {<a name="line.569"></a>
-<span class="sourceLineNo">570</span> Address server =<a name="line.570"></a>
-<span class="sourceLineNo">571</span> Address.fromParts(serverName.getHostname(), serverName.getPort());<a name="line.571"></a>
-<span class="sourceLineNo">572</span> boolean found = false;<a name="line.572"></a>
-<span class="sourceLineNo">573</span> for(RSGroupInfo rsgi: listRSGroups()) {<a name="line.573"></a>
-<span class="sourceLineNo">574</span> if(!RSGroupInfo.DEFAULT_GROUP.equals(rsgi.getName()) &&<a name="line.574"></a>
-<span class="sourceLineNo">575</span> rsgi.containsServer(server)) {<a name="line.575"></a>
-<span class="sourceLineNo">576</span> found = true;<a name="line.576"></a>
-<span class="sourceLineNo">577</span> break;<a name="line.577"></a>
-<span class="sourceLineNo">578</span> }<a name="line.578"></a>
-<span class="sourceLineNo">579</span> }<a name="line.579"></a>
-<span class="sourceLineNo">580</span> if (!found) {<a name="line.580"></a>
-<span class="sourceLineNo">581</span> defaultServers.add(server);<a name="line.581"></a>
-<span class="sourceLineNo">582</span> }<a name="line.582"></a>
-<span class="sourceLineNo">583</span> }<a name="line.583"></a>
-<span class="sourceLineNo">584</span> return defaultServers;<a name="line.584"></a>
-<span class="sourceLineNo">585</span> }<a name="line.585"></a>
-<span class="sourceLineNo">586</span><a name="line.586"></a>
-<span class="sourceLineNo">587</span> // Called by ServerEventsListenerThread. Synchronize on this because redoing<a name="line.587"></a>
-<span class="sourceLineNo">588</span> // the rsGroupMap then writing it out.<a name="line.588"></a>
-<span class="sourceLineNo">589</span> private synchronized void updateDefaultServers(SortedSet<Address> servers) throws IOException {<a name="line.589"></a>
-<span class="sourceLineNo">590</span> RSGroupInfo info = rsGroupMap.get(RSGroupInfo.DEFAULT_GROUP);<a name="line.590"></a>
-<span class="sourceLineNo">591</span> RSGroupInfo newInfo = new RSGroupInfo(info.getName(), servers, info.getTables());<a name="line.591"></a>
-<span class="sourceLineNo">592</span> HashMap<String, RSGroupInfo> newGroupMap = Maps.newHashMap(rsGroupMap);<a name="line.592"></a>
-<span class="sourceLineNo">593</span> newGroupMap.put(newInfo.getName(), newInfo);<a name="line.593"></a>
-<span class="sourceLineNo">594</span> flushConfig(newGroupMap);<a name="line.594"></a>
-<span class="sourceLineNo">595</span> }<a name="line.595"></a>
-<span class="sourceLineNo">596</span><a name="line.596"></a>
-<span class="sourceLineNo">597</span> // Called by FailedOpenUpdaterThread<a name="line.597"></a>
-<span class="sourceLineNo">598</span> private void updateFailedAssignments() {<a name="line.598"></a>
-<span class="sourceLineNo">599</span> // Kick all regions in FAILED_OPEN state<a name="line.599"></a>
-<span class="sourceLineNo">600</span> List<RegionInfo> stuckAssignments = Lists.newArrayList();<a name="line.600"></a>
-<span class="sourceLineNo">601</span> for (RegionStateNode state:<a name="line.601"></a>
-<span class="sourceLineNo">602</span> masterServices.getAssignmentManager().getRegionStates().getRegionsInTransition()) {<a name="line.602"></a>
-<span class="sourceLineNo">603</span> if (state.isStuck()) {<a name="line.603"></a>
-<span class="sourceLineNo">604</span> stuckAssignments.add(state.getRegionInfo());<a name="line.604"></a>
-<span class="sourceLineNo">605</span> }<a name="line.605"></a>
-<span class="sourceLineNo">606</span> }<a name="line.606"></a>
-<span class="sourceLineNo">607</span> for (RegionInfo region: stuckAssignments) {<a name="line.607"></a>
-<span class="sourceLineNo">608</span> LOG.info("Retrying assignment of " + region);<a name="line.608"></a>
-<span class="sourceLineNo">609</span> try {<a name="line.609"></a>
-<span class="sourceLineNo">610</span> masterServices.getAssignmentManager().unassign(region);<a name="line.610"></a>
-<span class="sourceLineNo">611</span> } catch (IOException e) {<a name="line.611"></a>
-<span class="sourceLineNo">612</span> LOG.warn("Unable to reassign " + region, e);<a name="line.612"></a>
-<span class="sourceLineNo">613</span> }<a name="line.613"></a>
-<span class="sourceLineNo">614</span> }<a name="line.614"></a>
-<span class="sourceLineNo">615</span> }<a name="line.615"></a>
-<span class="sourceLineNo">616</span><a name="line.616"></a>
-<span class="sourceLineNo">617</span> /**<a name="line.617"></a>
-<span class="sourceLineNo">618</span> * Calls {@link RSGroupInfoManagerImpl#updateDefaultServers(SortedSet)} to update list of known<a name="line.618"></a>
-<span class="sourceLineNo">619</span> * servers. Notifications about server changes are received by registering {@link ServerListener}.<a name="line.619"></a>
-<span class="sourceLineNo">620</span> * As a listener, we need to return immediately, so the real work of updating the servers is<a name="line.620"></a>
-<span class="sourceLineNo">621</span> * done asynchronously in this thread.<a name="line.621"></a>
-<span class="sourceLineNo">622</span> */<a name="line.622"></a>
-<span class="sourceLineNo">623</span> private class ServerEventsListenerThread extends Thread implements ServerListener {<a name="line.623"></a>
-<span class="sourceLineNo">624</span> private final Logger LOG = LoggerFactory.getLogger(ServerEventsListenerThread.class);<a name="line.624"></a>
-<span class="sourceLineNo">625</span> private boolean changed = false;<a name="line.625"></a>
-<span class="sourceLineNo">626</span><a name="line.626"></a>
-<span class="sourceLineNo">627</span> ServerEventsListenerThread() {<a name="line.627"></a>
-<span class="sourceLineNo">628</span> setDaemon(true);<a name="line.628"></a>
-<span class="sourceLineNo">629</span> }<a name="line.629"></a>
+<span class="sourceLineNo">499</span> try {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> String groupBasePath = ZNodePaths.joinZNode(watcher.znodePaths.baseZNode, rsGroupZNode);<a name="line.500"></a>
+<span class="sourceLineNo">501</span> ZKUtil.createAndFailSilent(watcher, groupBasePath, ProtobufMagic.PB_MAGIC);<a name="line.501"></a>
+<span class="sourceLineNo">502</span><a name="line.502"></a>
+<span class="sourceLineNo">503</span> List<ZKUtil.ZKUtilOp> zkOps = new ArrayList<>(newGroupMap.size());<a name="line.503"></a>
+<span class="sourceLineNo">504</span> for(String groupName : prevRSGroups) {<a name="line.504"></a>
+<span class="sourceLineNo">505</span> if(!newGroupMap.containsKey(groupName)) {<a name="line.505"></a>
+<span class="sourceLineNo">506</span> String znode = ZNodePaths.joinZNode(groupBasePath, groupName);<a name="line.506"></a>
+<span class="sourceLineNo">507</span> zkOps.add(ZKUtil.ZKUtilOp.deleteNodeFailSilent(znode));<a name="line.507"></a>
+<span class="sourceLineNo">508</span> }<a name="line.508"></a>
+<span class="sourceLineNo">509</span> }<a name="line.509"></a>
+<span class="sourceLineNo">510</span><a name="line.510"></a>
+<span class="sourceLineNo">511</span><a name="line.511"></a>
+<span class="sourceLineNo">512</span> for (RSGroupInfo RSGroupInfo : newGroupMap.values()) {<a name="line.512"></a>
+<span class="sourceLineNo">513</span> String znode = ZNodePaths.joinZNode(groupBasePath, RSGroupInfo.getName());<a name="line.513"></a>
+<span class="sourceLineNo">514</span> RSGroupProtos.RSGroupInfo proto = RSGroupProtobufUtil.toProtoGroupInfo(RSGroupInfo);<a name="line.514"></a>
+<span class="sourceLineNo">515</span> LOG.debug("Updating znode: "+znode);<a name="line.515"></a>
+<span class="sourceLineNo">516</span> ZKUtil.createAndFailSilent(watcher, znode);<a name="line.516"></a>
+<span class="sourceLineNo">517</span> zkOps.add(ZKUtil.ZKUtilOp.deleteNodeFailSilent(znode));<a name="line.517"></a>
+<span class="sourceLineNo">518</span> zkOps.add(ZKUtil.ZKUtilOp.createAndFailSilent(znode,<a name="line.518"></a>
+<span class="sourceLineNo">519</span> ProtobufUtil.prependPBMagic(proto.toByteArray())));<a name="line.519"></a>
+<span class="sourceLineNo">520</span> }<a name="line.520"></a>
+<span class="sourceLineNo">521</span> LOG.debug("Writing ZK GroupInfo count: " + zkOps.size());<a name="line.521"></a>
+<span class="sourceLineNo">522</span><a name="line.522"></a>
+<span class="sourceLineNo">523</span> ZKUtil.multiOrSequential(watcher, zkOps, false);<a name="line.523"></a>
+<span class="sourceLineNo">524</span> } catch (KeeperException e) {<a name="line.524"></a>
+<span class="sourceLineNo">525</span> LOG.error("Failed to write to rsGroupZNode", e);<a name="line.525"></a>
+<span class="sourceLineNo">526</span> masterServices.abort("Failed to write to rsGroupZNode", e);<a name="line.526"></a>
+<span class="sourceLineNo">527</span> throw new IOException("Failed to write to rsGroupZNode",e);<a name="line.527"></a>
+<span class="sourceLineNo">528</span> }<a name="line.528"></a>
+<span class="sourceLineNo">529</span> updateCacheOfRSGroups(newGroupMap.keySet());<a name="line.529"></a>
+<span class="sourceLineNo">530</span> }<a name="line.530"></a>
+<span class="sourceLineNo">531</span><a name="line.531"></a>
+<span class="sourceLineNo">532</span> /**<a name="line.532"></a>
+<span class="sourceLineNo">533</span> * Make changes visible.<a name="line.533"></a>
+<span class="sourceLineNo">534</span> * Caller must be synchronized on 'this'.<a name="line.534"></a>
+<span class="sourceLineNo">535</span> */<a name="line.535"></a>
+<span class="sourceLineNo">536</span> private void resetRSGroupAndTableMaps(Map<String, RSGroupInfo> newRSGroupMap,<a name="line.536"></a>
+<span class="sourceLineNo">537</span> Map<TableName, String> newTableMap) {<a name="line.537"></a>
+<span class="sourceLineNo">538</span> // Make maps Immutable.<a name="line.538"></a>
+<span class="sourceLineNo">539</span> this.rsGroupMap = Collections.unmodifiableMap(newRSGroupMap);<a name="line.539"></a>
+<span class="sourceLineNo">540</span> this.tableMap = Collections.unmodifiableMap(newTableMap);<a name="line.540"></a>
+<span class="sourceLineNo">541</span> }<a name="line.541"></a>
+<span class="sourceLineNo">542</span><a name="line.542"></a>
+<span class="sourceLineNo">543</span> /**<a name="line.543"></a>
+<span class="sourceLineNo">544</span> * Update cache of rsgroups.<a name="line.544"></a>
+<span class="sourceLineNo">545</span> * Caller must be synchronized on 'this'.<a name="line.545"></a>
+<span class="sourceLineNo">546</span> * @param currentGroups Current list of Groups.<a name="line.546"></a>
+<span class="sourceLineNo">547</span> */<a name="line.547"></a>
+<span class="sourceLineNo">548</span> private void updateCacheOfRSGroups(final Set<String> currentGroups) {<a name="line.548"></a>
+<span class="sourceLineNo">549</span> this.prevRSGroups.clear();<a name="line.549"></a>
+<span class="sourceLineNo">550</span> this.prevRSGroups.addAll(currentGroups);<a name="line.550"></a>
+<span class="sourceLineNo">551</span> }<a name="line.551"></a>
+<span class="sourceLineNo">552</span><a name="line.552"></a>
+<span class="sourceLineNo">553</span> // Called by getDefaultServers. Presume it has lock in place.<a name="line.553"></a>
+<span class="sourceLineNo">554</span> private List<ServerName> getOnlineRS() throws IOException {<a name="line.554"></a>
+<span class="sourceLineNo">555</span> if (masterServices != null) {<a name="line.555"></a>
+<span class="sourceLineNo">556</span> return masterServices.getServerManager().getOnlineServersList();<a name="line.556"></a>
+<span class="sourceLineNo">557</span> }<a name="line.557"></a>
+<span class="sourceLineNo">558</span> LOG.debug("Reading online RS from zookeeper");<a name="line.558"></a>
+<span class="sourceLineNo">559</span> List<ServerName> servers = new LinkedList<>();<a name="line.559"></a>
+<span class="sourceLineNo">560</span> try {<a name="line.560"></a>
+<span class="sourceLineNo">561</span> for (String el: ZKUtil.listChildrenNoWatch(watcher, watcher.znodePaths.rsZNode)) {<a name="line.561"></a>
+<span class="sourceLineNo">562</span> servers.add(ServerName.parseServerName(el));<a name="line.562"></a>
+<span class="sourceLineNo">563</span> }<a name="line.563"></a>
+<span class="sourceLineNo">564</span> } catch (KeeperException e) {<a name="line.564"></a>
+<span class="sourceLineNo">565</span> throw new IOException("Failed to retrieve server list from zookeeper", e);<a name="line.565"></a>
+<span class="sourceLineNo">566</span> }<a name="line.566"></a>
+<span class="sourceLineNo">567</span> return servers;<a name="line.567"></a>
+<span class="sourceLineNo">568</span> }<a name="line.568"></a>
+<span class="sourceLineNo">569</span><a name="line.569"></a>
+<span class="sourceLineNo">570</span> // Called by ServerEventsListenerThread. Presume it has lock on this manager when it runs.<a name="line.570"></a>
+<span class="sourceLineNo">571</span> private SortedSet<Address> getDefaultServers() throws IOException {<a name="line.571"></a>
+<span class="sourceLineNo">572</span> SortedSet<Address> defaultServers = Sets.newTreeSet();<a name="line.572"></a>
+<span class="sourceLineNo">573</span> for (ServerName serverName : getOnlineRS()) {<a name="line.573"></a>
+<span class="sourceLineNo">574</span> Address server =<a name="line.574"></a>
+<span class="sourceLineNo">575</span> Address.fromParts(serverName.getHostname(), serverName.getPort());<a name="line.575"></a>
+<span class="sourceLineNo">576</span> boolean found = false;<a name="line.576"></a>
+<span class="sourceLineNo">577</span> for(RSGroupInfo rsgi: listRSGroups()) {<a name="line.577"></a>
+<span class="sourceLineNo">578</span> if(!RSGroupInfo.DEFAULT_GROUP.equals(rsgi.getName()) &&<a name="line.578"></a>
+<span class="sourceLineNo">579</span> rsgi.containsServer(server)) {<a name="line.579"></a>
+<span class="sourceLineNo">580</span> found = true;<a name="line.580"></a>
+<span class="sourceLineNo">581</span> break;<a name="line.581"></a>
+<span class="sourceLineNo">582</span> }<a name="line.582"></a>
+<span class="sourceLineNo">583</span> }<a name="line.583"></a>
+<span class="sourceLineNo">584</span> if (!found) {<a name="line.584"></a>
+<span class="sourceLineNo">585</span> defaultServers.add(server);<a name="line.585"></a>
+<span class="sourceLineNo">586</span> }<a name="line.586"></a>
+<span class="sourceLineNo">587</span> }<a name="line.587"></a>
+<span class="sourceLineNo">588</span> return defaultServers;<a name="line.588"></a>
+<span class="sourceLineNo">589</span> }<a name="line.589"></a>
+<span class="sourceLineNo">590</span><a name="line.590"></a>
+<span class="sourceLineNo">591</span> // Called by ServerEventsListenerThread. Synchronize on this because redoing<a name="line.591"></a>
+<span class="sourceLineNo">592</span> // the rsGroupMap then writing it out.<a name="line.592"></a>
+<span class="sourceLineNo">593</span> private synchronized void updateDefaultServers(SortedSet<Address> servers) throws IOException {<a name="line.593"></a>
+<span class="sourceLineNo">594</span> RSGroupInfo info = rsGroupMap.get(RSGroupInfo.DEFAULT_GROUP);<a name="line.594"></a>
+<span class="sourceLineNo">595</span> RSGroupInfo newInfo = new RSGroupInfo(info.getName(), servers, info.getTables());<a name="line.595"></a>
+<span class="sourceLineNo">596</span> HashMap<String, RSGroupInfo> newGroupMap = Maps.newHashMap(rsGroupMap);<a name="line.596"></a>
+<span class="sourceLineNo">597</span> newGroupMap.put(newInfo.getName(), newInfo);<a name="line.597"></a>
+<span class="sourceLineNo">598</span> flushConfig(newGroupMap);<a name="line.598"></a>
+<span class="sourceLineNo">599</span> }<a name="line.599"></a>
+<span class="sourceLineNo">600</span><a name="line.600"></a>
+<span class="sourceLineNo">601</span> // Called by FailedOpenUpdaterThread<a name="line.601"></a>
+<span class="sourceLineNo">602</span> private void updateFailedAssignments() {<a name="line.602"></a>
+<span class="sourceLineNo">603</span> // Kick all regions in FAILED_OPEN state<a name="line.603"></a>
+<span class="sourceLineNo">604</span> List<RegionInfo> stuckAssignments = Lists.newArrayList();<a name="line.604"></a>
+<span class="sourceLineNo">605</span> for (RegionStateNode state:<a name="line.605"></a>
+<span class="sourceLineNo">606</span> masterServices.getAssignmentManager().getRegionStates().getRegionsInTransition()) {<a name="line.606"></a>
+<span class="sourceLineNo">607</span> if (state.isStuck()) {<a name="line.607"></a>
+<span class="sourceLineNo">608</span> stuckAssignments.add(state.getRegionInfo());<a name="line.608"></a>
+<span class="sourceLineNo">609</span> }<a name="line.609"></a>
+<span class="sourceLineNo">610</span> }<a name="line.610"></a>
+<span class="sourceLineNo">611</span> for (RegionInfo region: stuckAssignments) {<a name="line.611"></a>
+<span class="sourceLineNo">612</span> LOG.info("Retrying assignment of " + region);<a name="line.612"></a>
+<span class="sourceLineNo">613</span> try {<a name="line.613"></a>
+<span class="sourceLineNo">614</span> masterServices.getAssignmentManager().unassign(region);<a name="line.614"></a>
+<span class="sourceLineNo">615</span> } catch (IOException e) {<a name="line.615"></a>
+<span class="sourceLineNo">616</span> LOG.warn("Unable to reassign " + region, e);<a name="line.616"></a>
+<span class="sourceLineNo">617</span> }<a name="line.617"></a>
+<span class="sourceLineNo">618</span> }<a name="line.618"></a>
+<span class="sourceLineNo">619</span> }<a name="line.619"></a>
+<span class="sourceLineNo">620</span><a name="line.620"></a>
+<span class="sourceLineNo">621</span> /**<a name="line.621"></a>
+<span class="sourceLineNo">622</span> * Calls {@link RSGroupInfoManagerImpl#updateDefaultServers(SortedSet)} to update list of known<a name="line.622"></a>
+<span class="sourceLineNo">623</span> * servers. Notifications about server changes are received by registering {@link ServerListener}.<a name="line.623"></a>
+<span class="sourceLineNo">624</span> * As a listener, we need to return immediately, so the real work of updating the servers is<a name="line.624"></a>
+<span class="sourceLineNo">625</span> * done asynchronously in this thread.<a name="line.625"></a>
+<span class="sourceLineNo">626</span> */<a name="line.626"></a>
+<span class="sourceLineNo">627</span> private class ServerEventsListenerThread extends Thread implements ServerListener {<a name="line.627"></a>
+<span class="sourceLineNo">628</span> private final Logger LOG = LoggerFactory.getLogger(ServerEventsListenerThread.class);<a name="line.628"></a>
+<span class="sourceLineNo">629</span> private boolean changed = false;<a name="line.629"></a>
<span class="sourceLineNo">630</span><a name="line.630"></a>
-<span class="sourceLineNo">631</span> @Override<a name="line.631"></a>
-<span class="sourceLineNo">632</span> public void serverAdded(ServerName serverName) {<a name="line.632"></a>
-<span class="sourceLineNo">633</span> serverChanged();<a name="line.633"></a>
-<span class="sourceLineNo">634</span> }<a name="line.634"></a>
-<span class="sourceLineNo">635</span><a name="line.635"></a>
-<span class="sourceLineNo">636</span> @Override<a name="line.636"></a>
-<span class="sourceLineNo">637</span> public void serverRemoved(ServerName serverName) {<a name="line.637"></a>
-<span class="sourceLineNo">638</span> serverChanged();<a name="line.638"></a>
-<span class="sourceLineNo">639</span> }<a name="line.639"></a>
-<span class="sourceLineNo">640</span><a name="line.640"></a>
-<span class="sourceLineNo">641</span> private synchronized void serverChanged() {<a name="line.641"></a>
-<span class="sourceLineNo">642</span> changed = true;<a name="line.642"></a>
-<span class="sourceLineNo">643</span> this.notify();<a name="line.643"></a>
-<span class="sourceLineNo">644</span> }<a name="line.644"></a>
-<span class="sourceLineNo">645</span><a name="line.645"></a>
-<span class="sourceLineNo">646</span> @Override<a name="line.646"></a>
-<span class="sourceLineNo">647</span> public void run() {<a name="line.647"></a>
-<span class="sourceLineNo">648</span> setName(ServerEventsListenerThread.class.getName() + "-" + masterServices.getServerName());<a name="line.648"></a>
-<span class="sourceLineNo">649</span> SortedSet<Address> prevDefaultServers = new TreeSet<>();<a name="line.649"></a>
-<span class="sourceLineNo">650</span> while(isMasterRunning(masterServices)) {<a name="line.650"></a>
-<span class="sourceLineNo">651</span> try {<a name="line.651"></a>
-<span class="sourceLineNo">652</span> LOG.info("Updating default servers.");<a name="line.652"></a>
-<span class="sourceLineNo">653</span> SortedSet<Address> servers = RSGroupInfoManagerImpl.this.getDefaultServers();<a name="line.653"></a>
-<span class="sourceLineNo">654</span> if (!servers.equals(prevDefaultServers)) {<a name="line.654"></a>
-<span class="sourceLineNo">655</span> RSGroupInfoManagerImpl.this.updateDefaultServers(servers);<a name="line.655"></a>
-<span class="sourceLineNo">656</span> prevDefaultServers = servers;<a name="line.656"></a>
-<span class="sourceLineNo">657</span> LOG.info("Updated with servers: "+servers.size());<a name="line.657"></a>
-<span class="sourceLineNo">658</span> }<a name="line.658"></a>
-<span class="sourceLineNo">659</span> try {<a name="line.659"></a>
-<span class="sourceLineNo">660</span> synchronized (this) {<a name="line.660"></a>
-<span class="sourceLineNo">661</span> while (!changed) {<a name="line.661"></a>
-<span class="sourceLineNo">662</span> wait();<a name="line.662"></a>
-<span class="sourceLineNo">663</span> }<a name="line.663"></a>
-<span class="sourceLineNo">664</span> changed = false;<a name="line.664"></a>
-<span class="sourceLineNo">665</span> }<a name="line.665"></a>
-<span class="sourceLineNo">666</span> } catch (InterruptedException e) {<a name="line.666"></a>
-<span class="sourceLineNo">667</span> LOG.warn("Interrupted", e);<a name="line.667"></a>
-<span class="sourceLineNo">668</span> }<a name="line.668"></a>
-<span class="sourceLineNo">669</span> } catch (IOException e) {<a name="line.669"></a>
-<span class="sourceLineNo">670</span> LOG.warn("Failed to update default servers", e);<a name="line.670"></a>
-<span class="sourceLineNo">671</span> }<a name="line.671"></a>
-<span class="sourceLineNo">672</span> }<a name="line.672"></a>
-<span class="sourceLineNo">673</span> }<a name="line.673"></a>
-<span class="sourceLineNo">674</span> }<a name="line.674"></a>
-<span class="sourceLineNo">675</span><a name="line.675"></a>
-<span class="sourceLineNo">676</span> private class FailedOpenUpdaterThread extends Thread implements ServerListener {<a name="line.676"></a>
-<span class="sourceLineNo">677</span> private final long waitInterval;<a name="line.677"></a>
-<span class="sourceLineNo">678</span> private volatile boolean hasChanged = false;<a name="line.678"></a>
+<span class="sourceLineNo">631</span> ServerEventsListenerThread() {<a name="line.631"></a>
+<span class="sourceLineNo">632</span> setDaemon(true);<a name="line.632"></a>
+<span class="sourceLineNo">633</span> }<a name="line.633"></a>
+<span class="sourceLineNo">634</span><a name="line.634"></a>
+<span class="sourceLineNo">635</span> @Override<a name="line.635"></a>
+<span class="sourceLineNo">636</span> public void serverAdded(ServerName serverName) {<a name="line.636"></a>
+<span class="sourceLineNo">637</span> serverChanged();<a name="line.637"></a>
+<span class="sourceLineNo">638</span> }<a name="line.638"></a>
+<span class="sourceLineNo">639</span><a name="line.639"></a>
+<span class="sourceLineNo">640</span> @Override<a name="line.640"></a>
+<span class="sourceLineNo">641</span> public void serverRemoved(ServerName serverName) {<a name="line.641"></a>
+<span class="sourceLineNo">642</span> serverChanged();<a name="line.642"></a>
+<span class="sourceLineNo">643</span> }<a name="line.643"></a>
+<span class="sourceLineNo">644</span><a name="line.644"></a>
+<span class="sourceLineNo">645</span> private synchronized void serverChanged() {<a name="line.645"></a>
+<span class="sourceLineNo">646</span> changed = true;<a name="line.646"></a>
+<span class="sourceLineNo">647</span> this.notify();<a name="line.647"></a>
+<span class="sourceLineNo">648</span> }<a name="line.648"></a>
+<span class="sourceLineNo">649</span><a name="line.649"></a>
+<span class="sourceLineNo">650</span> @Override<a name="line.650"></a>
+<span class="sourceLineNo">651</span> public void run() {<a name="line.651"></a>
+<span class="sourceLineNo">652</span> setName(ServerEventsListenerThread.class.getName() + "-" + masterServices.getServerName());<a name="line.652"></a>
+<span class="sourceLineNo">653</span> SortedSet<Address> prevDefaultServers = new TreeSet<>();<a name="line.653"></a>
+<span class="sourceLineNo">654</span> while(isMasterRunning(masterServices)) {<a name="line.654"></a>
+<span class="sourceLineNo">655</span> try {<a name="line.655"></a>
+<span class="sourceLineNo">656</span> LOG.info("Updating default servers.");<a name="line.656"></a>
+<span class="sourceLineNo">657</span> SortedSet<Address> servers = RSGroupInfoManagerImpl.this.getDefaultServers();<a name="line.657"></a>
+<span class="sourceLineNo">658</span> if (!servers.equals(prevDefaultServers)) {<a name="line.658"></a>
+<span class="sourceLineNo">659</span> RSGroupInfoManagerImpl.this.updateDefaultServers(servers);<a name="line.659"></a>
+<span class="sourceLineNo">660</span> prevDefaultServers = servers;<a name="line.660"></a>
+<span class="sourceLineNo">661</span> LOG.info("Updated with servers: "+servers.size());<a name="line.661"></a>
+<span class="sourceLineNo">662</span> }<a name="line.662"></a>
+<span class="sourceLineNo">663</span> try {<a name="line.663"></a>
+<span class="sourceLineNo">664</span> synchronized (this) {<a name="line.664"></a>
+<span class="sourceLineNo">665</span> while (!changed) {<a name="line.665"></a>
+<span class="sourceLineNo">666</span> wait();<a name="line.666"></a>
+<span class="sourceLineNo">667</span> }<a name="line.667"></a>
+<span class="sourceLineNo">668</span> changed = false;<a name="line.668"></a>
+<span class="sourceLineNo">669</span> }<a name="line.669"></a>
+<span class="sourceLineNo">670</span> } catch (InterruptedException e) {<a name="line.670"></a>
+<span class="sourceLineNo">671</span> LOG.warn("Interrupted", e);<a name="line.671"></a>
+<span class="sourceLineNo">672</span> }<a name="line.672"></a>
+<span class="sourceLineNo">673</span> } catch (IOException e) {<a name="line.673"></a>
+<span class="sourceLineNo">674</span> LOG.warn("Failed to update default servers", e);<a name="line.674"></a>
+<span class="sourceLineNo">675</span> }<a name="line.675"></a>
+<span class="sourceLineNo">676</span> }<a name="line.676"></a>
+<span class="sourceLineNo">677</span> }<a name="line.677"></a>
+<span class="sourceLineNo">678</span> }<a name="line.678"></a>
<span class="sourceLineNo">679</span><a name="line.679"></a>
-<span class="sourceLineNo">680</span> public FailedOpenUpdaterThread(Configuration conf) {<a name="line.680"></a>
-<span class="sourceLineNo">681</span> this.waitInterval = conf.getLong(REASSIGN_WAIT_INTERVAL_KEY,<a name="line.681"></a>
-<span class="sourceLineNo">682</span> DEFAULT_REASSIGN_WAIT_INTERVAL);<a name="line.682"></a>
-<span class="sourceLineNo">683</span> setDaemon(true);<a name="line.683"></a>
-<span class="sourceLineNo">684</span> }<a name="line.684"></a>
-<span class="sourceLineNo">685</span><a name="line.685"></a>
-<span class="sourceLineNo">686</span> @Override<a name="line.686"></a>
-<span class="sourceLineNo">687</span> public void serverAdded(ServerName serverName) {<a name="line.687"></a>
-<span class="sourceLineNo">688</span> serverChanged();<a name="line.688"></a>
-<span class="sourceLineNo">689</span> }<a name="line.689"></a>
-<span class="sourceLineNo">690</span><a name="line.690"></a>
-<span class="sourceLineNo">691</span> @Override<a name="line.691"></a>
-<span class="sourceLineNo">692</span> public void serverRemoved(ServerName serverName) {<a name="line.692"></a>
+<span class="sourceLineNo">680</span> private class FailedOpenUpdaterThread extends Thread implements ServerListener {<a name="line.680"></a>
+<span class="sourceLineNo">681</span> private final long waitInterval;<a name="line.681"></a>
+<span class="sourceLineNo">682</span> private volatile boolean hasChanged = false;<a name="line.682"></a>
+<span class="sourceLineNo">683</span><a name="line.683"></a>
+<span class="sourceLineNo">684</span> public FailedOpenUpdaterThread(Configuration conf) {<a name="line.684"></a>
+<span class="sourceLineNo">685</span> this.waitInterval = conf.getLong(REASSIGN_WAIT_INTERVAL_KEY,<a name="line.685"></a>
+<span class="sourceLineNo">686</span> DEFAULT_REASSIGN_WAIT_INTERVAL);<a name="line.686"></a>
+<span class="sourceLineNo">687</span> setDaemon(true);<a name="line.687"></a>
+<span class="sourceLineNo">688</span> }<a name="line.688"></a>
+<span class="sourceLineNo">689</span><a name="line.689"></a>
+<span class="sourceLineNo">690</span> @Override<a name="line.690"></a>
+<span class="sourceLineNo">691</span> public void serverAdded(ServerName serverName) {<a name="line.691"></a>
+<span class="sourceLineNo">692</span> serverChanged();<a name="line.692"></a>
<span class="sourceLineNo">693</span> }<a name="line.693"></a>
<span class="sourceLineNo">694</span><a name="line.694"></a>
<span class="sourceLineNo">695</span> @Override<a name="line.695"></a>
-<span class="sourceLineNo">696</span> public void run() {<a name="line.696"></a>
-<span class="sourceLineNo">697</span> while (isMasterRunning(masterServices)) {<a name="line.697"></a>
-<span class="sourceLineNo">698</span> boolean interrupted = false;<a name="line.698"></a>
-<span class="sourceLineNo">699</span> try {<a name="line.699"></a>
-<span class="sourceLineNo">700</span> synchronized (this) {<a name="line.700"></a>
-<span class="sourceLineNo">701</span> while (!hasChanged) {<a name="line.701"></a>
-<span class="sourceLineNo">702</span> wait();<a name="line.702"></a>
-<span class="sourceLineNo">703</span> }<a name="line.703"></a>
-<span class="sourceLineNo">704</span> hasChanged = false;<a name="line.704"></a>
-<span class="sourceLineNo">705</span> }<a name="line.705"></a>
-<span class="sourceLineNo">706</span> } catch (InterruptedException e) {<a name="line.706"></a>
-<span class="sourceLineNo">707</span> LOG.warn("Interrupted", e);<a name="line.707"></a>
-<span class="sourceLineNo">708</span> interrupted = true;<a name="line.708"></a>
-<span class="sourceLineNo">709</span> }<a name="line.709"></a>
-<span class="sourceLineNo">710</span> if (!isMasterRunning(masterServices) || interrupted) {<a name="line.710"></a>
-<span class="sourceLineNo">711</span> continue;<a name="line.711"></a>
-<span class="sourceLineNo">712</span> }<a name="line.712"></a>
-<span class="sourceLineNo">713</span><a name="line.713"></a>
-<span class="sourceLineNo">714</span> // First, wait a while in case more servers are about to rejoin the cluster<a name="line.714"></a>
-<span class="sourceLineNo">715</span> try {<a name="line.715"></a>
-<span class="sourceLineNo">716</span> Thread.sleep(waitInterval);<a name="line.716"></a>
-<span class="sourceLineNo">717</span> } catch (InterruptedException e) {<a name="line.717"></a>
-<span class="sourceLineNo">718</span> LOG.warn("Interrupted", e);<a name="line.718"></a>
-<span class="sourceLineNo">719</span> }<a name="line.719"></a>
-<span class="sourceLineNo">720</span> if (!isMasterRunning(masterServices)) {<a name="line.720"></a>
-<span class="sourceLineNo">721</span> continue;<a name="line.721"></a>
-<span class="sourceLineNo">722</span> }<a name="line.722"></a>
-<span class="sourceLineNo">723</span><a name="line.723"></a>
-<span class="sourceLineNo">724</span> // Kick all regions in FAILED_OPEN state<a name="line.724"></a>
-<span class="sourceLineNo">725</span> updateFailedAssignments();<a name="line.725"></a>
-<span class="sourceLineNo">726</span> }<a name="line.726"></a>
-<span class="sourceLineNo">727</span> }<a name="line.727"></a>
-<span class="sourceLineNo">728</span><a name="line.728"></a>
-<span class="sourceLineNo">729</span> public void serverChanged() {<a name="line.729"></a>
-<span class="sourceLineNo">730</span> synchronized (this) {<a name="line.730"></a>
-<span class="sourceLineNo">731</span> hasChanged = true;<a name="line.731"></a>
-<span class="sourceLineNo">732</span> this.notify();<a name="line.732"></a>
-<span class="sourceLineNo">733</span> }<a name="line.733"></a>
-<span class="sourceLineNo">734</span> }<a name="line.734"></a>
-<span class="sourceLineNo">735</span> }<a name="line.735"></a>
-<span class="sourceLineNo">736</span><a name="line.736"></a>
-<span class="sourceLineNo">737</span> private class RSGroupStartupWorker extends Thread {<a name="line.737"></a>
-<span class="sourceLineNo">738</span> private final Logger LOG = LoggerFactory.getLogger(RSGroupStartupWorker.class);<a name="line.738"></a>
-<span class="sourceLineNo">739</span> private volatile boolean online = false;<a name="line.739"></a>
+<span class="sourceLineNo">696</span> public void serverRemoved(ServerName serverName) {<a name="line.696"></a>
+<span class="sourceLineNo">697</span> }<a name="line.697"></a>
+<span class="sourceLineNo">698</span><a name="line.698"></a>
+<span class="sourceLineNo">699</span> @Override<a name="line.699"></a>
+<span class="sourceLineNo">700</span> public void run() {<a name="line.700"></a>
+<span class="sourceLineNo">701</span> while (isMasterRunning(masterServices)) {<a name="line.701"></a>
+<span class="sourceLineNo">702</span> boolean interrupted = false;<a name="line.702"></a>
+<span class="sourceLineNo">703</span> try {<a name="line.703"></a>
+<span class="sourceLineNo">704</span> synchronized (this) {<a name="line.704"></a>
+<span class="sourceLineNo">705</span> while (!hasChanged) {<a name="line.705"></a>
+<span class="sourceLineNo">706</span> wait();<a name="line.706"></a>
+<span class="sourceLineNo">707</span> }<a name="line.707"></a>
+<span class="sourceLineNo">708</span> hasChanged = false;<a name="line.708"></a>
+<span class="sourceLineNo">709</span> }<a name="line.709"></a>
+<span class="sourceLineNo">710</span> } catch (InterruptedException e) {<a name="line.710"></a>
+<span class="sourceLineNo">711</span> LOG.warn("Interrupted", e);<a name="line.711"></a>
+<span class="sourceLineNo">712</span> interrupted = true;<a name="line.712"></a>
+<span class="sourceLineNo">713</span> }<a name="line.713"></a>
+<span class="sourceLineNo">714</span> if (!isMasterRunning(masterServices) || interrupted) {<a name="line.714"></a>
+<span class="sourceLineNo">715</span> continue;<a name="line.715"></a>
+<span class="sourceLineNo">716</span> }<a name="line.716"></a>
+<span class="sourceLineNo">717</span><a name="line.717"></a>
+<span class="sourceLineNo">718</span> // First, wait a while in case more servers are about to rejoin the cluster<a name="line.718"></a>
+<span class="sourceLineNo">719</span> try {<a name="line.719"></a>
+<span class="sourceLineNo">720</span> Thread.sleep(waitInterval);<a name="line.720"></a>
+<span class="sourceLineNo">721</span> } catch (InterruptedException e) {<a name="line.721"></a>
+<span class="sourceLineNo">722</span> LOG.warn("Interrupted", e);<a name="line.722"></a>
+<span class="sourceLineNo">723</span> }<a name="line.723"></a>
+<span class="sourceLineNo">724</span> if (!isMasterRunning(masterServices)) {<a name="line.724"></a>
+<span class="sourceLineNo">725</span> continue;<a name="line.725"></a>
+<span class="sourceLineNo">726</span> }<a name="line.726"></a>
+<span class="sourceLineNo">727</span><a name="line.727"></a>
+<span class="sourceLineNo">728</span> // Kick all regions in FAILED_OPEN state<a name="line.728"></a>
+<span class="sourceLineNo">729</span> updateFailedAssignments();<a name="line.729"></a>
+<span class="sourceLineNo">730</span> }<a name="line.730"></a>
+<span class="sourceLineNo">731</span> }<a name="line.731"></a>
+<span class="sourceLineNo">732</span><a name="line.732"></a>
+<span class="sourceLineNo">733</span> public void serverChanged() {<a name="line.733"></a>
+<span class="sourceLineNo">734</span> synchronized (this) {<a name="line.734"></a>
+<span class="sourceLineNo">735</span> hasChanged = true;<a name="line.735"></a>
+<span class="sourceLineNo">736</span> this.notify();<a name="line.736"></a>
+<span class="sourceLineNo">737</span> }<a name="line.737"></a>
+<span class="sourceLineNo">738</span> }<a name="line.738"></a>
+<span class="sourceLineNo">739</span> }<a name="line.739"></a>
<span class="sourceLineNo">740</span><a name="line.740"></a>
-<span class="sourceLineNo">741</span> RSGroupStartupWorker() {<a name="line.741"></a>
-<span class="sourceLineNo">742</span> setDaemon(true);<a name="line.742"></a>
-<span class="sourceLineNo">743</span> }<a name="line.743"></a>
+<span class="sourceLineNo">741</span> private class RSGroupStartupWorker extends Thread {<a name="line.741"></a>
+<span class="sourceLineNo">742</span> private final Logger LOG = LoggerFactory.getLogger(RSGroupStartupWorker.class);<a name="line.742"></a>
+<span class="sourceLineNo">743</span> private volatile boolean online = false;<a name="line.743"></a>
<span class="sourceLineNo">744</span><a name="line.744"></a>
-<span class="sourceLineNo">745</span> @Override<a name="line.745"></a>
-<span class="sourceLineNo">746</span> public void run() {<a name="line.746"></a>
-<span class="sourceLineNo">747</span> setName(RSGroupStartupWorker.class.getName() + "-" + masterServices.getServerName());<a name="line.747"></a>
-<span class="sourceLineNo">748</span> if (waitForGroupTableOnline()) {<a name="line.748"></a>
-<span class="sourceLineNo">749</span> LOG.info("GroupBasedLoadBalancer is now online");<a name="line.749"></a>
-<span class="sourceLineNo">750</span> }<a name="line.750"></a>
-<span class="sourceLineNo">751</span> }<a name="line.751"></a>
-<span class="sourceLineNo">752</span><a name="line.752"></a>
-<span class="sourceLineNo">753</span> private boolean waitForGroupTableOnline() {<a name="line.753"></a>
-<span class="sourceLineNo">754</span> final List<RegionInfo> foundRegions = new LinkedList<>();<a name="line.754"></a>
-<span class="sourceLineNo">755</span> final List<RegionInfo> assignedRegions = new LinkedList<>();<a name="line.755"></a>
-<span class="sourceLineNo">756</span> final AtomicBoolean found = new AtomicBoolean(false);<a name="line.756"></a>
-<span class="sourceLineNo">757</span> final TableStateManager tsm = masterServices.getTableStateManager();<a name="line.757"></a>
-<span class="sourceLineNo">758</span> boolean createSent = false;<a name="line.758"></a>
-<span class="sourceLineNo">759</span> while (!found.get() && isMasterRunning(masterServices)) {<a name="line.759"></a>
-<span class="sourceLineNo">760</span> foundRegions.clear();<a name="line.760"></a>
-<span class="sourceLineNo">761</span> assignedRegions.clear();<a name="line.761"></a>
-<span class="sourceLineNo">762</span> found.set(true);<a name="line.762"></a>
-<span class="sourceLineNo">763</span> try {<a name="line.763"></a>
-<span class="sourceLineNo">764</span> conn.getTable(TableName.NAMESPACE_TABLE_NAME);<a name="line.764"></a>
-<span class="sourceLineNo">765</span> conn.getTable(RSGROUP_TABLE_NAME);<a name="line.765"></a>
-<span class="sourceLineNo">766</span> boolean rootMetaFound =<a name="line.766"></a>
-<span class="sourceLineNo">767</span> masterServices.getMetaTableLocator().verifyMetaRegionLocation(<a name="line.767"></a>
-<span class="sourceLineNo">768</span> conn, masterServices.getZooKeeper(), 1);<a name="line.768"></a>
-<span class="sourceLineNo">769</span> final AtomicBoolean nsFound = new AtomicBoolean(false);<a name="line.769"></a>
-<span class="sourceLineNo">770</span> if (rootMetaFound) {<a name="line.770"></a>
-<span class="sourceLineNo">771</span> MetaTableAccessor.Visitor visitor = new DefaultVisitorBase() {<a name="line.771"></a>
-<span class="sourceLineNo">772</span> @Override<a name="line.772"></a>
-<span class="sourceLineNo">773</span> public boolean visitInternal(Result row) throws IOException {<a name="line.773"></a>
-<span class="sourceLineNo">774</span> RegionInfo info = MetaTableAccessor.getRegionInfo(row);<a name="line.774"></a>
-<span class="sourceLineNo">775</span> if (info != null) {<a name="line.775"></a>
-<span class="sourceLineNo">776</span> Cell serverCell =<a name="line.776"></a>
-<span class="sourceLineNo">777</span> row.getColumnLatestCell(HConstants.CATALOG_FAMILY,<a name="line.777"></a>
-<span class="sourceLineNo">778</span> HConstants.SERVER_QUALIFIER);<a name="line.778"></a>
-<span class="sourceLineNo">779</span> if (RSGROUP_TABLE_NAME.equals(info.getTable()) && serverCell != null) {<a name="line.779"></a>
-<span class="sourceLineNo">780</span> ServerName sn =<a name="line.780"></a>
-<span class="sourceLineNo">781</span> ServerName.parseVersionedServerName(CellUtil.cloneValue(serverCell));<a name="line.781"></a>
-<span class="sourceLineNo">782</span> if (sn == null) {<a name="line.782"></a>
-<span class="sourceLineNo">783</span> found.set(false);<a name="line.783"></a>
-<span class="sourceLineNo">784</span> } else if (tsm.isTableState(RSGROUP_TABLE_NAME, TableState.State.ENABLED)) {<a name="line.784"></a>
-<span class="sourceLineNo">785</span> try {<a name="line.785"></a>
-<span class="sourceLineNo">786</span> ClientProtos.ClientService.BlockingInterface rs = conn.getClient(sn);<a name="line.786"></a>
-<span class="sourceLineNo">787</span> ClientProtos.GetRequest request =<a name="line.787"></a>
-<span class="sourceLineNo">788</span> RequestConverter.buildGetRequest(info.getRegionName(),<a name="line.788"></a>
-<span class="sourceLineNo">789</span> new Get(ROW_KEY));<a name="line.789"></a>
-<span class="sourceLineNo">790</span> rs.get(null, request);<a name="line.790"></a>
-<span class="sourceLineNo">791</span> assignedRegions.add(info);<a name="line.791"></a>
-<span class="sourceLineNo">792</span> } catch(Exception ex) {<a name="line.792"></a>
-<span class="sourceLineNo">793</span> LOG.debug("Caught exception while verifying group region", ex);<a name="line.793"></a>
-<span class="sourceLineNo">794</span> }<a name="line.794"></a>
-<span class="sourceLineNo">795</span> }<a name="line.795"></a>
-<span class="sourceLineNo">796</span> foundRegions.add(info);<a name="line.796"></a>
-<span class="sourceLineNo">797</span> }<a name="line.797"></a>
-<span class="sourceLineNo">798</span> if (TableName.NAMESPACE_TABLE_NAME.equals(info.getTable())) {<a name="line.798"></a>
-<span class="sourceLineNo">799</span> Cell cell = row.getColumnLatestCell(HConstants.CATALOG_FAMILY,<a name="line.799"></a>
-<span class="sourceLineNo">800</span> HConstants.SERVER_QUALIFIER);<a name="line.800"></a>
-<span class="sourceLineNo">801</span> ServerName sn = null;<a name="line.801"></a>
-<span class="sourceLineNo">802</span> if(cell != null) {<a name="line.802"></a>
-<span class="sourceLineNo">803</span> sn = ServerName.parseVersionedServerName(CellUtil.cloneValue(cell));<a name="line.803"></a>
-<span class="sourceLineNo">804</span> }<a name="line.804"></a>
-<span class="sourceLineNo">805</span> if (sn == null) {<a name="line.805"></a>
-<span class="sourceLineNo">806</span> nsFound.set(false);<a name="line.806"></a>
-<span class="sourceLineNo">807</span> } else if (tsm.isTableState(TableName.NAMESPACE_TABLE_NAME,<a name="line.807"></a>
-<span class="sourceLineNo">808</span> TableState.State.ENABLED)) {<a name="line.808"></a>
-<span class="sourceLineNo">809</span> try {<a name="line.809"></a>
-<span class="sourceLineNo">810</span> ClientProtos.ClientService.BlockingInterface rs = conn.getClient(sn);<a name="line.810"></a>
-<span class="sourceLineNo">811</span> ClientProtos.GetRequest request =<a name="line.811"></a>
-<span class="sourceLineNo">812</span> RequestConverter.buildGetRequest(info.getRegionName(),<a name="line.812"></a>
-<span class="sourceLineNo">813</span> new Get(ROW_KEY));<a name="line.813"></a>
-<span class="sourceLineNo">814</span> rs.get(null, request);<a name="line.814"></a>
-<span class="sourceLineNo">815</span> nsFound.set(true);<a name="line.815"></a>
-<span class="sourceLineNo">816</span> } catch(Exception ex) {<a name="line.816"></a>
-<span class="sourceLineNo">817</span> LOG.debug("Caught exception while verifying group region", ex);<a name="line.817"></a>
-<span class="sourceLineNo">818</span> }<a name="line.818"></a>
-<span class="sourceLineNo">819</span> }<a name="line.819"></a>
-<span class="sourceLineNo">820</span> }<a name="line.820"></a>
-<span class="sourceLineNo">821</span> }<a name="line.821"></a>
-<span class="sourceLineNo">822</span> return true;<a name="line.822"></a>
-<span class="sourceLineNo">823</span> }<a name="line.823"></a>
-<span class="sourceLineNo">824</span> };<a name="line.824"></a>
-<span class="sourceLineNo">825</span> MetaTableAccessor.fullScanRegions(conn, visitor);<a name="line.825"></a>
-<span class="sourceLineNo">826</span> // if no regions in meta then we have to create the table<a name="line.826"></a>
-<span class="sourceLineNo">827</span> if (foundRegions.size() < 1 && rootMetaFound && !createSent && nsFound.get()) {<a name="line.827"></a>
-<span class="sourceLineNo">828</span> createRSGroupTable();<a name="line.828"></a>
-<span class="sourceLineNo">829</span> createSent = true;<a name="line.829"></a>
-<span class="sourceLineNo">830</span> }<a name="line.830"></a>
-<span class="sourceLineNo">831</span> LOG.info("RSGroup table=" + RSGROUP_TABLE_NAME + " isOnline=" + found.get()<a name="line.831"></a>
-<span class="sourceLineNo">832</span> + ", regionCount=" + foundRegions.size() + ", assignCount="<a name="line.832"></a>
-<span class="sourceLineNo">833</span> + assignedRegions.size() + ", rootMetaFound=" + rootMetaFound);<a name="line.833"></a>
-<span class="sourceLineNo">834</span> found.set(found.get() && assignedRegions.size() == foundRegions.size()<a name="line.834"></a>
-<span class="sourceLineNo">835</span> && foundRegions.size() > 0);<a name="line.835"></a>
-<span class="sourceLineNo">836</span> } else {<a name="line.836"></a>
-<span class="sourceLineNo">837</span> LOG.info("Waiting for catalog tables to come online");<a name="line.837"></a>
-<span class="sourceLineNo">838</span> found.set(false);<a name="line.838"></a>
-<span class="sourceLineNo">839</span> }<a name="line.839"></a>
-<span class="sourceLineNo">840</span> if (found.get()) {<a name="line.840"></a>
-<span class="sourceLineNo">841</span> LOG.debug("With group table online, refreshing cached information.");<a name="line.841"></a>
-<span class="sourceLineNo">842</span> RSGroupInfoManagerImpl.this.refresh(true);<a name="line.842"></a>
-<span class="sourceLineNo">843</span> online = true;<a name="line.843"></a>
-<span class="sourceLineNo">844</span> //flush any inconsistencies between ZK and HTable<a name="line.844"></a>
-<span class="sourceLineNo">845</span> RSGroupInfoManagerImpl.this.flushConfig();<a name="line.845"></a>
-<span class="sourceLineNo">846</span> }<a name="line.846"></a>
-<span class="sourceLineNo">847</span> } catch (RuntimeException e) {<a name="line.847"></a>
-<span class="sourceLineNo">848</span> throw e;<a name="line.848"></a>
-<span class="sourceLineNo">849</span> } catch(Exception e) {<a name="line.849"></a>
-<span class="sourceLineNo">850</span> found.set(false);<a name="line.850"></a>
-<span class="sourceLineNo">851</span> LOG.warn("Failed to perform check", e);<a name="line.851"></a>
-<span class="sourceLineNo">852</span> }<a name="line.852"></a>
-<span class="sourceLineNo">853</span> try {<a name="line.853"></a>
-<span class="sourceLineNo">854</span> Thread.sleep(100);<a name="line.854"></a>
-<span class="sourceLineNo">855</span> } catch (InterruptedException e) {<a name="line.855"></a>
-<span class="sourceLineNo">856</span> LOG.info("Sleep interrupted", e);<a name="line.856"></a>
-<span class="sourceLineNo">857</span> }<a name="line.857"></a>
-<span class="sourceLineNo">858</span> }<a name="line.858"></a>
-<span class="sourceLineNo">859</span> return found.get();<a name="line.859"></a>
-<span class="sourceLineNo">860</span> }<a name="line.860"></a>
-<span class="sourceLineNo">861</span><a name="line.861"></a>
-<span class="sourceLineNo">862</span> private void createRSGroupTable() throws IOException {<a name="line.862"></a>
-<span class="sourceLineNo">863</span> Long procId = masterServices.createSystemTable(RSGROUP_TABLE_DESC);<a name="line.863"></a>
-<span class="sourceLineNo">864</span> // wait for region to be online<a name="line.864"></a>
-<span class="sourceLineNo">865</span> int tries = 600;<a name="line.865"></a>
-<span class="sourceLineNo">866</span> while (!(masterServices.getMasterProcedureExecutor().isFinished(procId))<a name="line.866"></a>
-<span class="sourceLineNo">867</span> && masterServices.getMasterProcedureExecutor().isRunning()<a name="line.867"></a>
-<span class="sourceLineNo">868</span> && tries > 0) {<a name="line.868"></a>
-<span class="sourceLineNo">869</span> try {<a name="line.869"></a>
-<span class="sourceLineNo">870</span> Thread.sleep(100);<a name="line.870"></a>
-<span class="sourceLineNo">871</span> } catch (InterruptedException e) {<a name="line.871"></a>
-<span class="sourceLineNo">872</span> throw new IOException("Wait interrupted ", e);<a name="line.872"></a>
-<span class="sourceLineNo">873</span> }<a name="line.873"></a>
-<span class="sourceLineNo">874</span> tries--;<a name="line.874"></a>
-<span class="sourceLineNo">875</span> }<a name="line.875"></a>
-<span class="sourceLineNo">876</span> if(tries <= 0) {<a na
<TRUNCATED>
[10/12] hbase-site git commit: Published site at
773aff90fdf9edf4687b373d1c7ba859d166a437.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.WorkerState.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.WorkerState.html b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.WorkerState.html
index 484b604..70c4db7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.WorkerState.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.WorkerState.html
@@ -95,222 +95,219 @@
<span class="sourceLineNo">087</span> setWorkerState(WorkerState.RUNNING);<a name="line.87"></a>
<span class="sourceLineNo">088</span> // Loop until we close down<a name="line.88"></a>
<span class="sourceLineNo">089</span> while (isActive()) {<a name="line.89"></a>
-<span class="sourceLineNo">090</span> int sleepMultiplier = 1;<a name="line.90"></a>
-<span class="sourceLineNo">091</span> // Sleep until replication is enabled again<a name="line.91"></a>
-<span class="sourceLineNo">092</span> if (!source.isPeerEnabled()) {<a name="line.92"></a>
-<span class="sourceLineNo">093</span> if (sleepForRetries("Replication is disabled", sleepMultiplier)) {<a name="line.93"></a>
-<span class="sourceLineNo">094</span> sleepMultiplier++;<a name="line.94"></a>
-<span class="sourceLineNo">095</span> }<a name="line.95"></a>
-<span class="sourceLineNo">096</span> continue;<a name="line.96"></a>
-<span class="sourceLineNo">097</span> }<a name="line.97"></a>
-<span class="sourceLineNo">098</span> try {<a name="line.98"></a>
-<span class="sourceLineNo">099</span> WALEntryBatch entryBatch = entryReader.take();<a name="line.99"></a>
-<span class="sourceLineNo">100</span> // the NO_MORE_DATA instance has no path so do not all shipEdits<a name="line.100"></a>
-<span class="sourceLineNo">101</span> if (entryBatch == WALEntryBatch.NO_MORE_DATA) {<a name="line.101"></a>
-<span class="sourceLineNo">102</span> noMoreData();<a name="line.102"></a>
-<span class="sourceLineNo">103</span> } else {<a name="line.103"></a>
-<span class="sourceLineNo">104</span> shipEdits(entryBatch);<a name="line.104"></a>
-<span class="sourceLineNo">105</span> }<a name="line.105"></a>
-<span class="sourceLineNo">106</span> } catch (InterruptedException e) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span> LOG.trace("Interrupted while waiting for next replication entry batch", e);<a name="line.107"></a>
-<span class="sourceLineNo">108</span> Thread.currentThread().interrupt();<a name="line.108"></a>
-<span class="sourceLineNo">109</span> }<a name="line.109"></a>
-<span class="sourceLineNo">110</span> }<a name="line.110"></a>
-<span class="sourceLineNo">111</span> // If the worker exits run loop without finishing its task, mark it as stopped.<a name="line.111"></a>
-<span class="sourceLineNo">112</span> if (!isFinished()) {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> setWorkerState(WorkerState.STOPPED);<a name="line.113"></a>
-<span class="sourceLineNo">114</span> } else {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> postFinish();<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span> }<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span> // To be implemented by recovered shipper<a name="line.119"></a>
-<span class="sourceLineNo">120</span> protected void noMoreData() {<a name="line.120"></a>
-<span class="sourceLineNo">121</span> }<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span> // To be implemented by recovered shipper<a name="line.123"></a>
-<span class="sourceLineNo">124</span> protected void postFinish() {<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> * Do the shipping logic<a name="line.128"></a>
-<span class="sourceLineNo">129</span> */<a name="line.129"></a>
-<span class="sourceLineNo">130</span> private void shipEdits(WALEntryBatch entryBatch) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> List<Entry> entries = entryBatch.getWalEntries();<a name="line.131"></a>
-<span class="sourceLineNo">132</span> int sleepMultiplier = 0;<a name="line.132"></a>
-<span class="sourceLineNo">133</span> if (entries.isEmpty()) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span> if (updateLogPosition(entryBatch)) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> // if there was nothing to ship and it's not an error<a name="line.135"></a>
-<span class="sourceLineNo">136</span> // set "ageOfLastShippedOp" to <now> to indicate that we're current<a name="line.136"></a>
-<span class="sourceLineNo">137</span> source.getSourceMetrics().setAgeOfLastShippedOp(EnvironmentEdgeManager.currentTime(),<a name="line.137"></a>
-<span class="sourceLineNo">138</span> walGroupId);<a name="line.138"></a>
-<span class="sourceLineNo">139</span> }<a name="line.139"></a>
-<span class="sourceLineNo">140</span> return;<a name="line.140"></a>
-<span class="sourceLineNo">141</span> }<a name="line.141"></a>
-<span class="sourceLineNo">142</span> int currentSize = (int) entryBatch.getHeapSize();<a name="line.142"></a>
-<span class="sourceLineNo">143</span> while (isActive()) {<a name="line.143"></a>
-<span class="sourceLineNo">144</span> try {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> try {<a name="line.145"></a>
-<span class="sourceLineNo">146</span> source.tryThrottle(currentSize);<a name="line.146"></a>
-<span class="sourceLineNo">147</span> } catch (InterruptedException e) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> LOG.debug("Interrupted while sleeping for throttling control");<a name="line.148"></a>
-<span class="sourceLineNo">149</span> Thread.currentThread().interrupt();<a name="line.149"></a>
-<span class="sourceLineNo">150</span> // current thread might be interrupted to terminate<a name="line.150"></a>
-<span class="sourceLineNo">151</span> // directly go back to while() for confirm this<a name="line.151"></a>
-<span class="sourceLineNo">152</span> continue;<a name="line.152"></a>
-<span class="sourceLineNo">153</span> }<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span> // create replicateContext here, so the entries can be GC'd upon return from this call<a name="line.155"></a>
-<span class="sourceLineNo">156</span> // stack<a name="line.156"></a>
-<span class="sourceLineNo">157</span> ReplicationEndpoint.ReplicateContext replicateContext =<a name="line.157"></a>
-<span class="sourceLineNo">158</span> new ReplicationEndpoint.ReplicateContext();<a name="line.158"></a>
-<span class="sourceLineNo">159</span> replicateContext.setEntries(entries).setSize(currentSize);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> replicateContext.setWalGroupId(walGroupId);<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span> long startTimeNs = System.nanoTime();<a name="line.162"></a>
-<span class="sourceLineNo">163</span> // send the edits to the endpoint. Will block until the edits are shipped and acknowledged<a name="line.163"></a>
-<span class="sourceLineNo">164</span> boolean replicated = source.getReplicationEndpoint().replicate(replicateContext);<a name="line.164"></a>
-<span class="sourceLineNo">165</span> long endTimeNs = System.nanoTime();<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span> if (!replicated) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> continue;<a name="line.168"></a>
-<span class="sourceLineNo">169</span> } else {<a name="line.169"></a>
-<span class="sourceLineNo">170</span> sleepMultiplier = Math.max(sleepMultiplier - 1, 0);<a name="line.170"></a>
-<span class="sourceLineNo">171</span> }<a name="line.171"></a>
-<span class="sourceLineNo">172</span> // Clean up hfile references<a name="line.172"></a>
-<span class="sourceLineNo">173</span> for (Entry entry : entries) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span> cleanUpHFileRefs(entry.getEdit());<a name="line.174"></a>
-<span class="sourceLineNo">175</span> }<a name="line.175"></a>
-<span class="sourceLineNo">176</span> // Log and clean up WAL logs<a name="line.176"></a>
-<span class="sourceLineNo">177</span> updateLogPosition(entryBatch);<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> source.postShipEdits(entries, currentSize);<a name="line.179"></a>
-<span class="sourceLineNo">180</span> // FIXME check relationship between wal group and overall<a name="line.180"></a>
-<span class="sourceLineNo">181</span> source.getSourceMetrics().shipBatch(entryBatch.getNbOperations(), currentSize,<a name="line.181"></a>
-<span class="sourceLineNo">182</span> entryBatch.getNbHFiles());<a name="line.182"></a>
-<span class="sourceLineNo">183</span> source.getSourceMetrics().setAgeOfLastShippedOp(<a name="line.183"></a>
-<span class="sourceLineNo">184</span> entries.get(entries.size() - 1).getKey().getWriteTime(), walGroupId);<a name="line.184"></a>
-<span class="sourceLineNo">185</span> if (LOG.isTraceEnabled()) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> LOG.trace("Replicated " + entries.size() + " entries or " + entryBatch.getNbOperations()<a name="line.186"></a>
-<span class="sourceLineNo">187</span> + " operations in " + ((endTimeNs - startTimeNs) / 1000000) + " ms");<a name="line.187"></a>
-<span class="sourceLineNo">188</span> }<a name="line.188"></a>
-<span class="sourceLineNo">189</span> break;<a name="line.189"></a>
-<span class="sourceLineNo">190</span> } catch (Exception ex) {<a name="line.190"></a>
-<span class="sourceLineNo">191</span> LOG.warn(source.getReplicationEndpoint().getClass().getName() + " threw unknown exception:"<a name="line.191"></a>
-<span class="sourceLineNo">192</span> + org.apache.hadoop.util.StringUtils.stringifyException(ex));<a name="line.192"></a>
-<span class="sourceLineNo">193</span> if (sleepForRetries("ReplicationEndpoint threw exception", sleepMultiplier)) {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> sleepMultiplier++;<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> }<a name="line.197"></a>
-<span class="sourceLineNo">198</span> }<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span> private void cleanUpHFileRefs(WALEdit edit) throws IOException {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> String peerId = source.getPeerId();<a name="line.201"></a>
-<span class="sourceLineNo">202</span> if (peerId.contains("-")) {<a name="line.202"></a>
-<span class="sourceLineNo">203</span> // peerClusterZnode will be in the form peerId + "-" + rsZNode.<a name="line.203"></a>
-<span class="sourceLineNo">204</span> // A peerId will not have "-" in its name, see HBASE-11394<a name="line.204"></a>
-<span class="sourceLineNo">205</span> peerId = peerId.split("-")[0];<a name="line.205"></a>
-<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> List<Cell> cells = edit.getCells();<a name="line.207"></a>
-<span class="sourceLineNo">208</span> int totalCells = cells.size();<a name="line.208"></a>
-<span class="sourceLineNo">209</span> for (int i = 0; i < totalCells; i++) {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> Cell cell = cells.get(i);<a name="line.210"></a>
-<span class="sourceLineNo">211</span> if (CellUtil.matchingQualifier(cell, WALEdit.BULK_LOAD)) {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> BulkLoadDescriptor bld = WALEdit.getBulkLoadDescriptor(cell);<a name="line.212"></a>
-<span class="sourceLineNo">213</span> List<StoreDescriptor> stores = bld.getStoresList();<a name="line.213"></a>
-<span class="sourceLineNo">214</span> int totalStores = stores.size();<a name="line.214"></a>
-<span class="sourceLineNo">215</span> for (int j = 0; j < totalStores; j++) {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> List<String> storeFileList = stores.get(j).getStoreFileList();<a name="line.216"></a>
-<span class="sourceLineNo">217</span> source.getSourceManager().cleanUpHFileRefs(peerId, storeFileList);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> source.getSourceMetrics().decrSizeOfHFileRefsQueue(storeFileList.size());<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> }<a name="line.221"></a>
-<span class="sourceLineNo">222</span> }<a name="line.222"></a>
-<span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span> private boolean updateLogPosition(WALEntryBatch batch) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span> boolean updated = false;<a name="line.225"></a>
-<span class="sourceLineNo">226</span> // if end of file is true, then the logPositionAndCleanOldLogs method will remove the file<a name="line.226"></a>
-<span class="sourceLineNo">227</span> // record on zk, so let's call it. The last wal position maybe zero if end of file is true and<a name="line.227"></a>
-<span class="sourceLineNo">228</span> // there is no entry in the batch. It is OK because that the queue storage will ignore the zero<a name="line.228"></a>
-<span class="sourceLineNo">229</span> // position and the file will be removed soon in cleanOldLogs.<a name="line.229"></a>
-<span class="sourceLineNo">230</span> if (batch.isEndOfFile() || !batch.getLastWalPath().equals(currentPath) ||<a name="line.230"></a>
-<span class="sourceLineNo">231</span> batch.getLastWalPosition() != currentPosition) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> source.getSourceManager().logPositionAndCleanOldLogs(source.getQueueId(),<a name="line.232"></a>
-<span class="sourceLineNo">233</span> source.isRecovered(), batch);<a name="line.233"></a>
-<span class="sourceLineNo">234</span> updated = true;<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span> // if end of file is true, then we can just skip to the next file in queue.<a name="line.236"></a>
-<span class="sourceLineNo">237</span> // the only exception is for recovered queue, if we reach the end of the queue, then there will<a name="line.237"></a>
-<span class="sourceLineNo">238</span> // no more files so here the currentPath may be null.<a name="line.238"></a>
-<span class="sourceLineNo">239</span> if (batch.isEndOfFile()) {<a name="line.239"></a>
-<span class="sourceLineNo">240</span> currentPath = entryReader.getCurrentPath();<a name="line.240"></a>
-<span class="sourceLineNo">241</span> currentPosition = 0L;<a name="line.241"></a>
-<span class="sourceLineNo">242</span> } else {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> currentPath = batch.getLastWalPath();<a name="line.243"></a>
-<span class="sourceLineNo">244</span> currentPosition = batch.getLastWalPosition();<a name="line.244"></a>
-<span class="sourceLineNo">245</span> }<a name="line.245"></a>
-<span class="sourceLineNo">246</span> return updated;<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> public void startup(UncaughtExceptionHandler handler) {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> String name = Thread.currentThread().getName();<a name="line.250"></a>
-<span class="sourceLineNo">251</span> Threads.setDaemonThreadRunning(this,<a name="line.251"></a>
-<span class="sourceLineNo">252</span> name + ".replicationSource.shipper" + walGroupId + "," + source.getQueueId(), handler);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span> Path getCurrentPath() {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> return entryReader.getCurrentPath();<a name="line.256"></a>
-<span class="sourceLineNo">257</span> }<a name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span> long getCurrentPosition() {<a name="line.259"></a>
-<span class="sourceLineNo">260</span> return currentPosition;<a name="line.260"></a>
-<span class="sourceLineNo">261</span> }<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span> void setWALReader(ReplicationSourceWALReader entryReader) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> this.entryReader = entryReader;<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> long getStartPosition() {<a name="line.267"></a>
-<span class="sourceLineNo">268</span> return 0;<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 boolean isActive() {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> return source.isSourceActive() && state == WorkerState.RUNNING && !isInterrupted();<a name="line.272"></a>
-<span class="sourceLineNo">273</span> }<a name="line.273"></a>
-<span class="sourceLineNo">274</span><a name="line.274"></a>
-<span class="sourceLineNo">275</span> protected final void setWorkerState(WorkerState state) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span> this.state = state;<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> void stopWorker() {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> setWorkerState(WorkerState.STOPPED);<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> public boolean isFinished() {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> return state == WorkerState.FINISHED;<a name="line.284"></a>
-<span class="sourceLineNo">285</span> }<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span> /**<a name="line.287"></a>
-<span class="sourceLineNo">288</span> * Do the sleeping logic<a name="line.288"></a>
-<span class="sourceLineNo">289</span> * @param msg Why we sleep<a name="line.289"></a>
-<span class="sourceLineNo">290</span> * @param sleepMultiplier by how many times the default sleeping time is augmented<a name="line.290"></a>
-<span class="sourceLineNo">291</span> * @return True if <code>sleepMultiplier</code> is &lt; <code>maxRetriesMultiplier</code><a name="line.291"></a>
-<span class="sourceLineNo">292</span> */<a name="line.292"></a>
-<span class="sourceLineNo">293</span> public boolean sleepForRetries(String msg, int sleepMultiplier) {<a name="line.293"></a>
-<span class="sourceLineNo">294</span> try {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> if (LOG.isTraceEnabled()) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> LOG.trace(msg + ", sleeping " + sleepForRetries + " times " + sleepMultiplier);<a name="line.296"></a>
-<span class="sourceLineNo">297</span> }<a name="line.297"></a>
-<span class="sourceLineNo">298</span> Thread.sleep(this.sleepForRetries * sleepMultiplier);<a name="line.298"></a>
-<span class="sourceLineNo">299</span> } catch (InterruptedException e) {<a name="line.299"></a>
-<span class="sourceLineNo">300</span> LOG.debug("Interrupted while sleeping between retries");<a name="line.300"></a>
-<span class="sourceLineNo">301</span> Thread.currentThread().interrupt();<a name="line.301"></a>
-<span class="sourceLineNo">302</span> }<a name="line.302"></a>
-<span class="sourceLineNo">303</span> return sleepMultiplier < maxRetriesMultiplier;<a name="line.303"></a>
-<span class="sourceLineNo">304</span> }<a name="line.304"></a>
-<span class="sourceLineNo">305</span>}<a name="line.305"></a>
+<span class="sourceLineNo">090</span> // Sleep until replication is enabled again<a name="line.90"></a>
+<span class="sourceLineNo">091</span> if (!source.isPeerEnabled()) {<a name="line.91"></a>
+<span class="sourceLineNo">092</span> // The peer enabled check is in memory, not expensive, so do not need to increase the<a name="line.92"></a>
+<span class="sourceLineNo">093</span> // sleep interval as it may cause a long lag when we enable the peer.<a name="line.93"></a>
+<span class="sourceLineNo">094</span> sleepForRetries("Replication is disabled", 1);<a name="line.94"></a>
+<span class="sourceLineNo">095</span> continue;<a name="line.95"></a>
+<span class="sourceLineNo">096</span> }<a name="line.96"></a>
+<span class="sourceLineNo">097</span> try {<a name="line.97"></a>
+<span class="sourceLineNo">098</span> WALEntryBatch entryBatch = entryReader.take();<a name="line.98"></a>
+<span class="sourceLineNo">099</span> // the NO_MORE_DATA instance has no path so do not all shipEdits<a name="line.99"></a>
+<span class="sourceLineNo">100</span> if (entryBatch == WALEntryBatch.NO_MORE_DATA) {<a name="line.100"></a>
+<span class="sourceLineNo">101</span> noMoreData();<a name="line.101"></a>
+<span class="sourceLineNo">102</span> } else {<a name="line.102"></a>
+<span class="sourceLineNo">103</span> shipEdits(entryBatch);<a name="line.103"></a>
+<span class="sourceLineNo">104</span> }<a name="line.104"></a>
+<span class="sourceLineNo">105</span> } catch (InterruptedException e) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span> LOG.trace("Interrupted while waiting for next replication entry batch", e);<a name="line.106"></a>
+<span class="sourceLineNo">107</span> Thread.currentThread().interrupt();<a name="line.107"></a>
+<span class="sourceLineNo">108</span> }<a name="line.108"></a>
+<span class="sourceLineNo">109</span> }<a name="line.109"></a>
+<span class="sourceLineNo">110</span> // If the worker exits run loop without finishing its task, mark it as stopped.<a name="line.110"></a>
+<span class="sourceLineNo">111</span> if (!isFinished()) {<a name="line.111"></a>
+<span class="sourceLineNo">112</span> setWorkerState(WorkerState.STOPPED);<a name="line.112"></a>
+<span class="sourceLineNo">113</span> } else {<a name="line.113"></a>
+<span class="sourceLineNo">114</span> postFinish();<a name="line.114"></a>
+<span class="sourceLineNo">115</span> }<a name="line.115"></a>
+<span class="sourceLineNo">116</span> }<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span> // To be implemented by recovered shipper<a name="line.118"></a>
+<span class="sourceLineNo">119</span> protected void noMoreData() {<a name="line.119"></a>
+<span class="sourceLineNo">120</span> }<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span> // To be implemented by recovered shipper<a name="line.122"></a>
+<span class="sourceLineNo">123</span> protected void postFinish() {<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> * Do the shipping logic<a name="line.127"></a>
+<span class="sourceLineNo">128</span> */<a name="line.128"></a>
+<span class="sourceLineNo">129</span> private void shipEdits(WALEntryBatch entryBatch) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> List<Entry> entries = entryBatch.getWalEntries();<a name="line.130"></a>
+<span class="sourceLineNo">131</span> int sleepMultiplier = 0;<a name="line.131"></a>
+<span class="sourceLineNo">132</span> if (entries.isEmpty()) {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> if (updateLogPosition(entryBatch)) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> // if there was nothing to ship and it's not an error<a name="line.134"></a>
+<span class="sourceLineNo">135</span> // set "ageOfLastShippedOp" to <now> to indicate that we're current<a name="line.135"></a>
+<span class="sourceLineNo">136</span> source.getSourceMetrics().setAgeOfLastShippedOp(EnvironmentEdgeManager.currentTime(),<a name="line.136"></a>
+<span class="sourceLineNo">137</span> walGroupId);<a name="line.137"></a>
+<span class="sourceLineNo">138</span> }<a name="line.138"></a>
+<span class="sourceLineNo">139</span> return;<a name="line.139"></a>
+<span class="sourceLineNo">140</span> }<a name="line.140"></a>
+<span class="sourceLineNo">141</span> int currentSize = (int) entryBatch.getHeapSize();<a name="line.141"></a>
+<span class="sourceLineNo">142</span> while (isActive()) {<a name="line.142"></a>
+<span class="sourceLineNo">143</span> try {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> try {<a name="line.144"></a>
+<span class="sourceLineNo">145</span> source.tryThrottle(currentSize);<a name="line.145"></a>
+<span class="sourceLineNo">146</span> } catch (InterruptedException e) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> LOG.debug("Interrupted while sleeping for throttling control");<a name="line.147"></a>
+<span class="sourceLineNo">148</span> Thread.currentThread().interrupt();<a name="line.148"></a>
+<span class="sourceLineNo">149</span> // current thread might be interrupted to terminate<a name="line.149"></a>
+<span class="sourceLineNo">150</span> // directly go back to while() for confirm this<a name="line.150"></a>
+<span class="sourceLineNo">151</span> continue;<a name="line.151"></a>
+<span class="sourceLineNo">152</span> }<a name="line.152"></a>
+<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">154</span> // create replicateContext here, so the entries can be GC'd upon return from this call<a name="line.154"></a>
+<span class="sourceLineNo">155</span> // stack<a name="line.155"></a>
+<span class="sourceLineNo">156</span> ReplicationEndpoint.ReplicateContext replicateContext =<a name="line.156"></a>
+<span class="sourceLineNo">157</span> new ReplicationEndpoint.ReplicateContext();<a name="line.157"></a>
+<span class="sourceLineNo">158</span> replicateContext.setEntries(entries).setSize(currentSize);<a name="line.158"></a>
+<span class="sourceLineNo">159</span> replicateContext.setWalGroupId(walGroupId);<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span> long startTimeNs = System.nanoTime();<a name="line.161"></a>
+<span class="sourceLineNo">162</span> // send the edits to the endpoint. Will block until the edits are shipped and acknowledged<a name="line.162"></a>
+<span class="sourceLineNo">163</span> boolean replicated = source.getReplicationEndpoint().replicate(replicateContext);<a name="line.163"></a>
+<span class="sourceLineNo">164</span> long endTimeNs = System.nanoTime();<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span> if (!replicated) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span> continue;<a name="line.167"></a>
+<span class="sourceLineNo">168</span> } else {<a name="line.168"></a>
+<span class="sourceLineNo">169</span> sleepMultiplier = Math.max(sleepMultiplier - 1, 0);<a name="line.169"></a>
+<span class="sourceLineNo">170</span> }<a name="line.170"></a>
+<span class="sourceLineNo">171</span> // Clean up hfile references<a name="line.171"></a>
+<span class="sourceLineNo">172</span> for (Entry entry : entries) {<a name="line.172"></a>
+<span class="sourceLineNo">173</span> cleanUpHFileRefs(entry.getEdit());<a name="line.173"></a>
+<span class="sourceLineNo">174</span> }<a name="line.174"></a>
+<span class="sourceLineNo">175</span> // Log and clean up WAL logs<a name="line.175"></a>
+<span class="sourceLineNo">176</span> updateLogPosition(entryBatch);<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span> source.postShipEdits(entries, currentSize);<a name="line.178"></a>
+<span class="sourceLineNo">179</span> // FIXME check relationship between wal group and overall<a name="line.179"></a>
+<span class="sourceLineNo">180</span> source.getSourceMetrics().shipBatch(entryBatch.getNbOperations(), currentSize,<a name="line.180"></a>
+<span class="sourceLineNo">181</span> entryBatch.getNbHFiles());<a name="line.181"></a>
+<span class="sourceLineNo">182</span> source.getSourceMetrics().setAgeOfLastShippedOp(<a name="line.182"></a>
+<span class="sourceLineNo">183</span> entries.get(entries.size() - 1).getKey().getWriteTime(), walGroupId);<a name="line.183"></a>
+<span class="sourceLineNo">184</span> if (LOG.isTraceEnabled()) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> LOG.trace("Replicated " + entries.size() + " entries or " + entryBatch.getNbOperations()<a name="line.185"></a>
+<span class="sourceLineNo">186</span> + " operations in " + ((endTimeNs - startTimeNs) / 1000000) + " ms");<a name="line.186"></a>
+<span class="sourceLineNo">187</span> }<a name="line.187"></a>
+<span class="sourceLineNo">188</span> break;<a name="line.188"></a>
+<span class="sourceLineNo">189</span> } catch (Exception ex) {<a name="line.189"></a>
+<span class="sourceLineNo">190</span> LOG.warn("{} threw unknown exception:",<a name="line.190"></a>
+<span class="sourceLineNo">191</span> source.getReplicationEndpoint().getClass().getName(), ex);<a name="line.191"></a>
+<span class="sourceLineNo">192</span> if (sleepForRetries("ReplicationEndpoint threw exception", sleepMultiplier)) {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> sleepMultiplier++;<a name="line.193"></a>
+<span class="sourceLineNo">194</span> }<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> }<a name="line.197"></a>
+<span class="sourceLineNo">198</span><a name="line.198"></a>
+<span class="sourceLineNo">199</span> private void cleanUpHFileRefs(WALEdit edit) throws IOException {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> String peerId = source.getPeerId();<a name="line.200"></a>
+<span class="sourceLineNo">201</span> if (peerId.contains("-")) {<a name="line.201"></a>
+<span class="sourceLineNo">202</span> // peerClusterZnode will be in the form peerId + "-" + rsZNode.<a name="line.202"></a>
+<span class="sourceLineNo">203</span> // A peerId will not have "-" in its name, see HBASE-11394<a name="line.203"></a>
+<span class="sourceLineNo">204</span> peerId = peerId.split("-")[0];<a name="line.204"></a>
+<span class="sourceLineNo">205</span> }<a name="line.205"></a>
+<span class="sourceLineNo">206</span> List<Cell> cells = edit.getCells();<a name="line.206"></a>
+<span class="sourceLineNo">207</span> int totalCells = cells.size();<a name="line.207"></a>
+<span class="sourceLineNo">208</span> for (int i = 0; i < totalCells; i++) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span> Cell cell = cells.get(i);<a name="line.209"></a>
+<span class="sourceLineNo">210</span> if (CellUtil.matchingQualifier(cell, WALEdit.BULK_LOAD)) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> BulkLoadDescriptor bld = WALEdit.getBulkLoadDescriptor(cell);<a name="line.211"></a>
+<span class="sourceLineNo">212</span> List<StoreDescriptor> stores = bld.getStoresList();<a name="line.212"></a>
+<span class="sourceLineNo">213</span> int totalStores = stores.size();<a name="line.213"></a>
+<span class="sourceLineNo">214</span> for (int j = 0; j < totalStores; j++) {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> List<String> storeFileList = stores.get(j).getStoreFileList();<a name="line.215"></a>
+<span class="sourceLineNo">216</span> source.getSourceManager().cleanUpHFileRefs(peerId, storeFileList);<a name="line.216"></a>
+<span class="sourceLineNo">217</span> source.getSourceMetrics().decrSizeOfHFileRefsQueue(storeFileList.size());<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> }<a name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span> private boolean updateLogPosition(WALEntryBatch batch) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> boolean updated = false;<a name="line.224"></a>
+<span class="sourceLineNo">225</span> // if end of file is true, then the logPositionAndCleanOldLogs method will remove the file<a name="line.225"></a>
+<span class="sourceLineNo">226</span> // record on zk, so let's call it. The last wal position maybe zero if end of file is true and<a name="line.226"></a>
+<span class="sourceLineNo">227</span> // there is no entry in the batch. It is OK because that the queue storage will ignore the zero<a name="line.227"></a>
+<span class="sourceLineNo">228</span> // position and the file will be removed soon in cleanOldLogs.<a name="line.228"></a>
+<span class="sourceLineNo">229</span> if (batch.isEndOfFile() || !batch.getLastWalPath().equals(currentPath) ||<a name="line.229"></a>
+<span class="sourceLineNo">230</span> batch.getLastWalPosition() != currentPosition) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> source.getSourceManager().logPositionAndCleanOldLogs(source.getQueueId(),<a name="line.231"></a>
+<span class="sourceLineNo">232</span> source.isRecovered(), batch);<a name="line.232"></a>
+<span class="sourceLineNo">233</span> updated = true;<a name="line.233"></a>
+<span class="sourceLineNo">234</span> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span> // if end of file is true, then we can just skip to the next file in queue.<a name="line.235"></a>
+<span class="sourceLineNo">236</span> // the only exception is for recovered queue, if we reach the end of the queue, then there will<a name="line.236"></a>
+<span class="sourceLineNo">237</span> // no more files so here the currentPath may be null.<a name="line.237"></a>
+<span class="sourceLineNo">238</span> if (batch.isEndOfFile()) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> currentPath = entryReader.getCurrentPath();<a name="line.239"></a>
+<span class="sourceLineNo">240</span> currentPosition = 0L;<a name="line.240"></a>
+<span class="sourceLineNo">241</span> } else {<a name="line.241"></a>
+<span class="sourceLineNo">242</span> currentPath = batch.getLastWalPath();<a name="line.242"></a>
+<span class="sourceLineNo">243</span> currentPosition = batch.getLastWalPosition();<a name="line.243"></a>
+<span class="sourceLineNo">244</span> }<a name="line.244"></a>
+<span class="sourceLineNo">245</span> return updated;<a name="line.245"></a>
+<span class="sourceLineNo">246</span> }<a name="line.246"></a>
+<span class="sourceLineNo">247</span><a name="line.247"></a>
+<span class="sourceLineNo">248</span> public void startup(UncaughtExceptionHandler handler) {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> String name = Thread.currentThread().getName();<a name="line.249"></a>
+<span class="sourceLineNo">250</span> Threads.setDaemonThreadRunning(this,<a name="line.250"></a>
+<span class="sourceLineNo">251</span> name + ".replicationSource.shipper" + walGroupId + "," + source.getQueueId(), handler);<a name="line.251"></a>
+<span class="sourceLineNo">252</span> }<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span> Path getCurrentPath() {<a name="line.254"></a>
+<span class="sourceLineNo">255</span> return entryReader.getCurrentPath();<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span> long getCurrentPosition() {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> return currentPosition;<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> void setWALReader(ReplicationSourceWALReader entryReader) {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> this.entryReader = entryReader;<a name="line.263"></a>
+<span class="sourceLineNo">264</span> }<a name="line.264"></a>
+<span class="sourceLineNo">265</span><a name="line.265"></a>
+<span class="sourceLineNo">266</span> long getStartPosition() {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> return 0;<a name="line.267"></a>
+<span class="sourceLineNo">268</span> }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> private boolean isActive() {<a name="line.270"></a>
+<span class="sourceLineNo">271</span> return source.isSourceActive() && state == WorkerState.RUNNING && !isInterrupted();<a name="line.271"></a>
+<span class="sourceLineNo">272</span> }<a name="line.272"></a>
+<span class="sourceLineNo">273</span><a name="line.273"></a>
+<span class="sourceLineNo">274</span> protected final void setWorkerState(WorkerState state) {<a name="line.274"></a>
+<span class="sourceLineNo">275</span> this.state = state;<a name="line.275"></a>
+<span class="sourceLineNo">276</span> }<a name="line.276"></a>
+<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">278</span> void stopWorker() {<a name="line.278"></a>
+<span class="sourceLineNo">279</span> setWorkerState(WorkerState.STOPPED);<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span> public boolean isFinished() {<a name="line.282"></a>
+<span class="sourceLineNo">283</span> return state == WorkerState.FINISHED;<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span> /**<a name="line.286"></a>
+<span class="sourceLineNo">287</span> * Do the sleeping logic<a name="line.287"></a>
+<span class="sourceLineNo">288</span> * @param msg Why we sleep<a name="line.288"></a>
+<span class="sourceLineNo">289</span> * @param sleepMultiplier by how many times the default sleeping time is augmented<a name="line.289"></a>
+<span class="sourceLineNo">290</span> * @return True if <code>sleepMultiplier</code> is &lt; <code>maxRetriesMultiplier</code><a name="line.290"></a>
+<span class="sourceLineNo">291</span> */<a name="line.291"></a>
+<span class="sourceLineNo">292</span> public boolean sleepForRetries(String msg, int sleepMultiplier) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span> try {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> LOG.trace("{}, sleeping {} times {}", msg, sleepForRetries, sleepMultiplier);<a name="line.294"></a>
+<span class="sourceLineNo">295</span> Thread.sleep(this.sleepForRetries * sleepMultiplier);<a name="line.295"></a>
+<span class="sourceLineNo">296</span> } catch (InterruptedException e) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> LOG.debug("Interrupted while sleeping between retries");<a name="line.297"></a>
+<span class="sourceLineNo">298</span> Thread.currentThread().interrupt();<a name="line.298"></a>
+<span class="sourceLineNo">299</span> }<a name="line.299"></a>
+<span class="sourceLineNo">300</span> return sleepMultiplier < maxRetriesMultiplier;<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>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html
index 484b604..70c4db7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html
@@ -95,222 +95,219 @@
<span class="sourceLineNo">087</span> setWorkerState(WorkerState.RUNNING);<a name="line.87"></a>
<span class="sourceLineNo">088</span> // Loop until we close down<a name="line.88"></a>
<span class="sourceLineNo">089</span> while (isActive()) {<a name="line.89"></a>
-<span class="sourceLineNo">090</span> int sleepMultiplier = 1;<a name="line.90"></a>
-<span class="sourceLineNo">091</span> // Sleep until replication is enabled again<a name="line.91"></a>
-<span class="sourceLineNo">092</span> if (!source.isPeerEnabled()) {<a name="line.92"></a>
-<span class="sourceLineNo">093</span> if (sleepForRetries("Replication is disabled", sleepMultiplier)) {<a name="line.93"></a>
-<span class="sourceLineNo">094</span> sleepMultiplier++;<a name="line.94"></a>
-<span class="sourceLineNo">095</span> }<a name="line.95"></a>
-<span class="sourceLineNo">096</span> continue;<a name="line.96"></a>
-<span class="sourceLineNo">097</span> }<a name="line.97"></a>
-<span class="sourceLineNo">098</span> try {<a name="line.98"></a>
-<span class="sourceLineNo">099</span> WALEntryBatch entryBatch = entryReader.take();<a name="line.99"></a>
-<span class="sourceLineNo">100</span> // the NO_MORE_DATA instance has no path so do not all shipEdits<a name="line.100"></a>
-<span class="sourceLineNo">101</span> if (entryBatch == WALEntryBatch.NO_MORE_DATA) {<a name="line.101"></a>
-<span class="sourceLineNo">102</span> noMoreData();<a name="line.102"></a>
-<span class="sourceLineNo">103</span> } else {<a name="line.103"></a>
-<span class="sourceLineNo">104</span> shipEdits(entryBatch);<a name="line.104"></a>
-<span class="sourceLineNo">105</span> }<a name="line.105"></a>
-<span class="sourceLineNo">106</span> } catch (InterruptedException e) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span> LOG.trace("Interrupted while waiting for next replication entry batch", e);<a name="line.107"></a>
-<span class="sourceLineNo">108</span> Thread.currentThread().interrupt();<a name="line.108"></a>
-<span class="sourceLineNo">109</span> }<a name="line.109"></a>
-<span class="sourceLineNo">110</span> }<a name="line.110"></a>
-<span class="sourceLineNo">111</span> // If the worker exits run loop without finishing its task, mark it as stopped.<a name="line.111"></a>
-<span class="sourceLineNo">112</span> if (!isFinished()) {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> setWorkerState(WorkerState.STOPPED);<a name="line.113"></a>
-<span class="sourceLineNo">114</span> } else {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> postFinish();<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span> }<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span> // To be implemented by recovered shipper<a name="line.119"></a>
-<span class="sourceLineNo">120</span> protected void noMoreData() {<a name="line.120"></a>
-<span class="sourceLineNo">121</span> }<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span> // To be implemented by recovered shipper<a name="line.123"></a>
-<span class="sourceLineNo">124</span> protected void postFinish() {<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> * Do the shipping logic<a name="line.128"></a>
-<span class="sourceLineNo">129</span> */<a name="line.129"></a>
-<span class="sourceLineNo">130</span> private void shipEdits(WALEntryBatch entryBatch) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> List<Entry> entries = entryBatch.getWalEntries();<a name="line.131"></a>
-<span class="sourceLineNo">132</span> int sleepMultiplier = 0;<a name="line.132"></a>
-<span class="sourceLineNo">133</span> if (entries.isEmpty()) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span> if (updateLogPosition(entryBatch)) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> // if there was nothing to ship and it's not an error<a name="line.135"></a>
-<span class="sourceLineNo">136</span> // set "ageOfLastShippedOp" to <now> to indicate that we're current<a name="line.136"></a>
-<span class="sourceLineNo">137</span> source.getSourceMetrics().setAgeOfLastShippedOp(EnvironmentEdgeManager.currentTime(),<a name="line.137"></a>
-<span class="sourceLineNo">138</span> walGroupId);<a name="line.138"></a>
-<span class="sourceLineNo">139</span> }<a name="line.139"></a>
-<span class="sourceLineNo">140</span> return;<a name="line.140"></a>
-<span class="sourceLineNo">141</span> }<a name="line.141"></a>
-<span class="sourceLineNo">142</span> int currentSize = (int) entryBatch.getHeapSize();<a name="line.142"></a>
-<span class="sourceLineNo">143</span> while (isActive()) {<a name="line.143"></a>
-<span class="sourceLineNo">144</span> try {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> try {<a name="line.145"></a>
-<span class="sourceLineNo">146</span> source.tryThrottle(currentSize);<a name="line.146"></a>
-<span class="sourceLineNo">147</span> } catch (InterruptedException e) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> LOG.debug("Interrupted while sleeping for throttling control");<a name="line.148"></a>
-<span class="sourceLineNo">149</span> Thread.currentThread().interrupt();<a name="line.149"></a>
-<span class="sourceLineNo">150</span> // current thread might be interrupted to terminate<a name="line.150"></a>
-<span class="sourceLineNo">151</span> // directly go back to while() for confirm this<a name="line.151"></a>
-<span class="sourceLineNo">152</span> continue;<a name="line.152"></a>
-<span class="sourceLineNo">153</span> }<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span> // create replicateContext here, so the entries can be GC'd upon return from this call<a name="line.155"></a>
-<span class="sourceLineNo">156</span> // stack<a name="line.156"></a>
-<span class="sourceLineNo">157</span> ReplicationEndpoint.ReplicateContext replicateContext =<a name="line.157"></a>
-<span class="sourceLineNo">158</span> new ReplicationEndpoint.ReplicateContext();<a name="line.158"></a>
-<span class="sourceLineNo">159</span> replicateContext.setEntries(entries).setSize(currentSize);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> replicateContext.setWalGroupId(walGroupId);<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span> long startTimeNs = System.nanoTime();<a name="line.162"></a>
-<span class="sourceLineNo">163</span> // send the edits to the endpoint. Will block until the edits are shipped and acknowledged<a name="line.163"></a>
-<span class="sourceLineNo">164</span> boolean replicated = source.getReplicationEndpoint().replicate(replicateContext);<a name="line.164"></a>
-<span class="sourceLineNo">165</span> long endTimeNs = System.nanoTime();<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span> if (!replicated) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> continue;<a name="line.168"></a>
-<span class="sourceLineNo">169</span> } else {<a name="line.169"></a>
-<span class="sourceLineNo">170</span> sleepMultiplier = Math.max(sleepMultiplier - 1, 0);<a name="line.170"></a>
-<span class="sourceLineNo">171</span> }<a name="line.171"></a>
-<span class="sourceLineNo">172</span> // Clean up hfile references<a name="line.172"></a>
-<span class="sourceLineNo">173</span> for (Entry entry : entries) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span> cleanUpHFileRefs(entry.getEdit());<a name="line.174"></a>
-<span class="sourceLineNo">175</span> }<a name="line.175"></a>
-<span class="sourceLineNo">176</span> // Log and clean up WAL logs<a name="line.176"></a>
-<span class="sourceLineNo">177</span> updateLogPosition(entryBatch);<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> source.postShipEdits(entries, currentSize);<a name="line.179"></a>
-<span class="sourceLineNo">180</span> // FIXME check relationship between wal group and overall<a name="line.180"></a>
-<span class="sourceLineNo">181</span> source.getSourceMetrics().shipBatch(entryBatch.getNbOperations(), currentSize,<a name="line.181"></a>
-<span class="sourceLineNo">182</span> entryBatch.getNbHFiles());<a name="line.182"></a>
-<span class="sourceLineNo">183</span> source.getSourceMetrics().setAgeOfLastShippedOp(<a name="line.183"></a>
-<span class="sourceLineNo">184</span> entries.get(entries.size() - 1).getKey().getWriteTime(), walGroupId);<a name="line.184"></a>
-<span class="sourceLineNo">185</span> if (LOG.isTraceEnabled()) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> LOG.trace("Replicated " + entries.size() + " entries or " + entryBatch.getNbOperations()<a name="line.186"></a>
-<span class="sourceLineNo">187</span> + " operations in " + ((endTimeNs - startTimeNs) / 1000000) + " ms");<a name="line.187"></a>
-<span class="sourceLineNo">188</span> }<a name="line.188"></a>
-<span class="sourceLineNo">189</span> break;<a name="line.189"></a>
-<span class="sourceLineNo">190</span> } catch (Exception ex) {<a name="line.190"></a>
-<span class="sourceLineNo">191</span> LOG.warn(source.getReplicationEndpoint().getClass().getName() + " threw unknown exception:"<a name="line.191"></a>
-<span class="sourceLineNo">192</span> + org.apache.hadoop.util.StringUtils.stringifyException(ex));<a name="line.192"></a>
-<span class="sourceLineNo">193</span> if (sleepForRetries("ReplicationEndpoint threw exception", sleepMultiplier)) {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> sleepMultiplier++;<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> }<a name="line.197"></a>
-<span class="sourceLineNo">198</span> }<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span> private void cleanUpHFileRefs(WALEdit edit) throws IOException {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> String peerId = source.getPeerId();<a name="line.201"></a>
-<span class="sourceLineNo">202</span> if (peerId.contains("-")) {<a name="line.202"></a>
-<span class="sourceLineNo">203</span> // peerClusterZnode will be in the form peerId + "-" + rsZNode.<a name="line.203"></a>
-<span class="sourceLineNo">204</span> // A peerId will not have "-" in its name, see HBASE-11394<a name="line.204"></a>
-<span class="sourceLineNo">205</span> peerId = peerId.split("-")[0];<a name="line.205"></a>
-<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> List<Cell> cells = edit.getCells();<a name="line.207"></a>
-<span class="sourceLineNo">208</span> int totalCells = cells.size();<a name="line.208"></a>
-<span class="sourceLineNo">209</span> for (int i = 0; i < totalCells; i++) {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> Cell cell = cells.get(i);<a name="line.210"></a>
-<span class="sourceLineNo">211</span> if (CellUtil.matchingQualifier(cell, WALEdit.BULK_LOAD)) {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> BulkLoadDescriptor bld = WALEdit.getBulkLoadDescriptor(cell);<a name="line.212"></a>
-<span class="sourceLineNo">213</span> List<StoreDescriptor> stores = bld.getStoresList();<a name="line.213"></a>
-<span class="sourceLineNo">214</span> int totalStores = stores.size();<a name="line.214"></a>
-<span class="sourceLineNo">215</span> for (int j = 0; j < totalStores; j++) {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> List<String> storeFileList = stores.get(j).getStoreFileList();<a name="line.216"></a>
-<span class="sourceLineNo">217</span> source.getSourceManager().cleanUpHFileRefs(peerId, storeFileList);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> source.getSourceMetrics().decrSizeOfHFileRefsQueue(storeFileList.size());<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> }<a name="line.221"></a>
-<span class="sourceLineNo">222</span> }<a name="line.222"></a>
-<span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span> private boolean updateLogPosition(WALEntryBatch batch) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span> boolean updated = false;<a name="line.225"></a>
-<span class="sourceLineNo">226</span> // if end of file is true, then the logPositionAndCleanOldLogs method will remove the file<a name="line.226"></a>
-<span class="sourceLineNo">227</span> // record on zk, so let's call it. The last wal position maybe zero if end of file is true and<a name="line.227"></a>
-<span class="sourceLineNo">228</span> // there is no entry in the batch. It is OK because that the queue storage will ignore the zero<a name="line.228"></a>
-<span class="sourceLineNo">229</span> // position and the file will be removed soon in cleanOldLogs.<a name="line.229"></a>
-<span class="sourceLineNo">230</span> if (batch.isEndOfFile() || !batch.getLastWalPath().equals(currentPath) ||<a name="line.230"></a>
-<span class="sourceLineNo">231</span> batch.getLastWalPosition() != currentPosition) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> source.getSourceManager().logPositionAndCleanOldLogs(source.getQueueId(),<a name="line.232"></a>
-<span class="sourceLineNo">233</span> source.isRecovered(), batch);<a name="line.233"></a>
-<span class="sourceLineNo">234</span> updated = true;<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span> // if end of file is true, then we can just skip to the next file in queue.<a name="line.236"></a>
-<span class="sourceLineNo">237</span> // the only exception is for recovered queue, if we reach the end of the queue, then there will<a name="line.237"></a>
-<span class="sourceLineNo">238</span> // no more files so here the currentPath may be null.<a name="line.238"></a>
-<span class="sourceLineNo">239</span> if (batch.isEndOfFile()) {<a name="line.239"></a>
-<span class="sourceLineNo">240</span> currentPath = entryReader.getCurrentPath();<a name="line.240"></a>
-<span class="sourceLineNo">241</span> currentPosition = 0L;<a name="line.241"></a>
-<span class="sourceLineNo">242</span> } else {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> currentPath = batch.getLastWalPath();<a name="line.243"></a>
-<span class="sourceLineNo">244</span> currentPosition = batch.getLastWalPosition();<a name="line.244"></a>
-<span class="sourceLineNo">245</span> }<a name="line.245"></a>
-<span class="sourceLineNo">246</span> return updated;<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> public void startup(UncaughtExceptionHandler handler) {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> String name = Thread.currentThread().getName();<a name="line.250"></a>
-<span class="sourceLineNo">251</span> Threads.setDaemonThreadRunning(this,<a name="line.251"></a>
-<span class="sourceLineNo">252</span> name + ".replicationSource.shipper" + walGroupId + "," + source.getQueueId(), handler);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span> Path getCurrentPath() {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> return entryReader.getCurrentPath();<a name="line.256"></a>
-<span class="sourceLineNo">257</span> }<a name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span> long getCurrentPosition() {<a name="line.259"></a>
-<span class="sourceLineNo">260</span> return currentPosition;<a name="line.260"></a>
-<span class="sourceLineNo">261</span> }<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span> void setWALReader(ReplicationSourceWALReader entryReader) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> this.entryReader = entryReader;<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> long getStartPosition() {<a name="line.267"></a>
-<span class="sourceLineNo">268</span> return 0;<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 boolean isActive() {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> return source.isSourceActive() && state == WorkerState.RUNNING && !isInterrupted();<a name="line.272"></a>
-<span class="sourceLineNo">273</span> }<a name="line.273"></a>
-<span class="sourceLineNo">274</span><a name="line.274"></a>
-<span class="sourceLineNo">275</span> protected final void setWorkerState(WorkerState state) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span> this.state = state;<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> void stopWorker() {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> setWorkerState(WorkerState.STOPPED);<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> public boolean isFinished() {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> return state == WorkerState.FINISHED;<a name="line.284"></a>
-<span class="sourceLineNo">285</span> }<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span> /**<a name="line.287"></a>
-<span class="sourceLineNo">288</span> * Do the sleeping logic<a name="line.288"></a>
-<span class="sourceLineNo">289</span> * @param msg Why we sleep<a name="line.289"></a>
-<span class="sourceLineNo">290</span> * @param sleepMultiplier by how many times the default sleeping time is augmented<a name="line.290"></a>
-<span class="sourceLineNo">291</span> * @return True if <code>sleepMultiplier</code> is &lt; <code>maxRetriesMultiplier</code><a name="line.291"></a>
-<span class="sourceLineNo">292</span> */<a name="line.292"></a>
-<span class="sourceLineNo">293</span> public boolean sleepForRetries(String msg, int sleepMultiplier) {<a name="line.293"></a>
-<span class="sourceLineNo">294</span> try {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> if (LOG.isTraceEnabled()) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> LOG.trace(msg + ", sleeping " + sleepForRetries + " times " + sleepMultiplier);<a name="line.296"></a>
-<span class="sourceLineNo">297</span> }<a name="line.297"></a>
-<span class="sourceLineNo">298</span> Thread.sleep(this.sleepForRetries * sleepMultiplier);<a name="line.298"></a>
-<span class="sourceLineNo">299</span> } catch (InterruptedException e) {<a name="line.299"></a>
-<span class="sourceLineNo">300</span> LOG.debug("Interrupted while sleeping between retries");<a name="line.300"></a>
-<span class="sourceLineNo">301</span> Thread.currentThread().interrupt();<a name="line.301"></a>
-<span class="sourceLineNo">302</span> }<a name="line.302"></a>
-<span class="sourceLineNo">303</span> return sleepMultiplier < maxRetriesMultiplier;<a name="line.303"></a>
-<span class="sourceLineNo">304</span> }<a name="line.304"></a>
-<span class="sourceLineNo">305</span>}<a name="line.305"></a>
+<span class="sourceLineNo">090</span> // Sleep until replication is enabled again<a name="line.90"></a>
+<span class="sourceLineNo">091</span> if (!source.isPeerEnabled()) {<a name="line.91"></a>
+<span class="sourceLineNo">092</span> // The peer enabled check is in memory, not expensive, so do not need to increase the<a name="line.92"></a>
+<span class="sourceLineNo">093</span> // sleep interval as it may cause a long lag when we enable the peer.<a name="line.93"></a>
+<span class="sourceLineNo">094</span> sleepForRetries("Replication is disabled", 1);<a name="line.94"></a>
+<span class="sourceLineNo">095</span> continue;<a name="line.95"></a>
+<span class="sourceLineNo">096</span> }<a name="line.96"></a>
+<span class="sourceLineNo">097</span> try {<a name="line.97"></a>
+<span class="sourceLineNo">098</span> WALEntryBatch entryBatch = entryReader.take();<a name="line.98"></a>
+<span class="sourceLineNo">099</span> // the NO_MORE_DATA instance has no path so do not all shipEdits<a name="line.99"></a>
+<span class="sourceLineNo">100</span> if (entryBatch == WALEntryBatch.NO_MORE_DATA) {<a name="line.100"></a>
+<span class="sourceLineNo">101</span> noMoreData();<a name="line.101"></a>
+<span class="sourceLineNo">102</span> } else {<a name="line.102"></a>
+<span class="sourceLineNo">103</span> shipEdits(entryBatch);<a name="line.103"></a>
+<span class="sourceLineNo">104</span> }<a name="line.104"></a>
+<span class="sourceLineNo">105</span> } catch (InterruptedException e) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span> LOG.trace("Interrupted while waiting for next replication entry batch", e);<a name="line.106"></a>
+<span class="sourceLineNo">107</span> Thread.currentThread().interrupt();<a name="line.107"></a>
+<span class="sourceLineNo">108</span> }<a name="line.108"></a>
+<span class="sourceLineNo">109</span> }<a name="line.109"></a>
+<span class="sourceLineNo">110</span> // If the worker exits run loop without finishing its task, mark it as stopped.<a name="line.110"></a>
+<span class="sourceLineNo">111</span> if (!isFinished()) {<a name="line.111"></a>
+<span class="sourceLineNo">112</span> setWorkerState(WorkerState.STOPPED);<a name="line.112"></a>
+<span class="sourceLineNo">113</span> } else {<a name="line.113"></a>
+<span class="sourceLineNo">114</span> postFinish();<a name="line.114"></a>
+<span class="sourceLineNo">115</span> }<a name="line.115"></a>
+<span class="sourceLineNo">116</span> }<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span> // To be implemented by recovered shipper<a name="line.118"></a>
+<span class="sourceLineNo">119</span> protected void noMoreData() {<a name="line.119"></a>
+<span class="sourceLineNo">120</span> }<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span> // To be implemented by recovered shipper<a name="line.122"></a>
+<span class="sourceLineNo">123</span> protected void postFinish() {<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> * Do the shipping logic<a name="line.127"></a>
+<span class="sourceLineNo">128</span> */<a name="line.128"></a>
+<span class="sourceLineNo">129</span> private void shipEdits(WALEntryBatch entryBatch) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> List<Entry> entries = entryBatch.getWalEntries();<a name="line.130"></a>
+<span class="sourceLineNo">131</span> int sleepMultiplier = 0;<a name="line.131"></a>
+<span class="sourceLineNo">132</span> if (entries.isEmpty()) {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> if (updateLogPosition(entryBatch)) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> // if there was nothing to ship and it's not an error<a name="line.134"></a>
+<span class="sourceLineNo">135</span> // set "ageOfLastShippedOp" to <now> to indicate that we're current<a name="line.135"></a>
+<span class="sourceLineNo">136</span> source.getSourceMetrics().setAgeOfLastShippedOp(EnvironmentEdgeManager.currentTime(),<a name="line.136"></a>
+<span class="sourceLineNo">137</span> walGroupId);<a name="line.137"></a>
+<span class="sourceLineNo">138</span> }<a name="line.138"></a>
+<span class="sourceLineNo">139</span> return;<a name="line.139"></a>
+<span class="sourceLineNo">140</span> }<a name="line.140"></a>
+<span class="sourceLineNo">141</span> int currentSize = (int) entryBatch.getHeapSize();<a name="line.141"></a>
+<span class="sourceLineNo">142</span> while (isActive()) {<a name="line.142"></a>
+<span class="sourceLineNo">143</span> try {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> try {<a name="line.144"></a>
+<span class="sourceLineNo">145</span> source.tryThrottle(currentSize);<a name="line.145"></a>
+<span class="sourceLineNo">146</span> } catch (InterruptedException e) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> LOG.debug("Interrupted while sleeping for throttling control");<a name="line.147"></a>
+<span class="sourceLineNo">148</span> Thread.currentThread().interrupt();<a name="line.148"></a>
+<span class="sourceLineNo">149</span> // current thread might be interrupted to terminate<a name="line.149"></a>
+<span class="sourceLineNo">150</span> // directly go back to while() for confirm this<a name="line.150"></a>
+<span class="sourceLineNo">151</span> continue;<a name="line.151"></a>
+<span class="sourceLineNo">152</span> }<a name="line.152"></a>
+<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">154</span> // create replicateContext here, so the entries can be GC'd upon return from this call<a name="line.154"></a>
+<span class="sourceLineNo">155</span> // stack<a name="line.155"></a>
+<span class="sourceLineNo">156</span> ReplicationEndpoint.ReplicateContext replicateContext =<a name="line.156"></a>
+<span class="sourceLineNo">157</span> new ReplicationEndpoint.ReplicateContext();<a name="line.157"></a>
+<span class="sourceLineNo">158</span> replicateContext.setEntries(entries).setSize(currentSize);<a name="line.158"></a>
+<span class="sourceLineNo">159</span> replicateContext.setWalGroupId(walGroupId);<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span> long startTimeNs = System.nanoTime();<a name="line.161"></a>
+<span class="sourceLineNo">162</span> // send the edits to the endpoint. Will block until the edits are shipped and acknowledged<a name="line.162"></a>
+<span class="sourceLineNo">163</span> boolean replicated = source.getReplicationEndpoint().replicate(replicateContext);<a name="line.163"></a>
+<span class="sourceLineNo">164</span> long endTimeNs = System.nanoTime();<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span> if (!replicated) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span> continue;<a name="line.167"></a>
+<span class="sourceLineNo">168</span> } else {<a name="line.168"></a>
+<span class="sourceLineNo">169</span> sleepMultiplier = Math.max(sleepMultiplier - 1, 0);<a name="line.169"></a>
+<span class="sourceLineNo">170</span> }<a name="line.170"></a>
+<span class="sourceLineNo">171</span> // Clean up hfile references<a name="line.171"></a>
+<span class="sourceLineNo">172</span> for (Entry entry : entries) {<a name="line.172"></a>
+<span class="sourceLineNo">173</span> cleanUpHFileRefs(entry.getEdit());<a name="line.173"></a>
+<span class="sourceLineNo">174</span> }<a name="line.174"></a>
+<span class="sourceLineNo">175</span> // Log and clean up WAL logs<a name="line.175"></a>
+<span class="sourceLineNo">176</span> updateLogPosition(entryBatch);<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span> source.postShipEdits(entries, currentSize);<a name="line.178"></a>
+<span class="sourceLineNo">179</span> // FIXME check relationship between wal group and overall<a name="line.179"></a>
+<span class="sourceLineNo">180</span> source.getSourceMetrics().shipBatch(entryBatch.getNbOperations(), currentSize,<a name="line.180"></a>
+<span class="sourceLineNo">181</span> entryBatch.getNbHFiles());<a name="line.181"></a>
+<span class="sourceLineNo">182</span> source.getSourceMetrics().setAgeOfLastShippedOp(<a name="line.182"></a>
+<span class="sourceLineNo">183</span> entries.get(entries.size() - 1).getKey().getWriteTime(), walGroupId);<a name="line.183"></a>
+<span class="sourceLineNo">184</span> if (LOG.isTraceEnabled()) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> LOG.trace("Replicated " + entries.size() + " entries or " + entryBatch.getNbOperations()<a name="line.185"></a>
+<span class="sourceLineNo">186</span> + " operations in " + ((endTimeNs - startTimeNs) / 1000000) + " ms");<a name="line.186"></a>
+<span class="sourceLineNo">187</span> }<a name="line.187"></a>
+<span class="sourceLineNo">188</span> break;<a name="line.188"></a>
+<span class="sourceLineNo">189</span> } catch (Exception ex) {<a name="line.189"></a>
+<span class="sourceLineNo">190</span> LOG.warn("{} threw unknown exception:",<a name="line.190"></a>
+<span class="sourceLineNo">191</span> source.getReplicationEndpoint().getClass().getName(), ex);<a name="line.191"></a>
+<span class="sourceLineNo">192</span> if (sleepForRetries("ReplicationEndpoint threw exception", sleepMultiplier)) {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> sleepMultiplier++;<a name="line.193"></a>
+<span class="sourceLineNo">194</span> }<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> }<a name="line.197"></a>
+<span class="sourceLineNo">198</span><a name="line.198"></a>
+<span class="sourceLineNo">199</span> private void cleanUpHFileRefs(WALEdit edit) throws IOException {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> String peerId = source.getPeerId();<a name="line.200"></a>
+<span class="sourceLineNo">201</span> if (peerId.contains("-")) {<a name="line.201"></a>
+<span class="sourceLineNo">202</span> // peerClusterZnode will be in the form peerId + "-" + rsZNode.<a name="line.202"></a>
+<span class="sourceLineNo">203</span> // A peerId will not have "-" in its name, see HBASE-11394<a name="line.203"></a>
+<span class="sourceLineNo">204</span> peerId = peerId.split("-")[0];<a name="line.204"></a>
+<span class="sourceLineNo">205</span> }<a name="line.205"></a>
+<span class="sourceLineNo">206</span> List<Cell> cells = edit.getCells();<a name="line.206"></a>
+<span class="sourceLineNo">207</span> int totalCells = cells.size();<a name="line.207"></a>
+<span class="sourceLineNo">208</span> for (int i = 0; i < totalCells; i++) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span> Cell cell = cells.get(i);<a name="line.209"></a>
+<span class="sourceLineNo">210</span> if (CellUtil.matchingQualifier(cell, WALEdit.BULK_LOAD)) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> BulkLoadDescriptor bld = WALEdit.getBulkLoadDescriptor(cell);<a name="line.211"></a>
+<span class="sourceLineNo">212</span> List<StoreDescriptor> stores = bld.getStoresList();<a name="line.212"></a>
+<span class="sourceLineNo">213</span> int totalStores = stores.size();<a name="line.213"></a>
+<span class="sourceLineNo">214</span> for (int j = 0; j < totalStores; j++) {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> List<String> storeFileList = stores.get(j).getStoreFileList();<a name="line.215"></a>
+<span class="sourceLineNo">216</span> source.getSourceManager().cleanUpHFileRefs(peerId, storeFileList);<a name="line.216"></a>
+<span class="sourceLineNo">217</span> source.getSourceMetrics().decrSizeOfHFileRefsQueue(storeFileList.size());<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> }<a name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span> private boolean updateLogPosition(WALEntryBatch batch) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> boolean updated = false;<a name="line.224"></a>
+<span class="sourceLineNo">225</span> // if end of file is true, then the logPositionAndCleanOldLogs method will remove the file<a name="line.225"></a>
+<span class="sourceLineNo">226</span> // record on zk, so let's call it. The last wal position maybe zero if end of file is true and<a name="line.226"></a>
+<span class="sourceLineNo">227</span> // there is no entry in the batch. It is OK because that the queue storage will ignore the zero<a name="line.227"></a>
+<span class="sourceLineNo">228</span> // position and the file will be removed soon in cleanOldLogs.<a name="line.228"></a>
+<span class="sourceLineNo">229</span> if (batch.isEndOfFile() || !batch.getLastWalPath().equals(currentPath) ||<a name="line.229"></a>
+<span class="sourceLineNo">230</span> batch.getLastWalPosition() != currentPosition) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> source.getSourceManager().logPositionAndCleanOldLogs(source.getQueueId(),<a name="line.231"></a>
+<span class="sourceLineNo">232</span> source.isRecovered(), batch);<a name="line.232"></a>
+<span class="sourceLineNo">233</span> updated = true;<a name="line.233"></a>
+<span class="sourceLineNo">234</span> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span> // if end of file is true, then we can just skip to the next file in queue.<a name="line.235"></a>
+<span class="sourceLineNo">236</span> // the only exception is for recovered queue, if we reach the end of the queue, then there will<a name="line.236"></a>
+<span class="sourceLineNo">237</span> // no more files so here the currentPath may be null.<a name="line.237"></a>
+<span class="sourceLineNo">238</span> if (batch.isEndOfFile()) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> currentPath = entryReader.getCurrentPath();<a name="line.239"></a>
+<span class="sourceLineNo">240</span> currentPosition = 0L;<a name="line.240"></a>
+<span class="sourceLineNo">241</span> } else {<a name="line.241"></a>
+<span class="sourceLineNo">242</span> currentPath = batch.getLastWalPath();<a name="line.242"></a>
+<span class="sourceLineNo">243</span> currentPosition = batch.getLastWalPosition();<a name="line.243"></a>
+<span class="sourceLineNo">244</span> }<a name="line.244"></a>
+<span class="sourceLineNo">245</span> return updated;<a name="line.245"></a>
+<span class="sourceLineNo">246</span> }<a name="line.246"></a>
+<span class="sourceLineNo">247</span><a name="line.247"></a>
+<span class="sourceLineNo">248</span> public void startup(UncaughtExceptionHandler handler) {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> String name = Thread.currentThread().getName();<a name="line.249"></a>
+<span class="sourceLineNo">250</span> Threads.setDaemonThreadRunning(this,<a name="line.250"></a>
+<span class="sourceLineNo">251</span> name + ".replicationSource.shipper" + walGroupId + "," + source.getQueueId(), handler);<a name="line.251"></a>
+<span class="sourceLineNo">252</span> }<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span> Path getCurrentPath() {<a name="line.254"></a>
+<span class="sourceLineNo">255</span> return entryReader.getCurrentPath();<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span> long getCurrentPosition() {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> return currentPosition;<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> void setWALReader(ReplicationSourceWALReader entryReader) {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> this.entryReader = entryReader;<a name="line.263"></a>
+<span class="sourceLineNo">264</span> }<a name="line.264"></a>
+<span class="sourceLineNo">265</span><a name="line.265"></a>
+<span class="sourceLineNo">266</span> long getStartPosition() {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> return 0;<a name="line.267"></a>
+<span class="sourceLineNo">268</span> }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> private boolean isActive() {<a name="line.270"></a>
+<span class="sourceLineNo">271</span> return source.isSourceActive() && state == WorkerState.RUNNING && !isInterrupted();<a name="line.271"></a>
+<span class="sourceLineNo">272</span> }<a name="line.272"></a>
+<span class="sourceLineNo">273</span><a name="line.273"></a>
+<span class="sourceLineNo">274</span> protected final void setWorkerState(WorkerState state) {<a name="line.274"></a>
+<span class="sourceLineNo">275</span> this.state = state;<a name="line.275"></a>
+<span class="sourceLineNo">276</span> }<a name="line.276"></a>
+<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">278</span> void stopWorker() {<a name="line.278"></a>
+<span class="sourceLineNo">279</span> setWorkerState(WorkerState.STOPPED);<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span> public boolean isFinished() {<a name="line.282"></a>
+<span class="sourceLineNo">283</span> return state == WorkerState.FINISHED;<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span> /**<a name="line.286"></a>
+<span class="sourceLineNo">287</span> * Do the sleeping logic<a name="line.287"></a>
+<span class="sourceLineNo">288</span> * @param msg Why we sleep<a name="line.288"></a>
+<span class="sourceLineNo">289</span> * @param sleepMultiplier by how many times the default sleeping time is augmented<a name="line.289"></a>
+<span class="sourceLineNo">290</span> * @return True if <code>sleepMultiplier</code> is &lt; <code>maxRetriesMultiplier</code><a name="line.290"></a>
+<span class="sourceLineNo">291</span> */<a name="line.291"></a>
+<span class="sourceLineNo">292</span> public boolean sleepForRetries(String msg, int sleepMultiplier) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span> try {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> LOG.trace("{}, sleeping {} times {}", msg, sleepForRetries, sleepMultiplier);<a name="line.294"></a>
+<span class="sourceLineNo">295</span> Thread.sleep(this.sleepForRetries * sleepMultiplier);<a name="line.295"></a>
+<span class="sourceLineNo">296</span> } catch (InterruptedException e) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> LOG.debug("Interrupted while sleeping between retries");<a name="line.297"></a>
+<span class="sourceLineNo">298</span> Thread.currentThread().interrupt();<a name="line.298"></a>
+<span class="sourceLineNo">299</span> }<a name="line.299"></a>
+<span class="sourceLineNo">300</span> return sleepMultiplier < maxRetriesMultiplier;<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>
[12/12] hbase-site git commit: Published site at
773aff90fdf9edf4687b373d1c7ba859d166a437.
Posted by gi...@apache.org.
Published site at 773aff90fdf9edf4687b373d1c7ba859d166a437.
Project: http://git-wip-us.apache.org/repos/asf/hbase-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase-site/commit/5269c877
Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/5269c877
Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/5269c877
Branch: refs/heads/asf-site
Commit: 5269c8776656abcda5e3220859d244b57112ef07
Parents: e09c3da
Author: jenkins <bu...@apache.org>
Authored: Mon Apr 16 14:46:16 2018 +0000
Committer: jenkins <bu...@apache.org>
Committed: Mon Apr 16 14:46:16 2018 +0000
----------------------------------------------------------------------
acid-semantics.html | 4 +-
apache_hbase_reference_guide.pdf | 4 +-
book.html | 2 +-
bulk-loads.html | 4 +-
checkstyle-aggregate.html | 40 +-
coc.html | 4 +-
dependencies.html | 4 +-
dependency-convergence.html | 4 +-
dependency-info.html | 4 +-
dependency-management.html | 4 +-
devapidocs/constant-values.html | 6 +-
.../hbase/procedure/ZKProcedureMemberRpcs.html | 16 +-
.../regionserver/ReplicationSourceShipper.html | 30 +-
.../ReplicationSourceWALReader.html | 34 +-
...InfoManagerImpl.FailedOpenUpdaterThread.html | 16 +-
...oupInfoManagerImpl.RSGroupStartupWorker.html | 16 +-
...oManagerImpl.ServerEventsListenerThread.html | 16 +-
.../hbase/rsgroup/RSGroupInfoManagerImpl.html | 28 +-
.../org/apache/hadoop/hbase/Version.html | 6 +-
.../hbase/procedure/ZKProcedureMemberRpcs.html | 456 +++----
.../ReplicationSourceShipper.WorkerState.html | 429 ++++---
.../regionserver/ReplicationSourceShipper.html | 429 ++++---
.../ReplicationSourceWALReader.html | 538 ++++-----
...InfoManagerImpl.FailedOpenUpdaterThread.html | 1126 +++++++++---------
...oupInfoManagerImpl.RSGroupStartupWorker.html | 1126 +++++++++---------
...oManagerImpl.ServerEventsListenerThread.html | 1126 +++++++++---------
.../hbase/rsgroup/RSGroupInfoManagerImpl.html | 1126 +++++++++---------
export_control.html | 4 +-
index.html | 4 +-
integration.html | 4 +-
issue-tracking.html | 4 +-
license.html | 4 +-
mail-lists.html | 4 +-
metrics.html | 4 +-
old_news.html | 4 +-
plugin-management.html | 4 +-
plugins.html | 4 +-
poweredbyhbase.html | 4 +-
project-info.html | 4 +-
project-reports.html | 4 +-
project-summary.html | 4 +-
pseudo-distributed.html | 4 +-
replication.html | 4 +-
resources.html | 4 +-
source-repository.html | 4 +-
sponsors.html | 4 +-
supportingprojects.html | 4 +-
team-list.html | 4 +-
testdevapidocs/index-all.html | 4 +
.../org/apache/hadoop/hbase/package-tree.html | 10 +-
.../hadoop/hbase/procedure/package-tree.html | 8 +-
.../hadoop/hbase/procedure2/package-tree.html | 2 +-
.../hadoop/hbase/regionserver/package-tree.html | 4 +-
.../TestWALEntryStream.PathWatcher.html | 8 +-
.../regionserver/TestWALEntryStream.html | 153 ++-
.../apache/hadoop/hbase/test/package-tree.html | 4 +-
.../TestWALEntryStream.PathWatcher.html | 1089 +++++++++--------
.../regionserver/TestWALEntryStream.html | 1089 +++++++++--------
58 files changed, 4613 insertions(+), 4440 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/acid-semantics.html
----------------------------------------------------------------------
diff --git a/acid-semantics.html b/acid-semantics.html
index 0497eae..5f956f4 100644
--- a/acid-semantics.html
+++ b/acid-semantics.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Apache HBase (TM) ACID Properties
@@ -601,7 +601,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/apache_hbase_reference_guide.pdf
----------------------------------------------------------------------
diff --git a/apache_hbase_reference_guide.pdf b/apache_hbase_reference_guide.pdf
index 1601d5d..8fa20c9 100644
--- a/apache_hbase_reference_guide.pdf
+++ b/apache_hbase_reference_guide.pdf
@@ -5,8 +5,8 @@
/Author (Apache HBase Team)
/Creator (Asciidoctor PDF 1.5.0.alpha.15, based on Prawn 2.2.2)
/Producer (Apache HBase Team)
-/ModDate (D:20180415144458+00'00')
-/CreationDate (D:20180415144458+00'00')
+/ModDate (D:20180416144427+00'00')
+/CreationDate (D:20180416144427+00'00')
>>
endobj
2 0 obj
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/book.html
----------------------------------------------------------------------
diff --git a/book.html b/book.html
index f67c937..78c268a 100644
--- a/book.html
+++ b/book.html
@@ -37715,7 +37715,7 @@ The server will return cellblocks compressed using this same compressor as long
<div id="footer">
<div id="footer-text">
Version 3.0.0-SNAPSHOT<br>
-Last updated 2018-04-15 14:30:22 UTC
+Last updated 2018-04-16 14:29:50 UTC
</div>
</div>
</body>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/bulk-loads.html
----------------------------------------------------------------------
diff --git a/bulk-loads.html b/bulk-loads.html
index d56993b..80b9771 100644
--- a/bulk-loads.html
+++ b/bulk-loads.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Bulk Loads in Apache HBase (TM)
@@ -306,7 +306,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/checkstyle-aggregate.html
----------------------------------------------------------------------
diff --git a/checkstyle-aggregate.html b/checkstyle-aggregate.html
index bd4bb8be..fa02e08 100644
--- a/checkstyle-aggregate.html
+++ b/checkstyle-aggregate.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Checkstyle Results</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -10322,12 +10322,12 @@
<td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_javadoc.html#JavadocTagContinuationIndentation">JavadocTagContinuationIndentation</a>
<ul>
<li>offset: <tt>"2"</tt></li></ul></td>
-<td>784</td>
+<td>798</td>
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td></tr>
<tr class="b">
<td></td>
<td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_javadoc.html#NonEmptyAtclauseDescription">NonEmptyAtclauseDescription</a></td>
-<td>3845</td>
+<td>3831</td>
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td></tr>
<tr class="a">
<td>misc</td>
@@ -14536,7 +14536,7 @@
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 26 has parse error. Missed HTML close tag 'arg'. Sometimes it means that close tag missed for one of previous tags.</td>
<td>44</td></tr></table></div>
<div class="section">
@@ -15172,7 +15172,7 @@
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 4 has parse error. Missed HTML close tag 'pre'. Sometimes it means that close tag missed for one of previous tags.</td>
<td>59</td></tr></table></div>
<div class="section">
@@ -16927,7 +16927,7 @@
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 19 has parse error. Details: no viable alternative at input '<code>\n * List<Future<' while parsing HTML_TAG</td>
<td>167</td></tr></table></div>
<div class="section">
@@ -19849,7 +19849,7 @@
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 2 has parse error. Unrecognized error from ANTLR parser: null</td>
<td>83</td></tr>
<tr class="a">
@@ -33832,7 +33832,7 @@
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 37 has parse error. Details: no viable alternative at input '<ColumnFamily,' while parsing HTML_ELEMENT</td>
<td>29</td></tr></table></div>
<div class="section">
@@ -50128,7 +50128,7 @@
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 24 has parse error. Details: no viable alternative at input '<key,' while parsing HTML_ELEMENT</td>
<td>25</td></tr>
<tr class="b">
@@ -53716,7 +53716,7 @@
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 2 has parse error. Unrecognized error from ANTLR parser: null</td>
<td>587</td></tr>
<tr class="a">
@@ -73267,7 +73267,7 @@
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 60 has parse error. Missed HTML close tag 'Comparable'. Sometimes it means that close tag missed for one of previous tags.</td>
<td>29</td></tr>
<tr class="a">
@@ -74625,7 +74625,7 @@
<td>whitespace</td>
<td>ParenPad</td>
<td>')' is preceded with whitespace.</td>
-<td>214</td></tr></table></div>
+<td>218</td></tr></table></div>
<div class="section">
<h3 id="org.apache.hadoop.hbase.procedure.ZKProcedureUtil.java">org/apache/hadoop/hbase/procedure/ZKProcedureUtil.java</h3>
<table border="0" class="table table-striped">
@@ -77449,7 +77449,7 @@
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 0 has parse error. Unrecognized error from ANTLR parser: null</td>
<td>74</td></tr>
<tr class="a">
@@ -87415,7 +87415,7 @@
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 33 has parse error. Missed HTML close tag 'number'. Sometimes it means that close tag missed for one of previous tags.</td>
<td>127</td></tr>
<tr class="b">
@@ -95409,7 +95409,7 @@
<td>indentation</td>
<td>Indentation</td>
<td>'lambda arguments' have incorrect indentation level 8, expected level should be 6.</td>
-<td>541</td></tr></table></div>
+<td>598</td></tr></table></div>
<div class="section">
<h3 id="org.apache.hadoop.hbase.replication.regionserver.WALEntrySinkFilter.java">org/apache/hadoop/hbase/replication/regionserver/WALEntrySinkFilter.java</h3>
<table border="0" class="table table-striped">
@@ -115969,7 +115969,7 @@
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 23 has parse error. Details: no viable alternative at input '<expected,' while parsing HTML_ELEMENT</td>
<td>143</td></tr>
<tr class="a">
@@ -116173,7 +116173,7 @@
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 78 has parse error. Details: no viable alternative at input '<Object>, Map<String,' while parsing HTML_TAG</td>
<td>33</td></tr>
<tr class="a">
@@ -116773,7 +116773,7 @@
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 35 has parse error. Missed HTML close tag 'index'. Sometimes it means that close tag missed for one of previous tags.</td>
<td>823</td></tr>
<tr class="b">
@@ -120580,7 +120580,7 @@
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 58 has parse error. Details: no viable alternative at input '<byte[' while parsing HTML_ELEMENT</td>
<td>426</td></tr>
<tr class="a">
@@ -123433,7 +123433,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/coc.html
----------------------------------------------------------------------
diff --git a/coc.html b/coc.html
index bd77abe..42f9d7f 100644
--- a/coc.html
+++ b/coc.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Code of Conduct Policy
@@ -375,7 +375,7 @@ email to <a class="externalLink" href="mailto:private@hbase.apache.org">the priv
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/dependencies.html
----------------------------------------------------------------------
diff --git a/dependencies.html b/dependencies.html
index 59b75d1..6ad6a29 100644
--- a/dependencies.html
+++ b/dependencies.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Dependencies</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -440,7 +440,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/dependency-convergence.html
----------------------------------------------------------------------
diff --git a/dependency-convergence.html b/dependency-convergence.html
index 5a9c614..e441ca2 100644
--- a/dependency-convergence.html
+++ b/dependency-convergence.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Reactor Dependency Convergence</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -1105,7 +1105,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/dependency-info.html
----------------------------------------------------------------------
diff --git a/dependency-info.html b/dependency-info.html
index 71f2641..dc88589 100644
--- a/dependency-info.html
+++ b/dependency-info.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Dependency Information</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -313,7 +313,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/dependency-management.html
----------------------------------------------------------------------
diff --git a/dependency-management.html b/dependency-management.html
index 9a99ddd..e7c3bc5 100644
--- a/dependency-management.html
+++ b/dependency-management.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Dependency Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -969,7 +969,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/devapidocs/constant-values.html
----------------------------------------------------------------------
diff --git a/devapidocs/constant-values.html b/devapidocs/constant-values.html
index 75947f9..4432fe6 100644
--- a/devapidocs/constant-values.html
+++ b/devapidocs/constant-values.html
@@ -3768,21 +3768,21 @@
<!-- -->
</a><code>public static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/apache/hadoop/hbase/Version.html#date">date</a></code></td>
-<td class="colLast"><code>"Sun Apr 15 14:39:34 UTC 2018"</code></td>
+<td class="colLast"><code>"Mon Apr 16 14:39:11 UTC 2018"</code></td>
</tr>
<tr class="rowColor">
<td class="colFirst"><a name="org.apache.hadoop.hbase.Version.revision">
<!-- -->
</a><code>public static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/apache/hadoop/hbase/Version.html#revision">revision</a></code></td>
-<td class="colLast"><code>"125767b44e93f1094b77a6cf8c2a5ca19b5cabd2"</code></td>
+<td class="colLast"><code>"773aff90fdf9edf4687b373d1c7ba859d166a437"</code></td>
</tr>
<tr class="altColor">
<td class="colFirst"><a name="org.apache.hadoop.hbase.Version.srcChecksum">
<!-- -->
</a><code>public static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/apache/hadoop/hbase/Version.html#srcChecksum">srcChecksum</a></code></td>
-<td class="colLast"><code>"0e82933325241f67aa5a3d17fe3f63a2"</code></td>
+<td class="colLast"><code>"83e5500271237f8b8d44991e5fb13ecd"</code></td>
</tr>
<tr class="rowColor">
<td class="colFirst"><a name="org.apache.hadoop.hbase.Version.url">
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/devapidocs/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html b/devapidocs/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html
index 8425eaf..af56cb1 100644
--- a/devapidocs/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html
+++ b/devapidocs/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html
@@ -419,7 +419,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/procedure/ProcedureMe
<ul class="blockList">
<li class="blockList">
<h4>waitForNewProcedures</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html#line.149">waitForNewProcedures</a>()</pre>
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html#line.153">waitForNewProcedures</a>()</pre>
</li>
</ul>
<a name="startNewSubprocedure-java.lang.String-">
@@ -428,7 +428,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/procedure/ProcedureMe
<ul class="blockList">
<li class="blockList">
<h4>startNewSubprocedure</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html#line.182">startNewSubprocedure</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path)</pre>
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html#line.186">startNewSubprocedure</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> path)</pre>
<div class="block">Kick off a new sub-procedure on the listener with the data stored in the passed znode.
<p>
Will attempt to create the same procedure multiple times if an procedure znode with the same
@@ -445,7 +445,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/procedure/ProcedureMe
<ul class="blockList">
<li class="blockList">
<h4>sendMemberAcquired</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html#line.237">sendMemberAcquired</a>(<a href="../../../../../org/apache/hadoop/hbase/procedure/Subprocedure.html" title="class in org.apache.hadoop.hbase.procedure">Subprocedure</a> sub)
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html#line.241">sendMemberAcquired</a>(<a href="../../../../../org/apache/hadoop/hbase/procedure/Subprocedure.html" title="class in org.apache.hadoop.hbase.procedure">Subprocedure</a> sub)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">This attempts to create an acquired state znode for the procedure (snapshot name).
@@ -467,7 +467,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/procedure/ProcedureMe
<ul class="blockList">
<li class="blockList">
<h4>sendMemberCompleted</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html#line.262">sendMemberCompleted</a>(<a href="../../../../../org/apache/hadoop/hbase/procedure/Subprocedure.html" title="class in org.apache.hadoop.hbase.procedure">Subprocedure</a> sub,
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html#line.266">sendMemberCompleted</a>(<a href="../../../../../org/apache/hadoop/hbase/procedure/Subprocedure.html" title="class in org.apache.hadoop.hbase.procedure">Subprocedure</a> sub,
byte[] data)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">This acts as the ack for a completed procedure</div>
@@ -488,7 +488,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/procedure/ProcedureMe
<ul class="blockList">
<li class="blockList">
<h4>sendMemberAborted</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html#line.286">sendMemberAborted</a>(<a href="../../../../../org/apache/hadoop/hbase/procedure/Subprocedure.html" title="class in org.apache.hadoop.hbase.procedure">Subprocedure</a> sub,
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html#line.290">sendMemberAborted</a>(<a href="../../../../../org/apache/hadoop/hbase/procedure/Subprocedure.html" title="class in org.apache.hadoop.hbase.procedure">Subprocedure</a> sub,
<a href="../../../../../org/apache/hadoop/hbase/errorhandling/ForeignException.html" title="class in org.apache.hadoop.hbase.errorhandling">ForeignException</a> ee)</pre>
<div class="block">This should be called by the member and should write a serialized root cause exception as
to the abort znode.</div>
@@ -507,7 +507,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/procedure/ProcedureMe
<ul class="blockList">
<li class="blockList">
<h4>abort</h4>
-<pre>protected void <a href="../../../../../src-html/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html#line.312">abort</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> abortZNode)</pre>
+<pre>protected void <a href="../../../../../src-html/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html#line.316">abort</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> abortZNode)</pre>
<div class="block">Pass along the found abort notification to the listener</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -521,7 +521,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/procedure/ProcedureMe
<ul class="blockList">
<li class="blockList">
<h4>start</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html#line.352">start</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> memberName,
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html#line.356">start</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> memberName,
<a href="../../../../../org/apache/hadoop/hbase/procedure/ProcedureMember.html" title="class in org.apache.hadoop.hbase.procedure">ProcedureMember</a> listener)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from interface: <code><a href="../../../../../org/apache/hadoop/hbase/procedure/ProcedureMemberRpcs.html#start-java.lang.String-org.apache.hadoop.hbase.procedure.ProcedureMember-">ProcedureMemberRpcs</a></code></span></div>
<div class="block">Initialize and start any threads or connections the member needs.</div>
@@ -537,7 +537,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/procedure/ProcedureMe
<ul class="blockListLast">
<li class="blockList">
<h4>close</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html#line.361">close</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html#line.365">close</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/devapidocs/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html b/devapidocs/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html
index 2e76480..bc68439 100644
--- a/devapidocs/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html
+++ b/devapidocs/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html
@@ -503,7 +503,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>noMoreData</h4>
-<pre>protected void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.120">noMoreData</a>()</pre>
+<pre>protected void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.119">noMoreData</a>()</pre>
</li>
</ul>
<a name="postFinish--">
@@ -512,7 +512,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>postFinish</h4>
-<pre>protected void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.124">postFinish</a>()</pre>
+<pre>protected void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.123">postFinish</a>()</pre>
</li>
</ul>
<a name="shipEdits-org.apache.hadoop.hbase.replication.regionserver.WALEntryBatch-">
@@ -521,7 +521,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>shipEdits</h4>
-<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.130">shipEdits</a>(<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/WALEntryBatch.html" title="class in org.apache.hadoop.hbase.replication.regionserver">WALEntryBatch</a> entryBatch)</pre>
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.129">shipEdits</a>(<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/WALEntryBatch.html" title="class in org.apache.hadoop.hbase.replication.regionserver">WALEntryBatch</a> entryBatch)</pre>
<div class="block">Do the shipping logic</div>
</li>
</ul>
@@ -531,7 +531,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>cleanUpHFileRefs</h4>
-<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.200">cleanUpHFileRefs</a>(<a href="../../../../../../org/apache/hadoop/hbase/wal/WALEdit.html" title="class in org.apache.hadoop.hbase.wal">WALEdit</a> edit)
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.199">cleanUpHFileRefs</a>(<a href="../../../../../../org/apache/hadoop/hbase/wal/WALEdit.html" title="class in org.apache.hadoop.hbase.wal">WALEdit</a> edit)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -545,7 +545,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>updateLogPosition</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.224">updateLogPosition</a>(<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/WALEntryBatch.html" title="class in org.apache.hadoop.hbase.replication.regionserver">WALEntryBatch</a> batch)</pre>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.223">updateLogPosition</a>(<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/WALEntryBatch.html" title="class in org.apache.hadoop.hbase.replication.regionserver">WALEntryBatch</a> batch)</pre>
</li>
</ul>
<a name="startup-java.lang.Thread.UncaughtExceptionHandler-">
@@ -554,7 +554,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>startup</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.249">startup</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.UncaughtExceptionHandler.html?is-external=true" title="class or interface in java.lang">Thread.UncaughtExceptionHandler</a> handler)</pre>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.248">startup</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.UncaughtExceptionHandler.html?is-external=true" title="class or interface in java.lang">Thread.UncaughtExceptionHandler</a> handler)</pre>
</li>
</ul>
<a name="getCurrentPath--">
@@ -563,7 +563,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>getCurrentPath</h4>
-<pre>org.apache.hadoop.fs.Path <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.255">getCurrentPath</a>()</pre>
+<pre>org.apache.hadoop.fs.Path <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.254">getCurrentPath</a>()</pre>
</li>
</ul>
<a name="getCurrentPosition--">
@@ -572,7 +572,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>getCurrentPosition</h4>
-<pre>long <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.259">getCurrentPosition</a>()</pre>
+<pre>long <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.258">getCurrentPosition</a>()</pre>
</li>
</ul>
<a name="setWALReader-org.apache.hadoop.hbase.replication.regionserver.ReplicationSourceWALReader-">
@@ -581,7 +581,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>setWALReader</h4>
-<pre>void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.263">setWALReader</a>(<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html" title="class in org.apache.hadoop.hbase.replication.regionserver">ReplicationSourceWALReader</a> entryReader)</pre>
+<pre>void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.262">setWALReader</a>(<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html" title="class in org.apache.hadoop.hbase.replication.regionserver">ReplicationSourceWALReader</a> entryReader)</pre>
</li>
</ul>
<a name="getStartPosition--">
@@ -590,7 +590,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>getStartPosition</h4>
-<pre>long <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.267">getStartPosition</a>()</pre>
+<pre>long <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.266">getStartPosition</a>()</pre>
</li>
</ul>
<a name="isActive--">
@@ -599,7 +599,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>isActive</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.271">isActive</a>()</pre>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.270">isActive</a>()</pre>
</li>
</ul>
<a name="setWorkerState-org.apache.hadoop.hbase.replication.regionserver.ReplicationSourceShipper.WorkerState-">
@@ -608,7 +608,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>setWorkerState</h4>
-<pre>protected final void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.275">setWorkerState</a>(<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.WorkerState.html" title="enum in org.apache.hadoop.hbase.replication.regionserver">ReplicationSourceShipper.WorkerState</a> state)</pre>
+<pre>protected final void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.274">setWorkerState</a>(<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.WorkerState.html" title="enum in org.apache.hadoop.hbase.replication.regionserver">ReplicationSourceShipper.WorkerState</a> state)</pre>
</li>
</ul>
<a name="stopWorker--">
@@ -617,7 +617,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>stopWorker</h4>
-<pre>void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.279">stopWorker</a>()</pre>
+<pre>void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.278">stopWorker</a>()</pre>
</li>
</ul>
<a name="isFinished--">
@@ -626,7 +626,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>isFinished</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.283">isFinished</a>()</pre>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.282">isFinished</a>()</pre>
</li>
</ul>
<a name="sleepForRetries-java.lang.String-int-">
@@ -635,7 +635,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockListLast">
<li class="blockList">
<h4>sleepForRetries</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.293">sleepForRetries</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> msg,
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html#line.292">sleepForRetries</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> msg,
int sleepMultiplier)</pre>
<div class="block">Do the sleeping logic</div>
<dl>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/devapidocs/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html b/devapidocs/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html
index 5959408..6020731 100644
--- a/devapidocs/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html
+++ b/devapidocs/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html
@@ -589,7 +589,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>addEntryToBatch</h4>
-<pre>protected final boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.162">addEntryToBatch</a>(<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/WALEntryBatch.html" title="class in org.apache.hadoop.hbase.replication.regionserver">WALEntryBatch</a> batch,
+<pre>protected final boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.166">addEntryToBatch</a>(<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/WALEntryBatch.html" title="class in org.apache.hadoop.hbase.replication.regionserver">WALEntryBatch</a> batch,
<a href="../../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a> entry)</pre>
</li>
</ul>
@@ -599,7 +599,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>switched</h4>
-<pre>protected static final boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.176">switched</a>(<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/WALEntryStream.html" title="class in org.apache.hadoop.hbase.replication.regionserver">WALEntryStream</a> entryStream,
+<pre>protected static final boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.180">switched</a>(<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/WALEntryStream.html" title="class in org.apache.hadoop.hbase.replication.regionserver">WALEntryStream</a> entryStream,
org.apache.hadoop.fs.Path path)</pre>
</li>
</ul>
@@ -609,7 +609,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>readWALEntries</h4>
-<pre>protected <a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/WALEntryBatch.html" title="class in org.apache.hadoop.hbase.replication.regionserver">WALEntryBatch</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.181">readWALEntries</a>(<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/WALEntryStream.html" title="class in org.apache.hadoop.hbase.replication.regionserver">WALEntryStream</a> entryStream)
+<pre>protected <a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/WALEntryBatch.html" title="class in org.apache.hadoop.hbase.replication.regionserver">WALEntryBatch</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.185">readWALEntries</a>(<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/WALEntryStream.html" title="class in org.apache.hadoop.hbase.replication.regionserver">WALEntryStream</a> entryStream)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></pre>
<dl>
@@ -625,7 +625,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>handleEmptyWALEntryBatch</h4>
-<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.223">handleEmptyWALEntryBatch</a>(org.apache.hadoop.fs.Path currentPath)
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.227">handleEmptyWALEntryBatch</a>(org.apache.hadoop.fs.Path currentPath)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -639,7 +639,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>handleEofException</h4>
-<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.238">handleEofException</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a> e)</pre>
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.242">handleEofException</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a> e)</pre>
</li>
</ul>
<a name="getCurrentPath--">
@@ -648,7 +648,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>getCurrentPath</h4>
-<pre>public org.apache.hadoop.fs.Path <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.253">getCurrentPath</a>()</pre>
+<pre>public org.apache.hadoop.fs.Path <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.257">getCurrentPath</a>()</pre>
</li>
</ul>
<a name="checkQuota--">
@@ -657,7 +657,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>checkQuota</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.264">checkQuota</a>()</pre>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.268">checkQuota</a>()</pre>
</li>
</ul>
<a name="createBatch-org.apache.hadoop.hbase.replication.regionserver.WALEntryStream-">
@@ -666,7 +666,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>createBatch</h4>
-<pre>protected final <a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/WALEntryBatch.html" title="class in org.apache.hadoop.hbase.replication.regionserver">WALEntryBatch</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.273">createBatch</a>(<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/WALEntryStream.html" title="class in org.apache.hadoop.hbase.replication.regionserver">WALEntryStream</a> entryStream)</pre>
+<pre>protected final <a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/WALEntryBatch.html" title="class in org.apache.hadoop.hbase.replication.regionserver">WALEntryBatch</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.277">createBatch</a>(<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/WALEntryStream.html" title="class in org.apache.hadoop.hbase.replication.regionserver">WALEntryStream</a> entryStream)</pre>
</li>
</ul>
<a name="filterEntry-org.apache.hadoop.hbase.wal.WAL.Entry-">
@@ -675,7 +675,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>filterEntry</h4>
-<pre>protected final <a href="../../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.277">filterEntry</a>(<a href="../../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a> entry)</pre>
+<pre>protected final <a href="../../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.281">filterEntry</a>(<a href="../../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a> entry)</pre>
</li>
</ul>
<a name="take--">
@@ -684,7 +684,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>take</h4>
-<pre>public <a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/WALEntryBatch.html" title="class in org.apache.hadoop.hbase.replication.regionserver">WALEntryBatch</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.291">take</a>()
+<pre>public <a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/WALEntryBatch.html" title="class in org.apache.hadoop.hbase.replication.regionserver">WALEntryBatch</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.295">take</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></pre>
<div class="block">Retrieves the next batch of WAL entries from the queue, waiting up to the specified time for a
batch to become available</div>
@@ -702,7 +702,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>getEntrySize</h4>
-<pre>private long <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.295">getEntrySize</a>(<a href="../../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a> entry)</pre>
+<pre>private long <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.299">getEntrySize</a>(<a href="../../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a> entry)</pre>
</li>
</ul>
<a name="updateBatchStats-org.apache.hadoop.hbase.replication.regionserver.WALEntryBatch-org.apache.hadoop.hbase.wal.WAL.Entry-long-">
@@ -711,7 +711,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>updateBatchStats</h4>
-<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.300">updateBatchStats</a>(<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/WALEntryBatch.html" title="class in org.apache.hadoop.hbase.replication.regionserver">WALEntryBatch</a> batch,
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.304">updateBatchStats</a>(<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/WALEntryBatch.html" title="class in org.apache.hadoop.hbase.replication.regionserver">WALEntryBatch</a> batch,
<a href="../../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a> entry,
long entrySize)</pre>
</li>
@@ -722,7 +722,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>countDistinctRowKeysAndHFiles</h4>
-<pre>private <a href="../../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.314">countDistinctRowKeysAndHFiles</a>(<a href="../../../../../../org/apache/hadoop/hbase/wal/WALEdit.html" title="class in org.apache.hadoop.hbase.wal">WALEdit</a> edit)</pre>
+<pre>private <a href="../../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.318">countDistinctRowKeysAndHFiles</a>(<a href="../../../../../../org/apache/hadoop/hbase/wal/WALEdit.html" title="class in org.apache.hadoop.hbase.wal">WALEdit</a> edit)</pre>
<div class="block">Count the number of different row keys in the given edit because of mini-batching. We assume
that there's at least one Cell in the WALEdit.</div>
<dl>
@@ -739,7 +739,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>calculateTotalSizeOfStoreFiles</h4>
-<pre>private int <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.352">calculateTotalSizeOfStoreFiles</a>(<a href="../../../../../../org/apache/hadoop/hbase/wal/WALEdit.html" title="class in org.apache.hadoop.hbase.wal">WALEdit</a> edit)</pre>
+<pre>private int <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.356">calculateTotalSizeOfStoreFiles</a>(<a href="../../../../../../org/apache/hadoop/hbase/wal/WALEdit.html" title="class in org.apache.hadoop.hbase.wal">WALEdit</a> edit)</pre>
<div class="block">Calculate the total size of all the store files</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -755,7 +755,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>acquireBufferQuota</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.382">acquireBufferQuota</a>(long size)</pre>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.386">acquireBufferQuota</a>(long size)</pre>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>size</code> - delta size for grown buffer</dd>
@@ -770,7 +770,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>isReaderRunning</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.389">isReaderRunning</a>()</pre>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.393">isReaderRunning</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>whether the reader thread is running</dd>
@@ -783,7 +783,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockListLast">
<li class="blockList">
<h4>setReaderRunning</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.396">setReaderRunning</a>(boolean readerRunning)</pre>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html#line.400">setReaderRunning</a>(boolean readerRunning)</pre>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>readerRunning</code> - the readerRunning to set</dd>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html b/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html
index f8e886a..7e454b1 100644
--- a/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html
+++ b/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>private class <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.676">RSGroupInfoManagerImpl.FailedOpenUpdaterThread</a>
+<pre>private class <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.680">RSGroupInfoManagerImpl.FailedOpenUpdaterThread</a>
extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true" title="class or interface in java.lang">Thread</a>
implements <a href="../../../../../org/apache/hadoop/hbase/master/ServerListener.html" title="interface in org.apache.hadoop.hbase.master">ServerListener</a></pre>
</li>
@@ -267,7 +267,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/ServerListener
<ul class="blockList">
<li class="blockList">
<h4>waitInterval</h4>
-<pre>private final long <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html#line.677">waitInterval</a></pre>
+<pre>private final long <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html#line.681">waitInterval</a></pre>
</li>
</ul>
<a name="hasChanged">
@@ -276,7 +276,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/ServerListener
<ul class="blockListLast">
<li class="blockList">
<h4>hasChanged</h4>
-<pre>private volatile boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html#line.678">hasChanged</a></pre>
+<pre>private volatile boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html#line.682">hasChanged</a></pre>
</li>
</ul>
</li>
@@ -293,7 +293,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/ServerListener
<ul class="blockListLast">
<li class="blockList">
<h4>FailedOpenUpdaterThread</h4>
-<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html#line.680">FailedOpenUpdaterThread</a>(org.apache.hadoop.conf.Configuration conf)</pre>
+<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html#line.684">FailedOpenUpdaterThread</a>(org.apache.hadoop.conf.Configuration conf)</pre>
</li>
</ul>
</li>
@@ -310,7 +310,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/ServerListener
<ul class="blockList">
<li class="blockList">
<h4>serverAdded</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html#line.687">serverAdded</a>(<a href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> serverName)</pre>
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html#line.691">serverAdded</a>(<a href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> serverName)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from interface: <code><a href="../../../../../org/apache/hadoop/hbase/master/ServerListener.html#serverAdded-org.apache.hadoop.hbase.ServerName-">ServerListener</a></code></span></div>
<div class="block">The server has joined the cluster.</div>
<dl>
@@ -327,7 +327,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/ServerListener
<ul class="blockList">
<li class="blockList">
<h4>serverRemoved</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html#line.692">serverRemoved</a>(<a href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> serverName)</pre>
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html#line.696">serverRemoved</a>(<a href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> serverName)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from interface: <code><a href="../../../../../org/apache/hadoop/hbase/master/ServerListener.html#serverRemoved-org.apache.hadoop.hbase.ServerName-">ServerListener</a></code></span></div>
<div class="block">The server was removed from the cluster.</div>
<dl>
@@ -344,7 +344,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/ServerListener
<ul class="blockList">
<li class="blockList">
<h4>run</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html#line.696">run</a>()</pre>
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html#line.700">run</a>()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true#run--" title="class or interface in java.lang">run</a></code> in interface <code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true" title="class or interface in java.lang">Runnable</a></code></dd>
@@ -359,7 +359,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/ServerListener
<ul class="blockListLast">
<li class="blockList">
<h4>serverChanged</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html#line.729">serverChanged</a>()</pre>
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html#line.733">serverChanged</a>()</pre>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html b/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html
index e5ebafd..2d3a41a 100644
--- a/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html
+++ b/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>private class <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.737">RSGroupInfoManagerImpl.RSGroupStartupWorker</a>
+<pre>private class <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.741">RSGroupInfoManagerImpl.RSGroupStartupWorker</a>
extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true" title="class or interface in java.lang">Thread</a></pre>
</li>
</ul>
@@ -255,7 +255,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>LOG</h4>
-<pre>private final org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html#line.738">LOG</a></pre>
+<pre>private final org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html#line.742">LOG</a></pre>
</li>
</ul>
<a name="online">
@@ -264,7 +264,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockListLast">
<li class="blockList">
<h4>online</h4>
-<pre>private volatile boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html#line.739">online</a></pre>
+<pre>private volatile boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html#line.743">online</a></pre>
</li>
</ul>
</li>
@@ -281,7 +281,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockListLast">
<li class="blockList">
<h4>RSGroupStartupWorker</h4>
-<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html#line.741">RSGroupStartupWorker</a>()</pre>
+<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html#line.745">RSGroupStartupWorker</a>()</pre>
</li>
</ul>
</li>
@@ -298,7 +298,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>run</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html#line.746">run</a>()</pre>
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html#line.750">run</a>()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true#run--" title="class or interface in java.lang">run</a></code> in interface <code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true" title="class or interface in java.lang">Runnable</a></code></dd>
@@ -313,7 +313,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>waitForGroupTableOnline</h4>
-<pre>private boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html#line.753">waitForGroupTableOnline</a>()</pre>
+<pre>private boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html#line.757">waitForGroupTableOnline</a>()</pre>
</li>
</ul>
<a name="createRSGroupTable--">
@@ -322,7 +322,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockList">
<li class="blockList">
<h4>createRSGroupTable</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html#line.862">createRSGroupTable</a>()
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html#line.866">createRSGroupTable</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -336,7 +336,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockListLast">
<li class="blockList">
<h4>isOnline</h4>
-<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html#line.887">isOnline</a>()</pre>
+<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.RSGroupStartupWorker.html#line.891">isOnline</a>()</pre>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html b/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html
index 2be0b3c..70df792 100644
--- a/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html
+++ b/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>private class <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.623">RSGroupInfoManagerImpl.ServerEventsListenerThread</a>
+<pre>private class <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.627">RSGroupInfoManagerImpl.ServerEventsListenerThread</a>
extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true" title="class or interface in java.lang">Thread</a>
implements <a href="../../../../../org/apache/hadoop/hbase/master/ServerListener.html" title="interface in org.apache.hadoop.hbase.master">ServerListener</a></pre>
<div class="block">Calls <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#updateDefaultServers-java.util.SortedSet-"><code>RSGroupInfoManagerImpl.updateDefaultServers(SortedSet)</code></a> to update list of known
@@ -271,7 +271,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/ServerListener
<ul class="blockList">
<li class="blockList">
<h4>LOG</h4>
-<pre>private final org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html#line.624">LOG</a></pre>
+<pre>private final org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html#line.628">LOG</a></pre>
</li>
</ul>
<a name="changed">
@@ -280,7 +280,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/ServerListener
<ul class="blockListLast">
<li class="blockList">
<h4>changed</h4>
-<pre>private boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html#line.625">changed</a></pre>
+<pre>private boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html#line.629">changed</a></pre>
</li>
</ul>
</li>
@@ -297,7 +297,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/ServerListener
<ul class="blockListLast">
<li class="blockList">
<h4>ServerEventsListenerThread</h4>
-<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html#line.627">ServerEventsListenerThread</a>()</pre>
+<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html#line.631">ServerEventsListenerThread</a>()</pre>
</li>
</ul>
</li>
@@ -314,7 +314,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/ServerListener
<ul class="blockList">
<li class="blockList">
<h4>serverAdded</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html#line.632">serverAdded</a>(<a href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> serverName)</pre>
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html#line.636">serverAdded</a>(<a href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> serverName)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from interface: <code><a href="../../../../../org/apache/hadoop/hbase/master/ServerListener.html#serverAdded-org.apache.hadoop.hbase.ServerName-">ServerListener</a></code></span></div>
<div class="block">The server has joined the cluster.</div>
<dl>
@@ -331,7 +331,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/ServerListener
<ul class="blockList">
<li class="blockList">
<h4>serverRemoved</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html#line.637">serverRemoved</a>(<a href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> serverName)</pre>
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html#line.641">serverRemoved</a>(<a href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> serverName)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from interface: <code><a href="../../../../../org/apache/hadoop/hbase/master/ServerListener.html#serverRemoved-org.apache.hadoop.hbase.ServerName-">ServerListener</a></code></span></div>
<div class="block">The server was removed from the cluster.</div>
<dl>
@@ -348,7 +348,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/ServerListener
<ul class="blockList">
<li class="blockList">
<h4>serverChanged</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html#line.641">serverChanged</a>()</pre>
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html#line.645">serverChanged</a>()</pre>
</li>
</ul>
<a name="run--">
@@ -357,7 +357,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/ServerListener
<ul class="blockListLast">
<li class="blockList">
<h4>run</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html#line.647">run</a>()</pre>
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html#line.651">run</a>()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true#run--" title="class or interface in java.lang">run</a></code> in interface <code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true" title="class or interface in java.lang">Runnable</a></code></dd>
[03/12] hbase-site git commit: Published site at
773aff90fdf9edf4687b373d1c7ba859d166a437.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
index 77c24c6..ca2f60e 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
@@ -253,10 +253,10 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestWithCellVisibilityLoadAndVerify.Counters</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Generator.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Generator.Counts</span></a></li>
<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Verify.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Verify.Counts</span></a></li>
<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestLoadAndVerify.Counters</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestWithCellVisibilityLoadAndVerify.Counters</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Generator.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Generator.Counts</span></a></li>
</ul>
</li>
</ul>
[11/12] hbase-site git commit: Published site at
773aff90fdf9edf4687b373d1c7ba859d166a437.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html b/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html
index 1821bc9..1b859fb 100644
--- a/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html
+++ b/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html
@@ -899,7 +899,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfoMa
<ul class="blockList">
<li class="blockList">
<h4>refresh</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.376">refresh</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.380">refresh</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from interface: <code><a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfoManager.html#refresh--">RSGroupInfoManager</a></code></span></div>
<div class="block">Refresh/reload the group information from the persistent store</div>
@@ -917,7 +917,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfoMa
<ul class="blockList">
<li class="blockList">
<h4>refresh</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.384">refresh</a>(boolean forceOnline)
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.388">refresh</a>(boolean forceOnline)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Read rsgroup info from the source of truth, the hbase:rsgroup table.
Update zk cache. Called on startup of the manager.</div>
@@ -933,7 +933,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfoMa
<ul class="blockList">
<li class="blockList">
<h4>flushConfigTable</h4>
-<pre>private <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.436">flushConfigTable</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfo.html" title="class in org.apache.hadoop.hbase.rsgroup">RSGroupInfo</a>> groupMap)
+<pre>private <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.440">flushConfigTable</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfo.html" title="class in org.apache.hadoop.hbase.rsgroup">RSGroupInfo</a>> groupMap)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -947,7 +947,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfoMa
<ul class="blockList">
<li class="blockList">
<h4>flushConfig</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.466">flushConfig</a>()
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.470">flushConfig</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -961,7 +961,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfoMa
<ul class="blockList">
<li class="blockList">
<h4>flushConfig</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.471">flushConfig</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfo.html" title="class in org.apache.hadoop.hbase.rsgroup">RSGroupInfo</a>> newGroupMap)
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.475">flushConfig</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfo.html" title="class in org.apache.hadoop.hbase.rsgroup">RSGroupInfo</a>> newGroupMap)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -975,7 +975,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfoMa
<ul class="blockList">
<li class="blockList">
<h4>resetRSGroupAndTableMaps</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.532">resetRSGroupAndTableMaps</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfo.html" title="class in org.apache.hadoop.hbase.rsgroup">RSGroupInfo</a>> newRSGroupMap,
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.536">resetRSGroupAndTableMaps</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfo.html" title="class in org.apache.hadoop.hbase.rsgroup">RSGroupInfo</a>> newRSGroupMap,
<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> newTableMap)</pre>
<div class="block">Make changes visible.
Caller must be synchronized on 'this'.</div>
@@ -987,7 +987,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfoMa
<ul class="blockList">
<li class="blockList">
<h4>updateCacheOfRSGroups</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.544">updateCacheOfRSGroups</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> currentGroups)</pre>
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.548">updateCacheOfRSGroups</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>> currentGroups)</pre>
<div class="block">Update cache of rsgroups.
Caller must be synchronized on 'this'.</div>
<dl>
@@ -1002,7 +1002,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfoMa
<ul class="blockList">
<li class="blockList">
<h4>getOnlineRS</h4>
-<pre>private <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.550">getOnlineRS</a>()
+<pre>private <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.554">getOnlineRS</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -1016,7 +1016,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfoMa
<ul class="blockList">
<li class="blockList">
<h4>getDefaultServers</h4>
-<pre>private <a href="https://docs.oracle.com/javase/8/docs/api/java/util/SortedSet.html?is-external=true" title="class or interface in java.util">SortedSet</a><<a href="../../../../../org/apache/hadoop/hbase/net/Address.html" title="class in org.apache.hadoop.hbase.net">Address</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.567">getDefaultServers</a>()
+<pre>private <a href="https://docs.oracle.com/javase/8/docs/api/java/util/SortedSet.html?is-external=true" title="class or interface in java.util">SortedSet</a><<a href="../../../../../org/apache/hadoop/hbase/net/Address.html" title="class in org.apache.hadoop.hbase.net">Address</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.571">getDefaultServers</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -1030,7 +1030,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfoMa
<ul class="blockList">
<li class="blockList">
<h4>updateDefaultServers</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.589">updateDefaultServers</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/SortedSet.html?is-external=true" title="class or interface in java.util">SortedSet</a><<a href="../../../../../org/apache/hadoop/hbase/net/Address.html" title="class in org.apache.hadoop.hbase.net">Address</a>> servers)
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.593">updateDefaultServers</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/SortedSet.html?is-external=true" title="class or interface in java.util">SortedSet</a><<a href="../../../../../org/apache/hadoop/hbase/net/Address.html" title="class in org.apache.hadoop.hbase.net">Address</a>> servers)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -1044,7 +1044,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfoMa
<ul class="blockList">
<li class="blockList">
<h4>updateFailedAssignments</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.598">updateFailedAssignments</a>()</pre>
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.602">updateFailedAssignments</a>()</pre>
</li>
</ul>
<a name="isMasterRunning-org.apache.hadoop.hbase.master.MasterServices-">
@@ -1053,7 +1053,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfoMa
<ul class="blockList">
<li class="blockList">
<h4>isMasterRunning</h4>
-<pre>private static boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.892">isMasterRunning</a>(<a href="../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a> masterServices)</pre>
+<pre>private static boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.896">isMasterRunning</a>(<a href="../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a> masterServices)</pre>
</li>
</ul>
<a name="multiMutate-java.util.List-">
@@ -1062,7 +1062,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfoMa
<ul class="blockList">
<li class="blockList">
<h4>multiMutate</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.896">multiMutate</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/hadoop/hbase/client/Mutation.html" title="class in org.apache.hadoop.hbase.client">Mutation</a>> mutations)
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.900">multiMutate</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/hadoop/hbase/client/Mutation.html" title="class in org.apache.hadoop.hbase.client">Mutation</a>> mutations)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -1076,7 +1076,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfoMa
<ul class="blockListLast">
<li class="blockList">
<h4>checkGroupName</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.925">checkGroupName</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> groupName)
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html#line.929">checkGroupName</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> groupName)
throws <a href="../../../../../org/apache/hadoop/hbase/constraint/ConstraintException.html" title="class in org.apache.hadoop.hbase.constraint">ConstraintException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
index 01f53ff..bb27134 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
@@ -16,11 +16,11 @@
<span class="sourceLineNo">008</span>@InterfaceAudience.Private<a name="line.8"></a>
<span class="sourceLineNo">009</span>public class Version {<a name="line.9"></a>
<span class="sourceLineNo">010</span> public static final String version = "3.0.0-SNAPSHOT";<a name="line.10"></a>
-<span class="sourceLineNo">011</span> public static final String revision = "125767b44e93f1094b77a6cf8c2a5ca19b5cabd2";<a name="line.11"></a>
+<span class="sourceLineNo">011</span> public static final String revision = "773aff90fdf9edf4687b373d1c7ba859d166a437";<a name="line.11"></a>
<span class="sourceLineNo">012</span> public static final String user = "jenkins";<a name="line.12"></a>
-<span class="sourceLineNo">013</span> public static final String date = "Sun Apr 15 14:39:34 UTC 2018";<a name="line.13"></a>
+<span class="sourceLineNo">013</span> public static final String date = "Mon Apr 16 14:39:11 UTC 2018";<a name="line.13"></a>
<span class="sourceLineNo">014</span> public static final String url = "git://jenkins-websites1.apache.org/home/jenkins/jenkins-slave/workspace/hbase_generate_website/hbase";<a name="line.14"></a>
-<span class="sourceLineNo">015</span> public static final String srcChecksum = "0e82933325241f67aa5a3d17fe3f63a2";<a name="line.15"></a>
+<span class="sourceLineNo">015</span> public static final String srcChecksum = "83e5500271237f8b8d44991e5fb13ecd";<a name="line.15"></a>
<span class="sourceLineNo">016</span>}<a name="line.16"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/devapidocs/src-html/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html b/devapidocs/src-html/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html
index 4b58424..0e38344 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.html
@@ -143,234 +143,238 @@
<span class="sourceLineNo">135</span> LOG.debug("Checking for aborted procedures on node: '" + zkController.getAbortZnode() + "'");<a name="line.135"></a>
<span class="sourceLineNo">136</span> try {<a name="line.136"></a>
<span class="sourceLineNo">137</span> // this is the list of the currently aborted procedues<a name="line.137"></a>
-<span class="sourceLineNo">138</span> for (String node : ZKUtil.listChildrenAndWatchForNewChildren(zkController.getWatcher(),<a name="line.138"></a>
-<span class="sourceLineNo">139</span> zkController.getAbortZnode())) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span> String abortNode = ZNodePaths.joinZNode(zkController.getAbortZnode(), node);<a name="line.140"></a>
-<span class="sourceLineNo">141</span> abort(abortNode);<a name="line.141"></a>
+<span class="sourceLineNo">138</span> List<String> children = ZKUtil.listChildrenAndWatchForNewChildren(zkController.getWatcher(),<a name="line.138"></a>
+<span class="sourceLineNo">139</span> zkController.getAbortZnode());<a name="line.139"></a>
+<span class="sourceLineNo">140</span> if (children == null || children.isEmpty()) {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> return;<a name="line.141"></a>
<span class="sourceLineNo">142</span> }<a name="line.142"></a>
-<span class="sourceLineNo">143</span> } catch (KeeperException e) {<a name="line.143"></a>
-<span class="sourceLineNo">144</span> member.controllerConnectionFailure("Failed to list children for abort node:"<a name="line.144"></a>
-<span class="sourceLineNo">145</span> + zkController.getAbortZnode(), e, null);<a name="line.145"></a>
-<span class="sourceLineNo">146</span> }<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> private void waitForNewProcedures() {<a name="line.149"></a>
-<span class="sourceLineNo">150</span> // watch for new procedues that we need to start subprocedures for<a name="line.150"></a>
-<span class="sourceLineNo">151</span> LOG.debug("Looking for new procedures under znode:'" + zkController.getAcquiredBarrier() + "'");<a name="line.151"></a>
-<span class="sourceLineNo">152</span> List<String> runningProcedures = null;<a name="line.152"></a>
-<span class="sourceLineNo">153</span> try {<a name="line.153"></a>
-<span class="sourceLineNo">154</span> runningProcedures = ZKUtil.listChildrenAndWatchForNewChildren(zkController.getWatcher(),<a name="line.154"></a>
-<span class="sourceLineNo">155</span> zkController.getAcquiredBarrier());<a name="line.155"></a>
-<span class="sourceLineNo">156</span> if (runningProcedures == null) {<a name="line.156"></a>
-<span class="sourceLineNo">157</span> LOG.debug("No running procedures.");<a name="line.157"></a>
-<span class="sourceLineNo">158</span> return;<a name="line.158"></a>
-<span class="sourceLineNo">159</span> }<a name="line.159"></a>
-<span class="sourceLineNo">160</span> } catch (KeeperException e) {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> member.controllerConnectionFailure("General failure when watching for new procedures",<a name="line.161"></a>
-<span class="sourceLineNo">162</span> e, null);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> }<a name="line.163"></a>
-<span class="sourceLineNo">164</span> if (runningProcedures == null) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> LOG.debug("No running procedures.");<a name="line.165"></a>
-<span class="sourceLineNo">166</span> return;<a name="line.166"></a>
+<span class="sourceLineNo">143</span> for (String node : children) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> String abortNode = ZNodePaths.joinZNode(zkController.getAbortZnode(), node);<a name="line.144"></a>
+<span class="sourceLineNo">145</span> abort(abortNode);<a name="line.145"></a>
+<span class="sourceLineNo">146</span> }<a name="line.146"></a>
+<span class="sourceLineNo">147</span> } catch (KeeperException e) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> member.controllerConnectionFailure("Failed to list children for abort node:"<a name="line.148"></a>
+<span class="sourceLineNo">149</span> + zkController.getAbortZnode(), e, null);<a name="line.149"></a>
+<span class="sourceLineNo">150</span> }<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> private void waitForNewProcedures() {<a name="line.153"></a>
+<span class="sourceLineNo">154</span> // watch for new procedues that we need to start subprocedures for<a name="line.154"></a>
+<span class="sourceLineNo">155</span> LOG.debug("Looking for new procedures under znode:'" + zkController.getAcquiredBarrier() + "'");<a name="line.155"></a>
+<span class="sourceLineNo">156</span> List<String> runningProcedures = null;<a name="line.156"></a>
+<span class="sourceLineNo">157</span> try {<a name="line.157"></a>
+<span class="sourceLineNo">158</span> runningProcedures = ZKUtil.listChildrenAndWatchForNewChildren(zkController.getWatcher(),<a name="line.158"></a>
+<span class="sourceLineNo">159</span> zkController.getAcquiredBarrier());<a name="line.159"></a>
+<span class="sourceLineNo">160</span> if (runningProcedures == null) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span> LOG.debug("No running procedures.");<a name="line.161"></a>
+<span class="sourceLineNo">162</span> return;<a name="line.162"></a>
+<span class="sourceLineNo">163</span> }<a name="line.163"></a>
+<span class="sourceLineNo">164</span> } catch (KeeperException e) {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> member.controllerConnectionFailure("General failure when watching for new procedures",<a name="line.165"></a>
+<span class="sourceLineNo">166</span> e, null);<a name="line.166"></a>
<span class="sourceLineNo">167</span> }<a name="line.167"></a>
-<span class="sourceLineNo">168</span> for (String procName : runningProcedures) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span> // then read in the procedure information<a name="line.169"></a>
-<span class="sourceLineNo">170</span> String path = ZNodePaths.joinZNode(zkController.getAcquiredBarrier(), procName);<a name="line.170"></a>
-<span class="sourceLineNo">171</span> startNewSubprocedure(path);<a name="line.171"></a>
-<span class="sourceLineNo">172</span> }<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> * Kick off a new sub-procedure on the listener with the data stored in the passed znode.<a name="line.176"></a>
-<span class="sourceLineNo">177</span> * <p><a name="line.177"></a>
-<span class="sourceLineNo">178</span> * Will attempt to create the same procedure multiple times if an procedure znode with the same<a name="line.178"></a>
-<span class="sourceLineNo">179</span> * name is created. It is left up the coordinator to ensure this doesn't occur.<a name="line.179"></a>
-<span class="sourceLineNo">180</span> * @param path full path to the znode for the procedure to start<a name="line.180"></a>
-<span class="sourceLineNo">181</span> */<a name="line.181"></a>
-<span class="sourceLineNo">182</span> private synchronized void startNewSubprocedure(String path) {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> LOG.debug("Found procedure znode: " + path);<a name="line.183"></a>
-<span class="sourceLineNo">184</span> String opName = ZKUtil.getNodeName(path);<a name="line.184"></a>
-<span class="sourceLineNo">185</span> // start watching for an abort notification for the procedure<a name="line.185"></a>
-<span class="sourceLineNo">186</span> String abortZNode = zkController.getAbortZNode(opName);<a name="line.186"></a>
-<span class="sourceLineNo">187</span> try {<a name="line.187"></a>
-<span class="sourceLineNo">188</span> if (ZKUtil.watchAndCheckExists(zkController.getWatcher(), abortZNode)) {<a name="line.188"></a>
-<span class="sourceLineNo">189</span> LOG.debug("Not starting:" + opName + " because we already have an abort notification.");<a name="line.189"></a>
-<span class="sourceLineNo">190</span> return;<a name="line.190"></a>
-<span class="sourceLineNo">191</span> }<a name="line.191"></a>
-<span class="sourceLineNo">192</span> } catch (KeeperException e) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> member.controllerConnectionFailure("Failed to get the abort znode (" + abortZNode<a name="line.193"></a>
-<span class="sourceLineNo">194</span> + ") for procedure :" + opName, e, opName);<a name="line.194"></a>
-<span class="sourceLineNo">195</span> return;<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> // get the data for the procedure<a name="line.198"></a>
-<span class="sourceLineNo">199</span> Subprocedure subproc = null;<a name="line.199"></a>
-<span class="sourceLineNo">200</span> try {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> byte[] data = ZKUtil.getData(zkController.getWatcher(), path);<a name="line.201"></a>
-<span class="sourceLineNo">202</span> if (!ProtobufUtil.isPBMagicPrefix(data)) {<a name="line.202"></a>
-<span class="sourceLineNo">203</span> String msg = "Data in for starting procedure " + opName +<a name="line.203"></a>
-<span class="sourceLineNo">204</span> " is illegally formatted (no pb magic). " +<a name="line.204"></a>
-<span class="sourceLineNo">205</span> "Killing the procedure: " + Bytes.toString(data);<a name="line.205"></a>
-<span class="sourceLineNo">206</span> LOG.error(msg);<a name="line.206"></a>
-<span class="sourceLineNo">207</span> throw new IllegalArgumentException(msg);<a name="line.207"></a>
-<span class="sourceLineNo">208</span> }<a name="line.208"></a>
-<span class="sourceLineNo">209</span> LOG.debug("start proc data length is " + data.length);<a name="line.209"></a>
-<span class="sourceLineNo">210</span> data = Arrays.copyOfRange(data, ProtobufUtil.lengthOfPBMagic(), data.length);<a name="line.210"></a>
-<span class="sourceLineNo">211</span> LOG.debug("Found data for znode:" + path);<a name="line.211"></a>
-<span class="sourceLineNo">212</span> subproc = member.createSubprocedure(opName, data);<a name="line.212"></a>
-<span class="sourceLineNo">213</span> member.submitSubprocedure(subproc);<a name="line.213"></a>
-<span class="sourceLineNo">214</span> } catch (IllegalArgumentException iae ) {<a name="line.214"></a>
-<span class="sourceLineNo">215</span> LOG.error("Illegal argument exception", iae);<a name="line.215"></a>
-<span class="sourceLineNo">216</span> sendMemberAborted(subproc, new ForeignException(getMemberName(), iae));<a name="line.216"></a>
-<span class="sourceLineNo">217</span> } catch (IllegalStateException ise) {<a name="line.217"></a>
-<span class="sourceLineNo">218</span> LOG.error("Illegal state exception ", ise);<a name="line.218"></a>
-<span class="sourceLineNo">219</span> sendMemberAborted(subproc, new ForeignException(getMemberName(), ise));<a name="line.219"></a>
-<span class="sourceLineNo">220</span> } catch (KeeperException e) {<a name="line.220"></a>
-<span class="sourceLineNo">221</span> member.controllerConnectionFailure("Failed to get data for new procedure:" + opName,<a name="line.221"></a>
-<span class="sourceLineNo">222</span> e, opName);<a name="line.222"></a>
-<span class="sourceLineNo">223</span> } catch (InterruptedException e) {<a name="line.223"></a>
-<span class="sourceLineNo">224</span> member.controllerConnectionFailure("Failed to get data for new procedure:" + opName,<a name="line.224"></a>
-<span class="sourceLineNo">225</span> e, opName);<a name="line.225"></a>
-<span class="sourceLineNo">226</span> Thread.currentThread().interrupt();<a name="line.226"></a>
-<span class="sourceLineNo">227</span> }<a name="line.227"></a>
-<span class="sourceLineNo">228</span> }<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span> /**<a name="line.230"></a>
-<span class="sourceLineNo">231</span> * This attempts to create an acquired state znode for the procedure (snapshot name).<a name="line.231"></a>
-<span class="sourceLineNo">232</span> *<a name="line.232"></a>
-<span class="sourceLineNo">233</span> * It then looks for the reached znode to trigger in-barrier execution. If not present we<a name="line.233"></a>
-<span class="sourceLineNo">234</span> * have a watcher, if present then trigger the in-barrier action.<a name="line.234"></a>
-<span class="sourceLineNo">235</span> */<a name="line.235"></a>
-<span class="sourceLineNo">236</span> @Override<a name="line.236"></a>
-<span class="sourceLineNo">237</span> public void sendMemberAcquired(Subprocedure sub) throws IOException {<a name="line.237"></a>
-<span class="sourceLineNo">238</span> String procName = sub.getName();<a name="line.238"></a>
-<span class="sourceLineNo">239</span> try {<a name="line.239"></a>
-<span class="sourceLineNo">240</span> LOG.debug("Member: '" + memberName + "' joining acquired barrier for procedure (" + procName<a name="line.240"></a>
-<span class="sourceLineNo">241</span> + ") in zk");<a name="line.241"></a>
-<span class="sourceLineNo">242</span> String acquiredZNode = ZNodePaths.joinZNode(ZKProcedureUtil.getAcquireBarrierNode(<a name="line.242"></a>
-<span class="sourceLineNo">243</span> zkController, procName), memberName);<a name="line.243"></a>
-<span class="sourceLineNo">244</span> ZKUtil.createAndFailSilent(zkController.getWatcher(), acquiredZNode);<a name="line.244"></a>
-<span class="sourceLineNo">245</span><a name="line.245"></a>
-<span class="sourceLineNo">246</span> // watch for the complete node for this snapshot<a name="line.246"></a>
-<span class="sourceLineNo">247</span> String reachedBarrier = zkController.getReachedBarrierNode(procName);<a name="line.247"></a>
-<span class="sourceLineNo">248</span> LOG.debug("Watch for global barrier reached:" + reachedBarrier);<a name="line.248"></a>
-<span class="sourceLineNo">249</span> if (ZKUtil.watchAndCheckExists(zkController.getWatcher(), reachedBarrier)) {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> receivedReachedGlobalBarrier(reachedBarrier);<a name="line.250"></a>
-<span class="sourceLineNo">251</span> }<a name="line.251"></a>
-<span class="sourceLineNo">252</span> } catch (KeeperException e) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> member.controllerConnectionFailure("Failed to acquire barrier for procedure: "<a name="line.253"></a>
-<span class="sourceLineNo">254</span> + procName + " and member: " + memberName, e, procName);<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><a name="line.257"></a>
-<span class="sourceLineNo">258</span> /**<a name="line.258"></a>
-<span class="sourceLineNo">259</span> * This acts as the ack for a completed procedure<a name="line.259"></a>
-<span class="sourceLineNo">260</span> */<a name="line.260"></a>
-<span class="sourceLineNo">261</span> @Override<a name="line.261"></a>
-<span class="sourceLineNo">262</span> public void sendMemberCompleted(Subprocedure sub, byte[] data) throws IOException {<a name="line.262"></a>
-<span class="sourceLineNo">263</span> String procName = sub.getName();<a name="line.263"></a>
-<span class="sourceLineNo">264</span> LOG.debug("Marking procedure '" + procName + "' completed for member '" + memberName<a name="line.264"></a>
-<span class="sourceLineNo">265</span> + "' in zk");<a name="line.265"></a>
-<span class="sourceLineNo">266</span> String joinPath =<a name="line.266"></a>
-<span class="sourceLineNo">267</span> ZNodePaths.joinZNode(zkController.getReachedBarrierNode(procName), memberName);<a name="line.267"></a>
-<span class="sourceLineNo">268</span> // ProtobufUtil.prependPBMagic does not take care of null<a name="line.268"></a>
-<span class="sourceLineNo">269</span> if (data == null) {<a name="line.269"></a>
-<span class="sourceLineNo">270</span> data = new byte[0];<a name="line.270"></a>
-<span class="sourceLineNo">271</span> }<a name="line.271"></a>
-<span class="sourceLineNo">272</span> try {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> ZKUtil.createAndFailSilent(zkController.getWatcher(), joinPath,<a name="line.273"></a>
-<span class="sourceLineNo">274</span> ProtobufUtil.prependPBMagic(data));<a name="line.274"></a>
-<span class="sourceLineNo">275</span> } catch (KeeperException e) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span> member.controllerConnectionFailure("Failed to post zk node:" + joinPath<a name="line.276"></a>
-<span class="sourceLineNo">277</span> + " to join procedure barrier.", e, procName);<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> /**<a name="line.281"></a>
-<span class="sourceLineNo">282</span> * This should be called by the member and should write a serialized root cause exception as<a name="line.282"></a>
-<span class="sourceLineNo">283</span> * to the abort znode.<a name="line.283"></a>
-<span class="sourceLineNo">284</span> */<a name="line.284"></a>
-<span class="sourceLineNo">285</span> @Override<a name="line.285"></a>
-<span class="sourceLineNo">286</span> public void sendMemberAborted(Subprocedure sub, ForeignException ee) {<a name="line.286"></a>
-<span class="sourceLineNo">287</span> if (sub == null) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span> LOG.error("Failed due to null subprocedure", ee);<a name="line.288"></a>
-<span class="sourceLineNo">289</span> return;<a name="line.289"></a>
-<span class="sourceLineNo">290</span> }<a name="line.290"></a>
-<span class="sourceLineNo">291</span> String procName = sub.getName();<a name="line.291"></a>
-<span class="sourceLineNo">292</span> LOG.debug("Aborting procedure (" + procName + ") in zk");<a name="line.292"></a>
-<span class="sourceLineNo">293</span> String procAbortZNode = zkController.getAbortZNode(procName);<a name="line.293"></a>
-<span class="sourceLineNo">294</span> try {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> String source = (ee.getSource() == null) ? memberName: ee.getSource();<a name="line.295"></a>
-<span class="sourceLineNo">296</span> byte[] errorInfo = ProtobufUtil.prependPBMagic(ForeignException.serialize(source, ee));<a name="line.296"></a>
-<span class="sourceLineNo">297</span> ZKUtil.createAndFailSilent(zkController.getWatcher(), procAbortZNode, errorInfo);<a name="line.297"></a>
-<span class="sourceLineNo">298</span> LOG.debug("Finished creating abort znode:" + procAbortZNode);<a name="line.298"></a>
-<span class="sourceLineNo">299</span> } catch (KeeperException e) {<a name="line.299"></a>
-<span class="sourceLineNo">300</span> // possible that we get this error for the procedure if we already reset the zk state, but in<a name="line.300"></a>
-<span class="sourceLineNo">301</span> // that case we should still get an error for that procedure anyways<a name="line.301"></a>
-<span class="sourceLineNo">302</span> zkController.logZKTree(zkController.getBaseZnode());<a name="line.302"></a>
-<span class="sourceLineNo">303</span> member.controllerConnectionFailure("Failed to post zk node:" + procAbortZNode<a name="line.303"></a>
-<span class="sourceLineNo">304</span> + " to abort procedure", e, procName);<a name="line.304"></a>
-<span class="sourceLineNo">305</span> }<a name="line.305"></a>
-<span class="sourceLineNo">306</span> }<a name="line.306"></a>
-<span class="sourceLineNo">307</span><a name="line.307"></a>
-<span class="sourceLineNo">308</span> /**<a name="line.308"></a>
-<span class="sourceLineNo">309</span> * Pass along the found abort notification to the listener<a name="line.309"></a>
-<span class="sourceLineNo">310</span> * @param abortZNode full znode path to the failed procedure information<a name="line.310"></a>
-<span class="sourceLineNo">311</span> */<a name="line.311"></a>
-<span class="sourceLineNo">312</span> protected void abort(String abortZNode) {<a name="line.312"></a>
-<span class="sourceLineNo">313</span> LOG.debug("Aborting procedure member for znode " + abortZNode);<a name="line.313"></a>
-<span class="sourceLineNo">314</span> String opName = ZKUtil.getNodeName(abortZNode);<a name="line.314"></a>
-<span class="sourceLineNo">315</span> try {<a name="line.315"></a>
-<span class="sourceLineNo">316</span> byte[] data = ZKUtil.getData(zkController.getWatcher(), abortZNode);<a name="line.316"></a>
-<span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span> // figure out the data we need to pass<a name="line.318"></a>
-<span class="sourceLineNo">319</span> ForeignException ee;<a name="line.319"></a>
-<span class="sourceLineNo">320</span> try {<a name="line.320"></a>
-<span class="sourceLineNo">321</span> if (data == null || data.length == 0) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span> // ignore<a name="line.322"></a>
-<span class="sourceLineNo">323</span> return;<a name="line.323"></a>
-<span class="sourceLineNo">324</span> } else if (!ProtobufUtil.isPBMagicPrefix(data)) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> String msg = "Illegally formatted data in abort node for proc " + opName<a name="line.325"></a>
-<span class="sourceLineNo">326</span> + ". Killing the procedure.";<a name="line.326"></a>
-<span class="sourceLineNo">327</span> LOG.error(msg);<a name="line.327"></a>
-<span class="sourceLineNo">328</span> // we got a remote exception, but we can't describe it so just return exn from here<a name="line.328"></a>
-<span class="sourceLineNo">329</span> ee = new ForeignException(getMemberName(), new IllegalArgumentException(msg));<a name="line.329"></a>
-<span class="sourceLineNo">330</span> } else {<a name="line.330"></a>
-<span class="sourceLineNo">331</span> data = Arrays.copyOfRange(data, ProtobufUtil.lengthOfPBMagic(), data.length);<a name="line.331"></a>
-<span class="sourceLineNo">332</span> ee = ForeignException.deserialize(data);<a name="line.332"></a>
-<span class="sourceLineNo">333</span> }<a name="line.333"></a>
-<span class="sourceLineNo">334</span> } catch (IOException e) {<a name="line.334"></a>
-<span class="sourceLineNo">335</span> LOG.warn("Got an error notification for op:" + opName<a name="line.335"></a>
-<span class="sourceLineNo">336</span> + " but we can't read the information. Killing the procedure.");<a name="line.336"></a>
-<span class="sourceLineNo">337</span> // we got a remote exception, but we can't describe it so just return exn from here<a name="line.337"></a>
-<span class="sourceLineNo">338</span> ee = new ForeignException(getMemberName(), e);<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>
-<span class="sourceLineNo">341</span> this.member.receiveAbortProcedure(opName, ee);<a name="line.341"></a>
-<span class="sourceLineNo">342</span> } catch (KeeperException e) {<a name="line.342"></a>
-<span class="sourceLineNo">343</span> member.controllerConnectionFailure("Failed to get data for abort znode:" + abortZNode<a name="line.343"></a>
-<span class="sourceLineNo">344</span> + zkController.getAbortZnode(), e, opName);<a name="line.344"></a>
-<span class="sourceLineNo">345</span> } catch (InterruptedException e) {<a name="line.345"></a>
-<span class="sourceLineNo">346</span> LOG.warn("abort already in progress", e);<a name="line.346"></a>
-<span class="sourceLineNo">347</span> Thread.currentThread().interrupt();<a name="line.347"></a>
-<span class="sourceLineNo">348</span> }<a name="line.348"></a>
-<span class="sourceLineNo">349</span> }<a name="line.349"></a>
-<span class="sourceLineNo">350</span><a name="line.350"></a>
-<span class="sourceLineNo">351</span> @Override<a name="line.351"></a>
-<span class="sourceLineNo">352</span> public void start(final String memberName, final ProcedureMember listener) {<a name="line.352"></a>
-<span class="sourceLineNo">353</span> LOG.debug("Starting procedure member '" + memberName + "'");<a name="line.353"></a>
-<span class="sourceLineNo">354</span> this.member = listener;<a name="line.354"></a>
-<span class="sourceLineNo">355</span> this.memberName = memberName;<a name="line.355"></a>
-<span class="sourceLineNo">356</span> watchForAbortedProcedures();<a name="line.356"></a>
-<span class="sourceLineNo">357</span> waitForNewProcedures();<a name="line.357"></a>
-<span class="sourceLineNo">358</span> }<a name="line.358"></a>
-<span class="sourceLineNo">359</span><a name="line.359"></a>
-<span class="sourceLineNo">360</span> @Override<a name="line.360"></a>
-<span class="sourceLineNo">361</span> public void close() throws IOException {<a name="line.361"></a>
-<span class="sourceLineNo">362</span> zkController.close();<a name="line.362"></a>
-<span class="sourceLineNo">363</span> }<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span>}<a name="line.365"></a>
+<span class="sourceLineNo">168</span> if (runningProcedures == null) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span> LOG.debug("No running procedures.");<a name="line.169"></a>
+<span class="sourceLineNo">170</span> return;<a name="line.170"></a>
+<span class="sourceLineNo">171</span> }<a name="line.171"></a>
+<span class="sourceLineNo">172</span> for (String procName : runningProcedures) {<a name="line.172"></a>
+<span class="sourceLineNo">173</span> // then read in the procedure information<a name="line.173"></a>
+<span class="sourceLineNo">174</span> String path = ZNodePaths.joinZNode(zkController.getAcquiredBarrier(), procName);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> startNewSubprocedure(path);<a name="line.175"></a>
+<span class="sourceLineNo">176</span> }<a name="line.176"></a>
+<span class="sourceLineNo">177</span> }<a name="line.177"></a>
+<span class="sourceLineNo">178</span><a name="line.178"></a>
+<span class="sourceLineNo">179</span> /**<a name="line.179"></a>
+<span class="sourceLineNo">180</span> * Kick off a new sub-procedure on the listener with the data stored in the passed znode.<a name="line.180"></a>
+<span class="sourceLineNo">181</span> * <p><a name="line.181"></a>
+<span class="sourceLineNo">182</span> * Will attempt to create the same procedure multiple times if an procedure znode with the same<a name="line.182"></a>
+<span class="sourceLineNo">183</span> * name is created. It is left up the coordinator to ensure this doesn't occur.<a name="line.183"></a>
+<span class="sourceLineNo">184</span> * @param path full path to the znode for the procedure to start<a name="line.184"></a>
+<span class="sourceLineNo">185</span> */<a name="line.185"></a>
+<span class="sourceLineNo">186</span> private synchronized void startNewSubprocedure(String path) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> LOG.debug("Found procedure znode: " + path);<a name="line.187"></a>
+<span class="sourceLineNo">188</span> String opName = ZKUtil.getNodeName(path);<a name="line.188"></a>
+<span class="sourceLineNo">189</span> // start watching for an abort notification for the procedure<a name="line.189"></a>
+<span class="sourceLineNo">190</span> String abortZNode = zkController.getAbortZNode(opName);<a name="line.190"></a>
+<span class="sourceLineNo">191</span> try {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> if (ZKUtil.watchAndCheckExists(zkController.getWatcher(), abortZNode)) {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> LOG.debug("Not starting:" + opName + " because we already have an abort notification.");<a name="line.193"></a>
+<span class="sourceLineNo">194</span> return;<a name="line.194"></a>
+<span class="sourceLineNo">195</span> }<a name="line.195"></a>
+<span class="sourceLineNo">196</span> } catch (KeeperException e) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> member.controllerConnectionFailure("Failed to get the abort znode (" + abortZNode<a name="line.197"></a>
+<span class="sourceLineNo">198</span> + ") for procedure :" + opName, e, opName);<a name="line.198"></a>
+<span class="sourceLineNo">199</span> return;<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> // get the data for the procedure<a name="line.202"></a>
+<span class="sourceLineNo">203</span> Subprocedure subproc = null;<a name="line.203"></a>
+<span class="sourceLineNo">204</span> try {<a name="line.204"></a>
+<span class="sourceLineNo">205</span> byte[] data = ZKUtil.getData(zkController.getWatcher(), path);<a name="line.205"></a>
+<span class="sourceLineNo">206</span> if (!ProtobufUtil.isPBMagicPrefix(data)) {<a name="line.206"></a>
+<span class="sourceLineNo">207</span> String msg = "Data in for starting procedure " + opName +<a name="line.207"></a>
+<span class="sourceLineNo">208</span> " is illegally formatted (no pb magic). " +<a name="line.208"></a>
+<span class="sourceLineNo">209</span> "Killing the procedure: " + Bytes.toString(data);<a name="line.209"></a>
+<span class="sourceLineNo">210</span> LOG.error(msg);<a name="line.210"></a>
+<span class="sourceLineNo">211</span> throw new IllegalArgumentException(msg);<a name="line.211"></a>
+<span class="sourceLineNo">212</span> }<a name="line.212"></a>
+<span class="sourceLineNo">213</span> LOG.debug("start proc data length is " + data.length);<a name="line.213"></a>
+<span class="sourceLineNo">214</span> data = Arrays.copyOfRange(data, ProtobufUtil.lengthOfPBMagic(), data.length);<a name="line.214"></a>
+<span class="sourceLineNo">215</span> LOG.debug("Found data for znode:" + path);<a name="line.215"></a>
+<span class="sourceLineNo">216</span> subproc = member.createSubprocedure(opName, data);<a name="line.216"></a>
+<span class="sourceLineNo">217</span> member.submitSubprocedure(subproc);<a name="line.217"></a>
+<span class="sourceLineNo">218</span> } catch (IllegalArgumentException iae ) {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> LOG.error("Illegal argument exception", iae);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> sendMemberAborted(subproc, new ForeignException(getMemberName(), iae));<a name="line.220"></a>
+<span class="sourceLineNo">221</span> } catch (IllegalStateException ise) {<a name="line.221"></a>
+<span class="sourceLineNo">222</span> LOG.error("Illegal state exception ", ise);<a name="line.222"></a>
+<span class="sourceLineNo">223</span> sendMemberAborted(subproc, new ForeignException(getMemberName(), ise));<a name="line.223"></a>
+<span class="sourceLineNo">224</span> } catch (KeeperException e) {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> member.controllerConnectionFailure("Failed to get data for new procedure:" + opName,<a name="line.225"></a>
+<span class="sourceLineNo">226</span> e, opName);<a name="line.226"></a>
+<span class="sourceLineNo">227</span> } catch (InterruptedException e) {<a name="line.227"></a>
+<span class="sourceLineNo">228</span> member.controllerConnectionFailure("Failed to get data for new procedure:" + opName,<a name="line.228"></a>
+<span class="sourceLineNo">229</span> e, opName);<a name="line.229"></a>
+<span class="sourceLineNo">230</span> Thread.currentThread().interrupt();<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> /**<a name="line.234"></a>
+<span class="sourceLineNo">235</span> * This attempts to create an acquired state znode for the procedure (snapshot name).<a name="line.235"></a>
+<span class="sourceLineNo">236</span> *<a name="line.236"></a>
+<span class="sourceLineNo">237</span> * It then looks for the reached znode to trigger in-barrier execution. If not present we<a name="line.237"></a>
+<span class="sourceLineNo">238</span> * have a watcher, if present then trigger the in-barrier action.<a name="line.238"></a>
+<span class="sourceLineNo">239</span> */<a name="line.239"></a>
+<span class="sourceLineNo">240</span> @Override<a name="line.240"></a>
+<span class="sourceLineNo">241</span> public void sendMemberAcquired(Subprocedure sub) throws IOException {<a name="line.241"></a>
+<span class="sourceLineNo">242</span> String procName = sub.getName();<a name="line.242"></a>
+<span class="sourceLineNo">243</span> try {<a name="line.243"></a>
+<span class="sourceLineNo">244</span> LOG.debug("Member: '" + memberName + "' joining acquired barrier for procedure (" + procName<a name="line.244"></a>
+<span class="sourceLineNo">245</span> + ") in zk");<a name="line.245"></a>
+<span class="sourceLineNo">246</span> String acquiredZNode = ZNodePaths.joinZNode(ZKProcedureUtil.getAcquireBarrierNode(<a name="line.246"></a>
+<span class="sourceLineNo">247</span> zkController, procName), memberName);<a name="line.247"></a>
+<span class="sourceLineNo">248</span> ZKUtil.createAndFailSilent(zkController.getWatcher(), acquiredZNode);<a name="line.248"></a>
+<span class="sourceLineNo">249</span><a name="line.249"></a>
+<span class="sourceLineNo">250</span> // watch for the complete node for this snapshot<a name="line.250"></a>
+<span class="sourceLineNo">251</span> String reachedBarrier = zkController.getReachedBarrierNode(procName);<a name="line.251"></a>
+<span class="sourceLineNo">252</span> LOG.debug("Watch for global barrier reached:" + reachedBarrier);<a name="line.252"></a>
+<span class="sourceLineNo">253</span> if (ZKUtil.watchAndCheckExists(zkController.getWatcher(), reachedBarrier)) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> receivedReachedGlobalBarrier(reachedBarrier);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> }<a name="line.255"></a>
+<span class="sourceLineNo">256</span> } catch (KeeperException e) {<a name="line.256"></a>
+<span class="sourceLineNo">257</span> member.controllerConnectionFailure("Failed to acquire barrier for procedure: "<a name="line.257"></a>
+<span class="sourceLineNo">258</span> + procName + " and member: " + memberName, e, procName);<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> /**<a name="line.262"></a>
+<span class="sourceLineNo">263</span> * This acts as the ack for a completed procedure<a name="line.263"></a>
+<span class="sourceLineNo">264</span> */<a name="line.264"></a>
+<span class="sourceLineNo">265</span> @Override<a name="line.265"></a>
+<span class="sourceLineNo">266</span> public void sendMemberCompleted(Subprocedure sub, byte[] data) throws IOException {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> String procName = sub.getName();<a name="line.267"></a>
+<span class="sourceLineNo">268</span> LOG.debug("Marking procedure '" + procName + "' completed for member '" + memberName<a name="line.268"></a>
+<span class="sourceLineNo">269</span> + "' in zk");<a name="line.269"></a>
+<span class="sourceLineNo">270</span> String joinPath =<a name="line.270"></a>
+<span class="sourceLineNo">271</span> ZNodePaths.joinZNode(zkController.getReachedBarrierNode(procName), memberName);<a name="line.271"></a>
+<span class="sourceLineNo">272</span> // ProtobufUtil.prependPBMagic does not take care of null<a name="line.272"></a>
+<span class="sourceLineNo">273</span> if (data == null) {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> data = new byte[0];<a name="line.274"></a>
+<span class="sourceLineNo">275</span> }<a name="line.275"></a>
+<span class="sourceLineNo">276</span> try {<a name="line.276"></a>
+<span class="sourceLineNo">277</span> ZKUtil.createAndFailSilent(zkController.getWatcher(), joinPath,<a name="line.277"></a>
+<span class="sourceLineNo">278</span> ProtobufUtil.prependPBMagic(data));<a name="line.278"></a>
+<span class="sourceLineNo">279</span> } catch (KeeperException e) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> member.controllerConnectionFailure("Failed to post zk node:" + joinPath<a name="line.280"></a>
+<span class="sourceLineNo">281</span> + " to join procedure barrier.", e, procName);<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> /**<a name="line.285"></a>
+<span class="sourceLineNo">286</span> * This should be called by the member and should write a serialized root cause exception as<a name="line.286"></a>
+<span class="sourceLineNo">287</span> * to the abort znode.<a name="line.287"></a>
+<span class="sourceLineNo">288</span> */<a name="line.288"></a>
+<span class="sourceLineNo">289</span> @Override<a name="line.289"></a>
+<span class="sourceLineNo">290</span> public void sendMemberAborted(Subprocedure sub, ForeignException ee) {<a name="line.290"></a>
+<span class="sourceLineNo">291</span> if (sub == null) {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> LOG.error("Failed due to null subprocedure", ee);<a name="line.292"></a>
+<span class="sourceLineNo">293</span> return;<a name="line.293"></a>
+<span class="sourceLineNo">294</span> }<a name="line.294"></a>
+<span class="sourceLineNo">295</span> String procName = sub.getName();<a name="line.295"></a>
+<span class="sourceLineNo">296</span> LOG.debug("Aborting procedure (" + procName + ") in zk");<a name="line.296"></a>
+<span class="sourceLineNo">297</span> String procAbortZNode = zkController.getAbortZNode(procName);<a name="line.297"></a>
+<span class="sourceLineNo">298</span> try {<a name="line.298"></a>
+<span class="sourceLineNo">299</span> String source = (ee.getSource() == null) ? memberName: ee.getSource();<a name="line.299"></a>
+<span class="sourceLineNo">300</span> byte[] errorInfo = ProtobufUtil.prependPBMagic(ForeignException.serialize(source, ee));<a name="line.300"></a>
+<span class="sourceLineNo">301</span> ZKUtil.createAndFailSilent(zkController.getWatcher(), procAbortZNode, errorInfo);<a name="line.301"></a>
+<span class="sourceLineNo">302</span> LOG.debug("Finished creating abort znode:" + procAbortZNode);<a name="line.302"></a>
+<span class="sourceLineNo">303</span> } catch (KeeperException e) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span> // possible that we get this error for the procedure if we already reset the zk state, but in<a name="line.304"></a>
+<span class="sourceLineNo">305</span> // that case we should still get an error for that procedure anyways<a name="line.305"></a>
+<span class="sourceLineNo">306</span> zkController.logZKTree(zkController.getBaseZnode());<a name="line.306"></a>
+<span class="sourceLineNo">307</span> member.controllerConnectionFailure("Failed to post zk node:" + procAbortZNode<a name="line.307"></a>
+<span class="sourceLineNo">308</span> + " to abort procedure", e, procName);<a name="line.308"></a>
+<span class="sourceLineNo">309</span> }<a name="line.309"></a>
+<span class="sourceLineNo">310</span> }<a name="line.310"></a>
+<span class="sourceLineNo">311</span><a name="line.311"></a>
+<span class="sourceLineNo">312</span> /**<a name="line.312"></a>
+<span class="sourceLineNo">313</span> * Pass along the found abort notification to the listener<a name="line.313"></a>
+<span class="sourceLineNo">314</span> * @param abortZNode full znode path to the failed procedure information<a name="line.314"></a>
+<span class="sourceLineNo">315</span> */<a name="line.315"></a>
+<span class="sourceLineNo">316</span> protected void abort(String abortZNode) {<a name="line.316"></a>
+<span class="sourceLineNo">317</span> LOG.debug("Aborting procedure member for znode " + abortZNode);<a name="line.317"></a>
+<span class="sourceLineNo">318</span> String opName = ZKUtil.getNodeName(abortZNode);<a name="line.318"></a>
+<span class="sourceLineNo">319</span> try {<a name="line.319"></a>
+<span class="sourceLineNo">320</span> byte[] data = ZKUtil.getData(zkController.getWatcher(), abortZNode);<a name="line.320"></a>
+<span class="sourceLineNo">321</span><a name="line.321"></a>
+<span class="sourceLineNo">322</span> // figure out the data we need to pass<a name="line.322"></a>
+<span class="sourceLineNo">323</span> ForeignException ee;<a name="line.323"></a>
+<span class="sourceLineNo">324</span> try {<a name="line.324"></a>
+<span class="sourceLineNo">325</span> if (data == null || data.length == 0) {<a name="line.325"></a>
+<span class="sourceLineNo">326</span> // ignore<a name="line.326"></a>
+<span class="sourceLineNo">327</span> return;<a name="line.327"></a>
+<span class="sourceLineNo">328</span> } else if (!ProtobufUtil.isPBMagicPrefix(data)) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span> String msg = "Illegally formatted data in abort node for proc " + opName<a name="line.329"></a>
+<span class="sourceLineNo">330</span> + ". Killing the procedure.";<a name="line.330"></a>
+<span class="sourceLineNo">331</span> LOG.error(msg);<a name="line.331"></a>
+<span class="sourceLineNo">332</span> // we got a remote exception, but we can't describe it so just return exn from here<a name="line.332"></a>
+<span class="sourceLineNo">333</span> ee = new ForeignException(getMemberName(), new IllegalArgumentException(msg));<a name="line.333"></a>
+<span class="sourceLineNo">334</span> } else {<a name="line.334"></a>
+<span class="sourceLineNo">335</span> data = Arrays.copyOfRange(data, ProtobufUtil.lengthOfPBMagic(), data.length);<a name="line.335"></a>
+<span class="sourceLineNo">336</span> ee = ForeignException.deserialize(data);<a name="line.336"></a>
+<span class="sourceLineNo">337</span> }<a name="line.337"></a>
+<span class="sourceLineNo">338</span> } catch (IOException e) {<a name="line.338"></a>
+<span class="sourceLineNo">339</span> LOG.warn("Got an error notification for op:" + opName<a name="line.339"></a>
+<span class="sourceLineNo">340</span> + " but we can't read the information. Killing the procedure.");<a name="line.340"></a>
+<span class="sourceLineNo">341</span> // we got a remote exception, but we can't describe it so just return exn from here<a name="line.341"></a>
+<span class="sourceLineNo">342</span> ee = new ForeignException(getMemberName(), e);<a name="line.342"></a>
+<span class="sourceLineNo">343</span> }<a name="line.343"></a>
+<span class="sourceLineNo">344</span><a name="line.344"></a>
+<span class="sourceLineNo">345</span> this.member.receiveAbortProcedure(opName, ee);<a name="line.345"></a>
+<span class="sourceLineNo">346</span> } catch (KeeperException e) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span> member.controllerConnectionFailure("Failed to get data for abort znode:" + abortZNode<a name="line.347"></a>
+<span class="sourceLineNo">348</span> + zkController.getAbortZnode(), e, opName);<a name="line.348"></a>
+<span class="sourceLineNo">349</span> } catch (InterruptedException e) {<a name="line.349"></a>
+<span class="sourceLineNo">350</span> LOG.warn("abort already in progress", e);<a name="line.350"></a>
+<span class="sourceLineNo">351</span> Thread.currentThread().interrupt();<a name="line.351"></a>
+<span class="sourceLineNo">352</span> }<a name="line.352"></a>
+<span class="sourceLineNo">353</span> }<a name="line.353"></a>
+<span class="sourceLineNo">354</span><a name="line.354"></a>
+<span class="sourceLineNo">355</span> @Override<a name="line.355"></a>
+<span class="sourceLineNo">356</span> public void start(final String memberName, final ProcedureMember listener) {<a name="line.356"></a>
+<span class="sourceLineNo">357</span> LOG.debug("Starting procedure member '" + memberName + "'");<a name="line.357"></a>
+<span class="sourceLineNo">358</span> this.member = listener;<a name="line.358"></a>
+<span class="sourceLineNo">359</span> this.memberName = memberName;<a name="line.359"></a>
+<span class="sourceLineNo">360</span> watchForAbortedProcedures();<a name="line.360"></a>
+<span class="sourceLineNo">361</span> waitForNewProcedures();<a name="line.361"></a>
+<span class="sourceLineNo">362</span> }<a name="line.362"></a>
+<span class="sourceLineNo">363</span><a name="line.363"></a>
+<span class="sourceLineNo">364</span> @Override<a name="line.364"></a>
+<span class="sourceLineNo">365</span> public void close() throws IOException {<a name="line.365"></a>
+<span class="sourceLineNo">366</span> zkController.close();<a name="line.366"></a>
+<span class="sourceLineNo">367</span> }<a name="line.367"></a>
+<span class="sourceLineNo">368</span><a name="line.368"></a>
+<span class="sourceLineNo">369</span>}<a name="line.369"></a>
[08/12] hbase-site git commit: Published site at
773aff90fdf9edf4687b373d1c7ba859d166a437.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html b/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html
index 506f6cc..3ca913b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.FailedOpenUpdaterThread.html
@@ -362,580 +362,584 @@
<span class="sourceLineNo">354</span> //Overwrite any info stored by table, this takes precedence<a name="line.354"></a>
<span class="sourceLineNo">355</span> try {<a name="line.355"></a>
<span class="sourceLineNo">356</span> if(ZKUtil.checkExists(watcher, groupBasePath) != -1) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span> for(String znode: ZKUtil.listChildrenAndWatchForNewChildren(watcher, groupBasePath)) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> byte[] data = ZKUtil.getData(watcher, ZNodePaths.joinZNode(groupBasePath, znode));<a name="line.358"></a>
-<span class="sourceLineNo">359</span> if(data.length > 0) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> ProtobufUtil.expectPBMagicPrefix(data);<a name="line.360"></a>
-<span class="sourceLineNo">361</span> ByteArrayInputStream bis = new ByteArrayInputStream(<a name="line.361"></a>
-<span class="sourceLineNo">362</span> data, ProtobufUtil.lengthOfPBMagic(), data.length);<a name="line.362"></a>
-<span class="sourceLineNo">363</span> RSGroupInfoList.add(RSGroupProtobufUtil.toGroupInfo(<a name="line.363"></a>
-<span class="sourceLineNo">364</span> RSGroupProtos.RSGroupInfo.parseFrom(bis)));<a name="line.364"></a>
-<span class="sourceLineNo">365</span> }<a name="line.365"></a>
-<span class="sourceLineNo">366</span> }<a name="line.366"></a>
-<span class="sourceLineNo">367</span> LOG.debug("Read ZK GroupInfo count:" + RSGroupInfoList.size());<a name="line.367"></a>
-<span class="sourceLineNo">368</span> }<a name="line.368"></a>
-<span class="sourceLineNo">369</span> } catch (KeeperException|DeserializationException|InterruptedException e) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span> throw new IOException("Failed to read rsGroupZNode",e);<a name="line.370"></a>
-<span class="sourceLineNo">371</span> }<a name="line.371"></a>
-<span class="sourceLineNo">372</span> return RSGroupInfoList;<a name="line.372"></a>
-<span class="sourceLineNo">373</span> }<a name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span> @Override<a name="line.375"></a>
-<span class="sourceLineNo">376</span> public void refresh() throws IOException {<a name="line.376"></a>
-<span class="sourceLineNo">377</span> refresh(false);<a name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span> /**<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * Read rsgroup info from the source of truth, the hbase:rsgroup table.<a name="line.381"></a>
-<span class="sourceLineNo">382</span> * Update zk cache. Called on startup of the manager.<a name="line.382"></a>
-<span class="sourceLineNo">383</span> */<a name="line.383"></a>
-<span class="sourceLineNo">384</span> private synchronized void refresh(boolean forceOnline) throws IOException {<a name="line.384"></a>
-<span class="sourceLineNo">385</span> List<RSGroupInfo> groupList = new LinkedList<>();<a name="line.385"></a>
-<span class="sourceLineNo">386</span><a name="line.386"></a>
-<span class="sourceLineNo">387</span> // Overwrite anything read from zk, group table is source of truth<a name="line.387"></a>
-<span class="sourceLineNo">388</span> // if online read from GROUP table<a name="line.388"></a>
-<span class="sourceLineNo">389</span> if (forceOnline || isOnline()) {<a name="line.389"></a>
-<span class="sourceLineNo">390</span> LOG.debug("Refreshing in Online mode.");<a name="line.390"></a>
-<span class="sourceLineNo">391</span> if (rsGroupTable == null) {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> rsGroupTable = conn.getTable(RSGROUP_TABLE_NAME);<a name="line.392"></a>
-<span class="sourceLineNo">393</span> }<a name="line.393"></a>
-<span class="sourceLineNo">394</span> groupList.addAll(retrieveGroupListFromGroupTable());<a name="line.394"></a>
-<span class="sourceLineNo">395</span> } else {<a name="line.395"></a>
-<span class="sourceLineNo">396</span> LOG.debug("Refreshing in Offline mode.");<a name="line.396"></a>
-<span class="sourceLineNo">397</span> groupList.addAll(retrieveGroupListFromZookeeper());<a name="line.397"></a>
-<span class="sourceLineNo">398</span> }<a name="line.398"></a>
-<span class="sourceLineNo">399</span><a name="line.399"></a>
-<span class="sourceLineNo">400</span> // refresh default group, prune<a name="line.400"></a>
-<span class="sourceLineNo">401</span> NavigableSet<TableName> orphanTables = new TreeSet<>();<a name="line.401"></a>
-<span class="sourceLineNo">402</span> for(String entry: masterServices.getTableDescriptors().getAll().keySet()) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span> orphanTables.add(TableName.valueOf(entry));<a name="line.403"></a>
-<span class="sourceLineNo">404</span> }<a name="line.404"></a>
-<span class="sourceLineNo">405</span><a name="line.405"></a>
-<span class="sourceLineNo">406</span> final List<TableName> specialTables = Arrays.asList(AccessControlLists.ACL_TABLE_NAME,<a name="line.406"></a>
-<span class="sourceLineNo">407</span> TableName.META_TABLE_NAME, TableName.NAMESPACE_TABLE_NAME, RSGROUP_TABLE_NAME);<a name="line.407"></a>
-<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span> for (TableName table : specialTables) {<a name="line.409"></a>
-<span class="sourceLineNo">410</span> orphanTables.add(table);<a name="line.410"></a>
-<span class="sourceLineNo">411</span> }<a name="line.411"></a>
-<span class="sourceLineNo">412</span> for (RSGroupInfo group: groupList) {<a name="line.412"></a>
-<span class="sourceLineNo">413</span> if(!group.getName().equals(RSGroupInfo.DEFAULT_GROUP)) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> orphanTables.removeAll(group.getTables());<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span> }<a name="line.416"></a>
-<span class="sourceLineNo">417</span><a name="line.417"></a>
-<span class="sourceLineNo">418</span> // This is added to the last of the list so it overwrites the 'default' rsgroup loaded<a name="line.418"></a>
-<span class="sourceLineNo">419</span> // from region group table or zk<a name="line.419"></a>
-<span class="sourceLineNo">420</span> groupList.add(new RSGroupInfo(RSGroupInfo.DEFAULT_GROUP, getDefaultServers(),<a name="line.420"></a>
-<span class="sourceLineNo">421</span> orphanTables));<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span> // populate the data<a name="line.423"></a>
-<span class="sourceLineNo">424</span> HashMap<String, RSGroupInfo> newGroupMap = Maps.newHashMap();<a name="line.424"></a>
-<span class="sourceLineNo">425</span> HashMap<TableName, String> newTableMap = Maps.newHashMap();<a name="line.425"></a>
-<span class="sourceLineNo">426</span> for (RSGroupInfo group : groupList) {<a name="line.426"></a>
-<span class="sourceLineNo">427</span> newGroupMap.put(group.getName(), group);<a name="line.427"></a>
-<span class="sourceLineNo">428</span> for(TableName table: group.getTables()) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span> newTableMap.put(table, group.getName());<a name="line.429"></a>
-<span class="sourceLineNo">430</span> }<a name="line.430"></a>
-<span class="sourceLineNo">431</span> }<a name="line.431"></a>
-<span class="sourceLineNo">432</span> resetRSGroupAndTableMaps(newGroupMap, newTableMap);<a name="line.432"></a>
-<span class="sourceLineNo">433</span> updateCacheOfRSGroups(rsGroupMap.keySet());<a name="line.433"></a>
-<span class="sourceLineNo">434</span> }<a name="line.434"></a>
-<span class="sourceLineNo">435</span><a name="line.435"></a>
-<span class="sourceLineNo">436</span> private synchronized Map<TableName,String> flushConfigTable(Map<String,RSGroupInfo> groupMap)<a name="line.436"></a>
-<span class="sourceLineNo">437</span> throws IOException {<a name="line.437"></a>
-<span class="sourceLineNo">438</span> Map<TableName,String> newTableMap = Maps.newHashMap();<a name="line.438"></a>
-<span class="sourceLineNo">439</span> List<Mutation> mutations = Lists.newArrayList();<a name="line.439"></a>
-<span class="sourceLineNo">440</span><a name="line.440"></a>
-<span class="sourceLineNo">441</span> // populate deletes<a name="line.441"></a>
-<span class="sourceLineNo">442</span> for(String groupName : prevRSGroups) {<a name="line.442"></a>
-<span class="sourceLineNo">443</span> if(!groupMap.containsKey(groupName)) {<a name="line.443"></a>
-<span class="sourceLineNo">444</span> Delete d = new Delete(Bytes.toBytes(groupName));<a name="line.444"></a>
-<span class="sourceLineNo">445</span> mutations.add(d);<a name="line.445"></a>
-<span class="sourceLineNo">446</span> }<a name="line.446"></a>
-<span class="sourceLineNo">447</span> }<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span> // populate puts<a name="line.449"></a>
-<span class="sourceLineNo">450</span> for(RSGroupInfo RSGroupInfo : groupMap.values()) {<a name="line.450"></a>
-<span class="sourceLineNo">451</span> RSGroupProtos.RSGroupInfo proto = RSGroupProtobufUtil.toProtoGroupInfo(RSGroupInfo);<a name="line.451"></a>
-<span class="sourceLineNo">452</span> Put p = new Put(Bytes.toBytes(RSGroupInfo.getName()));<a name="line.452"></a>
-<span class="sourceLineNo">453</span> p.addColumn(META_FAMILY_BYTES, META_QUALIFIER_BYTES, proto.toByteArray());<a name="line.453"></a>
-<span class="sourceLineNo">454</span> mutations.add(p);<a name="line.454"></a>
-<span class="sourceLineNo">455</span> for(TableName entry: RSGroupInfo.getTables()) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span> newTableMap.put(entry, RSGroupInfo.getName());<a name="line.456"></a>
-<span class="sourceLineNo">457</span> }<a name="line.457"></a>
-<span class="sourceLineNo">458</span> }<a name="line.458"></a>
-<span class="sourceLineNo">459</span><a name="line.459"></a>
-<span class="sourceLineNo">460</span> if(mutations.size() > 0) {<a name="line.460"></a>
-<span class="sourceLineNo">461</span> multiMutate(mutations);<a name="line.461"></a>
+<span class="sourceLineNo">357</span> List<String> children = ZKUtil.listChildrenAndWatchForNewChildren(watcher, groupBasePath);<a name="line.357"></a>
+<span class="sourceLineNo">358</span> if (children == null) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span> return RSGroupInfoList;<a name="line.359"></a>
+<span class="sourceLineNo">360</span> }<a name="line.360"></a>
+<span class="sourceLineNo">361</span> for(String znode: children) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span> byte[] data = ZKUtil.getData(watcher, ZNodePaths.joinZNode(groupBasePath, znode));<a name="line.362"></a>
+<span class="sourceLineNo">363</span> if(data.length > 0) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span> ProtobufUtil.expectPBMagicPrefix(data);<a name="line.364"></a>
+<span class="sourceLineNo">365</span> ByteArrayInputStream bis = new ByteArrayInputStream(<a name="line.365"></a>
+<span class="sourceLineNo">366</span> data, ProtobufUtil.lengthOfPBMagic(), data.length);<a name="line.366"></a>
+<span class="sourceLineNo">367</span> RSGroupInfoList.add(RSGroupProtobufUtil.toGroupInfo(<a name="line.367"></a>
+<span class="sourceLineNo">368</span> RSGroupProtos.RSGroupInfo.parseFrom(bis)));<a name="line.368"></a>
+<span class="sourceLineNo">369</span> }<a name="line.369"></a>
+<span class="sourceLineNo">370</span> }<a name="line.370"></a>
+<span class="sourceLineNo">371</span> LOG.debug("Read ZK GroupInfo count:" + RSGroupInfoList.size());<a name="line.371"></a>
+<span class="sourceLineNo">372</span> }<a name="line.372"></a>
+<span class="sourceLineNo">373</span> } catch (KeeperException|DeserializationException|InterruptedException e) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> throw new IOException("Failed to read rsGroupZNode",e);<a name="line.374"></a>
+<span class="sourceLineNo">375</span> }<a name="line.375"></a>
+<span class="sourceLineNo">376</span> return RSGroupInfoList;<a name="line.376"></a>
+<span class="sourceLineNo">377</span> }<a name="line.377"></a>
+<span class="sourceLineNo">378</span><a name="line.378"></a>
+<span class="sourceLineNo">379</span> @Override<a name="line.379"></a>
+<span class="sourceLineNo">380</span> public void refresh() throws IOException {<a name="line.380"></a>
+<span class="sourceLineNo">381</span> refresh(false);<a name="line.381"></a>
+<span class="sourceLineNo">382</span> }<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span> /**<a name="line.384"></a>
+<span class="sourceLineNo">385</span> * Read rsgroup info from the source of truth, the hbase:rsgroup table.<a name="line.385"></a>
+<span class="sourceLineNo">386</span> * Update zk cache. Called on startup of the manager.<a name="line.386"></a>
+<span class="sourceLineNo">387</span> */<a name="line.387"></a>
+<span class="sourceLineNo">388</span> private synchronized void refresh(boolean forceOnline) throws IOException {<a name="line.388"></a>
+<span class="sourceLineNo">389</span> List<RSGroupInfo> groupList = new LinkedList<>();<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span> // Overwrite anything read from zk, group table is source of truth<a name="line.391"></a>
+<span class="sourceLineNo">392</span> // if online read from GROUP table<a name="line.392"></a>
+<span class="sourceLineNo">393</span> if (forceOnline || isOnline()) {<a name="line.393"></a>
+<span class="sourceLineNo">394</span> LOG.debug("Refreshing in Online mode.");<a name="line.394"></a>
+<span class="sourceLineNo">395</span> if (rsGroupTable == null) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span> rsGroupTable = conn.getTable(RSGROUP_TABLE_NAME);<a name="line.396"></a>
+<span class="sourceLineNo">397</span> }<a name="line.397"></a>
+<span class="sourceLineNo">398</span> groupList.addAll(retrieveGroupListFromGroupTable());<a name="line.398"></a>
+<span class="sourceLineNo">399</span> } else {<a name="line.399"></a>
+<span class="sourceLineNo">400</span> LOG.debug("Refreshing in Offline mode.");<a name="line.400"></a>
+<span class="sourceLineNo">401</span> groupList.addAll(retrieveGroupListFromZookeeper());<a name="line.401"></a>
+<span class="sourceLineNo">402</span> }<a name="line.402"></a>
+<span class="sourceLineNo">403</span><a name="line.403"></a>
+<span class="sourceLineNo">404</span> // refresh default group, prune<a name="line.404"></a>
+<span class="sourceLineNo">405</span> NavigableSet<TableName> orphanTables = new TreeSet<>();<a name="line.405"></a>
+<span class="sourceLineNo">406</span> for(String entry: masterServices.getTableDescriptors().getAll().keySet()) {<a name="line.406"></a>
+<span class="sourceLineNo">407</span> orphanTables.add(TableName.valueOf(entry));<a name="line.407"></a>
+<span class="sourceLineNo">408</span> }<a name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span> final List<TableName> specialTables = Arrays.asList(AccessControlLists.ACL_TABLE_NAME,<a name="line.410"></a>
+<span class="sourceLineNo">411</span> TableName.META_TABLE_NAME, TableName.NAMESPACE_TABLE_NAME, RSGROUP_TABLE_NAME);<a name="line.411"></a>
+<span class="sourceLineNo">412</span><a name="line.412"></a>
+<span class="sourceLineNo">413</span> for (TableName table : specialTables) {<a name="line.413"></a>
+<span class="sourceLineNo">414</span> orphanTables.add(table);<a name="line.414"></a>
+<span class="sourceLineNo">415</span> }<a name="line.415"></a>
+<span class="sourceLineNo">416</span> for (RSGroupInfo group: groupList) {<a name="line.416"></a>
+<span class="sourceLineNo">417</span> if(!group.getName().equals(RSGroupInfo.DEFAULT_GROUP)) {<a name="line.417"></a>
+<span class="sourceLineNo">418</span> orphanTables.removeAll(group.getTables());<a name="line.418"></a>
+<span class="sourceLineNo">419</span> }<a name="line.419"></a>
+<span class="sourceLineNo">420</span> }<a name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span> // This is added to the last of the list so it overwrites the 'default' rsgroup loaded<a name="line.422"></a>
+<span class="sourceLineNo">423</span> // from region group table or zk<a name="line.423"></a>
+<span class="sourceLineNo">424</span> groupList.add(new RSGroupInfo(RSGroupInfo.DEFAULT_GROUP, getDefaultServers(),<a name="line.424"></a>
+<span class="sourceLineNo">425</span> orphanTables));<a name="line.425"></a>
+<span class="sourceLineNo">426</span><a name="line.426"></a>
+<span class="sourceLineNo">427</span> // populate the data<a name="line.427"></a>
+<span class="sourceLineNo">428</span> HashMap<String, RSGroupInfo> newGroupMap = Maps.newHashMap();<a name="line.428"></a>
+<span class="sourceLineNo">429</span> HashMap<TableName, String> newTableMap = Maps.newHashMap();<a name="line.429"></a>
+<span class="sourceLineNo">430</span> for (RSGroupInfo group : groupList) {<a name="line.430"></a>
+<span class="sourceLineNo">431</span> newGroupMap.put(group.getName(), group);<a name="line.431"></a>
+<span class="sourceLineNo">432</span> for(TableName table: group.getTables()) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span> newTableMap.put(table, group.getName());<a name="line.433"></a>
+<span class="sourceLineNo">434</span> }<a name="line.434"></a>
+<span class="sourceLineNo">435</span> }<a name="line.435"></a>
+<span class="sourceLineNo">436</span> resetRSGroupAndTableMaps(newGroupMap, newTableMap);<a name="line.436"></a>
+<span class="sourceLineNo">437</span> updateCacheOfRSGroups(rsGroupMap.keySet());<a name="line.437"></a>
+<span class="sourceLineNo">438</span> }<a name="line.438"></a>
+<span class="sourceLineNo">439</span><a name="line.439"></a>
+<span class="sourceLineNo">440</span> private synchronized Map<TableName,String> flushConfigTable(Map<String,RSGroupInfo> groupMap)<a name="line.440"></a>
+<span class="sourceLineNo">441</span> throws IOException {<a name="line.441"></a>
+<span class="sourceLineNo">442</span> Map<TableName,String> newTableMap = Maps.newHashMap();<a name="line.442"></a>
+<span class="sourceLineNo">443</span> List<Mutation> mutations = Lists.newArrayList();<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span> // populate deletes<a name="line.445"></a>
+<span class="sourceLineNo">446</span> for(String groupName : prevRSGroups) {<a name="line.446"></a>
+<span class="sourceLineNo">447</span> if(!groupMap.containsKey(groupName)) {<a name="line.447"></a>
+<span class="sourceLineNo">448</span> Delete d = new Delete(Bytes.toBytes(groupName));<a name="line.448"></a>
+<span class="sourceLineNo">449</span> mutations.add(d);<a name="line.449"></a>
+<span class="sourceLineNo">450</span> }<a name="line.450"></a>
+<span class="sourceLineNo">451</span> }<a name="line.451"></a>
+<span class="sourceLineNo">452</span><a name="line.452"></a>
+<span class="sourceLineNo">453</span> // populate puts<a name="line.453"></a>
+<span class="sourceLineNo">454</span> for(RSGroupInfo RSGroupInfo : groupMap.values()) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span> RSGroupProtos.RSGroupInfo proto = RSGroupProtobufUtil.toProtoGroupInfo(RSGroupInfo);<a name="line.455"></a>
+<span class="sourceLineNo">456</span> Put p = new Put(Bytes.toBytes(RSGroupInfo.getName()));<a name="line.456"></a>
+<span class="sourceLineNo">457</span> p.addColumn(META_FAMILY_BYTES, META_QUALIFIER_BYTES, proto.toByteArray());<a name="line.457"></a>
+<span class="sourceLineNo">458</span> mutations.add(p);<a name="line.458"></a>
+<span class="sourceLineNo">459</span> for(TableName entry: RSGroupInfo.getTables()) {<a name="line.459"></a>
+<span class="sourceLineNo">460</span> newTableMap.put(entry, RSGroupInfo.getName());<a name="line.460"></a>
+<span class="sourceLineNo">461</span> }<a name="line.461"></a>
<span class="sourceLineNo">462</span> }<a name="line.462"></a>
-<span class="sourceLineNo">463</span> return newTableMap;<a name="line.463"></a>
-<span class="sourceLineNo">464</span> }<a name="line.464"></a>
-<span class="sourceLineNo">465</span><a name="line.465"></a>
-<span class="sourceLineNo">466</span> private synchronized void flushConfig()<a name="line.466"></a>
-<span class="sourceLineNo">467</span> throws IOException {<a name="line.467"></a>
-<span class="sourceLineNo">468</span> flushConfig(this.rsGroupMap);<a name="line.468"></a>
-<span class="sourceLineNo">469</span> }<a name="line.469"></a>
-<span class="sourceLineNo">470</span><a name="line.470"></a>
-<span class="sourceLineNo">471</span> private synchronized void flushConfig(Map<String, RSGroupInfo> newGroupMap)<a name="line.471"></a>
-<span class="sourceLineNo">472</span> throws IOException {<a name="line.472"></a>
-<span class="sourceLineNo">473</span> Map<TableName, String> newTableMap;<a name="line.473"></a>
+<span class="sourceLineNo">463</span><a name="line.463"></a>
+<span class="sourceLineNo">464</span> if(mutations.size() > 0) {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> multiMutate(mutations);<a name="line.465"></a>
+<span class="sourceLineNo">466</span> }<a name="line.466"></a>
+<span class="sourceLineNo">467</span> return newTableMap;<a name="line.467"></a>
+<span class="sourceLineNo">468</span> }<a name="line.468"></a>
+<span class="sourceLineNo">469</span><a name="line.469"></a>
+<span class="sourceLineNo">470</span> private synchronized void flushConfig()<a name="line.470"></a>
+<span class="sourceLineNo">471</span> throws IOException {<a name="line.471"></a>
+<span class="sourceLineNo">472</span> flushConfig(this.rsGroupMap);<a name="line.472"></a>
+<span class="sourceLineNo">473</span> }<a name="line.473"></a>
<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span> // For offline mode persistence is still unavailable<a name="line.475"></a>
-<span class="sourceLineNo">476</span> // We're refreshing in-memory state but only for default servers<a name="line.476"></a>
-<span class="sourceLineNo">477</span> if (!isOnline()) {<a name="line.477"></a>
-<span class="sourceLineNo">478</span> Map<String, RSGroupInfo> m = Maps.newHashMap(rsGroupMap);<a name="line.478"></a>
-<span class="sourceLineNo">479</span> RSGroupInfo oldDefaultGroup = m.remove(RSGroupInfo.DEFAULT_GROUP);<a name="line.479"></a>
-<span class="sourceLineNo">480</span> RSGroupInfo newDefaultGroup = newGroupMap.remove(RSGroupInfo.DEFAULT_GROUP);<a name="line.480"></a>
-<span class="sourceLineNo">481</span> if (!m.equals(newGroupMap) ||<a name="line.481"></a>
-<span class="sourceLineNo">482</span> !oldDefaultGroup.getTables().equals(newDefaultGroup.getTables())) {<a name="line.482"></a>
-<span class="sourceLineNo">483</span> throw new IOException("Only default servers can be updated during offline mode");<a name="line.483"></a>
-<span class="sourceLineNo">484</span> }<a name="line.484"></a>
-<span class="sourceLineNo">485</span> newGroupMap.put(RSGroupInfo.DEFAULT_GROUP, newDefaultGroup);<a name="line.485"></a>
-<span class="sourceLineNo">486</span> rsGroupMap = newGroupMap;<a name="line.486"></a>
-<span class="sourceLineNo">487</span> return;<a name="line.487"></a>
-<span class="sourceLineNo">488</span> }<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span> newTableMap = flushConfigTable(newGroupMap);<a name="line.490"></a>
-<span class="sourceLineNo">491</span><a name="line.491"></a>
-<span class="sourceLineNo">492</span> // Make changes visible after having been persisted to the source of truth<a name="line.492"></a>
-<span class="sourceLineNo">493</span> resetRSGroupAndTableMaps(newGroupMap, newTableMap);<a name="line.493"></a>
-<span class="sourceLineNo">494</span><a name="line.494"></a>
-<span class="sourceLineNo">495</span> try {<a name="line.495"></a>
-<span class="sourceLineNo">496</span> String groupBasePath = ZNodePaths.joinZNode(watcher.znodePaths.baseZNode, rsGroupZNode);<a name="line.496"></a>
-<span class="sourceLineNo">497</span> ZKUtil.createAndFailSilent(watcher, groupBasePath, ProtobufMagic.PB_MAGIC);<a name="line.497"></a>
+<span class="sourceLineNo">475</span> private synchronized void flushConfig(Map<String, RSGroupInfo> newGroupMap)<a name="line.475"></a>
+<span class="sourceLineNo">476</span> throws IOException {<a name="line.476"></a>
+<span class="sourceLineNo">477</span> Map<TableName, String> newTableMap;<a name="line.477"></a>
+<span class="sourceLineNo">478</span><a name="line.478"></a>
+<span class="sourceLineNo">479</span> // For offline mode persistence is still unavailable<a name="line.479"></a>
+<span class="sourceLineNo">480</span> // We're refreshing in-memory state but only for default servers<a name="line.480"></a>
+<span class="sourceLineNo">481</span> if (!isOnline()) {<a name="line.481"></a>
+<span class="sourceLineNo">482</span> Map<String, RSGroupInfo> m = Maps.newHashMap(rsGroupMap);<a name="line.482"></a>
+<span class="sourceLineNo">483</span> RSGroupInfo oldDefaultGroup = m.remove(RSGroupInfo.DEFAULT_GROUP);<a name="line.483"></a>
+<span class="sourceLineNo">484</span> RSGroupInfo newDefaultGroup = newGroupMap.remove(RSGroupInfo.DEFAULT_GROUP);<a name="line.484"></a>
+<span class="sourceLineNo">485</span> if (!m.equals(newGroupMap) ||<a name="line.485"></a>
+<span class="sourceLineNo">486</span> !oldDefaultGroup.getTables().equals(newDefaultGroup.getTables())) {<a name="line.486"></a>
+<span class="sourceLineNo">487</span> throw new IOException("Only default servers can be updated during offline mode");<a name="line.487"></a>
+<span class="sourceLineNo">488</span> }<a name="line.488"></a>
+<span class="sourceLineNo">489</span> newGroupMap.put(RSGroupInfo.DEFAULT_GROUP, newDefaultGroup);<a name="line.489"></a>
+<span class="sourceLineNo">490</span> rsGroupMap = newGroupMap;<a name="line.490"></a>
+<span class="sourceLineNo">491</span> return;<a name="line.491"></a>
+<span class="sourceLineNo">492</span> }<a name="line.492"></a>
+<span class="sourceLineNo">493</span><a name="line.493"></a>
+<span class="sourceLineNo">494</span> newTableMap = flushConfigTable(newGroupMap);<a name="line.494"></a>
+<span class="sourceLineNo">495</span><a name="line.495"></a>
+<span class="sourceLineNo">496</span> // Make changes visible after having been persisted to the source of truth<a name="line.496"></a>
+<span class="sourceLineNo">497</span> resetRSGroupAndTableMaps(newGroupMap, newTableMap);<a name="line.497"></a>
<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span> List<ZKUtil.ZKUtilOp> zkOps = new ArrayList<>(newGroupMap.size());<a name="line.499"></a>
-<span class="sourceLineNo">500</span> for(String groupName : prevRSGroups) {<a name="line.500"></a>
-<span class="sourceLineNo">501</span> if(!newGroupMap.containsKey(groupName)) {<a name="line.501"></a>
-<span class="sourceLineNo">502</span> String znode = ZNodePaths.joinZNode(groupBasePath, groupName);<a name="line.502"></a>
-<span class="sourceLineNo">503</span> zkOps.add(ZKUtil.ZKUtilOp.deleteNodeFailSilent(znode));<a name="line.503"></a>
-<span class="sourceLineNo">504</span> }<a name="line.504"></a>
-<span class="sourceLineNo">505</span> }<a name="line.505"></a>
-<span class="sourceLineNo">506</span><a name="line.506"></a>
-<span class="sourceLineNo">507</span><a name="line.507"></a>
-<span class="sourceLineNo">508</span> for (RSGroupInfo RSGroupInfo : newGroupMap.values()) {<a name="line.508"></a>
-<span class="sourceLineNo">509</span> String znode = ZNodePaths.joinZNode(groupBasePath, RSGroupInfo.getName());<a name="line.509"></a>
-<span class="sourceLineNo">510</span> RSGroupProtos.RSGroupInfo proto = RSGroupProtobufUtil.toProtoGroupInfo(RSGroupInfo);<a name="line.510"></a>
-<span class="sourceLineNo">511</span> LOG.debug("Updating znode: "+znode);<a name="line.511"></a>
-<span class="sourceLineNo">512</span> ZKUtil.createAndFailSilent(watcher, znode);<a name="line.512"></a>
-<span class="sourceLineNo">513</span> zkOps.add(ZKUtil.ZKUtilOp.deleteNodeFailSilent(znode));<a name="line.513"></a>
-<span class="sourceLineNo">514</span> zkOps.add(ZKUtil.ZKUtilOp.createAndFailSilent(znode,<a name="line.514"></a>
-<span class="sourceLineNo">515</span> ProtobufUtil.prependPBMagic(proto.toByteArray())));<a name="line.515"></a>
-<span class="sourceLineNo">516</span> }<a name="line.516"></a>
-<span class="sourceLineNo">517</span> LOG.debug("Writing ZK GroupInfo count: " + zkOps.size());<a name="line.517"></a>
-<span class="sourceLineNo">518</span><a name="line.518"></a>
-<span class="sourceLineNo">519</span> ZKUtil.multiOrSequential(watcher, zkOps, false);<a name="line.519"></a>
-<span class="sourceLineNo">520</span> } catch (KeeperException e) {<a name="line.520"></a>
-<span class="sourceLineNo">521</span> LOG.error("Failed to write to rsGroupZNode", e);<a name="line.521"></a>
-<span class="sourceLineNo">522</span> masterServices.abort("Failed to write to rsGroupZNode", e);<a name="line.522"></a>
-<span class="sourceLineNo">523</span> throw new IOException("Failed to write to rsGroupZNode",e);<a name="line.523"></a>
-<span class="sourceLineNo">524</span> }<a name="line.524"></a>
-<span class="sourceLineNo">525</span> updateCacheOfRSGroups(newGroupMap.keySet());<a name="line.525"></a>
-<span class="sourceLineNo">526</span> }<a name="line.526"></a>
-<span class="sourceLineNo">527</span><a name="line.527"></a>
-<span class="sourceLineNo">528</span> /**<a name="line.528"></a>
-<span class="sourceLineNo">529</span> * Make changes visible.<a name="line.529"></a>
-<span class="sourceLineNo">530</span> * Caller must be synchronized on 'this'.<a name="line.530"></a>
-<span class="sourceLineNo">531</span> */<a name="line.531"></a>
-<span class="sourceLineNo">532</span> private void resetRSGroupAndTableMaps(Map<String, RSGroupInfo> newRSGroupMap,<a name="line.532"></a>
-<span class="sourceLineNo">533</span> Map<TableName, String> newTableMap) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span> // Make maps Immutable.<a name="line.534"></a>
-<span class="sourceLineNo">535</span> this.rsGroupMap = Collections.unmodifiableMap(newRSGroupMap);<a name="line.535"></a>
-<span class="sourceLineNo">536</span> this.tableMap = Collections.unmodifiableMap(newTableMap);<a name="line.536"></a>
-<span class="sourceLineNo">537</span> }<a name="line.537"></a>
-<span class="sourceLineNo">538</span><a name="line.538"></a>
-<span class="sourceLineNo">539</span> /**<a name="line.539"></a>
-<span class="sourceLineNo">540</span> * Update cache of rsgroups.<a name="line.540"></a>
-<span class="sourceLineNo">541</span> * Caller must be synchronized on 'this'.<a name="line.541"></a>
-<span class="sourceLineNo">542</span> * @param currentGroups Current list of Groups.<a name="line.542"></a>
-<span class="sourceLineNo">543</span> */<a name="line.543"></a>
-<span class="sourceLineNo">544</span> private void updateCacheOfRSGroups(final Set<String> currentGroups) {<a name="line.544"></a>
-<span class="sourceLineNo">545</span> this.prevRSGroups.clear();<a name="line.545"></a>
-<span class="sourceLineNo">546</span> this.prevRSGroups.addAll(currentGroups);<a name="line.546"></a>
-<span class="sourceLineNo">547</span> }<a name="line.547"></a>
-<span class="sourceLineNo">548</span><a name="line.548"></a>
-<span class="sourceLineNo">549</span> // Called by getDefaultServers. Presume it has lock in place.<a name="line.549"></a>
-<span class="sourceLineNo">550</span> private List<ServerName> getOnlineRS() throws IOException {<a name="line.550"></a>
-<span class="sourceLineNo">551</span> if (masterServices != null) {<a name="line.551"></a>
-<span class="sourceLineNo">552</span> return masterServices.getServerManager().getOnlineServersList();<a name="line.552"></a>
-<span class="sourceLineNo">553</span> }<a name="line.553"></a>
-<span class="sourceLineNo">554</span> LOG.debug("Reading online RS from zookeeper");<a name="line.554"></a>
-<span class="sourceLineNo">555</span> List<ServerName> servers = new LinkedList<>();<a name="line.555"></a>
-<span class="sourceLineNo">556</span> try {<a name="line.556"></a>
-<span class="sourceLineNo">557</span> for (String el: ZKUtil.listChildrenNoWatch(watcher, watcher.znodePaths.rsZNode)) {<a name="line.557"></a>
-<span class="sourceLineNo">558</span> servers.add(ServerName.parseServerName(el));<a name="line.558"></a>
-<span class="sourceLineNo">559</span> }<a name="line.559"></a>
-<span class="sourceLineNo">560</span> } catch (KeeperException e) {<a name="line.560"></a>
-<span class="sourceLineNo">561</span> throw new IOException("Failed to retrieve server list from zookeeper", e);<a name="line.561"></a>
-<span class="sourceLineNo">562</span> }<a name="line.562"></a>
-<span class="sourceLineNo">563</span> return servers;<a name="line.563"></a>
-<span class="sourceLineNo">564</span> }<a name="line.564"></a>
-<span class="sourceLineNo">565</span><a name="line.565"></a>
-<span class="sourceLineNo">566</span> // Called by ServerEventsListenerThread. Presume it has lock on this manager when it runs.<a name="line.566"></a>
-<span class="sourceLineNo">567</span> private SortedSet<Address> getDefaultServers() throws IOException {<a name="line.567"></a>
-<span class="sourceLineNo">568</span> SortedSet<Address> defaultServers = Sets.newTreeSet();<a name="line.568"></a>
-<span class="sourceLineNo">569</span> for (ServerName serverName : getOnlineRS()) {<a name="line.569"></a>
-<span class="sourceLineNo">570</span> Address server =<a name="line.570"></a>
-<span class="sourceLineNo">571</span> Address.fromParts(serverName.getHostname(), serverName.getPort());<a name="line.571"></a>
-<span class="sourceLineNo">572</span> boolean found = false;<a name="line.572"></a>
-<span class="sourceLineNo">573</span> for(RSGroupInfo rsgi: listRSGroups()) {<a name="line.573"></a>
-<span class="sourceLineNo">574</span> if(!RSGroupInfo.DEFAULT_GROUP.equals(rsgi.getName()) &&<a name="line.574"></a>
-<span class="sourceLineNo">575</span> rsgi.containsServer(server)) {<a name="line.575"></a>
-<span class="sourceLineNo">576</span> found = true;<a name="line.576"></a>
-<span class="sourceLineNo">577</span> break;<a name="line.577"></a>
-<span class="sourceLineNo">578</span> }<a name="line.578"></a>
-<span class="sourceLineNo">579</span> }<a name="line.579"></a>
-<span class="sourceLineNo">580</span> if (!found) {<a name="line.580"></a>
-<span class="sourceLineNo">581</span> defaultServers.add(server);<a name="line.581"></a>
-<span class="sourceLineNo">582</span> }<a name="line.582"></a>
-<span class="sourceLineNo">583</span> }<a name="line.583"></a>
-<span class="sourceLineNo">584</span> return defaultServers;<a name="line.584"></a>
-<span class="sourceLineNo">585</span> }<a name="line.585"></a>
-<span class="sourceLineNo">586</span><a name="line.586"></a>
-<span class="sourceLineNo">587</span> // Called by ServerEventsListenerThread. Synchronize on this because redoing<a name="line.587"></a>
-<span class="sourceLineNo">588</span> // the rsGroupMap then writing it out.<a name="line.588"></a>
-<span class="sourceLineNo">589</span> private synchronized void updateDefaultServers(SortedSet<Address> servers) throws IOException {<a name="line.589"></a>
-<span class="sourceLineNo">590</span> RSGroupInfo info = rsGroupMap.get(RSGroupInfo.DEFAULT_GROUP);<a name="line.590"></a>
-<span class="sourceLineNo">591</span> RSGroupInfo newInfo = new RSGroupInfo(info.getName(), servers, info.getTables());<a name="line.591"></a>
-<span class="sourceLineNo">592</span> HashMap<String, RSGroupInfo> newGroupMap = Maps.newHashMap(rsGroupMap);<a name="line.592"></a>
-<span class="sourceLineNo">593</span> newGroupMap.put(newInfo.getName(), newInfo);<a name="line.593"></a>
-<span class="sourceLineNo">594</span> flushConfig(newGroupMap);<a name="line.594"></a>
-<span class="sourceLineNo">595</span> }<a name="line.595"></a>
-<span class="sourceLineNo">596</span><a name="line.596"></a>
-<span class="sourceLineNo">597</span> // Called by FailedOpenUpdaterThread<a name="line.597"></a>
-<span class="sourceLineNo">598</span> private void updateFailedAssignments() {<a name="line.598"></a>
-<span class="sourceLineNo">599</span> // Kick all regions in FAILED_OPEN state<a name="line.599"></a>
-<span class="sourceLineNo">600</span> List<RegionInfo> stuckAssignments = Lists.newArrayList();<a name="line.600"></a>
-<span class="sourceLineNo">601</span> for (RegionStateNode state:<a name="line.601"></a>
-<span class="sourceLineNo">602</span> masterServices.getAssignmentManager().getRegionStates().getRegionsInTransition()) {<a name="line.602"></a>
-<span class="sourceLineNo">603</span> if (state.isStuck()) {<a name="line.603"></a>
-<span class="sourceLineNo">604</span> stuckAssignments.add(state.getRegionInfo());<a name="line.604"></a>
-<span class="sourceLineNo">605</span> }<a name="line.605"></a>
-<span class="sourceLineNo">606</span> }<a name="line.606"></a>
-<span class="sourceLineNo">607</span> for (RegionInfo region: stuckAssignments) {<a name="line.607"></a>
-<span class="sourceLineNo">608</span> LOG.info("Retrying assignment of " + region);<a name="line.608"></a>
-<span class="sourceLineNo">609</span> try {<a name="line.609"></a>
-<span class="sourceLineNo">610</span> masterServices.getAssignmentManager().unassign(region);<a name="line.610"></a>
-<span class="sourceLineNo">611</span> } catch (IOException e) {<a name="line.611"></a>
-<span class="sourceLineNo">612</span> LOG.warn("Unable to reassign " + region, e);<a name="line.612"></a>
-<span class="sourceLineNo">613</span> }<a name="line.613"></a>
-<span class="sourceLineNo">614</span> }<a name="line.614"></a>
-<span class="sourceLineNo">615</span> }<a name="line.615"></a>
-<span class="sourceLineNo">616</span><a name="line.616"></a>
-<span class="sourceLineNo">617</span> /**<a name="line.617"></a>
-<span class="sourceLineNo">618</span> * Calls {@link RSGroupInfoManagerImpl#updateDefaultServers(SortedSet)} to update list of known<a name="line.618"></a>
-<span class="sourceLineNo">619</span> * servers. Notifications about server changes are received by registering {@link ServerListener}.<a name="line.619"></a>
-<span class="sourceLineNo">620</span> * As a listener, we need to return immediately, so the real work of updating the servers is<a name="line.620"></a>
-<span class="sourceLineNo">621</span> * done asynchronously in this thread.<a name="line.621"></a>
-<span class="sourceLineNo">622</span> */<a name="line.622"></a>
-<span class="sourceLineNo">623</span> private class ServerEventsListenerThread extends Thread implements ServerListener {<a name="line.623"></a>
-<span class="sourceLineNo">624</span> private final Logger LOG = LoggerFactory.getLogger(ServerEventsListenerThread.class);<a name="line.624"></a>
-<span class="sourceLineNo">625</span> private boolean changed = false;<a name="line.625"></a>
-<span class="sourceLineNo">626</span><a name="line.626"></a>
-<span class="sourceLineNo">627</span> ServerEventsListenerThread() {<a name="line.627"></a>
-<span class="sourceLineNo">628</span> setDaemon(true);<a name="line.628"></a>
-<span class="sourceLineNo">629</span> }<a name="line.629"></a>
+<span class="sourceLineNo">499</span> try {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> String groupBasePath = ZNodePaths.joinZNode(watcher.znodePaths.baseZNode, rsGroupZNode);<a name="line.500"></a>
+<span class="sourceLineNo">501</span> ZKUtil.createAndFailSilent(watcher, groupBasePath, ProtobufMagic.PB_MAGIC);<a name="line.501"></a>
+<span class="sourceLineNo">502</span><a name="line.502"></a>
+<span class="sourceLineNo">503</span> List<ZKUtil.ZKUtilOp> zkOps = new ArrayList<>(newGroupMap.size());<a name="line.503"></a>
+<span class="sourceLineNo">504</span> for(String groupName : prevRSGroups) {<a name="line.504"></a>
+<span class="sourceLineNo">505</span> if(!newGroupMap.containsKey(groupName)) {<a name="line.505"></a>
+<span class="sourceLineNo">506</span> String znode = ZNodePaths.joinZNode(groupBasePath, groupName);<a name="line.506"></a>
+<span class="sourceLineNo">507</span> zkOps.add(ZKUtil.ZKUtilOp.deleteNodeFailSilent(znode));<a name="line.507"></a>
+<span class="sourceLineNo">508</span> }<a name="line.508"></a>
+<span class="sourceLineNo">509</span> }<a name="line.509"></a>
+<span class="sourceLineNo">510</span><a name="line.510"></a>
+<span class="sourceLineNo">511</span><a name="line.511"></a>
+<span class="sourceLineNo">512</span> for (RSGroupInfo RSGroupInfo : newGroupMap.values()) {<a name="line.512"></a>
+<span class="sourceLineNo">513</span> String znode = ZNodePaths.joinZNode(groupBasePath, RSGroupInfo.getName());<a name="line.513"></a>
+<span class="sourceLineNo">514</span> RSGroupProtos.RSGroupInfo proto = RSGroupProtobufUtil.toProtoGroupInfo(RSGroupInfo);<a name="line.514"></a>
+<span class="sourceLineNo">515</span> LOG.debug("Updating znode: "+znode);<a name="line.515"></a>
+<span class="sourceLineNo">516</span> ZKUtil.createAndFailSilent(watcher, znode);<a name="line.516"></a>
+<span class="sourceLineNo">517</span> zkOps.add(ZKUtil.ZKUtilOp.deleteNodeFailSilent(znode));<a name="line.517"></a>
+<span class="sourceLineNo">518</span> zkOps.add(ZKUtil.ZKUtilOp.createAndFailSilent(znode,<a name="line.518"></a>
+<span class="sourceLineNo">519</span> ProtobufUtil.prependPBMagic(proto.toByteArray())));<a name="line.519"></a>
+<span class="sourceLineNo">520</span> }<a name="line.520"></a>
+<span class="sourceLineNo">521</span> LOG.debug("Writing ZK GroupInfo count: " + zkOps.size());<a name="line.521"></a>
+<span class="sourceLineNo">522</span><a name="line.522"></a>
+<span class="sourceLineNo">523</span> ZKUtil.multiOrSequential(watcher, zkOps, false);<a name="line.523"></a>
+<span class="sourceLineNo">524</span> } catch (KeeperException e) {<a name="line.524"></a>
+<span class="sourceLineNo">525</span> LOG.error("Failed to write to rsGroupZNode", e);<a name="line.525"></a>
+<span class="sourceLineNo">526</span> masterServices.abort("Failed to write to rsGroupZNode", e);<a name="line.526"></a>
+<span class="sourceLineNo">527</span> throw new IOException("Failed to write to rsGroupZNode",e);<a name="line.527"></a>
+<span class="sourceLineNo">528</span> }<a name="line.528"></a>
+<span class="sourceLineNo">529</span> updateCacheOfRSGroups(newGroupMap.keySet());<a name="line.529"></a>
+<span class="sourceLineNo">530</span> }<a name="line.530"></a>
+<span class="sourceLineNo">531</span><a name="line.531"></a>
+<span class="sourceLineNo">532</span> /**<a name="line.532"></a>
+<span class="sourceLineNo">533</span> * Make changes visible.<a name="line.533"></a>
+<span class="sourceLineNo">534</span> * Caller must be synchronized on 'this'.<a name="line.534"></a>
+<span class="sourceLineNo">535</span> */<a name="line.535"></a>
+<span class="sourceLineNo">536</span> private void resetRSGroupAndTableMaps(Map<String, RSGroupInfo> newRSGroupMap,<a name="line.536"></a>
+<span class="sourceLineNo">537</span> Map<TableName, String> newTableMap) {<a name="line.537"></a>
+<span class="sourceLineNo">538</span> // Make maps Immutable.<a name="line.538"></a>
+<span class="sourceLineNo">539</span> this.rsGroupMap = Collections.unmodifiableMap(newRSGroupMap);<a name="line.539"></a>
+<span class="sourceLineNo">540</span> this.tableMap = Collections.unmodifiableMap(newTableMap);<a name="line.540"></a>
+<span class="sourceLineNo">541</span> }<a name="line.541"></a>
+<span class="sourceLineNo">542</span><a name="line.542"></a>
+<span class="sourceLineNo">543</span> /**<a name="line.543"></a>
+<span class="sourceLineNo">544</span> * Update cache of rsgroups.<a name="line.544"></a>
+<span class="sourceLineNo">545</span> * Caller must be synchronized on 'this'.<a name="line.545"></a>
+<span class="sourceLineNo">546</span> * @param currentGroups Current list of Groups.<a name="line.546"></a>
+<span class="sourceLineNo">547</span> */<a name="line.547"></a>
+<span class="sourceLineNo">548</span> private void updateCacheOfRSGroups(final Set<String> currentGroups) {<a name="line.548"></a>
+<span class="sourceLineNo">549</span> this.prevRSGroups.clear();<a name="line.549"></a>
+<span class="sourceLineNo">550</span> this.prevRSGroups.addAll(currentGroups);<a name="line.550"></a>
+<span class="sourceLineNo">551</span> }<a name="line.551"></a>
+<span class="sourceLineNo">552</span><a name="line.552"></a>
+<span class="sourceLineNo">553</span> // Called by getDefaultServers. Presume it has lock in place.<a name="line.553"></a>
+<span class="sourceLineNo">554</span> private List<ServerName> getOnlineRS() throws IOException {<a name="line.554"></a>
+<span class="sourceLineNo">555</span> if (masterServices != null) {<a name="line.555"></a>
+<span class="sourceLineNo">556</span> return masterServices.getServerManager().getOnlineServersList();<a name="line.556"></a>
+<span class="sourceLineNo">557</span> }<a name="line.557"></a>
+<span class="sourceLineNo">558</span> LOG.debug("Reading online RS from zookeeper");<a name="line.558"></a>
+<span class="sourceLineNo">559</span> List<ServerName> servers = new LinkedList<>();<a name="line.559"></a>
+<span class="sourceLineNo">560</span> try {<a name="line.560"></a>
+<span class="sourceLineNo">561</span> for (String el: ZKUtil.listChildrenNoWatch(watcher, watcher.znodePaths.rsZNode)) {<a name="line.561"></a>
+<span class="sourceLineNo">562</span> servers.add(ServerName.parseServerName(el));<a name="line.562"></a>
+<span class="sourceLineNo">563</span> }<a name="line.563"></a>
+<span class="sourceLineNo">564</span> } catch (KeeperException e) {<a name="line.564"></a>
+<span class="sourceLineNo">565</span> throw new IOException("Failed to retrieve server list from zookeeper", e);<a name="line.565"></a>
+<span class="sourceLineNo">566</span> }<a name="line.566"></a>
+<span class="sourceLineNo">567</span> return servers;<a name="line.567"></a>
+<span class="sourceLineNo">568</span> }<a name="line.568"></a>
+<span class="sourceLineNo">569</span><a name="line.569"></a>
+<span class="sourceLineNo">570</span> // Called by ServerEventsListenerThread. Presume it has lock on this manager when it runs.<a name="line.570"></a>
+<span class="sourceLineNo">571</span> private SortedSet<Address> getDefaultServers() throws IOException {<a name="line.571"></a>
+<span class="sourceLineNo">572</span> SortedSet<Address> defaultServers = Sets.newTreeSet();<a name="line.572"></a>
+<span class="sourceLineNo">573</span> for (ServerName serverName : getOnlineRS()) {<a name="line.573"></a>
+<span class="sourceLineNo">574</span> Address server =<a name="line.574"></a>
+<span class="sourceLineNo">575</span> Address.fromParts(serverName.getHostname(), serverName.getPort());<a name="line.575"></a>
+<span class="sourceLineNo">576</span> boolean found = false;<a name="line.576"></a>
+<span class="sourceLineNo">577</span> for(RSGroupInfo rsgi: listRSGroups()) {<a name="line.577"></a>
+<span class="sourceLineNo">578</span> if(!RSGroupInfo.DEFAULT_GROUP.equals(rsgi.getName()) &&<a name="line.578"></a>
+<span class="sourceLineNo">579</span> rsgi.containsServer(server)) {<a name="line.579"></a>
+<span class="sourceLineNo">580</span> found = true;<a name="line.580"></a>
+<span class="sourceLineNo">581</span> break;<a name="line.581"></a>
+<span class="sourceLineNo">582</span> }<a name="line.582"></a>
+<span class="sourceLineNo">583</span> }<a name="line.583"></a>
+<span class="sourceLineNo">584</span> if (!found) {<a name="line.584"></a>
+<span class="sourceLineNo">585</span> defaultServers.add(server);<a name="line.585"></a>
+<span class="sourceLineNo">586</span> }<a name="line.586"></a>
+<span class="sourceLineNo">587</span> }<a name="line.587"></a>
+<span class="sourceLineNo">588</span> return defaultServers;<a name="line.588"></a>
+<span class="sourceLineNo">589</span> }<a name="line.589"></a>
+<span class="sourceLineNo">590</span><a name="line.590"></a>
+<span class="sourceLineNo">591</span> // Called by ServerEventsListenerThread. Synchronize on this because redoing<a name="line.591"></a>
+<span class="sourceLineNo">592</span> // the rsGroupMap then writing it out.<a name="line.592"></a>
+<span class="sourceLineNo">593</span> private synchronized void updateDefaultServers(SortedSet<Address> servers) throws IOException {<a name="line.593"></a>
+<span class="sourceLineNo">594</span> RSGroupInfo info = rsGroupMap.get(RSGroupInfo.DEFAULT_GROUP);<a name="line.594"></a>
+<span class="sourceLineNo">595</span> RSGroupInfo newInfo = new RSGroupInfo(info.getName(), servers, info.getTables());<a name="line.595"></a>
+<span class="sourceLineNo">596</span> HashMap<String, RSGroupInfo> newGroupMap = Maps.newHashMap(rsGroupMap);<a name="line.596"></a>
+<span class="sourceLineNo">597</span> newGroupMap.put(newInfo.getName(), newInfo);<a name="line.597"></a>
+<span class="sourceLineNo">598</span> flushConfig(newGroupMap);<a name="line.598"></a>
+<span class="sourceLineNo">599</span> }<a name="line.599"></a>
+<span class="sourceLineNo">600</span><a name="line.600"></a>
+<span class="sourceLineNo">601</span> // Called by FailedOpenUpdaterThread<a name="line.601"></a>
+<span class="sourceLineNo">602</span> private void updateFailedAssignments() {<a name="line.602"></a>
+<span class="sourceLineNo">603</span> // Kick all regions in FAILED_OPEN state<a name="line.603"></a>
+<span class="sourceLineNo">604</span> List<RegionInfo> stuckAssignments = Lists.newArrayList();<a name="line.604"></a>
+<span class="sourceLineNo">605</span> for (RegionStateNode state:<a name="line.605"></a>
+<span class="sourceLineNo">606</span> masterServices.getAssignmentManager().getRegionStates().getRegionsInTransition()) {<a name="line.606"></a>
+<span class="sourceLineNo">607</span> if (state.isStuck()) {<a name="line.607"></a>
+<span class="sourceLineNo">608</span> stuckAssignments.add(state.getRegionInfo());<a name="line.608"></a>
+<span class="sourceLineNo">609</span> }<a name="line.609"></a>
+<span class="sourceLineNo">610</span> }<a name="line.610"></a>
+<span class="sourceLineNo">611</span> for (RegionInfo region: stuckAssignments) {<a name="line.611"></a>
+<span class="sourceLineNo">612</span> LOG.info("Retrying assignment of " + region);<a name="line.612"></a>
+<span class="sourceLineNo">613</span> try {<a name="line.613"></a>
+<span class="sourceLineNo">614</span> masterServices.getAssignmentManager().unassign(region);<a name="line.614"></a>
+<span class="sourceLineNo">615</span> } catch (IOException e) {<a name="line.615"></a>
+<span class="sourceLineNo">616</span> LOG.warn("Unable to reassign " + region, e);<a name="line.616"></a>
+<span class="sourceLineNo">617</span> }<a name="line.617"></a>
+<span class="sourceLineNo">618</span> }<a name="line.618"></a>
+<span class="sourceLineNo">619</span> }<a name="line.619"></a>
+<span class="sourceLineNo">620</span><a name="line.620"></a>
+<span class="sourceLineNo">621</span> /**<a name="line.621"></a>
+<span class="sourceLineNo">622</span> * Calls {@link RSGroupInfoManagerImpl#updateDefaultServers(SortedSet)} to update list of known<a name="line.622"></a>
+<span class="sourceLineNo">623</span> * servers. Notifications about server changes are received by registering {@link ServerListener}.<a name="line.623"></a>
+<span class="sourceLineNo">624</span> * As a listener, we need to return immediately, so the real work of updating the servers is<a name="line.624"></a>
+<span class="sourceLineNo">625</span> * done asynchronously in this thread.<a name="line.625"></a>
+<span class="sourceLineNo">626</span> */<a name="line.626"></a>
+<span class="sourceLineNo">627</span> private class ServerEventsListenerThread extends Thread implements ServerListener {<a name="line.627"></a>
+<span class="sourceLineNo">628</span> private final Logger LOG = LoggerFactory.getLogger(ServerEventsListenerThread.class);<a name="line.628"></a>
+<span class="sourceLineNo">629</span> private boolean changed = false;<a name="line.629"></a>
<span class="sourceLineNo">630</span><a name="line.630"></a>
-<span class="sourceLineNo">631</span> @Override<a name="line.631"></a>
-<span class="sourceLineNo">632</span> public void serverAdded(ServerName serverName) {<a name="line.632"></a>
-<span class="sourceLineNo">633</span> serverChanged();<a name="line.633"></a>
-<span class="sourceLineNo">634</span> }<a name="line.634"></a>
-<span class="sourceLineNo">635</span><a name="line.635"></a>
-<span class="sourceLineNo">636</span> @Override<a name="line.636"></a>
-<span class="sourceLineNo">637</span> public void serverRemoved(ServerName serverName) {<a name="line.637"></a>
-<span class="sourceLineNo">638</span> serverChanged();<a name="line.638"></a>
-<span class="sourceLineNo">639</span> }<a name="line.639"></a>
-<span class="sourceLineNo">640</span><a name="line.640"></a>
-<span class="sourceLineNo">641</span> private synchronized void serverChanged() {<a name="line.641"></a>
-<span class="sourceLineNo">642</span> changed = true;<a name="line.642"></a>
-<span class="sourceLineNo">643</span> this.notify();<a name="line.643"></a>
-<span class="sourceLineNo">644</span> }<a name="line.644"></a>
-<span class="sourceLineNo">645</span><a name="line.645"></a>
-<span class="sourceLineNo">646</span> @Override<a name="line.646"></a>
-<span class="sourceLineNo">647</span> public void run() {<a name="line.647"></a>
-<span class="sourceLineNo">648</span> setName(ServerEventsListenerThread.class.getName() + "-" + masterServices.getServerName());<a name="line.648"></a>
-<span class="sourceLineNo">649</span> SortedSet<Address> prevDefaultServers = new TreeSet<>();<a name="line.649"></a>
-<span class="sourceLineNo">650</span> while(isMasterRunning(masterServices)) {<a name="line.650"></a>
-<span class="sourceLineNo">651</span> try {<a name="line.651"></a>
-<span class="sourceLineNo">652</span> LOG.info("Updating default servers.");<a name="line.652"></a>
-<span class="sourceLineNo">653</span> SortedSet<Address> servers = RSGroupInfoManagerImpl.this.getDefaultServers();<a name="line.653"></a>
-<span class="sourceLineNo">654</span> if (!servers.equals(prevDefaultServers)) {<a name="line.654"></a>
-<span class="sourceLineNo">655</span> RSGroupInfoManagerImpl.this.updateDefaultServers(servers);<a name="line.655"></a>
-<span class="sourceLineNo">656</span> prevDefaultServers = servers;<a name="line.656"></a>
-<span class="sourceLineNo">657</span> LOG.info("Updated with servers: "+servers.size());<a name="line.657"></a>
-<span class="sourceLineNo">658</span> }<a name="line.658"></a>
-<span class="sourceLineNo">659</span> try {<a name="line.659"></a>
-<span class="sourceLineNo">660</span> synchronized (this) {<a name="line.660"></a>
-<span class="sourceLineNo">661</span> while (!changed) {<a name="line.661"></a>
-<span class="sourceLineNo">662</span> wait();<a name="line.662"></a>
-<span class="sourceLineNo">663</span> }<a name="line.663"></a>
-<span class="sourceLineNo">664</span> changed = false;<a name="line.664"></a>
-<span class="sourceLineNo">665</span> }<a name="line.665"></a>
-<span class="sourceLineNo">666</span> } catch (InterruptedException e) {<a name="line.666"></a>
-<span class="sourceLineNo">667</span> LOG.warn("Interrupted", e);<a name="line.667"></a>
-<span class="sourceLineNo">668</span> }<a name="line.668"></a>
-<span class="sourceLineNo">669</span> } catch (IOException e) {<a name="line.669"></a>
-<span class="sourceLineNo">670</span> LOG.warn("Failed to update default servers", e);<a name="line.670"></a>
-<span class="sourceLineNo">671</span> }<a name="line.671"></a>
-<span class="sourceLineNo">672</span> }<a name="line.672"></a>
-<span class="sourceLineNo">673</span> }<a name="line.673"></a>
-<span class="sourceLineNo">674</span> }<a name="line.674"></a>
-<span class="sourceLineNo">675</span><a name="line.675"></a>
-<span class="sourceLineNo">676</span> private class FailedOpenUpdaterThread extends Thread implements ServerListener {<a name="line.676"></a>
-<span class="sourceLineNo">677</span> private final long waitInterval;<a name="line.677"></a>
-<span class="sourceLineNo">678</span> private volatile boolean hasChanged = false;<a name="line.678"></a>
+<span class="sourceLineNo">631</span> ServerEventsListenerThread() {<a name="line.631"></a>
+<span class="sourceLineNo">632</span> setDaemon(true);<a name="line.632"></a>
+<span class="sourceLineNo">633</span> }<a name="line.633"></a>
+<span class="sourceLineNo">634</span><a name="line.634"></a>
+<span class="sourceLineNo">635</span> @Override<a name="line.635"></a>
+<span class="sourceLineNo">636</span> public void serverAdded(ServerName serverName) {<a name="line.636"></a>
+<span class="sourceLineNo">637</span> serverChanged();<a name="line.637"></a>
+<span class="sourceLineNo">638</span> }<a name="line.638"></a>
+<span class="sourceLineNo">639</span><a name="line.639"></a>
+<span class="sourceLineNo">640</span> @Override<a name="line.640"></a>
+<span class="sourceLineNo">641</span> public void serverRemoved(ServerName serverName) {<a name="line.641"></a>
+<span class="sourceLineNo">642</span> serverChanged();<a name="line.642"></a>
+<span class="sourceLineNo">643</span> }<a name="line.643"></a>
+<span class="sourceLineNo">644</span><a name="line.644"></a>
+<span class="sourceLineNo">645</span> private synchronized void serverChanged() {<a name="line.645"></a>
+<span class="sourceLineNo">646</span> changed = true;<a name="line.646"></a>
+<span class="sourceLineNo">647</span> this.notify();<a name="line.647"></a>
+<span class="sourceLineNo">648</span> }<a name="line.648"></a>
+<span class="sourceLineNo">649</span><a name="line.649"></a>
+<span class="sourceLineNo">650</span> @Override<a name="line.650"></a>
+<span class="sourceLineNo">651</span> public void run() {<a name="line.651"></a>
+<span class="sourceLineNo">652</span> setName(ServerEventsListenerThread.class.getName() + "-" + masterServices.getServerName());<a name="line.652"></a>
+<span class="sourceLineNo">653</span> SortedSet<Address> prevDefaultServers = new TreeSet<>();<a name="line.653"></a>
+<span class="sourceLineNo">654</span> while(isMasterRunning(masterServices)) {<a name="line.654"></a>
+<span class="sourceLineNo">655</span> try {<a name="line.655"></a>
+<span class="sourceLineNo">656</span> LOG.info("Updating default servers.");<a name="line.656"></a>
+<span class="sourceLineNo">657</span> SortedSet<Address> servers = RSGroupInfoManagerImpl.this.getDefaultServers();<a name="line.657"></a>
+<span class="sourceLineNo">658</span> if (!servers.equals(prevDefaultServers)) {<a name="line.658"></a>
+<span class="sourceLineNo">659</span> RSGroupInfoManagerImpl.this.updateDefaultServers(servers);<a name="line.659"></a>
+<span class="sourceLineNo">660</span> prevDefaultServers = servers;<a name="line.660"></a>
+<span class="sourceLineNo">661</span> LOG.info("Updated with servers: "+servers.size());<a name="line.661"></a>
+<span class="sourceLineNo">662</span> }<a name="line.662"></a>
+<span class="sourceLineNo">663</span> try {<a name="line.663"></a>
+<span class="sourceLineNo">664</span> synchronized (this) {<a name="line.664"></a>
+<span class="sourceLineNo">665</span> while (!changed) {<a name="line.665"></a>
+<span class="sourceLineNo">666</span> wait();<a name="line.666"></a>
+<span class="sourceLineNo">667</span> }<a name="line.667"></a>
+<span class="sourceLineNo">668</span> changed = false;<a name="line.668"></a>
+<span class="sourceLineNo">669</span> }<a name="line.669"></a>
+<span class="sourceLineNo">670</span> } catch (InterruptedException e) {<a name="line.670"></a>
+<span class="sourceLineNo">671</span> LOG.warn("Interrupted", e);<a name="line.671"></a>
+<span class="sourceLineNo">672</span> }<a name="line.672"></a>
+<span class="sourceLineNo">673</span> } catch (IOException e) {<a name="line.673"></a>
+<span class="sourceLineNo">674</span> LOG.warn("Failed to update default servers", e);<a name="line.674"></a>
+<span class="sourceLineNo">675</span> }<a name="line.675"></a>
+<span class="sourceLineNo">676</span> }<a name="line.676"></a>
+<span class="sourceLineNo">677</span> }<a name="line.677"></a>
+<span class="sourceLineNo">678</span> }<a name="line.678"></a>
<span class="sourceLineNo">679</span><a name="line.679"></a>
-<span class="sourceLineNo">680</span> public FailedOpenUpdaterThread(Configuration conf) {<a name="line.680"></a>
-<span class="sourceLineNo">681</span> this.waitInterval = conf.getLong(REASSIGN_WAIT_INTERVAL_KEY,<a name="line.681"></a>
-<span class="sourceLineNo">682</span> DEFAULT_REASSIGN_WAIT_INTERVAL);<a name="line.682"></a>
-<span class="sourceLineNo">683</span> setDaemon(true);<a name="line.683"></a>
-<span class="sourceLineNo">684</span> }<a name="line.684"></a>
-<span class="sourceLineNo">685</span><a name="line.685"></a>
-<span class="sourceLineNo">686</span> @Override<a name="line.686"></a>
-<span class="sourceLineNo">687</span> public void serverAdded(ServerName serverName) {<a name="line.687"></a>
-<span class="sourceLineNo">688</span> serverChanged();<a name="line.688"></a>
-<span class="sourceLineNo">689</span> }<a name="line.689"></a>
-<span class="sourceLineNo">690</span><a name="line.690"></a>
-<span class="sourceLineNo">691</span> @Override<a name="line.691"></a>
-<span class="sourceLineNo">692</span> public void serverRemoved(ServerName serverName) {<a name="line.692"></a>
+<span class="sourceLineNo">680</span> private class FailedOpenUpdaterThread extends Thread implements ServerListener {<a name="line.680"></a>
+<span class="sourceLineNo">681</span> private final long waitInterval;<a name="line.681"></a>
+<span class="sourceLineNo">682</span> private volatile boolean hasChanged = false;<a name="line.682"></a>
+<span class="sourceLineNo">683</span><a name="line.683"></a>
+<span class="sourceLineNo">684</span> public FailedOpenUpdaterThread(Configuration conf) {<a name="line.684"></a>
+<span class="sourceLineNo">685</span> this.waitInterval = conf.getLong(REASSIGN_WAIT_INTERVAL_KEY,<a name="line.685"></a>
+<span class="sourceLineNo">686</span> DEFAULT_REASSIGN_WAIT_INTERVAL);<a name="line.686"></a>
+<span class="sourceLineNo">687</span> setDaemon(true);<a name="line.687"></a>
+<span class="sourceLineNo">688</span> }<a name="line.688"></a>
+<span class="sourceLineNo">689</span><a name="line.689"></a>
+<span class="sourceLineNo">690</span> @Override<a name="line.690"></a>
+<span class="sourceLineNo">691</span> public void serverAdded(ServerName serverName) {<a name="line.691"></a>
+<span class="sourceLineNo">692</span> serverChanged();<a name="line.692"></a>
<span class="sourceLineNo">693</span> }<a name="line.693"></a>
<span class="sourceLineNo">694</span><a name="line.694"></a>
<span class="sourceLineNo">695</span> @Override<a name="line.695"></a>
-<span class="sourceLineNo">696</span> public void run() {<a name="line.696"></a>
-<span class="sourceLineNo">697</span> while (isMasterRunning(masterServices)) {<a name="line.697"></a>
-<span class="sourceLineNo">698</span> boolean interrupted = false;<a name="line.698"></a>
-<span class="sourceLineNo">699</span> try {<a name="line.699"></a>
-<span class="sourceLineNo">700</span> synchronized (this) {<a name="line.700"></a>
-<span class="sourceLineNo">701</span> while (!hasChanged) {<a name="line.701"></a>
-<span class="sourceLineNo">702</span> wait();<a name="line.702"></a>
-<span class="sourceLineNo">703</span> }<a name="line.703"></a>
-<span class="sourceLineNo">704</span> hasChanged = false;<a name="line.704"></a>
-<span class="sourceLineNo">705</span> }<a name="line.705"></a>
-<span class="sourceLineNo">706</span> } catch (InterruptedException e) {<a name="line.706"></a>
-<span class="sourceLineNo">707</span> LOG.warn("Interrupted", e);<a name="line.707"></a>
-<span class="sourceLineNo">708</span> interrupted = true;<a name="line.708"></a>
-<span class="sourceLineNo">709</span> }<a name="line.709"></a>
-<span class="sourceLineNo">710</span> if (!isMasterRunning(masterServices) || interrupted) {<a name="line.710"></a>
-<span class="sourceLineNo">711</span> continue;<a name="line.711"></a>
-<span class="sourceLineNo">712</span> }<a name="line.712"></a>
-<span class="sourceLineNo">713</span><a name="line.713"></a>
-<span class="sourceLineNo">714</span> // First, wait a while in case more servers are about to rejoin the cluster<a name="line.714"></a>
-<span class="sourceLineNo">715</span> try {<a name="line.715"></a>
-<span class="sourceLineNo">716</span> Thread.sleep(waitInterval);<a name="line.716"></a>
-<span class="sourceLineNo">717</span> } catch (InterruptedException e) {<a name="line.717"></a>
-<span class="sourceLineNo">718</span> LOG.warn("Interrupted", e);<a name="line.718"></a>
-<span class="sourceLineNo">719</span> }<a name="line.719"></a>
-<span class="sourceLineNo">720</span> if (!isMasterRunning(masterServices)) {<a name="line.720"></a>
-<span class="sourceLineNo">721</span> continue;<a name="line.721"></a>
-<span class="sourceLineNo">722</span> }<a name="line.722"></a>
-<span class="sourceLineNo">723</span><a name="line.723"></a>
-<span class="sourceLineNo">724</span> // Kick all regions in FAILED_OPEN state<a name="line.724"></a>
-<span class="sourceLineNo">725</span> updateFailedAssignments();<a name="line.725"></a>
-<span class="sourceLineNo">726</span> }<a name="line.726"></a>
-<span class="sourceLineNo">727</span> }<a name="line.727"></a>
-<span class="sourceLineNo">728</span><a name="line.728"></a>
-<span class="sourceLineNo">729</span> public void serverChanged() {<a name="line.729"></a>
-<span class="sourceLineNo">730</span> synchronized (this) {<a name="line.730"></a>
-<span class="sourceLineNo">731</span> hasChanged = true;<a name="line.731"></a>
-<span class="sourceLineNo">732</span> this.notify();<a name="line.732"></a>
-<span class="sourceLineNo">733</span> }<a name="line.733"></a>
-<span class="sourceLineNo">734</span> }<a name="line.734"></a>
-<span class="sourceLineNo">735</span> }<a name="line.735"></a>
-<span class="sourceLineNo">736</span><a name="line.736"></a>
-<span class="sourceLineNo">737</span> private class RSGroupStartupWorker extends Thread {<a name="line.737"></a>
-<span class="sourceLineNo">738</span> private final Logger LOG = LoggerFactory.getLogger(RSGroupStartupWorker.class);<a name="line.738"></a>
-<span class="sourceLineNo">739</span> private volatile boolean online = false;<a name="line.739"></a>
+<span class="sourceLineNo">696</span> public void serverRemoved(ServerName serverName) {<a name="line.696"></a>
+<span class="sourceLineNo">697</span> }<a name="line.697"></a>
+<span class="sourceLineNo">698</span><a name="line.698"></a>
+<span class="sourceLineNo">699</span> @Override<a name="line.699"></a>
+<span class="sourceLineNo">700</span> public void run() {<a name="line.700"></a>
+<span class="sourceLineNo">701</span> while (isMasterRunning(masterServices)) {<a name="line.701"></a>
+<span class="sourceLineNo">702</span> boolean interrupted = false;<a name="line.702"></a>
+<span class="sourceLineNo">703</span> try {<a name="line.703"></a>
+<span class="sourceLineNo">704</span> synchronized (this) {<a name="line.704"></a>
+<span class="sourceLineNo">705</span> while (!hasChanged) {<a name="line.705"></a>
+<span class="sourceLineNo">706</span> wait();<a name="line.706"></a>
+<span class="sourceLineNo">707</span> }<a name="line.707"></a>
+<span class="sourceLineNo">708</span> hasChanged = false;<a name="line.708"></a>
+<span class="sourceLineNo">709</span> }<a name="line.709"></a>
+<span class="sourceLineNo">710</span> } catch (InterruptedException e) {<a name="line.710"></a>
+<span class="sourceLineNo">711</span> LOG.warn("Interrupted", e);<a name="line.711"></a>
+<span class="sourceLineNo">712</span> interrupted = true;<a name="line.712"></a>
+<span class="sourceLineNo">713</span> }<a name="line.713"></a>
+<span class="sourceLineNo">714</span> if (!isMasterRunning(masterServices) || interrupted) {<a name="line.714"></a>
+<span class="sourceLineNo">715</span> continue;<a name="line.715"></a>
+<span class="sourceLineNo">716</span> }<a name="line.716"></a>
+<span class="sourceLineNo">717</span><a name="line.717"></a>
+<span class="sourceLineNo">718</span> // First, wait a while in case more servers are about to rejoin the cluster<a name="line.718"></a>
+<span class="sourceLineNo">719</span> try {<a name="line.719"></a>
+<span class="sourceLineNo">720</span> Thread.sleep(waitInterval);<a name="line.720"></a>
+<span class="sourceLineNo">721</span> } catch (InterruptedException e) {<a name="line.721"></a>
+<span class="sourceLineNo">722</span> LOG.warn("Interrupted", e);<a name="line.722"></a>
+<span class="sourceLineNo">723</span> }<a name="line.723"></a>
+<span class="sourceLineNo">724</span> if (!isMasterRunning(masterServices)) {<a name="line.724"></a>
+<span class="sourceLineNo">725</span> continue;<a name="line.725"></a>
+<span class="sourceLineNo">726</span> }<a name="line.726"></a>
+<span class="sourceLineNo">727</span><a name="line.727"></a>
+<span class="sourceLineNo">728</span> // Kick all regions in FAILED_OPEN state<a name="line.728"></a>
+<span class="sourceLineNo">729</span> updateFailedAssignments();<a name="line.729"></a>
+<span class="sourceLineNo">730</span> }<a name="line.730"></a>
+<span class="sourceLineNo">731</span> }<a name="line.731"></a>
+<span class="sourceLineNo">732</span><a name="line.732"></a>
+<span class="sourceLineNo">733</span> public void serverChanged() {<a name="line.733"></a>
+<span class="sourceLineNo">734</span> synchronized (this) {<a name="line.734"></a>
+<span class="sourceLineNo">735</span> hasChanged = true;<a name="line.735"></a>
+<span class="sourceLineNo">736</span> this.notify();<a name="line.736"></a>
+<span class="sourceLineNo">737</span> }<a name="line.737"></a>
+<span class="sourceLineNo">738</span> }<a name="line.738"></a>
+<span class="sourceLineNo">739</span> }<a name="line.739"></a>
<span class="sourceLineNo">740</span><a name="line.740"></a>
-<span class="sourceLineNo">741</span> RSGroupStartupWorker() {<a name="line.741"></a>
-<span class="sourceLineNo">742</span> setDaemon(true);<a name="line.742"></a>
-<span class="sourceLineNo">743</span> }<a name="line.743"></a>
+<span class="sourceLineNo">741</span> private class RSGroupStartupWorker extends Thread {<a name="line.741"></a>
+<span class="sourceLineNo">742</span> private final Logger LOG = LoggerFactory.getLogger(RSGroupStartupWorker.class);<a name="line.742"></a>
+<span class="sourceLineNo">743</span> private volatile boolean online = false;<a name="line.743"></a>
<span class="sourceLineNo">744</span><a name="line.744"></a>
-<span class="sourceLineNo">745</span> @Override<a name="line.745"></a>
-<span class="sourceLineNo">746</span> public void run() {<a name="line.746"></a>
-<span class="sourceLineNo">747</span> setName(RSGroupStartupWorker.class.getName() + "-" + masterServices.getServerName());<a name="line.747"></a>
-<span class="sourceLineNo">748</span> if (waitForGroupTableOnline()) {<a name="line.748"></a>
-<span class="sourceLineNo">749</span> LOG.info("GroupBasedLoadBalancer is now online");<a name="line.749"></a>
-<span class="sourceLineNo">750</span> }<a name="line.750"></a>
-<span class="sourceLineNo">751</span> }<a name="line.751"></a>
-<span class="sourceLineNo">752</span><a name="line.752"></a>
-<span class="sourceLineNo">753</span> private boolean waitForGroupTableOnline() {<a name="line.753"></a>
-<span class="sourceLineNo">754</span> final List<RegionInfo> foundRegions = new LinkedList<>();<a name="line.754"></a>
-<span class="sourceLineNo">755</span> final List<RegionInfo> assignedRegions = new LinkedList<>();<a name="line.755"></a>
-<span class="sourceLineNo">756</span> final AtomicBoolean found = new AtomicBoolean(false);<a name="line.756"></a>
-<span class="sourceLineNo">757</span> final TableStateManager tsm = masterServices.getTableStateManager();<a name="line.757"></a>
-<span class="sourceLineNo">758</span> boolean createSent = false;<a name="line.758"></a>
-<span class="sourceLineNo">759</span> while (!found.get() && isMasterRunning(masterServices)) {<a name="line.759"></a>
-<span class="sourceLineNo">760</span> foundRegions.clear();<a name="line.760"></a>
-<span class="sourceLineNo">761</span> assignedRegions.clear();<a name="line.761"></a>
-<span class="sourceLineNo">762</span> found.set(true);<a name="line.762"></a>
-<span class="sourceLineNo">763</span> try {<a name="line.763"></a>
-<span class="sourceLineNo">764</span> conn.getTable(TableName.NAMESPACE_TABLE_NAME);<a name="line.764"></a>
-<span class="sourceLineNo">765</span> conn.getTable(RSGROUP_TABLE_NAME);<a name="line.765"></a>
-<span class="sourceLineNo">766</span> boolean rootMetaFound =<a name="line.766"></a>
-<span class="sourceLineNo">767</span> masterServices.getMetaTableLocator().verifyMetaRegionLocation(<a name="line.767"></a>
-<span class="sourceLineNo">768</span> conn, masterServices.getZooKeeper(), 1);<a name="line.768"></a>
-<span class="sourceLineNo">769</span> final AtomicBoolean nsFound = new AtomicBoolean(false);<a name="line.769"></a>
-<span class="sourceLineNo">770</span> if (rootMetaFound) {<a name="line.770"></a>
-<span class="sourceLineNo">771</span> MetaTableAccessor.Visitor visitor = new DefaultVisitorBase() {<a name="line.771"></a>
-<span class="sourceLineNo">772</span> @Override<a name="line.772"></a>
-<span class="sourceLineNo">773</span> public boolean visitInternal(Result row) throws IOException {<a name="line.773"></a>
-<span class="sourceLineNo">774</span> RegionInfo info = MetaTableAccessor.getRegionInfo(row);<a name="line.774"></a>
-<span class="sourceLineNo">775</span> if (info != null) {<a name="line.775"></a>
-<span class="sourceLineNo">776</span> Cell serverCell =<a name="line.776"></a>
-<span class="sourceLineNo">777</span> row.getColumnLatestCell(HConstants.CATALOG_FAMILY,<a name="line.777"></a>
-<span class="sourceLineNo">778</span> HConstants.SERVER_QUALIFIER);<a name="line.778"></a>
-<span class="sourceLineNo">779</span> if (RSGROUP_TABLE_NAME.equals(info.getTable()) && serverCell != null) {<a name="line.779"></a>
-<span class="sourceLineNo">780</span> ServerName sn =<a name="line.780"></a>
-<span class="sourceLineNo">781</span> ServerName.parseVersionedServerName(CellUtil.cloneValue(serverCell));<a name="line.781"></a>
-<span class="sourceLineNo">782</span> if (sn == null) {<a name="line.782"></a>
-<span class="sourceLineNo">783</span> found.set(false);<a name="line.783"></a>
-<span class="sourceLineNo">784</span> } else if (tsm.isTableState(RSGROUP_TABLE_NAME, TableState.State.ENABLED)) {<a name="line.784"></a>
-<span class="sourceLineNo">785</span> try {<a name="line.785"></a>
-<span class="sourceLineNo">786</span> ClientProtos.ClientService.BlockingInterface rs = conn.getClient(sn);<a name="line.786"></a>
-<span class="sourceLineNo">787</span> ClientProtos.GetRequest request =<a name="line.787"></a>
-<span class="sourceLineNo">788</span> RequestConverter.buildGetRequest(info.getRegionName(),<a name="line.788"></a>
-<span class="sourceLineNo">789</span> new Get(ROW_KEY));<a name="line.789"></a>
-<span class="sourceLineNo">790</span> rs.get(null, request);<a name="line.790"></a>
-<span class="sourceLineNo">791</span> assignedRegions.add(info);<a name="line.791"></a>
-<span class="sourceLineNo">792</span> } catch(Exception ex) {<a name="line.792"></a>
-<span class="sourceLineNo">793</span> LOG.debug("Caught exception while verifying group region", ex);<a name="line.793"></a>
-<span class="sourceLineNo">794</span> }<a name="line.794"></a>
-<span class="sourceLineNo">795</span> }<a name="line.795"></a>
-<span class="sourceLineNo">796</span> foundRegions.add(info);<a name="line.796"></a>
-<span class="sourceLineNo">797</span> }<a name="line.797"></a>
-<span class="sourceLineNo">798</span> if (TableName.NAMESPACE_TABLE_NAME.equals(info.getTable())) {<a name="line.798"></a>
-<span class="sourceLineNo">799</span> Cell cell = row.getColumnLatestCell(HConstants.CATALOG_FAMILY,<a name="line.799"></a>
-<span class="sourceLineNo">800</span> HConstants.SERVER_QUALIFIER);<a name="line.800"></a>
-<span class="sourceLineNo">801</span> ServerName sn = null;<a name="line.801"></a>
-<span class="sourceLineNo">802</span> if(cell != null) {<a name="line.802"></a>
-<span class="sourceLineNo">803</span> sn = ServerName.parseVersionedServerName(CellUtil.cloneValue(cell));<a name="line.803"></a>
-<span class="sourceLineNo">804</span> }<a name="line.804"></a>
-<span class="sourceLineNo">805</span> if (sn == null) {<a name="line.805"></a>
-<span class="sourceLineNo">806</span> nsFound.set(false);<a name="line.806"></a>
-<span class="sourceLineNo">807</span> } else if (tsm.isTableState(TableName.NAMESPACE_TABLE_NAME,<a name="line.807"></a>
-<span class="sourceLineNo">808</span> TableState.State.ENABLED)) {<a name="line.808"></a>
-<span class="sourceLineNo">809</span> try {<a name="line.809"></a>
-<span class="sourceLineNo">810</span> ClientProtos.ClientService.BlockingInterface rs = conn.getClient(sn);<a name="line.810"></a>
-<span class="sourceLineNo">811</span> ClientProtos.GetRequest request =<a name="line.811"></a>
-<span class="sourceLineNo">812</span> RequestConverter.buildGetRequest(info.getRegionName(),<a name="line.812"></a>
-<span class="sourceLineNo">813</span> new Get(ROW_KEY));<a name="line.813"></a>
-<span class="sourceLineNo">814</span> rs.get(null, request);<a name="line.814"></a>
-<span class="sourceLineNo">815</span> nsFound.set(true);<a name="line.815"></a>
-<span class="sourceLineNo">816</span> } catch(Exception ex) {<a name="line.816"></a>
-<span class="sourceLineNo">817</span> LOG.debug("Caught exception while verifying group region", ex);<a name="line.817"></a>
-<span class="sourceLineNo">818</span> }<a name="line.818"></a>
-<span class="sourceLineNo">819</span> }<a name="line.819"></a>
-<span class="sourceLineNo">820</span> }<a name="line.820"></a>
-<span class="sourceLineNo">821</span> }<a name="line.821"></a>
-<span class="sourceLineNo">822</span> return true;<a name="line.822"></a>
-<span class="sourceLineNo">823</span> }<a name="line.823"></a>
-<span class="sourceLineNo">824</span> };<a name="line.824"></a>
-<span class="sourceLineNo">825</span> MetaTableAccessor.fullScanRegions(conn, visitor);<a name="line.825"></a>
-<span class="sourceLineNo">826</span> // if no regions in meta then we have to create the table<a name="line.826"></a>
-<span class="sourceLineNo">827</span> if (foundRegions.size() < 1 && rootMetaFound && !createSent && nsFound.get()) {<a name="line.827"></a>
-<span class="sourceLineNo">828</span> createRSGroupTable();<a name="line.828"></a>
-<span class="sourceLineNo">829</span> createSent = true;<a name="line.829"></a>
-<span class="sourceLineNo">830</span> }<a name="line.830"></a>
-<span class="sourceLineNo">831</span> LOG.info("RSGroup table=" + RSGROUP_TABLE_NAME + " isOnline=" + found.get()<a name="line.831"></a>
-<span class="sourceLineNo">832</span> + ", regionCount=" + foundRegions.size() + ", assignCount="<a name="line.832"></a>
-<span class="sourceLineNo">833</span> + assignedRegions.size() + ", rootMetaFound=" + rootMetaFound);<a name="line.833"></a>
-<span class="sourceLineNo">834</span> found.set(found.get() && assignedRegions.size() == foundRegions.size()<a name="line.834"></a>
-<span class="sourceLineNo">835</span> && foundRegions.size() > 0);<a name="line.835"></a>
-<span class="sourceLineNo">836</span> } else {<a name="line.836"></a>
-<span class="sourceLineNo">837</span> LOG.info("Waiting for catalog tables to come online");<a name="line.837"></a>
-<span class="sourceLineNo">838</span> found.set(false);<a name="line.838"></a>
-<span class="sourceLineNo">839</span> }<a name="line.839"></a>
-<span class="sourceLineNo">840</span> if (found.get()) {<a name="line.840"></a>
-<span class="sourceLineNo">841</span> LOG.debug("With group table online, refreshing cached information.");<a name="line.841"></a>
-<span class="sourceLineNo">842</span> RSGroupInfoManagerImpl.this.refresh(true);<a name="line.842"></a>
-<span class="sourceLineNo">843</span> online = true;<a name="line.843"></a>
-<span class="sourceLineNo">844</span> //flush any inconsistencies between ZK and HTable<a name="line.844"></a>
-<span class="sourceLineNo">845</span> RSGroupInfoManagerImpl.this.flushConfig();<a name="line.845"></a>
-<span class="sourceLineNo">846</span> }<a name="line.846"></a>
-<span class="sourceLineNo">847</span> } catch (RuntimeException e) {<a name="line.847"></a>
-<span class="sourceLineNo">848</span> throw e;<a name="line.848"></a>
-<span class="sourceLineNo">849</span> } catch(Exception e) {<a name="line.849"></a>
-<span class="sourceLineNo">850</span> found.set(false);<a name="line.850"></a>
-<span class="sourceLineNo">851</span> LOG.warn("Failed to perform check", e);<a name="line.851"></a>
-<span class="sourceLineNo">852</span> }<a name="line.852"></a>
-<span class="sourceLineNo">853</span> try {<a name="line.853"></a>
-<span class="sourceLineNo">854</span> Thread.sleep(100);<a name="line.854"></a>
-<span class="sourceLineNo">855</span> } catch (InterruptedException e) {<a name="line.855"></a>
-<span class="sourceLineNo">856</span> LOG.info("Sleep interrupted", e);<a name="line.856"></a>
-<span class="sourceLineNo">857</span> }<a name="line.857"></a>
-<span class="sourceLineNo">858</span> }<a name="line.858"></a>
-<span class="sourceLineNo">859</span> return found.get();<a name="line.859"></a>
-<span class="sourceLineNo">860</span> }<a name="line.860"></a>
-<span class="sourceLineNo">861</span><a name="line.861"></a>
-<span class="sourceLineNo">862</span> private void createRSGroupTable() throws IOException {<a name="line.862"></a>
-<span class="sourceLineNo">863</span> Long procId = masterServices.createSystemTable(RSGROUP_TABLE_DESC);<a name="line.863"></a>
-<span class="sourceLineNo">864</span> // wait for region to be online<a name="line.864"></a>
-<span class="sourceLineNo">865</span> int tries = 600;<a name="line.865"></a>
-<span class="sourceLineNo">866</span> while (!(masterServices.getMasterProcedureExecutor().isFinished(procId))<a name="line.866"></a>
-<span class="sourceLineNo">867</span> && masterServices.getMasterProcedureExecutor().isRunning()<a name="line.867"></a>
-<span class="sourceLineNo">868</span> && tries > 0) {<a name="line.868"></a>
-<span class="sourceLineNo">869</span> try {<a name="line.869"></a>
-<span class="sourceLineNo">870</span> Thread.sleep(100);<a name="line.870"></a>
-<span class="sourceLineNo">871</span> } catch (InterruptedException e) {<a name="line.871"></a>
-<span class="sourceLineNo">872</span> throw new IOException("Wait interrupted ", e);<a name="line.872"></a>
-<span class="sourceLineNo">873</span> }<a name="line.873"></a>
-<span class="sourceLineNo">874</span> tries--;<a name="line.874"></a>
-<span class="sourceLineNo">875</span> }<a name="line.875"></a>
-<span class="sourceLineNo">876</span> if(tries
<TRUNCATED>
[04/12] hbase-site git commit: Published site at
773aff90fdf9edf4687b373d1c7ba859d166a437.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/export_control.html
----------------------------------------------------------------------
diff --git a/export_control.html b/export_control.html
index 8dd8bc6..22be6e7 100644
--- a/export_control.html
+++ b/export_control.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Export Control
@@ -331,7 +331,7 @@ for more details.</p>
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index 5dd9b89..50ce950 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Apache HBaseâ„¢ Home</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -409,7 +409,7 @@ Apache HBase is an open-source, distributed, versioned, non-relational database
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/integration.html
----------------------------------------------------------------------
diff --git a/integration.html b/integration.html
index f7dfde3..453fd19 100644
--- a/integration.html
+++ b/integration.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – CI Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -291,7 +291,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/issue-tracking.html
----------------------------------------------------------------------
diff --git a/issue-tracking.html b/issue-tracking.html
index db4599c..55344bb 100644
--- a/issue-tracking.html
+++ b/issue-tracking.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Issue Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -288,7 +288,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/license.html
----------------------------------------------------------------------
diff --git a/license.html b/license.html
index f318d06..f47dad6 100644
--- a/license.html
+++ b/license.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Licenses</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -491,7 +491,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/mail-lists.html
----------------------------------------------------------------------
diff --git a/mail-lists.html b/mail-lists.html
index 8d07764..3f0eb24 100644
--- a/mail-lists.html
+++ b/mail-lists.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Mailing Lists</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -341,7 +341,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/metrics.html
----------------------------------------------------------------------
diff --git a/metrics.html b/metrics.html
index e5d1fb8..afa4e31 100644
--- a/metrics.html
+++ b/metrics.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Apache HBase (TM) Metrics
@@ -459,7 +459,7 @@ export HBASE_REGIONSERVER_OPTS="$HBASE_JMX_OPTS -Dcom.sun.management.jmxrem
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/old_news.html
----------------------------------------------------------------------
diff --git a/old_news.html b/old_news.html
index 9b459ec..0bfa6c1 100644
--- a/old_news.html
+++ b/old_news.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Old Apache HBase (TM) News
@@ -440,7 +440,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/plugin-management.html
----------------------------------------------------------------------
diff --git a/plugin-management.html b/plugin-management.html
index d41877c..21d4a60 100644
--- a/plugin-management.html
+++ b/plugin-management.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Plugin Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -440,7 +440,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/plugins.html
----------------------------------------------------------------------
diff --git a/plugins.html b/plugins.html
index 7360b73..0c1021f 100644
--- a/plugins.html
+++ b/plugins.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Plugins</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -375,7 +375,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/poweredbyhbase.html
----------------------------------------------------------------------
diff --git a/poweredbyhbase.html b/poweredbyhbase.html
index fdfc4b8..3e27cfe 100644
--- a/poweredbyhbase.html
+++ b/poweredbyhbase.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Powered By Apache HBase™</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -769,7 +769,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/project-info.html
----------------------------------------------------------------------
diff --git a/project-info.html b/project-info.html
index ef2fb51..93cc9fb 100644
--- a/project-info.html
+++ b/project-info.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Information</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -335,7 +335,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/project-reports.html
----------------------------------------------------------------------
diff --git a/project-reports.html b/project-reports.html
index 4baa35c..bcb86c8 100644
--- a/project-reports.html
+++ b/project-reports.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Generated Reports</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -305,7 +305,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/project-summary.html
----------------------------------------------------------------------
diff --git a/project-summary.html b/project-summary.html
index 83ef7f1..f2750cd 100644
--- a/project-summary.html
+++ b/project-summary.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Summary</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -331,7 +331,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/pseudo-distributed.html
----------------------------------------------------------------------
diff --git a/pseudo-distributed.html b/pseudo-distributed.html
index 4965275..eeb44ed 100644
--- a/pseudo-distributed.html
+++ b/pseudo-distributed.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Running Apache HBase (TM) in pseudo-distributed mode
@@ -308,7 +308,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/replication.html
----------------------------------------------------------------------
diff --git a/replication.html b/replication.html
index c18e45c..68e13f6 100644
--- a/replication.html
+++ b/replication.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Apache HBase (TM) Replication
@@ -303,7 +303,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/resources.html
----------------------------------------------------------------------
diff --git a/resources.html b/resources.html
index d0372f5..542f1e8 100644
--- a/resources.html
+++ b/resources.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Other Apache HBase (TM) Resources</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -331,7 +331,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/source-repository.html
----------------------------------------------------------------------
diff --git a/source-repository.html b/source-repository.html
index 2cf2c95..a6b6fc3 100644
--- a/source-repository.html
+++ b/source-repository.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Source Code Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -299,7 +299,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/sponsors.html
----------------------------------------------------------------------
diff --git a/sponsors.html b/sponsors.html
index 159c80c..d3534bb 100644
--- a/sponsors.html
+++ b/sponsors.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Apache HBase™ Sponsors</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -333,7 +333,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/supportingprojects.html
----------------------------------------------------------------------
diff --git a/supportingprojects.html b/supportingprojects.html
index 0fdf7b0..7f5279c 100644
--- a/supportingprojects.html
+++ b/supportingprojects.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Supporting Projects</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -520,7 +520,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/team-list.html
----------------------------------------------------------------------
diff --git a/team-list.html b/team-list.html
index 9570bb2..f5d2628 100644
--- a/team-list.html
+++ b/team-list.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180415" />
+ <meta name="Date-Revision-yyyymmdd" content="20180416" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Team</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -730,7 +730,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-04-15</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-04-16</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/testdevapidocs/index-all.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/index-all.html b/testdevapidocs/index-all.html
index 15b4680..7191316 100644
--- a/testdevapidocs/index-all.html
+++ b/testdevapidocs/index-all.html
@@ -25209,6 +25209,8 @@
</dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/assignment/TestAssignmentManager.MockRSProcedureDispatcher.MockRemoteCall.html#MockRemoteCall-org.apache.hadoop.hbase.ServerName-java.util.Set-">MockRemoteCall(ServerName, Set<RemoteProcedureDispatcher.RemoteProcedure>)</a></span> - Constructor for class org.apache.hadoop.hbase.master.assignment.<a href="org/apache/hadoop/hbase/master/assignment/TestAssignmentManager.MockRSProcedureDispatcher.MockRemoteCall.html" title="class in org.apache.hadoop.hbase.master.assignment">TestAssignmentManager.MockRSProcedureDispatcher.MockRemoteCall</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#mockReplicationSource-boolean-org.apache.hadoop.conf.Configuration-">mockReplicationSource(boolean, Configuration)</a></span> - Method in class org.apache.hadoop.hbase.replication.regionserver.<a href="org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html" title="class in org.apache.hadoop.hbase.replication.regionserver">TestWALEntryStream</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/TestClientScanner.MockRpcRetryingCallerFactory.html#MockRpcRetryingCallerFactory-org.apache.hadoop.conf.Configuration-">MockRpcRetryingCallerFactory(Configuration)</a></span> - Constructor for class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestClientScanner.MockRpcRetryingCallerFactory.html" title="class in org.apache.hadoop.hbase.client">TestClientScanner.MockRpcRetryingCallerFactory</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/assignment/TestAssignmentManager.MockRSProcedureDispatcher.html#mockRsExec">mockRsExec</a></span> - Variable in class org.apache.hadoop.hbase.master.assignment.<a href="org/apache/hadoop/hbase/master/assignment/TestAssignmentManager.MockRSProcedureDispatcher.html" title="class in org.apache.hadoop.hbase.master.assignment">TestAssignmentManager.MockRSProcedureDispatcher</a></dt>
@@ -57397,6 +57399,8 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#testReplicationSourceWALReader--">testReplicationSourceWALReader()</a></span> - Method in class org.apache.hadoop.hbase.replication.regionserver.<a href="org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html" title="class in org.apache.hadoop.hbase.replication.regionserver">TestWALEntryStream</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#testReplicationSourceWALReaderDisabled--">testReplicationSourceWALReaderDisabled()</a></span> - Method in class org.apache.hadoop.hbase.replication.regionserver.<a href="org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html" title="class in org.apache.hadoop.hbase.replication.regionserver">TestWALEntryStream</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#testReplicationSourceWALReaderRecovered--">testReplicationSourceWALReaderRecovered()</a></span> - Method in class org.apache.hadoop.hbase.replication.regionserver.<a href="org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html" title="class in org.apache.hadoop.hbase.replication.regionserver">TestWALEntryStream</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#testReplicationSourceWALReaderWrongPosition--">testReplicationSourceWALReaderWrongPosition()</a></span> - Method in class org.apache.hadoop.hbase.replication.regionserver.<a href="org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html" title="class in org.apache.hadoop.hbase.replication.regionserver">TestWALEntryStream</a></dt>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
index 5137044..42aea6a 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -570,14 +570,14 @@
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClusterManager.ServiceType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClusterManager.ServiceType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ScanPerformanceEvaluation.ScanCounter.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ScanPerformanceEvaluation.ScanCounter</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ResourceChecker.Phase.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ResourceChecker.Phase</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.CommandProvider.Operation.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HBaseClusterManager.CommandProvider.Operation</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.Stat.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">IntegrationTestRegionReplicaPerf.Stat</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleCommand.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.RoleCommand</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/PerformanceEvaluation.Counter.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">PerformanceEvaluation.Counter</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.Service.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.Service</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.CommandProvider.Operation.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HBaseClusterManager.CommandProvider.Operation</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleCommand.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.RoleCommand</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ScanPerformanceEvaluation.ScanCounter.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ScanPerformanceEvaluation.ScanCounter</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.ACTION.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">IntegrationTestDDLMasterFailover.ACTION</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ResourceChecker.Phase.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ResourceChecker.Phase</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/PerformanceEvaluation.Counter.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">PerformanceEvaluation.Counter</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html
index a1c9b1d..28973e0 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html
@@ -81,14 +81,14 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Object</span></a>
<ul>
-<li type="circle">org.apache.hadoop.hbase.procedure.Procedure (implements java.util.concurrent.<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Callable.html?is-external=true" title="class or interface in java.util.concurrent">Callable</a><V>, org.apache.hadoop.hbase.errorhandling.ForeignExceptionListener)
+<li type="circle">org.apache.hadoop.hbase.procedure2.Procedure<TEnvironment> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.procedure.<a href="../../../../../org/apache/hadoop/hbase/procedure/TestProcedure.LatchedProcedure.html" title="class in org.apache.hadoop.hbase.procedure"><span class="typeNameLink">TestProcedure.LatchedProcedure</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure.<a href="../../../../../org/apache/hadoop/hbase/procedure/TestProcedureDescriber.TestProcedure.html" title="class in org.apache.hadoop.hbase.procedure"><span class="typeNameLink">TestProcedureDescriber.TestProcedure</span></a></li>
</ul>
</li>
-<li type="circle">org.apache.hadoop.hbase.procedure2.Procedure<TEnvironment> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>)
+<li type="circle">org.apache.hadoop.hbase.procedure.Procedure (implements java.util.concurrent.<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Callable.html?is-external=true" title="class or interface in java.util.concurrent">Callable</a><V>, org.apache.hadoop.hbase.errorhandling.ForeignExceptionListener)
<ul>
-<li type="circle">org.apache.hadoop.hbase.procedure.<a href="../../../../../org/apache/hadoop/hbase/procedure/TestProcedureDescriber.TestProcedure.html" title="class in org.apache.hadoop.hbase.procedure"><span class="typeNameLink">TestProcedureDescriber.TestProcedure</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure.<a href="../../../../../org/apache/hadoop/hbase/procedure/TestProcedure.LatchedProcedure.html" title="class in org.apache.hadoop.hbase.procedure"><span class="typeNameLink">TestProcedure.LatchedProcedure</span></a></li>
</ul>
</li>
<li type="circle">org.apache.hadoop.hbase.procedure.ProcedureManager
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
index b72e392..19002f2 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -206,8 +206,8 @@
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestProcedureRecovery.TestStateMachineProcedure.State</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedureState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestStateMachineProcedure.TestSMProcedureState</span></a></li>
<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestYieldProcedures.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestYieldProcedures.TestStateMachineProcedure.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedureState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestStateMachineProcedure.TestSMProcedureState</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index 145855c..6f26e19 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -655,11 +655,11 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestMultiLogThreshold.ActionType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestMultiLogThreshold.ActionType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.CacheOnWriteType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestCacheOnWriteInSchema.CacheOnWriteType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestAtomicOperation.TestStep.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestAtomicOperation.TestStep</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestMultiLogThreshold.ActionType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestMultiLogThreshold.ActionType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.Metric.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestRegionServerReadRequestMetrics.Metric</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DataBlockEncodingTool.Manipulation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">DataBlockEncodingTool.Manipulation</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestAtomicOperation.TestStep.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestAtomicOperation.TestStep</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/testdevapidocs/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html b/testdevapidocs/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html
index c12abde..9be0b9f 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>class <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.523">TestWALEntryStream.PathWatcher</a>
+<pre>class <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.580">TestWALEntryStream.PathWatcher</a>
extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
implements org.apache.hadoop.hbase.regionserver.wal.WALActionsListener</pre>
</li>
@@ -214,7 +214,7 @@ implements org.apache.hadoop.hbase.regionserver.wal.WALActionsListener</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>currentPath</h4>
-<pre>org.apache.hadoop.fs.Path <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html#line.525">currentPath</a></pre>
+<pre>org.apache.hadoop.fs.Path <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html#line.582">currentPath</a></pre>
</li>
</ul>
</li>
@@ -231,7 +231,7 @@ implements org.apache.hadoop.hbase.regionserver.wal.WALActionsListener</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>PathWatcher</h4>
-<pre><a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html#line.523">PathWatcher</a>()</pre>
+<pre><a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html#line.580">PathWatcher</a>()</pre>
</li>
</ul>
</li>
@@ -248,7 +248,7 @@ implements org.apache.hadoop.hbase.regionserver.wal.WALActionsListener</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>preLogRoll</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html#line.528">preLogRoll</a>(org.apache.hadoop.fs.Path oldPath,
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html#line.585">preLogRoll</a>(org.apache.hadoop.fs.Path oldPath,
org.apache.hadoop.fs.Path newPath)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/testdevapidocs/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html b/testdevapidocs/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html
index e210cda..4acc22b 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":9,"i9":10,"i10":10,"i11":10,"i12":9,"i13":10,"i14":9,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":9,"i9":10,"i10":10,"i11":10,"i12":10,"i13":9,"i14":10,"i15":9,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10};
var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -109,7 +109,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<hr>
<br>
-<pre>public class <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.72">TestWALEntryStream</a>
+<pre>public class <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.77">TestWALEntryStream</a>
extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
</li>
</ul>
@@ -286,72 +286,81 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#getWALEdits-int-">getWALEdits</a></span>(int count)</code> </td>
</tr>
<tr id="i11" class="rowColor">
+<td class="colFirst"><code>private org.apache.hadoop.hbase.replication.regionserver.ReplicationSource</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#mockReplicationSource-boolean-org.apache.hadoop.conf.Configuration-">mockReplicationSource</a></span>(boolean recovered,
+ org.apache.hadoop.conf.Configuration conf)</code> </td>
+</tr>
+<tr id="i12" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#setUp--">setUp</a></span>()</code> </td>
</tr>
-<tr id="i12" class="altColor">
+<tr id="i13" class="rowColor">
<td class="colFirst"><code>static void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#setUpBeforeClass--">setUpBeforeClass</a></span>()</code> </td>
</tr>
-<tr id="i13" class="rowColor">
+<tr id="i14" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#tearDown--">tearDown</a></span>()</code> </td>
</tr>
-<tr id="i14" class="altColor">
+<tr id="i15" class="rowColor">
<td class="colFirst"><code>static void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#tearDownAfterClass--">tearDownAfterClass</a></span>()</code> </td>
</tr>
-<tr id="i15" class="rowColor">
+<tr id="i16" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#testAppendsWithRolls--">testAppendsWithRolls</a></span>()</code>
<div class="block">Tests basic reading of log appends</div>
</td>
</tr>
-<tr id="i16" class="altColor">
+<tr id="i17" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#testDifferentCounts--">testDifferentCounts</a></span>()</code> </td>
</tr>
-<tr id="i17" class="rowColor">
+<tr id="i18" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#testEmptyStream--">testEmptyStream</a></span>()</code> </td>
</tr>
-<tr id="i18" class="altColor">
+<tr id="i19" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#testLogrollWhileStreaming--">testLogrollWhileStreaming</a></span>()</code>
<div class="block">Tests that if after a stream is opened, more entries come in and then the log is rolled, we
don't mistakenly dequeue the current log thinking we're done with it</div>
</td>
</tr>
-<tr id="i19" class="rowColor">
+<tr id="i20" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#testNewEntriesWhileStreaming--">testNewEntriesWhileStreaming</a></span>()</code>
<div class="block">Tests that if writes come in while we have a stream open, we shouldn't miss them</div>
</td>
</tr>
-<tr id="i20" class="altColor">
+<tr id="i21" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#testPosition--">testPosition</a></span>()</code>
<div class="block">Tests that if we stop before hitting the end of a stream, we can continue where we left off
using the last position</div>
</td>
</tr>
-<tr id="i21" class="rowColor">
+<tr id="i22" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#testReadBeyondCommittedLength--">testReadBeyondCommittedLength</a></span>()</code> </td>
</tr>
-<tr id="i22" class="altColor">
+<tr id="i23" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#testReplicationSourceWALReader--">testReplicationSourceWALReader</a></span>()</code> </td>
</tr>
-<tr id="i23" class="rowColor">
+<tr id="i24" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#testReplicationSourceWALReaderDisabled--">testReplicationSourceWALReaderDisabled</a></span>()</code> </td>
+</tr>
+<tr id="i25" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#testReplicationSourceWALReaderRecovered--">testReplicationSourceWALReaderRecovered</a></span>()</code> </td>
</tr>
-<tr id="i24" class="altColor">
+<tr id="i26" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#testReplicationSourceWALReaderWrongPosition--">testReplicationSourceWALReaderWrongPosition</a></span>()</code> </td>
</tr>
-<tr id="i25" class="rowColor">
+<tr id="i27" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#testResumeStreamingFromPosition--">testResumeStreamingFromPosition</a></span>()</code> </td>
</tr>
@@ -383,7 +392,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>CLASS_RULE</h4>
-<pre>public static final <a href="../../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.75">CLASS_RULE</a></pre>
+<pre>public static final <a href="../../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.80">CLASS_RULE</a></pre>
</li>
</ul>
<a name="TEST_UTIL">
@@ -392,7 +401,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>TEST_UTIL</h4>
-<pre>private static <a href="../../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.78">TEST_UTIL</a></pre>
+<pre>private static <a href="../../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.83">TEST_UTIL</a></pre>
</li>
</ul>
<a name="CONF">
@@ -401,7 +410,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>CONF</h4>
-<pre>private static org.apache.hadoop.conf.Configuration <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.79">CONF</a></pre>
+<pre>private static org.apache.hadoop.conf.Configuration <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.84">CONF</a></pre>
</li>
</ul>
<a name="fs">
@@ -410,7 +419,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>fs</h4>
-<pre>private static org.apache.hadoop.fs.FileSystem <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.80">fs</a></pre>
+<pre>private static org.apache.hadoop.fs.FileSystem <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.85">fs</a></pre>
</li>
</ul>
<a name="cluster">
@@ -419,7 +428,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>cluster</h4>
-<pre>private static org.apache.hadoop.hdfs.MiniDFSCluster <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.81">cluster</a></pre>
+<pre>private static org.apache.hadoop.hdfs.MiniDFSCluster <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.86">cluster</a></pre>
</li>
</ul>
<a name="tableName">
@@ -428,7 +437,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>tableName</h4>
-<pre>private static final org.apache.hadoop.hbase.TableName <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.82">tableName</a></pre>
+<pre>private static final org.apache.hadoop.hbase.TableName <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.87">tableName</a></pre>
</li>
</ul>
<a name="family">
@@ -437,7 +446,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>family</h4>
-<pre>private static final byte[] <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.83">family</a></pre>
+<pre>private static final byte[] <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.88">family</a></pre>
</li>
</ul>
<a name="qualifier">
@@ -446,7 +455,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>qualifier</h4>
-<pre>private static final byte[] <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.84">qualifier</a></pre>
+<pre>private static final byte[] <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.89">qualifier</a></pre>
</li>
</ul>
<a name="info">
@@ -455,7 +464,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>info</h4>
-<pre>private static final org.apache.hadoop.hbase.client.RegionInfo <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.85">info</a></pre>
+<pre>private static final org.apache.hadoop.hbase.client.RegionInfo <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.90">info</a></pre>
</li>
</ul>
<a name="scopes">
@@ -464,7 +473,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>scopes</h4>
-<pre>private static final <a href="https://docs.oracle.com/javase/8/docs/api/java/util/NavigableMap.html?is-external=true" title="class or interface in java.util">NavigableMap</a><byte[],<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.87">scopes</a></pre>
+<pre>private static final <a href="https://docs.oracle.com/javase/8/docs/api/java/util/NavigableMap.html?is-external=true" title="class or interface in java.util">NavigableMap</a><byte[],<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.92">scopes</a></pre>
</li>
</ul>
<a name="log">
@@ -473,7 +482,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>log</h4>
-<pre>private org.apache.hadoop.hbase.wal.WAL <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.95">log</a></pre>
+<pre>private org.apache.hadoop.hbase.wal.WAL <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.100">log</a></pre>
</li>
</ul>
<a name="walQueue">
@@ -482,7 +491,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>walQueue</h4>
-<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/PriorityBlockingQueue.html?is-external=true" title="class or interface in java.util.concurrent">PriorityBlockingQueue</a><org.apache.hadoop.fs.Path> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.96">walQueue</a></pre>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/PriorityBlockingQueue.html?is-external=true" title="class or interface in java.util.concurrent">PriorityBlockingQueue</a><org.apache.hadoop.fs.Path> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.101">walQueue</a></pre>
</li>
</ul>
<a name="pathWatcher">
@@ -491,7 +500,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>pathWatcher</h4>
-<pre>private <a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html" title="class in org.apache.hadoop.hbase.replication.regionserver">TestWALEntryStream.PathWatcher</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.97">pathWatcher</a></pre>
+<pre>private <a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html" title="class in org.apache.hadoop.hbase.replication.regionserver">TestWALEntryStream.PathWatcher</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.102">pathWatcher</a></pre>
</li>
</ul>
<a name="tn">
@@ -500,7 +509,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>tn</h4>
-<pre>public org.junit.rules.TestName <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.100">tn</a></pre>
+<pre>public org.junit.rules.TestName <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.105">tn</a></pre>
</li>
</ul>
<a name="mvcc">
@@ -509,7 +518,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>mvcc</h4>
-<pre>private final org.apache.hadoop.hbase.regionserver.MultiVersionConcurrencyControl <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.101">mvcc</a></pre>
+<pre>private final org.apache.hadoop.hbase.regionserver.MultiVersionConcurrencyControl <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.106">mvcc</a></pre>
</li>
</ul>
</li>
@@ -526,7 +535,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>TestWALEntryStream</h4>
-<pre>public <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.72">TestWALEntryStream</a>()</pre>
+<pre>public <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.77">TestWALEntryStream</a>()</pre>
</li>
</ul>
</li>
@@ -543,7 +552,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getScopes</h4>
-<pre>private static <a href="https://docs.oracle.com/javase/8/docs/api/java/util/NavigableMap.html?is-external=true" title="class or interface in java.util">NavigableMap</a><byte[],<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.89">getScopes</a>()</pre>
+<pre>private static <a href="https://docs.oracle.com/javase/8/docs/api/java/util/NavigableMap.html?is-external=true" title="class or interface in java.util">NavigableMap</a><byte[],<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.94">getScopes</a>()</pre>
</li>
</ul>
<a name="setUpBeforeClass--">
@@ -552,7 +561,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>setUpBeforeClass</h4>
-<pre>public static void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.104">setUpBeforeClass</a>()
+<pre>public static void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.109">setUpBeforeClass</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -566,7 +575,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>tearDownAfterClass</h4>
-<pre>public static void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.114">tearDownAfterClass</a>()
+<pre>public static void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.119">tearDownAfterClass</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -580,7 +589,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>setUp</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.119">setUp</a>()
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.124">setUp</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -594,7 +603,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>tearDown</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.128">tearDown</a>()
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.133">tearDown</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -608,7 +617,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>testDifferentCounts</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.134">testDifferentCounts</a>()
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.139">testDifferentCounts</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -622,7 +631,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>testAppendsWithRolls</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.177">testAppendsWithRolls</a>()
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.182">testAppendsWithRolls</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Tests basic reading of log appends</div>
<dl>
@@ -637,7 +646,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>testLogrollWhileStreaming</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.231">testLogrollWhileStreaming</a>()
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.236">testLogrollWhileStreaming</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Tests that if after a stream is opened, more entries come in and then the log is rolled, we
don't mistakenly dequeue the current log thinking we're done with it</div>
@@ -653,7 +662,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>testNewEntriesWhileStreaming</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.257">testNewEntriesWhileStreaming</a>()
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.262">testNewEntriesWhileStreaming</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Tests that if writes come in while we have a stream open, we shouldn't miss them</div>
<dl>
@@ -668,7 +677,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>testResumeStreamingFromPosition</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.279">testResumeStreamingFromPosition</a>()
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.284">testResumeStreamingFromPosition</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -682,7 +691,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>testPosition</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.304">testPosition</a>()
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.309">testPosition</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Tests that if we stop before hitting the end of a stream, we can continue where we left off
using the last position</div>
@@ -698,7 +707,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>testEmptyStream</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.324">testEmptyStream</a>()
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.329">testEmptyStream</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -706,13 +715,23 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
</dl>
</li>
</ul>
+<a name="mockReplicationSource-boolean-org.apache.hadoop.conf.Configuration-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>mockReplicationSource</h4>
+<pre>private org.apache.hadoop.hbase.replication.regionserver.ReplicationSource <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.336">mockReplicationSource</a>(boolean recovered,
+ org.apache.hadoop.conf.Configuration conf)</pre>
+</li>
+</ul>
<a name="createReader-boolean-org.apache.hadoop.conf.Configuration-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>createReader</h4>
-<pre>private org.apache.hadoop.hbase.replication.regionserver.ReplicationSourceWALReader <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.331">createReader</a>(boolean recovered,
+<pre>private org.apache.hadoop.hbase.replication.regionserver.ReplicationSourceWALReader <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.349">createReader</a>(boolean recovered,
org.apache.hadoop.conf.Configuration conf)</pre>
</li>
</ul>
@@ -722,7 +741,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>testReplicationSourceWALReader</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.348">testReplicationSourceWALReader</a>()
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.359">testReplicationSourceWALReader</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -736,7 +755,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>testReplicationSourceWALReaderRecovered</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.379">testReplicationSourceWALReaderRecovered</a>()
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.390">testReplicationSourceWALReaderRecovered</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -750,7 +769,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>testReplicationSourceWALReaderWrongPosition</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.414">testReplicationSourceWALReaderWrongPosition</a>()
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.425">testReplicationSourceWALReaderWrongPosition</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -758,13 +777,31 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
</dl>
</li>
</ul>
+<a name="testReplicationSourceWALReaderDisabled--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testReplicationSourceWALReaderDisabled</h4>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.475">testReplicationSourceWALReaderDisabled</a>()
+ throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
+ <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a>,
+ <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ExecutionException.html?is-external=true" title="class or interface in java.util.concurrent">ExecutionException</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></code></dd>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ExecutionException.html?is-external=true" title="class or interface in java.util.concurrent">ExecutionException</a></code></dd>
+</dl>
+</li>
+</ul>
<a name="getRow-org.apache.hadoop.hbase.wal.WAL.Entry-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>getRow</h4>
-<pre>private <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.463">getRow</a>(org.apache.hadoop.hbase.wal.WAL.Entry entry)</pre>
+<pre>private <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.520">getRow</a>(org.apache.hadoop.hbase.wal.WAL.Entry entry)</pre>
</li>
</ul>
<a name="appendToLog-java.lang.String-">
@@ -773,7 +810,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>appendToLog</h4>
-<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.468">appendToLog</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key)
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.525">appendToLog</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -787,7 +824,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>appendEntriesToLogAndSync</h4>
-<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.475">appendEntriesToLogAndSync</a>(int count)
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.532">appendEntriesToLogAndSync</a>(int count)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -801,7 +838,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>appendToLogAndSync</h4>
-<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.483">appendToLogAndSync</a>()
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.540">appendToLogAndSync</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -815,7 +852,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>appendToLogAndSync</h4>
-<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.487">appendToLogAndSync</a>(int count)
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.544">appendToLogAndSync</a>(int count)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -829,7 +866,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>appendToLog</h4>
-<pre>private long <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.492">appendToLog</a>(int count)
+<pre>private long <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.549">appendToLog</a>(int count)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -843,7 +880,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getWALEdits</h4>
-<pre>private org.apache.hadoop.hbase.wal.WALEdit <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.497">getWALEdits</a>(int count)</pre>
+<pre>private org.apache.hadoop.hbase.wal.WALEdit <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.554">getWALEdits</a>(int count)</pre>
</li>
</ul>
<a name="getWALEdit-java.lang.String-">
@@ -852,7 +889,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getWALEdit</h4>
-<pre>private org.apache.hadoop.hbase.wal.WALEdit <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.506">getWALEdit</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> row)</pre>
+<pre>private org.apache.hadoop.hbase.wal.WALEdit <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.563">getWALEdit</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> row)</pre>
</li>
</ul>
<a name="getDummyFilter--">
@@ -861,7 +898,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getDummyFilter</h4>
-<pre>private org.apache.hadoop.hbase.replication.WALEntryFilter <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.513">getDummyFilter</a>()</pre>
+<pre>private org.apache.hadoop.hbase.replication.WALEntryFilter <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.570">getDummyFilter</a>()</pre>
</li>
</ul>
<a name="testReadBeyondCommittedLength--">
@@ -870,7 +907,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>testReadBeyondCommittedLength</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.535">testReadBeyondCommittedLength</a>()
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#line.592">testReadBeyondCommittedLength</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></pre>
<dl>
[02/12] hbase-site git commit: Published site at
773aff90fdf9edf4687b373d1c7ba859d166a437.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html
index 61c78d6..468ff43 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html
@@ -38,534 +38,591 @@
<span class="sourceLineNo">030</span>import java.util.NavigableMap;<a name="line.30"></a>
<span class="sourceLineNo">031</span>import java.util.OptionalLong;<a name="line.31"></a>
<span class="sourceLineNo">032</span>import java.util.TreeMap;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import java.util.concurrent.PriorityBlockingQueue;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import java.util.concurrent.atomic.AtomicLong;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.conf.Configuration;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.fs.FileSystem;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.fs.Path;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.Cell;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.HConstants;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.Server;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.TableName;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.Waiter.ExplainingPredicate;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.client.RegionInfoBuilder;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.regionserver.MultiVersionConcurrencyControl;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.regionserver.wal.WALActionsListener;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.replication.WALEntryFilter;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.testclassification.ReplicationTests;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.wal.WAL;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.wal.WAL.Entry;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.wal.WALEdit;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.wal.WALFactory;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.wal.WALKeyImpl;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.apache.hadoop.hdfs.MiniDFSCluster;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>import org.junit.After;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>import org.junit.AfterClass;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>import org.junit.Before;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>import org.junit.BeforeClass;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>import org.junit.ClassRule;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>import org.junit.Rule;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>import org.junit.Test;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>import org.junit.experimental.categories.Category;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>import org.junit.rules.TestName;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>import org.mockito.Mockito;<a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span>@Category({ ReplicationTests.class, LargeTests.class })<a name="line.71"></a>
-<span class="sourceLineNo">072</span>public class TestWALEntryStream {<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span> @ClassRule<a name="line.74"></a>
-<span class="sourceLineNo">075</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.75"></a>
-<span class="sourceLineNo">076</span> HBaseClassTestRule.forClass(TestWALEntryStream.class);<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span> private static HBaseTestingUtility TEST_UTIL;<a name="line.78"></a>
-<span class="sourceLineNo">079</span> private static Configuration CONF;<a name="line.79"></a>
-<span class="sourceLineNo">080</span> private static FileSystem fs;<a name="line.80"></a>
-<span class="sourceLineNo">081</span> private static MiniDFSCluster cluster;<a name="line.81"></a>
-<span class="sourceLineNo">082</span> private static final TableName tableName = TableName.valueOf("tablename");<a name="line.82"></a>
-<span class="sourceLineNo">083</span> private static final byte[] family = Bytes.toBytes("column");<a name="line.83"></a>
-<span class="sourceLineNo">084</span> private static final byte[] qualifier = Bytes.toBytes("qualifier");<a name="line.84"></a>
-<span class="sourceLineNo">085</span> private static final RegionInfo info = RegionInfoBuilder.newBuilder(tableName)<a name="line.85"></a>
-<span class="sourceLineNo">086</span> .setStartKey(HConstants.EMPTY_START_ROW).setEndKey(HConstants.LAST_ROW).build();<a name="line.86"></a>
-<span class="sourceLineNo">087</span> private static final NavigableMap<byte[], Integer> scopes = getScopes();<a name="line.87"></a>
-<span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span> private static NavigableMap<byte[], Integer> getScopes() {<a name="line.89"></a>
-<span class="sourceLineNo">090</span> NavigableMap<byte[], Integer> scopes = new TreeMap<>(Bytes.BYTES_COMPARATOR);<a name="line.90"></a>
-<span class="sourceLineNo">091</span> scopes.put(family, 1);<a name="line.91"></a>
-<span class="sourceLineNo">092</span> return scopes;<a name="line.92"></a>
-<span class="sourceLineNo">093</span> }<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span> private WAL log;<a name="line.95"></a>
-<span class="sourceLineNo">096</span> PriorityBlockingQueue<Path> walQueue;<a name="line.96"></a>
-<span class="sourceLineNo">097</span> private PathWatcher pathWatcher;<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span> @Rule<a name="line.99"></a>
-<span class="sourceLineNo">100</span> public TestName tn = new TestName();<a name="line.100"></a>
-<span class="sourceLineNo">101</span> private final MultiVersionConcurrencyControl mvcc = new MultiVersionConcurrencyControl();<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span> @BeforeClass<a name="line.103"></a>
-<span class="sourceLineNo">104</span> public static void setUpBeforeClass() throws Exception {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> TEST_UTIL = new HBaseTestingUtility();<a name="line.105"></a>
-<span class="sourceLineNo">106</span> CONF = TEST_UTIL.getConfiguration();<a name="line.106"></a>
-<span class="sourceLineNo">107</span> TEST_UTIL.startMiniDFSCluster(3);<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span> cluster = TEST_UTIL.getDFSCluster();<a name="line.109"></a>
-<span class="sourceLineNo">110</span> fs = cluster.getFileSystem();<a name="line.110"></a>
-<span class="sourceLineNo">111</span> }<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span> @AfterClass<a name="line.113"></a>
-<span class="sourceLineNo">114</span> public static void tearDownAfterClass() throws Exception {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> TEST_UTIL.shutdownMiniCluster();<a name="line.115"></a>
+<span class="sourceLineNo">033</span>import java.util.concurrent.ExecutionException;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import java.util.concurrent.ForkJoinPool;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import java.util.concurrent.Future;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import java.util.concurrent.PriorityBlockingQueue;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import java.util.concurrent.atomic.AtomicBoolean;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import java.util.concurrent.atomic.AtomicInteger;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import java.util.concurrent.atomic.AtomicLong;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.conf.Configuration;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.fs.FileSystem;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.fs.Path;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.Cell;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.HConstants;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.Server;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.TableName;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.Waiter.ExplainingPredicate;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.client.RegionInfoBuilder;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.regionserver.MultiVersionConcurrencyControl;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.regionserver.wal.WALActionsListener;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.replication.WALEntryFilter;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.testclassification.ReplicationTests;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.wal.WAL;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.wal.WAL.Entry;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.wal.WALEdit;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.wal.WALFactory;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>import org.apache.hadoop.hbase.wal.WALKeyImpl;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>import org.apache.hadoop.hdfs.MiniDFSCluster;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>import org.junit.After;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>import org.junit.AfterClass;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>import org.junit.Before;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>import org.junit.BeforeClass;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>import org.junit.ClassRule;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>import org.junit.Rule;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>import org.junit.Test;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>import org.junit.experimental.categories.Category;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>import org.junit.rules.TestName;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>import org.mockito.Mockito;<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span>@Category({ ReplicationTests.class, LargeTests.class })<a name="line.76"></a>
+<span class="sourceLineNo">077</span>public class TestWALEntryStream {<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span> @ClassRule<a name="line.79"></a>
+<span class="sourceLineNo">080</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.80"></a>
+<span class="sourceLineNo">081</span> HBaseClassTestRule.forClass(TestWALEntryStream.class);<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span> private static HBaseTestingUtility TEST_UTIL;<a name="line.83"></a>
+<span class="sourceLineNo">084</span> private static Configuration CONF;<a name="line.84"></a>
+<span class="sourceLineNo">085</span> private static FileSystem fs;<a name="line.85"></a>
+<span class="sourceLineNo">086</span> private static MiniDFSCluster cluster;<a name="line.86"></a>
+<span class="sourceLineNo">087</span> private static final TableName tableName = TableName.valueOf("tablename");<a name="line.87"></a>
+<span class="sourceLineNo">088</span> private static final byte[] family = Bytes.toBytes("column");<a name="line.88"></a>
+<span class="sourceLineNo">089</span> private static final byte[] qualifier = Bytes.toBytes("qualifier");<a name="line.89"></a>
+<span class="sourceLineNo">090</span> private static final RegionInfo info = RegionInfoBuilder.newBuilder(tableName)<a name="line.90"></a>
+<span class="sourceLineNo">091</span> .setStartKey(HConstants.EMPTY_START_ROW).setEndKey(HConstants.LAST_ROW).build();<a name="line.91"></a>
+<span class="sourceLineNo">092</span> private static final NavigableMap<byte[], Integer> scopes = getScopes();<a name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span> private static NavigableMap<byte[], Integer> getScopes() {<a name="line.94"></a>
+<span class="sourceLineNo">095</span> NavigableMap<byte[], Integer> scopes = new TreeMap<>(Bytes.BYTES_COMPARATOR);<a name="line.95"></a>
+<span class="sourceLineNo">096</span> scopes.put(family, 1);<a name="line.96"></a>
+<span class="sourceLineNo">097</span> return scopes;<a name="line.97"></a>
+<span class="sourceLineNo">098</span> }<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span> private WAL log;<a name="line.100"></a>
+<span class="sourceLineNo">101</span> PriorityBlockingQueue<Path> walQueue;<a name="line.101"></a>
+<span class="sourceLineNo">102</span> private PathWatcher pathWatcher;<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span> @Rule<a name="line.104"></a>
+<span class="sourceLineNo">105</span> public TestName tn = new TestName();<a name="line.105"></a>
+<span class="sourceLineNo">106</span> private final MultiVersionConcurrencyControl mvcc = new MultiVersionConcurrencyControl();<a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span> @BeforeClass<a name="line.108"></a>
+<span class="sourceLineNo">109</span> public static void setUpBeforeClass() throws Exception {<a name="line.109"></a>
+<span class="sourceLineNo">110</span> TEST_UTIL = new HBaseTestingUtility();<a name="line.110"></a>
+<span class="sourceLineNo">111</span> CONF = TEST_UTIL.getConfiguration();<a name="line.111"></a>
+<span class="sourceLineNo">112</span> TEST_UTIL.startMiniDFSCluster(3);<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span> cluster = TEST_UTIL.getDFSCluster();<a name="line.114"></a>
+<span class="sourceLineNo">115</span> fs = cluster.getFileSystem();<a name="line.115"></a>
<span class="sourceLineNo">116</span> }<a name="line.116"></a>
<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> @Before<a name="line.118"></a>
-<span class="sourceLineNo">119</span> public void setUp() throws Exception {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> walQueue = new PriorityBlockingQueue<>();<a name="line.120"></a>
-<span class="sourceLineNo">121</span> pathWatcher = new PathWatcher();<a name="line.121"></a>
-<span class="sourceLineNo">122</span> final WALFactory wals = new WALFactory(CONF, tn.getMethodName());<a name="line.122"></a>
-<span class="sourceLineNo">123</span> wals.getWALProvider().addWALActionsListener(pathWatcher);<a name="line.123"></a>
-<span class="sourceLineNo">124</span> log = wals.getWAL(info);<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> @After<a name="line.127"></a>
-<span class="sourceLineNo">128</span> public void tearDown() throws Exception {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> log.close();<a name="line.129"></a>
+<span class="sourceLineNo">118</span> @AfterClass<a name="line.118"></a>
+<span class="sourceLineNo">119</span> public static void tearDownAfterClass() throws Exception {<a name="line.119"></a>
+<span class="sourceLineNo">120</span> TEST_UTIL.shutdownMiniCluster();<a name="line.120"></a>
+<span class="sourceLineNo">121</span> }<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span> @Before<a name="line.123"></a>
+<span class="sourceLineNo">124</span> public void setUp() throws Exception {<a name="line.124"></a>
+<span class="sourceLineNo">125</span> walQueue = new PriorityBlockingQueue<>();<a name="line.125"></a>
+<span class="sourceLineNo">126</span> pathWatcher = new PathWatcher();<a name="line.126"></a>
+<span class="sourceLineNo">127</span> final WALFactory wals = new WALFactory(CONF, tn.getMethodName());<a name="line.127"></a>
+<span class="sourceLineNo">128</span> wals.getWALProvider().addWALActionsListener(pathWatcher);<a name="line.128"></a>
+<span class="sourceLineNo">129</span> log = wals.getWAL(info);<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> // Try out different combinations of row count and KeyValue count<a name="line.132"></a>
-<span class="sourceLineNo">133</span> @Test<a name="line.133"></a>
-<span class="sourceLineNo">134</span> public void testDifferentCounts() throws Exception {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> int[] NB_ROWS = { 1500, 60000 };<a name="line.135"></a>
-<span class="sourceLineNo">136</span> int[] NB_KVS = { 1, 100 };<a name="line.136"></a>
-<span class="sourceLineNo">137</span> // whether compression is used<a name="line.137"></a>
-<span class="sourceLineNo">138</span> Boolean[] BOOL_VALS = { false, true };<a name="line.138"></a>
-<span class="sourceLineNo">139</span> // long lastPosition = 0;<a name="line.139"></a>
-<span class="sourceLineNo">140</span> for (int nbRows : NB_ROWS) {<a name="line.140"></a>
-<span class="sourceLineNo">141</span> for (int walEditKVs : NB_KVS) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> for (boolean isCompressionEnabled : BOOL_VALS) {<a name="line.142"></a>
-<span class="sourceLineNo">143</span> TEST_UTIL.getConfiguration().setBoolean(HConstants.ENABLE_WAL_COMPRESSION,<a name="line.143"></a>
-<span class="sourceLineNo">144</span> isCompressionEnabled);<a name="line.144"></a>
-<span class="sourceLineNo">145</span> mvcc.advanceTo(1);<a name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span> for (int i = 0; i < nbRows; i++) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> appendToLogAndSync(walEditKVs);<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> log.rollWriter();<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span> try (WALEntryStream entryStream =<a name="line.153"></a>
-<span class="sourceLineNo">154</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> int i = 0;<a name="line.155"></a>
-<span class="sourceLineNo">156</span> while (entryStream.hasNext()) {<a name="line.156"></a>
-<span class="sourceLineNo">157</span> assertNotNull(entryStream.next());<a name="line.157"></a>
-<span class="sourceLineNo">158</span> i++;<a name="line.158"></a>
-<span class="sourceLineNo">159</span> }<a name="line.159"></a>
-<span class="sourceLineNo">160</span> assertEquals(nbRows, i);<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span> // should've read all entries<a name="line.162"></a>
-<span class="sourceLineNo">163</span> assertFalse(entryStream.hasNext());<a name="line.163"></a>
-<span class="sourceLineNo">164</span> }<a name="line.164"></a>
-<span class="sourceLineNo">165</span> // reset everything for next loop<a name="line.165"></a>
-<span class="sourceLineNo">166</span> log.close();<a name="line.166"></a>
-<span class="sourceLineNo">167</span> setUp();<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> }<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span> /**<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * Tests basic reading of log appends<a name="line.174"></a>
-<span class="sourceLineNo">175</span> */<a name="line.175"></a>
-<span class="sourceLineNo">176</span> @Test<a name="line.176"></a>
-<span class="sourceLineNo">177</span> public void testAppendsWithRolls() throws Exception {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> appendToLogAndSync();<a name="line.178"></a>
-<span class="sourceLineNo">179</span> long oldPos;<a name="line.179"></a>
-<span class="sourceLineNo">180</span> try (WALEntryStream entryStream =<a name="line.180"></a>
-<span class="sourceLineNo">181</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> // There's one edit in the log, read it. Reading past it needs to throw exception<a name="line.182"></a>
-<span class="sourceLineNo">183</span> assertTrue(entryStream.hasNext());<a name="line.183"></a>
-<span class="sourceLineNo">184</span> WAL.Entry entry = entryStream.peek();<a name="line.184"></a>
-<span class="sourceLineNo">185</span> assertSame(entry, entryStream.next());<a name="line.185"></a>
-<span class="sourceLineNo">186</span> assertNotNull(entry);<a name="line.186"></a>
-<span class="sourceLineNo">187</span> assertFalse(entryStream.hasNext());<a name="line.187"></a>
-<span class="sourceLineNo">188</span> assertNull(entryStream.peek());<a name="line.188"></a>
-<span class="sourceLineNo">189</span> assertNull(entryStream.next());<a name="line.189"></a>
-<span class="sourceLineNo">190</span> oldPos = entryStream.getPosition();<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> appendToLogAndSync();<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span> try (WALEntryStream entryStream = new WALEntryStream(walQueue, fs, CONF, oldPos,<a name="line.195"></a>
-<span class="sourceLineNo">196</span> log, null, new MetricsSource("1"))) {<a name="line.196"></a>
-<span class="sourceLineNo">197</span> // Read the newly added entry, make sure we made progress<a name="line.197"></a>
-<span class="sourceLineNo">198</span> WAL.Entry entry = entryStream.next();<a name="line.198"></a>
-<span class="sourceLineNo">199</span> assertNotEquals(oldPos, entryStream.getPosition());<a name="line.199"></a>
-<span class="sourceLineNo">200</span> assertNotNull(entry);<a name="line.200"></a>
-<span class="sourceLineNo">201</span> oldPos = entryStream.getPosition();<a name="line.201"></a>
-<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> // We rolled but we still should see the end of the first log and get that item<a name="line.204"></a>
-<span class="sourceLineNo">205</span> appendToLogAndSync();<a name="line.205"></a>
-<span class="sourceLineNo">206</span> log.rollWriter();<a name="line.206"></a>
-<span class="sourceLineNo">207</span> appendToLogAndSync();<a name="line.207"></a>
+<span class="sourceLineNo">132</span> @After<a name="line.132"></a>
+<span class="sourceLineNo">133</span> public void tearDown() throws Exception {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> log.close();<a name="line.134"></a>
+<span class="sourceLineNo">135</span> }<a name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span> // Try out different combinations of row count and KeyValue count<a name="line.137"></a>
+<span class="sourceLineNo">138</span> @Test<a name="line.138"></a>
+<span class="sourceLineNo">139</span> public void testDifferentCounts() throws Exception {<a name="line.139"></a>
+<span class="sourceLineNo">140</span> int[] NB_ROWS = { 1500, 60000 };<a name="line.140"></a>
+<span class="sourceLineNo">141</span> int[] NB_KVS = { 1, 100 };<a name="line.141"></a>
+<span class="sourceLineNo">142</span> // whether compression is used<a name="line.142"></a>
+<span class="sourceLineNo">143</span> Boolean[] BOOL_VALS = { false, true };<a name="line.143"></a>
+<span class="sourceLineNo">144</span> // long lastPosition = 0;<a name="line.144"></a>
+<span class="sourceLineNo">145</span> for (int nbRows : NB_ROWS) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> for (int walEditKVs : NB_KVS) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> for (boolean isCompressionEnabled : BOOL_VALS) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> TEST_UTIL.getConfiguration().setBoolean(HConstants.ENABLE_WAL_COMPRESSION,<a name="line.148"></a>
+<span class="sourceLineNo">149</span> isCompressionEnabled);<a name="line.149"></a>
+<span class="sourceLineNo">150</span> mvcc.advanceTo(1);<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span> for (int i = 0; i < nbRows; i++) {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> appendToLogAndSync(walEditKVs);<a name="line.153"></a>
+<span class="sourceLineNo">154</span> }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span> log.rollWriter();<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span> try (WALEntryStream entryStream =<a name="line.158"></a>
+<span class="sourceLineNo">159</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span> int i = 0;<a name="line.160"></a>
+<span class="sourceLineNo">161</span> while (entryStream.hasNext()) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span> assertNotNull(entryStream.next());<a name="line.162"></a>
+<span class="sourceLineNo">163</span> i++;<a name="line.163"></a>
+<span class="sourceLineNo">164</span> }<a name="line.164"></a>
+<span class="sourceLineNo">165</span> assertEquals(nbRows, i);<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span> // should've read all entries<a name="line.167"></a>
+<span class="sourceLineNo">168</span> assertFalse(entryStream.hasNext());<a name="line.168"></a>
+<span class="sourceLineNo">169</span> }<a name="line.169"></a>
+<span class="sourceLineNo">170</span> // reset everything for next loop<a name="line.170"></a>
+<span class="sourceLineNo">171</span> log.close();<a name="line.171"></a>
+<span class="sourceLineNo">172</span> setUp();<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> }<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span> /**<a name="line.178"></a>
+<span class="sourceLineNo">179</span> * Tests basic reading of log appends<a name="line.179"></a>
+<span class="sourceLineNo">180</span> */<a name="line.180"></a>
+<span class="sourceLineNo">181</span> @Test<a name="line.181"></a>
+<span class="sourceLineNo">182</span> public void testAppendsWithRolls() throws Exception {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> appendToLogAndSync();<a name="line.183"></a>
+<span class="sourceLineNo">184</span> long oldPos;<a name="line.184"></a>
+<span class="sourceLineNo">185</span> try (WALEntryStream entryStream =<a name="line.185"></a>
+<span class="sourceLineNo">186</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> // There's one edit in the log, read it. Reading past it needs to throw exception<a name="line.187"></a>
+<span class="sourceLineNo">188</span> assertTrue(entryStream.hasNext());<a name="line.188"></a>
+<span class="sourceLineNo">189</span> WAL.Entry entry = entryStream.peek();<a name="line.189"></a>
+<span class="sourceLineNo">190</span> assertSame(entry, entryStream.next());<a name="line.190"></a>
+<span class="sourceLineNo">191</span> assertNotNull(entry);<a name="line.191"></a>
+<span class="sourceLineNo">192</span> assertFalse(entryStream.hasNext());<a name="line.192"></a>
+<span class="sourceLineNo">193</span> assertNull(entryStream.peek());<a name="line.193"></a>
+<span class="sourceLineNo">194</span> assertNull(entryStream.next());<a name="line.194"></a>
+<span class="sourceLineNo">195</span> oldPos = entryStream.getPosition();<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> appendToLogAndSync();<a name="line.198"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span> try (WALEntryStream entryStream = new WALEntryStream(walQueue, fs, CONF, oldPos,<a name="line.200"></a>
+<span class="sourceLineNo">201</span> log, null, new MetricsSource("1"))) {<a name="line.201"></a>
+<span class="sourceLineNo">202</span> // Read the newly added entry, make sure we made progress<a name="line.202"></a>
+<span class="sourceLineNo">203</span> WAL.Entry entry = entryStream.next();<a name="line.203"></a>
+<span class="sourceLineNo">204</span> assertNotEquals(oldPos, entryStream.getPosition());<a name="line.204"></a>
+<span class="sourceLineNo">205</span> assertNotNull(entry);<a name="line.205"></a>
+<span class="sourceLineNo">206</span> oldPos = entryStream.getPosition();<a name="line.206"></a>
+<span class="sourceLineNo">207</span> }<a name="line.207"></a>
<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span> try (WALEntryStream entryStream = new WALEntryStream(walQueue, fs, CONF, oldPos,<a name="line.209"></a>
-<span class="sourceLineNo">210</span> log, null, new MetricsSource("1"))) {<a name="line.210"></a>
-<span class="sourceLineNo">211</span> WAL.Entry entry = entryStream.next();<a name="line.211"></a>
-<span class="sourceLineNo">212</span> assertNotEquals(oldPos, entryStream.getPosition());<a name="line.212"></a>
-<span class="sourceLineNo">213</span> assertNotNull(entry);<a name="line.213"></a>
-<span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span> // next item should come from the new log<a name="line.215"></a>
-<span class="sourceLineNo">216</span> entry = entryStream.next();<a name="line.216"></a>
+<span class="sourceLineNo">209</span> // We rolled but we still should see the end of the first log and get that item<a name="line.209"></a>
+<span class="sourceLineNo">210</span> appendToLogAndSync();<a name="line.210"></a>
+<span class="sourceLineNo">211</span> log.rollWriter();<a name="line.211"></a>
+<span class="sourceLineNo">212</span> appendToLogAndSync();<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span> try (WALEntryStream entryStream = new WALEntryStream(walQueue, fs, CONF, oldPos,<a name="line.214"></a>
+<span class="sourceLineNo">215</span> log, null, new MetricsSource("1"))) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> WAL.Entry entry = entryStream.next();<a name="line.216"></a>
<span class="sourceLineNo">217</span> assertNotEquals(oldPos, entryStream.getPosition());<a name="line.217"></a>
<span class="sourceLineNo">218</span> assertNotNull(entry);<a name="line.218"></a>
<span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span> // no more entries to read<a name="line.220"></a>
-<span class="sourceLineNo">221</span> assertFalse(entryStream.hasNext());<a name="line.221"></a>
-<span class="sourceLineNo">222</span> oldPos = entryStream.getPosition();<a name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> }<a name="line.224"></a>
-<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span> /**<a name="line.226"></a>
-<span class="sourceLineNo">227</span> * Tests that if after a stream is opened, more entries come in and then the log is rolled, we<a name="line.227"></a>
-<span class="sourceLineNo">228</span> * don't mistakenly dequeue the current log thinking we're done with it<a name="line.228"></a>
-<span class="sourceLineNo">229</span> */<a name="line.229"></a>
-<span class="sourceLineNo">230</span> @Test<a name="line.230"></a>
-<span class="sourceLineNo">231</span> public void testLogrollWhileStreaming() throws Exception {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> appendToLog("1");<a name="line.232"></a>
-<span class="sourceLineNo">233</span> appendToLog("2");// 2<a name="line.233"></a>
-<span class="sourceLineNo">234</span> try (WALEntryStream entryStream =<a name="line.234"></a>
-<span class="sourceLineNo">235</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.235"></a>
-<span class="sourceLineNo">236</span> assertEquals("1", getRow(entryStream.next()));<a name="line.236"></a>
-<span class="sourceLineNo">237</span><a name="line.237"></a>
-<span class="sourceLineNo">238</span> appendToLog("3"); // 3 - comes in after reader opened<a name="line.238"></a>
-<span class="sourceLineNo">239</span> log.rollWriter(); // log roll happening while we're reading<a name="line.239"></a>
-<span class="sourceLineNo">240</span> appendToLog("4"); // 4 - this append is in the rolled log<a name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span> assertEquals("2", getRow(entryStream.next()));<a name="line.242"></a>
-<span class="sourceLineNo">243</span> assertEquals(2, walQueue.size()); // we should not have dequeued yet since there's still an<a name="line.243"></a>
-<span class="sourceLineNo">244</span> // entry in first log<a name="line.244"></a>
-<span class="sourceLineNo">245</span> assertEquals("3", getRow(entryStream.next())); // if implemented improperly, this would be 4<a name="line.245"></a>
-<span class="sourceLineNo">246</span> // and 3 would be skipped<a name="line.246"></a>
-<span class="sourceLineNo">247</span> assertEquals("4", getRow(entryStream.next())); // 4<a name="line.247"></a>
-<span class="sourceLineNo">248</span> assertEquals(1, walQueue.size()); // now we've dequeued and moved on to next log properly<a name="line.248"></a>
-<span class="sourceLineNo">249</span> assertFalse(entryStream.hasNext());<a name="line.249"></a>
-<span class="sourceLineNo">250</span> }<a name="line.250"></a>
-<span class="sourceLineNo">251</span> }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span> /**<a name="line.253"></a>
-<span class="sourceLineNo">254</span> * Tests that if writes come in while we have a stream open, we shouldn't miss them<a name="line.254"></a>
-<span class="sourceLineNo">255</span> */<a name="line.255"></a>
-<span class="sourceLineNo">256</span> @Test<a name="line.256"></a>
-<span class="sourceLineNo">257</span> public void testNewEntriesWhileStreaming() throws Exception {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> appendToLog("1");<a name="line.258"></a>
-<span class="sourceLineNo">259</span> try (WALEntryStream entryStream =<a name="line.259"></a>
-<span class="sourceLineNo">260</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> entryStream.next(); // we've hit the end of the stream at this point<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span> // some new entries come in while we're streaming<a name="line.263"></a>
-<span class="sourceLineNo">264</span> appendToLog("2");<a name="line.264"></a>
-<span class="sourceLineNo">265</span> appendToLog("3");<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span> // don't see them<a name="line.267"></a>
-<span class="sourceLineNo">268</span> assertFalse(entryStream.hasNext());<a name="line.268"></a>
-<span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span> // But we do if we reset<a name="line.270"></a>
-<span class="sourceLineNo">271</span> entryStream.reset();<a name="line.271"></a>
-<span class="sourceLineNo">272</span> assertEquals("2", getRow(entryStream.next()));<a name="line.272"></a>
-<span class="sourceLineNo">273</span> assertEquals("3", getRow(entryStream.next()));<a name="line.273"></a>
-<span class="sourceLineNo">274</span> assertFalse(entryStream.hasNext());<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></a>
-<span class="sourceLineNo">277</span><a name="line.277"></a>
-<span class="sourceLineNo">278</span> @Test<a name="line.278"></a>
-<span class="sourceLineNo">279</span> public void testResumeStreamingFromPosition() throws Exception {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> long lastPosition = 0;<a name="line.280"></a>
-<span class="sourceLineNo">281</span> appendToLog("1");<a name="line.281"></a>
-<span class="sourceLineNo">282</span> try (WALEntryStream entryStream =<a name="line.282"></a>
-<span class="sourceLineNo">283</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> entryStream.next(); // we've hit the end of the stream at this point<a name="line.284"></a>
-<span class="sourceLineNo">285</span> appendToLog("2");<a name="line.285"></a>
-<span class="sourceLineNo">286</span> appendToLog("3");<a name="line.286"></a>
-<span class="sourceLineNo">287</span> lastPosition = entryStream.getPosition();<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span> // next stream should picks up where we left off<a name="line.289"></a>
-<span class="sourceLineNo">290</span> try (WALEntryStream entryStream =<a name="line.290"></a>
-<span class="sourceLineNo">291</span> new WALEntryStream(walQueue, fs, CONF, lastPosition, log, null, new MetricsSource("1"))) {<a name="line.291"></a>
-<span class="sourceLineNo">292</span> assertEquals("2", getRow(entryStream.next()));<a name="line.292"></a>
-<span class="sourceLineNo">293</span> assertEquals("3", getRow(entryStream.next()));<a name="line.293"></a>
-<span class="sourceLineNo">294</span> assertFalse(entryStream.hasNext()); // done<a name="line.294"></a>
-<span class="sourceLineNo">295</span> assertEquals(1, walQueue.size());<a name="line.295"></a>
-<span class="sourceLineNo">296</span> }<a name="line.296"></a>
-<span class="sourceLineNo">297</span> }<a name="line.297"></a>
-<span class="sourceLineNo">298</span><a name="line.298"></a>
-<span class="sourceLineNo">299</span> /**<a name="line.299"></a>
-<span class="sourceLineNo">300</span> * Tests that if we stop before hitting the end of a stream, we can continue where we left off<a name="line.300"></a>
-<span class="sourceLineNo">301</span> * using the last position<a name="line.301"></a>
-<span class="sourceLineNo">302</span> */<a name="line.302"></a>
-<span class="sourceLineNo">303</span> @Test<a name="line.303"></a>
-<span class="sourceLineNo">304</span> public void testPosition() throws Exception {<a name="line.304"></a>
-<span class="sourceLineNo">305</span> long lastPosition = 0;<a name="line.305"></a>
-<span class="sourceLineNo">306</span> appendEntriesToLogAndSync(3);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> // read only one element<a name="line.307"></a>
-<span class="sourceLineNo">308</span> try (WALEntryStream entryStream = new WALEntryStream(walQueue, fs, CONF, lastPosition,<a name="line.308"></a>
-<span class="sourceLineNo">309</span> log, null, new MetricsSource("1"))) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span> entryStream.next();<a name="line.310"></a>
-<span class="sourceLineNo">311</span> lastPosition = entryStream.getPosition();<a name="line.311"></a>
-<span class="sourceLineNo">312</span> }<a name="line.312"></a>
-<span class="sourceLineNo">313</span> // there should still be two more entries from where we left off<a name="line.313"></a>
-<span class="sourceLineNo">314</span> try (WALEntryStream entryStream =<a name="line.314"></a>
-<span class="sourceLineNo">315</span> new WALEntryStream(walQueue, fs, CONF, lastPosition, log, null, new MetricsSource("1"))) {<a name="line.315"></a>
-<span class="sourceLineNo">316</span> assertNotNull(entryStream.next());<a name="line.316"></a>
-<span class="sourceLineNo">317</span> assertNotNull(entryStream.next());<a name="line.317"></a>
-<span class="sourceLineNo">318</span> assertFalse(entryStream.hasNext());<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><a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span> @Test<a name="line.323"></a>
-<span class="sourceLineNo">324</span> public void testEmptyStream() throws Exception {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> try (WALEntryStream entryStream =<a name="line.325"></a>
-<span class="sourceLineNo">326</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> assertFalse(entryStream.hasNext());<a name="line.327"></a>
-<span class="sourceLineNo">328</span> }<a name="line.328"></a>
-<span class="sourceLineNo">329</span> }<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span> private ReplicationSourceWALReader createReader(boolean recovered, Configuration conf) {<a name="line.331"></a>
-<span class="sourceLineNo">332</span> ReplicationSourceManager mockSourceManager = Mockito.mock(ReplicationSourceManager.class);<a name="line.332"></a>
-<span class="sourceLineNo">333</span> when(mockSourceManager.getTotalBufferUsed()).thenReturn(new AtomicLong(0));<a name="line.333"></a>
-<span class="sourceLineNo">334</span> Server mockServer = Mockito.mock(Server.class);<a name="line.334"></a>
-<span class="sourceLineNo">335</span> ReplicationSource source = Mockito.mock(ReplicationSource.class);<a name="line.335"></a>
-<span class="sourceLineNo">336</span> when(source.getSourceManager()).thenReturn(mockSourceManager);<a name="line.336"></a>
-<span class="sourceLineNo">337</span> when(source.getSourceMetrics()).thenReturn(new MetricsSource("1"));<a name="line.337"></a>
-<span class="sourceLineNo">338</span> when(source.getWALFileLengthProvider()).thenReturn(log);<a name="line.338"></a>
-<span class="sourceLineNo">339</span> when(source.getServer()).thenReturn(mockServer);<a name="line.339"></a>
-<span class="sourceLineNo">340</span> when(source.isRecovered()).thenReturn(recovered);<a name="line.340"></a>
-<span class="sourceLineNo">341</span> ReplicationSourceWALReader reader =<a name="line.341"></a>
-<span class="sourceLineNo">342</span> new ReplicationSourceWALReader(fs, conf, walQueue, 0, getDummyFilter(), source);<a name="line.342"></a>
-<span class="sourceLineNo">343</span> reader.start();<a name="line.343"></a>
-<span class="sourceLineNo">344</span> return reader;<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span> @Test<a name="line.347"></a>
-<span class="sourceLineNo">348</span> public void testReplicationSourceWALReader() throws Exception {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> appendEntriesToLogAndSync(3);<a name="line.349"></a>
-<span class="sourceLineNo">350</span> // get ending position<a name="line.350"></a>
-<span class="sourceLineNo">351</span> long position;<a name="line.351"></a>
-<span class="sourceLineNo">352</span> try (WALEntryStream entryStream =<a name="line.352"></a>
-<span class="sourceLineNo">353</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> entryStream.next();<a name="line.354"></a>
-<span class="sourceLineNo">355</span> entryStream.next();<a name="line.355"></a>
-<span class="sourceLineNo">356</span> entryStream.next();<a name="line.356"></a>
-<span class="sourceLineNo">357</span> position = entryStream.getPosition();<a name="line.357"></a>
-<span class="sourceLineNo">358</span> }<a name="line.358"></a>
-<span class="sourceLineNo">359</span><a name="line.359"></a>
-<span class="sourceLineNo">360</span> // start up a reader<a name="line.360"></a>
-<span class="sourceLineNo">361</span> Path walPath = walQueue.peek();<a name="line.361"></a>
-<span class="sourceLineNo">362</span> ReplicationSourceWALReader reader = createReader(false, CONF);<a name="line.362"></a>
-<span class="sourceLineNo">363</span> WALEntryBatch entryBatch = reader.take();<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span> // should've batched up our entries<a name="line.365"></a>
-<span class="sourceLineNo">366</span> assertNotNull(entryBatch);<a name="line.366"></a>
-<span class="sourceLineNo">367</span> assertEquals(3, entryBatch.getWalEntries().size());<a name="line.367"></a>
-<span class="sourceLineNo">368</span> assertEquals(position, entryBatch.getLastWalPosition());<a name="line.368"></a>
-<span class="sourceLineNo">369</span> assertEquals(walPath, entryBatch.getLastWalPath());<a name="line.369"></a>
-<span class="sourceLineNo">370</span> assertEquals(3, entryBatch.getNbRowKeys());<a name="line.370"></a>
-<span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span> appendToLog("foo");<a name="line.372"></a>
-<span class="sourceLineNo">373</span> entryBatch = reader.take();<a name="line.373"></a>
-<span class="sourceLineNo">374</span> assertEquals(1, entryBatch.getNbEntries());<a name="line.374"></a>
-<span class="sourceLineNo">375</span> assertEquals("foo", getRow(entryBatch.getWalEntries().get(0)));<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> @Test<a name="line.378"></a>
-<span class="sourceLineNo">379</span> public void testReplicationSourceWALReaderRecovered() throws Exception {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> appendEntriesToLogAndSync(10);<a name="line.380"></a>
-<span class="sourceLineNo">381</span> Path walPath = walQueue.peek();<a name="line.381"></a>
-<span class="sourceLineNo">382</span> log.rollWriter();<a name="line.382"></a>
-<span class="sourceLineNo">383</span> appendEntriesToLogAndSync(5);<a name="line.383"></a>
-<span class="sourceLineNo">384</span> log.shutdown();<a name="line.384"></a>
-<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span> Configuration conf = new Configuration(CONF);<a name="line.386"></a>
-<span class="sourceLineNo">387</span> conf.setInt("replication.source.nb.capacity", 10);<a name="line.387"></a>
+<span class="sourceLineNo">220</span> // next item should come from the new log<a name="line.220"></a>
+<span class="sourceLineNo">221</span> entry = entryStream.next();<a name="line.221"></a>
+<span class="sourceLineNo">222</span> assertNotEquals(oldPos, entryStream.getPosition());<a name="line.222"></a>
+<span class="sourceLineNo">223</span> assertNotNull(entry);<a name="line.223"></a>
+<span class="sourceLineNo">224</span><a name="line.224"></a>
+<span class="sourceLineNo">225</span> // no more entries to read<a name="line.225"></a>
+<span class="sourceLineNo">226</span> assertFalse(entryStream.hasNext());<a name="line.226"></a>
+<span class="sourceLineNo">227</span> oldPos = entryStream.getPosition();<a name="line.227"></a>
+<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">229</span> }<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> * Tests that if after a stream is opened, more entries come in and then the log is rolled, we<a name="line.232"></a>
+<span class="sourceLineNo">233</span> * don't mistakenly dequeue the current log thinking we're done with it<a name="line.233"></a>
+<span class="sourceLineNo">234</span> */<a name="line.234"></a>
+<span class="sourceLineNo">235</span> @Test<a name="line.235"></a>
+<span class="sourceLineNo">236</span> public void testLogrollWhileStreaming() throws Exception {<a name="line.236"></a>
+<span class="sourceLineNo">237</span> appendToLog("1");<a name="line.237"></a>
+<span class="sourceLineNo">238</span> appendToLog("2");// 2<a name="line.238"></a>
+<span class="sourceLineNo">239</span> try (WALEntryStream entryStream =<a name="line.239"></a>
+<span class="sourceLineNo">240</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> assertEquals("1", getRow(entryStream.next()));<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span> appendToLog("3"); // 3 - comes in after reader opened<a name="line.243"></a>
+<span class="sourceLineNo">244</span> log.rollWriter(); // log roll happening while we're reading<a name="line.244"></a>
+<span class="sourceLineNo">245</span> appendToLog("4"); // 4 - this append is in the rolled log<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span> assertEquals("2", getRow(entryStream.next()));<a name="line.247"></a>
+<span class="sourceLineNo">248</span> assertEquals(2, walQueue.size()); // we should not have dequeued yet since there's still an<a name="line.248"></a>
+<span class="sourceLineNo">249</span> // entry in first log<a name="line.249"></a>
+<span class="sourceLineNo">250</span> assertEquals("3", getRow(entryStream.next())); // if implemented improperly, this would be 4<a name="line.250"></a>
+<span class="sourceLineNo">251</span> // and 3 would be skipped<a name="line.251"></a>
+<span class="sourceLineNo">252</span> assertEquals("4", getRow(entryStream.next())); // 4<a name="line.252"></a>
+<span class="sourceLineNo">253</span> assertEquals(1, walQueue.size()); // now we've dequeued and moved on to next log properly<a name="line.253"></a>
+<span class="sourceLineNo">254</span> assertFalse(entryStream.hasNext());<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><a name="line.257"></a>
+<span class="sourceLineNo">258</span> /**<a name="line.258"></a>
+<span class="sourceLineNo">259</span> * Tests that if writes come in while we have a stream open, we shouldn't miss them<a name="line.259"></a>
+<span class="sourceLineNo">260</span> */<a name="line.260"></a>
+<span class="sourceLineNo">261</span> @Test<a name="line.261"></a>
+<span class="sourceLineNo">262</span> public void testNewEntriesWhileStreaming() throws Exception {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> appendToLog("1");<a name="line.263"></a>
+<span class="sourceLineNo">264</span> try (WALEntryStream entryStream =<a name="line.264"></a>
+<span class="sourceLineNo">265</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> entryStream.next(); // we've hit the end of the stream at this point<a name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
+<span class="sourceLineNo">268</span> // some new entries come in while we're streaming<a name="line.268"></a>
+<span class="sourceLineNo">269</span> appendToLog("2");<a name="line.269"></a>
+<span class="sourceLineNo">270</span> appendToLog("3");<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span> // don't see them<a name="line.272"></a>
+<span class="sourceLineNo">273</span> assertFalse(entryStream.hasNext());<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span> // But we do if we reset<a name="line.275"></a>
+<span class="sourceLineNo">276</span> entryStream.reset();<a name="line.276"></a>
+<span class="sourceLineNo">277</span> assertEquals("2", getRow(entryStream.next()));<a name="line.277"></a>
+<span class="sourceLineNo">278</span> assertEquals("3", getRow(entryStream.next()));<a name="line.278"></a>
+<span class="sourceLineNo">279</span> assertFalse(entryStream.hasNext());<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span> }<a name="line.281"></a>
+<span class="sourceLineNo">282</span><a name="line.282"></a>
+<span class="sourceLineNo">283</span> @Test<a name="line.283"></a>
+<span class="sourceLineNo">284</span> public void testResumeStreamingFromPosition() throws Exception {<a name="line.284"></a>
+<span class="sourceLineNo">285</span> long lastPosition = 0;<a name="line.285"></a>
+<span class="sourceLineNo">286</span> appendToLog("1");<a name="line.286"></a>
+<span class="sourceLineNo">287</span> try (WALEntryStream entryStream =<a name="line.287"></a>
+<span class="sourceLineNo">288</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> entryStream.next(); // we've hit the end of the stream at this point<a name="line.289"></a>
+<span class="sourceLineNo">290</span> appendToLog("2");<a name="line.290"></a>
+<span class="sourceLineNo">291</span> appendToLog("3");<a name="line.291"></a>
+<span class="sourceLineNo">292</span> lastPosition = entryStream.getPosition();<a name="line.292"></a>
+<span class="sourceLineNo">293</span> }<a name="line.293"></a>
+<span class="sourceLineNo">294</span> // next stream should picks up where we left off<a name="line.294"></a>
+<span class="sourceLineNo">295</span> try (WALEntryStream entryStream =<a name="line.295"></a>
+<span class="sourceLineNo">296</span> new WALEntryStream(walQueue, fs, CONF, lastPosition, log, null, new MetricsSource("1"))) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> assertEquals("2", getRow(entryStream.next()));<a name="line.297"></a>
+<span class="sourceLineNo">298</span> assertEquals("3", getRow(entryStream.next()));<a name="line.298"></a>
+<span class="sourceLineNo">299</span> assertFalse(entryStream.hasNext()); // done<a name="line.299"></a>
+<span class="sourceLineNo">300</span> assertEquals(1, walQueue.size());<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><a name="line.303"></a>
+<span class="sourceLineNo">304</span> /**<a name="line.304"></a>
+<span class="sourceLineNo">305</span> * Tests that if we stop before hitting the end of a stream, we can continue where we left off<a name="line.305"></a>
+<span class="sourceLineNo">306</span> * using the last position<a name="line.306"></a>
+<span class="sourceLineNo">307</span> */<a name="line.307"></a>
+<span class="sourceLineNo">308</span> @Test<a name="line.308"></a>
+<span class="sourceLineNo">309</span> public void testPosition() throws Exception {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> long lastPosition = 0;<a name="line.310"></a>
+<span class="sourceLineNo">311</span> appendEntriesToLogAndSync(3);<a name="line.311"></a>
+<span class="sourceLineNo">312</span> // read only one element<a name="line.312"></a>
+<span class="sourceLineNo">313</span> try (WALEntryStream entryStream = new WALEntryStream(walQueue, fs, CONF, lastPosition,<a name="line.313"></a>
+<span class="sourceLineNo">314</span> log, null, new MetricsSource("1"))) {<a name="line.314"></a>
+<span class="sourceLineNo">315</span> entryStream.next();<a name="line.315"></a>
+<span class="sourceLineNo">316</span> lastPosition = entryStream.getPosition();<a name="line.316"></a>
+<span class="sourceLineNo">317</span> }<a name="line.317"></a>
+<span class="sourceLineNo">318</span> // there should still be two more entries from where we left off<a name="line.318"></a>
+<span class="sourceLineNo">319</span> try (WALEntryStream entryStream =<a name="line.319"></a>
+<span class="sourceLineNo">320</span> new WALEntryStream(walQueue, fs, CONF, lastPosition, log, null, new MetricsSource("1"))) {<a name="line.320"></a>
+<span class="sourceLineNo">321</span> assertNotNull(entryStream.next());<a name="line.321"></a>
+<span class="sourceLineNo">322</span> assertNotNull(entryStream.next());<a name="line.322"></a>
+<span class="sourceLineNo">323</span> assertFalse(entryStream.hasNext());<a name="line.323"></a>
+<span class="sourceLineNo">324</span> }<a name="line.324"></a>
+<span class="sourceLineNo">325</span> }<a name="line.325"></a>
+<span class="sourceLineNo">326</span><a name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span> @Test<a name="line.328"></a>
+<span class="sourceLineNo">329</span> public void testEmptyStream() throws Exception {<a name="line.329"></a>
+<span class="sourceLineNo">330</span> try (WALEntryStream entryStream =<a name="line.330"></a>
+<span class="sourceLineNo">331</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.331"></a>
+<span class="sourceLineNo">332</span> assertFalse(entryStream.hasNext());<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><a name="line.335"></a>
+<span class="sourceLineNo">336</span> private ReplicationSource mockReplicationSource(boolean recovered, Configuration conf) {<a name="line.336"></a>
+<span class="sourceLineNo">337</span> ReplicationSourceManager mockSourceManager = Mockito.mock(ReplicationSourceManager.class);<a name="line.337"></a>
+<span class="sourceLineNo">338</span> when(mockSourceManager.getTotalBufferUsed()).thenReturn(new AtomicLong(0));<a name="line.338"></a>
+<span class="sourceLineNo">339</span> Server mockServer = Mockito.mock(Server.class);<a name="line.339"></a>
+<span class="sourceLineNo">340</span> ReplicationSource source = Mockito.mock(ReplicationSource.class);<a name="line.340"></a>
+<span class="sourceLineNo">341</span> when(source.getSourceManager()).thenReturn(mockSourceManager);<a name="line.341"></a>
+<span class="sourceLineNo">342</span> when(source.getSourceMetrics()).thenReturn(new MetricsSource("1"));<a name="line.342"></a>
+<span class="sourceLineNo">343</span> when(source.getWALFileLengthProvider()).thenReturn(log);<a name="line.343"></a>
+<span class="sourceLineNo">344</span> when(source.getServer()).thenReturn(mockServer);<a name="line.344"></a>
+<span class="sourceLineNo">345</span> when(source.isRecovered()).thenReturn(recovered);<a name="line.345"></a>
+<span class="sourceLineNo">346</span> return source;<a name="line.346"></a>
+<span class="sourceLineNo">347</span> }<a name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
+<span class="sourceLineNo">349</span> private ReplicationSourceWALReader createReader(boolean recovered, Configuration conf) {<a name="line.349"></a>
+<span class="sourceLineNo">350</span> ReplicationSource source = mockReplicationSource(recovered, conf);<a name="line.350"></a>
+<span class="sourceLineNo">351</span> when(source.isPeerEnabled()).thenReturn(true);<a name="line.351"></a>
+<span class="sourceLineNo">352</span> ReplicationSourceWALReader reader =<a name="line.352"></a>
+<span class="sourceLineNo">353</span> new ReplicationSourceWALReader(fs, conf, walQueue, 0, getDummyFilter(), source);<a name="line.353"></a>
+<span class="sourceLineNo">354</span> reader.start();<a name="line.354"></a>
+<span class="sourceLineNo">355</span> return reader;<a name="line.355"></a>
+<span class="sourceLineNo">356</span> }<a name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span> @Test<a name="line.358"></a>
+<span class="sourceLineNo">359</span> public void testReplicationSourceWALReader() throws Exception {<a name="line.359"></a>
+<span class="sourceLineNo">360</span> appendEntriesToLogAndSync(3);<a name="line.360"></a>
+<span class="sourceLineNo">361</span> // get ending position<a name="line.361"></a>
+<span class="sourceLineNo">362</span> long position;<a name="line.362"></a>
+<span class="sourceLineNo">363</span> try (WALEntryStream entryStream =<a name="line.363"></a>
+<span class="sourceLineNo">364</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.364"></a>
+<span class="sourceLineNo">365</span> entryStream.next();<a name="line.365"></a>
+<span class="sourceLineNo">366</span> entryStream.next();<a name="line.366"></a>
+<span class="sourceLineNo">367</span> entryStream.next();<a name="line.367"></a>
+<span class="sourceLineNo">368</span> position = entryStream.getPosition();<a name="line.368"></a>
+<span class="sourceLineNo">369</span> }<a name="line.369"></a>
+<span class="sourceLineNo">370</span><a name="line.370"></a>
+<span class="sourceLineNo">371</span> // start up a reader<a name="line.371"></a>
+<span class="sourceLineNo">372</span> Path walPath = walQueue.peek();<a name="line.372"></a>
+<span class="sourceLineNo">373</span> ReplicationSourceWALReader reader = createReader(false, CONF);<a name="line.373"></a>
+<span class="sourceLineNo">374</span> WALEntryBatch entryBatch = reader.take();<a name="line.374"></a>
+<span class="sourceLineNo">375</span><a name="line.375"></a>
+<span class="sourceLineNo">376</span> // should've batched up our entries<a name="line.376"></a>
+<span class="sourceLineNo">377</span> assertNotNull(entryBatch);<a name="line.377"></a>
+<span class="sourceLineNo">378</span> assertEquals(3, entryBatch.getWalEntries().size());<a name="line.378"></a>
+<span class="sourceLineNo">379</span> assertEquals(position, entryBatch.getLastWalPosition());<a name="line.379"></a>
+<span class="sourceLineNo">380</span> assertEquals(walPath, entryBatch.getLastWalPath());<a name="line.380"></a>
+<span class="sourceLineNo">381</span> assertEquals(3, entryBatch.getNbRowKeys());<a name="line.381"></a>
+<span class="sourceLineNo">382</span><a name="line.382"></a>
+<span class="sourceLineNo">383</span> appendToLog("foo");<a name="line.383"></a>
+<span class="sourceLineNo">384</span> entryBatch = reader.take();<a name="line.384"></a>
+<span class="sourceLineNo">385</span> assertEquals(1, entryBatch.getNbEntries());<a name="line.385"></a>
+<span class="sourceLineNo">386</span> assertEquals("foo", getRow(entryBatch.getWalEntries().get(0)));<a name="line.386"></a>
+<span class="sourceLineNo">387</span> }<a name="line.387"></a>
<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span> ReplicationSourceWALReader reader = createReader(true, conf);<a name="line.389"></a>
-<span class="sourceLineNo">390</span><a name="line.390"></a>
-<span class="sourceLineNo">391</span> WALEntryBatch batch = reader.take();<a name="line.391"></a>
-<span class="sourceLineNo">392</span> assertEquals(walPath, batch.getLastWalPath());<a name="line.392"></a>
-<span class="sourceLineNo">393</span> assertEquals(10, batch.getNbEntries());<a name="line.393"></a>
-<span class="sourceLineNo">394</span> assertFalse(batch.isEndOfFile());<a name="line.394"></a>
-<span class="sourceLineNo">395</span><a name="line.395"></a>
-<span class="sourceLineNo">396</span> batch = reader.take();<a name="line.396"></a>
-<span class="sourceLineNo">397</span> assertEquals(walPath, batch.getLastWalPath());<a name="line.397"></a>
-<span class="sourceLineNo">398</span> assertEquals(0, batch.getNbEntries());<a name="line.398"></a>
-<span class="sourceLineNo">399</span> assertTrue(batch.isEndOfFile());<a name="line.399"></a>
-<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span> walPath = walQueue.peek();<a name="line.401"></a>
-<span class="sourceLineNo">402</span> batch = reader.take();<a name="line.402"></a>
+<span class="sourceLineNo">389</span> @Test<a name="line.389"></a>
+<span class="sourceLineNo">390</span> public void testReplicationSourceWALReaderRecovered() throws Exception {<a name="line.390"></a>
+<span class="sourceLineNo">391</span> appendEntriesToLogAndSync(10);<a name="line.391"></a>
+<span class="sourceLineNo">392</span> Path walPath = walQueue.peek();<a name="line.392"></a>
+<span class="sourceLineNo">393</span> log.rollWriter();<a name="line.393"></a>
+<span class="sourceLineNo">394</span> appendEntriesToLogAndSync(5);<a name="line.394"></a>
+<span class="sourceLineNo">395</span> log.shutdown();<a name="line.395"></a>
+<span class="sourceLineNo">396</span><a name="line.396"></a>
+<span class="sourceLineNo">397</span> Configuration conf = new Configuration(CONF);<a name="line.397"></a>
+<span class="sourceLineNo">398</span> conf.setInt("replication.source.nb.capacity", 10);<a name="line.398"></a>
+<span class="sourceLineNo">399</span><a name="line.399"></a>
+<span class="sourceLineNo">400</span> ReplicationSourceWALReader reader = createReader(true, conf);<a name="line.400"></a>
+<span class="sourceLineNo">401</span><a name="line.401"></a>
+<span class="sourceLineNo">402</span> WALEntryBatch batch = reader.take();<a name="line.402"></a>
<span class="sourceLineNo">403</span> assertEquals(walPath, batch.getLastWalPath());<a name="line.403"></a>
-<span class="sourceLineNo">404</span> assertEquals(5, batch.getNbEntries());<a name="line.404"></a>
-<span class="sourceLineNo">405</span> // Actually this should be true but we haven't handled this yet since for a normal queue the<a name="line.405"></a>
-<span class="sourceLineNo">406</span> // last one is always open... Not a big deal for now.<a name="line.406"></a>
-<span class="sourceLineNo">407</span> assertFalse(batch.isEndOfFile());<a name="line.407"></a>
-<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span> assertSame(WALEntryBatch.NO_MORE_DATA, reader.take());<a name="line.409"></a>
-<span class="sourceLineNo">410</span> }<a name="line.410"></a>
+<span class="sourceLineNo">404</span> assertEquals(10, batch.getNbEntries());<a name="line.404"></a>
+<span class="sourceLineNo">405</span> assertFalse(batch.isEndOfFile());<a name="line.405"></a>
+<span class="sourceLineNo">406</span><a name="line.406"></a>
+<span class="sourceLineNo">407</span> batch = reader.take();<a name="line.407"></a>
+<span class="sourceLineNo">408</span> assertEquals(walPath, batch.getLastWalPath());<a name="line.408"></a>
+<span class="sourceLineNo">409</span> assertEquals(0, batch.getNbEntries());<a name="line.409"></a>
+<span class="sourceLineNo">410</span> assertTrue(batch.isEndOfFile());<a name="line.410"></a>
<span class="sourceLineNo">411</span><a name="line.411"></a>
-<span class="sourceLineNo">412</span> // Testcase for HBASE-20206<a name="line.412"></a>
-<span class="sourceLineNo">413</span> @Test<a name="line.413"></a>
-<span class="sourceLineNo">414</span> public void testReplicationSourceWALReaderWrongPosition() throws Exception {<a name="line.414"></a>
-<span class="sourceLineNo">415</span> appendEntriesToLogAndSync(1);<a name="line.415"></a>
-<span class="sourceLineNo">416</span> Path walPath = walQueue.peek();<a name="line.416"></a>
-<span class="sourceLineNo">417</span> log.rollWriter();<a name="line.417"></a>
-<span class="sourceLineNo">418</span> appendEntriesToLogAndSync(20);<a name="line.418"></a>
-<span class="sourceLineNo">419</span> TEST_UTIL.waitFor(5000, new ExplainingPredicate<Exception>() {<a name="line.419"></a>
-<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span> @Override<a name="line.421"></a>
-<span class="sourceLineNo">422</span> public boolean evaluate() throws Exception {<a name="line.422"></a>
-<span class="sourceLineNo">423</span> return fs.getFileStatus(walPath).getLen() > 0;<a name="line.423"></a>
-<span class="sourceLineNo">424</span> }<a name="line.424"></a>
-<span class="sourceLineNo">425</span><a name="line.425"></a>
-<span class="sourceLineNo">426</span> @Override<a name="line.426"></a>
-<span class="sourceLineNo">427</span> public String explainFailure() throws Exception {<a name="line.427"></a>
-<span class="sourceLineNo">428</span> return walPath + " has not been closed yet";<a name="line.428"></a>
-<span class="sourceLineNo">429</span> }<a name="line.429"></a>
-<span class="sourceLineNo">430</span><a name="line.430"></a>
-<span class="sourceLineNo">431</span> });<a name="line.431"></a>
-<span class="sourceLineNo">432</span> long walLength = fs.getFileStatus(walPath).getLen();<a name="line.432"></a>
-<span class="sourceLineNo">433</span><a name="line.433"></a>
-<span class="sourceLineNo">434</span> ReplicationSourceWALReader reader = createReader(false, CONF);<a name="line.434"></a>
-<span class="sourceLineNo">435</span><a name="line.435"></a>
-<span class="sourceLineNo">436</span> WALEntryBatch entryBatch = reader.take();<a name="line.436"></a>
-<span class="sourceLineNo">437</span> assertEquals(walPath, entryBatch.getLastWalPath());<a name="line.437"></a>
-<span class="sourceLineNo">438</span> assertTrue("Position " + entryBatch.getLastWalPosition() + " is out of range, file length is " +<a name="line.438"></a>
-<span class="sourceLineNo">439</span> walLength, entryBatch.getLastWalPosition() <= walLength);<a name="line.439"></a>
-<span class="sourceLineNo">440</span> assertEquals(1, entryBatch.getNbEntries());<a name="line.440"></a>
-<span class="sourceLineNo">441</span> assertTrue(entryBatch.isEndOfFile());<a name="line.441"></a>
-<span class="sourceLineNo">442</span><a name="line.442"></a>
-<span class="sourceLineNo">443</span> Path walPath2 = walQueue.peek();<a name="line.443"></a>
-<span class="sourceLineNo">444</span> entryBatch = reader.take();<a name="line.444"></a>
-<span class="sourceLineNo">445</span> assertEquals(walPath2, entryBatch.getLastWalPath());<a name="line.445"></a>
-<span class="sourceLineNo">446</span> assertEquals(20, entryBatch.getNbEntries());<a name="line.446"></a>
-<span class="sourceLineNo">447</span> assertFalse(entryBatch.isEndOfFile());<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span> log.rollWriter();<a name="line.449"></a>
-<span class="sourceLineNo">450</span> appendEntriesToLogAndSync(10);<a name="line.450"></a>
-<span class="sourceLineNo">451</span> entryBatch = reader.take();<a name="line.451"></a>
-<span class="sourceLineNo">452</span> assertEquals(walPath2, entryBatch.getLastWalPath());<a name="line.452"></a>
-<span class="sourceLineNo">453</span> assertEquals(0, entryBatch.getNbEntries());<a name="line.453"></a>
-<span class="sourceLineNo">454</span> assertTrue(entryBatch.isEndOfFile());<a name="line.454"></a>
-<span class="sourceLineNo">455</span><a name="line.455"></a>
-<span class="sourceLineNo">456</span> Path walPath3 = walQueue.peek();<a name="line.456"></a>
-<span class="sourceLineNo">457</span> entryBatch = reader.take();<a name="line.457"></a>
-<span class="sourceLineNo">458</span> assertEquals(walPath3, entryBatch.getLastWalPath());<a name="line.458"></a>
-<span class="sourceLineNo">459</span> assertEquals(10, entryBatch.getNbEntries());<a name="line.459"></a>
-<span class="sourceLineNo">460</span> assertFalse(entryBatch.isEndOfFile());<a name="line.460"></a>
-<span class="sourceLineNo">461</span> }<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span> private String getRow(WAL.Entry entry) {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> Cell cell = entry.getEdit().getCells().get(0);<a name="line.464"></a>
-<span class="sourceLineNo">465</span> return Bytes.toString(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.465"></a>
-<span class="sourceLineNo">466</span> }<a name="line.466"></a>
-<span class="sourceLineNo">467</span><a name="line.467"></a>
-<span class="sourceLineNo">468</span> private void appendToLog(String key) throws IOException {<a name="line.468"></a>
-<span class="sourceLineNo">469</span> final long txid = log.append(info,<a name="line.469"></a>
-<span class="sourceLineNo">470</span> new WALKeyImpl(info.getEncodedNameAsBytes(), tableName, System.currentTimeMillis(),<a name="line.470"></a>
-<span class="sourceLineNo">471</span> mvcc, scopes), getWALEdit(key), true);<a name="line.471"></a>
-<span class="sourceLineNo">472</span> log.sync(txid);<a name="line.472"></a>
-<span class="sourceLineNo">473</span> }<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span> private void appendEntriesToLogAndSync(int count) throws IOException {<a name="line.475"></a>
-<span class="sourceLineNo">476</span> long txid = -1L;<a name="line.476"></a>
-<span class="sourceLineNo">477</span> for (int i = 0; i < count; i++) {<a name="line.477"></a>
-<span class="sourceLineNo">478</span> txid = appendToLog(1);<a name="line.478"></a>
-<span class="sourceLineNo">479</span> }<a name="line.479"></a>
-<span class="sourceLineNo">480</span> log.sync(txid);<a name="line.480"></a>
-<span class="sourceLineNo">481</span> }<a name="line.481"></a>
-<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span> private void appendToLogAndSync() throws IOException {<a name="line.483"></a>
-<span class="sourceLineNo">484</span> appendToLogAndSync(1);<a name="line.484"></a>
-<span class="sourceLineNo">485</span> }<a name="line.485"></a>
-<span class="sourceLineNo">486</span><a name="line.486"></a>
-<span class="sourceLineNo">487</span> private void appendToLogAndSync(int count) throws IOException {<a name="line.487"></a>
-<span class="sourceLineNo">488</span> long txid = appendToLog(count);<a name="line.488"></a>
-<span class="sourceLineNo">489</span> log.sync(txid);<a name="line.489"></a>
-<span class="sourceLineNo">490</span> }<a name="line.490"></a>
-<span class="sourceLineNo">491</span><a name="line.491"></a>
-<span class="sourceLineNo">492</span> private long appendToLog(int count) throws IOException {<a name="line.492"></a>
-<span class="sourceLineNo">493</span> return log.append(info, new WALKeyImpl(info.getEncodedNameAsBytes(), tableName,<a name="line.493"></a>
-<span class="sourceLineNo">494</span> System.currentTimeMillis(), mvcc, scopes), getWALEdits(count), true);<a name="line.494"></a>
-<span class="sourceLineNo">495</span> }<a name="line.495"></a>
-<span class="sourceLineNo">496</span><a name="line.496"></a>
-<span class="sourceLineNo">497</span> private WALEdit getWALEdits(int count) {<a name="line.497"></a>
-<span class="sourceLineNo">498</span> WALEdit edit = new WALEdit();<a name="line.498"></a>
-<span class="sourceLineNo">499</span> for (int i = 0; i < count; i++) {<a name="line.499"></a>
-<span class="sourceLineNo">500</span> edit.add(new KeyValue(Bytes.toBytes(System.currentTimeMillis()), family, qualifier,<a name="line.500"></a>
-<span class="sourceLineNo">501</span> System.currentTimeMillis(), qualifier));<a name="line.501"></a>
-<span class="sourceLineNo">502</span> }<a name="line.502"></a>
-<span class="sourceLineNo">503</span> return edit;<a name="line.503"></a>
-<span class="sourceLineNo">504</span> }<a name="line.504"></a>
-<span class="sourceLineNo">505</span><a name="line.505"></a>
-<span class="sourceLineNo">506</span> private WALEdit getWALEdit(String row) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span> WALEdit edit = new WALEdit();<a name="line.507"></a>
-<span class="sourceLineNo">508</span> edit.add(<a name="line.508"></a>
-<span class="sourceLineNo">509</span> new KeyValue(Bytes.toBytes(row), family, qualifier, System.currentTimeMillis(), qualifier));<a name="line.509"></a>
-<span class="sourceLineNo">510</span> return edit;<a name="line.510"></a>
-<span class="sourceLineNo">511</span> }<a name="line.511"></a>
-<span class="sourceLineNo">512</span><a name="line.512"></a>
-<span class="sourceLineNo">513</span> private WALEntryFilter getDummyFilter() {<a name="line.513"></a>
-<span class="sourceLineNo">514</span> return new WALEntryFilter() {<a name="line.514"></a>
-<span class="sourceLineNo">515</span><a name="line.515"></a>
-<span class="sourceLineNo">516</span> @Override<a name="line.516"></a>
-<span class="sourceLineNo">517</span> public Entry filter(Entry entry) {<a name="line.517"></a>
-<span class="sourceLineNo">518</span> return entry;<a name="line.518"></a>
-<span class="sourceLineNo">519</span> }<a name="line.519"></a>
-<span class="sourceLineNo">520</span> };<a name="line.520"></a>
-<span class="sourceLineNo">521</span> }<a name="line.521"></a>
-<span class="sourceLineNo">522</span><a name="line.522"></a>
-<span class="sourceLineNo">523</span> class PathWatcher implements WALActionsListener {<a name="line.523"></a>
+<span class="sourceLineNo">412</span> walPath = walQueue.peek();<a name="line.412"></a>
+<span class="sourceLineNo">413</span> batch = reader.take();<a name="line.413"></a>
+<span class="sourceLineNo">414</span> assertEquals(walPath, batch.getLastWalPath());<a name="line.414"></a>
+<span class="sourceLineNo">415</span> assertEquals(5, batch.getNbEntries());<a name="line.415"></a>
+<span class="sourceLineNo">416</span> // Actually this should be true but we haven't handled this yet since for a normal queue the<a name="line.416"></a>
+<span class="sourceLineNo">417</span> // last one is always open... Not a big deal for now.<a name="line.417"></a>
+<span class="sourceLineNo">418</span> assertFalse(batch.isEndOfFile());<a name="line.418"></a>
+<span class="sourceLineNo">419</span><a name="line.419"></a>
+<span class="sourceLineNo">420</span> assertSame(WALEntryBatch.NO_MORE_DATA, reader.take());<a name="line.420"></a>
+<span class="sourceLineNo">421</span> }<a name="line.421"></a>
+<span class="sourceLineNo">422</span><a name="line.422"></a>
+<span class="sourceLineNo">423</span> // Testcase for HBASE-20206<a name="line.423"></a>
+<span class="sourceLineNo">424</span> @Test<a name="line.424"></a>
+<span class="sourceLineNo">425</span> public void testReplicationSourceWALReaderWrongPosition() throws Exception {<a name="line.425"></a>
+<span class="sourceLineNo">426</span> appendEntriesToLogAndSync(1);<a name="line.426"></a>
+<span class="sourceLineNo">427</span> Path walPath = walQueue.peek();<a name="line.427"></a>
+<span class="sourceLineNo">428</span> log.rollWriter();<a name="line.428"></a>
+<span class="sourceLineNo">429</span> appendEntriesToLogAndSync(20);<a name="line.429"></a>
+<span class="sourceLineNo">430</span> TEST_UTIL.waitFor(5000, new ExplainingPredicate<Exception>() {<a name="line.430"></a>
+<span class="sourceLineNo">431</span><a name="line.431"></a>
+<span class="sourceLineNo">432</span> @Override<a name="line.432"></a>
+<span class="sourceLineNo">433</span> public boolean evaluate() throws Exception {<a name="line.433"></a>
+<span class="sourceLineNo">434</span> return fs.getFileStatus(walPath).getLen() > 0;<a name="line.434"></a>
+<span class="sourceLineNo">435</span> }<a name="line.435"></a>
+<span class="sourceLineNo">436</span><a name="line.436"></a>
+<span class="sourceLineNo">437</span> @Override<a name="line.437"></a>
+<span class="sourceLineNo">438</span> public String explainFailure() throws Exception {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> return walPath + " has not been closed yet";<a name="line.439"></a>
+<span class="sourceLineNo">440</span> }<a name="line.440"></a>
+<span class="sourceLineNo">441</span><a name="line.441"></a>
+<span class="sourceLineNo">442</span> });<a name="line.442"></a>
+<span class="sourceLineNo">443</span> long walLength = fs.getFileStatus(walPath).getLen();<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span> ReplicationSourceWALReader reader = createReader(false, CONF);<a name="line.445"></a>
+<span class="sourceLineNo">446</span><a name="line.446"></a>
+<span class="sourceLineNo">447</span> WALEntryBatch entryBatch = reader.take();<a name="line.447"></a>
+<span class="sourceLineNo">448</span> assertEquals(walPath, entryBatch.getLastWalPath());<a name="line.448"></a>
+<span class="sourceLineNo">449</span> assertTrue("Position " + entryBatch.getLastWalPosition() + " is out of range, file length is " +<a name="line.449"></a>
+<span class="sourceLineNo">450</span> walLength, entryBatch.getLastWalPosition() <= walLength);<a name="line.450"></a>
+<span class="sourceLineNo">451</span> assertEquals(1, entryBatch.getNbEntries());<a name="line.451"></a>
+<span class="sourceLineNo">452</span> assertTrue(entryBatch.isEndOfFile());<a name="line.452"></a>
+<span class="sourceLineNo">453</span><a name="line.453"></a>
+<span class="sourceLineNo">454</span> Path walPath2 = walQueue.peek();<a name="line.454"></a>
+<span class="sourceLineNo">455</span> entryBatch = reader.take();<a name="line.455"></a>
+<span class="sourceLineNo">456</span> assertEquals(walPath2, entryBatch.getLastWalPath());<a name="line.456"></a>
+<span class="sourceLineNo">457</span> assertEquals(20, entryBatch.getNbEntries());<a name="line.457"></a>
+<span class="sourceLineNo">458</span> assertFalse(entryBatch.isEndOfFile());<a name="line.458"></a>
+<span class="sourceLineNo">459</span><a name="line.459"></a>
+<span class="sourceLineNo">460</span> log.rollWriter();<a name="line.460"></a>
+<span class="sourceLineNo">461</span> appendEntriesToLogAndSync(10);<a name="line.461"></a>
+<span class="sourceLineNo">462</span> entryBatch = reader.take();<a name="line.462"></a>
+<span class="sourceLineNo">463</span> assertEquals(walPath2, entryBatch.getLastWalPath());<a name="line.463"></a>
+<span class="sourceLineNo">464</span> assertEquals(0, entryBatch.getNbEntries());<a name=
<TRUNCATED>
[06/12] hbase-site git commit: Published site at
773aff90fdf9edf4687b373d1c7ba859d166a437.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html b/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html
index 506f6cc..3ca913b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.ServerEventsListenerThread.html
@@ -362,580 +362,584 @@
<span class="sourceLineNo">354</span> //Overwrite any info stored by table, this takes precedence<a name="line.354"></a>
<span class="sourceLineNo">355</span> try {<a name="line.355"></a>
<span class="sourceLineNo">356</span> if(ZKUtil.checkExists(watcher, groupBasePath) != -1) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span> for(String znode: ZKUtil.listChildrenAndWatchForNewChildren(watcher, groupBasePath)) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> byte[] data = ZKUtil.getData(watcher, ZNodePaths.joinZNode(groupBasePath, znode));<a name="line.358"></a>
-<span class="sourceLineNo">359</span> if(data.length > 0) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> ProtobufUtil.expectPBMagicPrefix(data);<a name="line.360"></a>
-<span class="sourceLineNo">361</span> ByteArrayInputStream bis = new ByteArrayInputStream(<a name="line.361"></a>
-<span class="sourceLineNo">362</span> data, ProtobufUtil.lengthOfPBMagic(), data.length);<a name="line.362"></a>
-<span class="sourceLineNo">363</span> RSGroupInfoList.add(RSGroupProtobufUtil.toGroupInfo(<a name="line.363"></a>
-<span class="sourceLineNo">364</span> RSGroupProtos.RSGroupInfo.parseFrom(bis)));<a name="line.364"></a>
-<span class="sourceLineNo">365</span> }<a name="line.365"></a>
-<span class="sourceLineNo">366</span> }<a name="line.366"></a>
-<span class="sourceLineNo">367</span> LOG.debug("Read ZK GroupInfo count:" + RSGroupInfoList.size());<a name="line.367"></a>
-<span class="sourceLineNo">368</span> }<a name="line.368"></a>
-<span class="sourceLineNo">369</span> } catch (KeeperException|DeserializationException|InterruptedException e) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span> throw new IOException("Failed to read rsGroupZNode",e);<a name="line.370"></a>
-<span class="sourceLineNo">371</span> }<a name="line.371"></a>
-<span class="sourceLineNo">372</span> return RSGroupInfoList;<a name="line.372"></a>
-<span class="sourceLineNo">373</span> }<a name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span> @Override<a name="line.375"></a>
-<span class="sourceLineNo">376</span> public void refresh() throws IOException {<a name="line.376"></a>
-<span class="sourceLineNo">377</span> refresh(false);<a name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span> /**<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * Read rsgroup info from the source of truth, the hbase:rsgroup table.<a name="line.381"></a>
-<span class="sourceLineNo">382</span> * Update zk cache. Called on startup of the manager.<a name="line.382"></a>
-<span class="sourceLineNo">383</span> */<a name="line.383"></a>
-<span class="sourceLineNo">384</span> private synchronized void refresh(boolean forceOnline) throws IOException {<a name="line.384"></a>
-<span class="sourceLineNo">385</span> List<RSGroupInfo> groupList = new LinkedList<>();<a name="line.385"></a>
-<span class="sourceLineNo">386</span><a name="line.386"></a>
-<span class="sourceLineNo">387</span> // Overwrite anything read from zk, group table is source of truth<a name="line.387"></a>
-<span class="sourceLineNo">388</span> // if online read from GROUP table<a name="line.388"></a>
-<span class="sourceLineNo">389</span> if (forceOnline || isOnline()) {<a name="line.389"></a>
-<span class="sourceLineNo">390</span> LOG.debug("Refreshing in Online mode.");<a name="line.390"></a>
-<span class="sourceLineNo">391</span> if (rsGroupTable == null) {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> rsGroupTable = conn.getTable(RSGROUP_TABLE_NAME);<a name="line.392"></a>
-<span class="sourceLineNo">393</span> }<a name="line.393"></a>
-<span class="sourceLineNo">394</span> groupList.addAll(retrieveGroupListFromGroupTable());<a name="line.394"></a>
-<span class="sourceLineNo">395</span> } else {<a name="line.395"></a>
-<span class="sourceLineNo">396</span> LOG.debug("Refreshing in Offline mode.");<a name="line.396"></a>
-<span class="sourceLineNo">397</span> groupList.addAll(retrieveGroupListFromZookeeper());<a name="line.397"></a>
-<span class="sourceLineNo">398</span> }<a name="line.398"></a>
-<span class="sourceLineNo">399</span><a name="line.399"></a>
-<span class="sourceLineNo">400</span> // refresh default group, prune<a name="line.400"></a>
-<span class="sourceLineNo">401</span> NavigableSet<TableName> orphanTables = new TreeSet<>();<a name="line.401"></a>
-<span class="sourceLineNo">402</span> for(String entry: masterServices.getTableDescriptors().getAll().keySet()) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span> orphanTables.add(TableName.valueOf(entry));<a name="line.403"></a>
-<span class="sourceLineNo">404</span> }<a name="line.404"></a>
-<span class="sourceLineNo">405</span><a name="line.405"></a>
-<span class="sourceLineNo">406</span> final List<TableName> specialTables = Arrays.asList(AccessControlLists.ACL_TABLE_NAME,<a name="line.406"></a>
-<span class="sourceLineNo">407</span> TableName.META_TABLE_NAME, TableName.NAMESPACE_TABLE_NAME, RSGROUP_TABLE_NAME);<a name="line.407"></a>
-<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span> for (TableName table : specialTables) {<a name="line.409"></a>
-<span class="sourceLineNo">410</span> orphanTables.add(table);<a name="line.410"></a>
-<span class="sourceLineNo">411</span> }<a name="line.411"></a>
-<span class="sourceLineNo">412</span> for (RSGroupInfo group: groupList) {<a name="line.412"></a>
-<span class="sourceLineNo">413</span> if(!group.getName().equals(RSGroupInfo.DEFAULT_GROUP)) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> orphanTables.removeAll(group.getTables());<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span> }<a name="line.416"></a>
-<span class="sourceLineNo">417</span><a name="line.417"></a>
-<span class="sourceLineNo">418</span> // This is added to the last of the list so it overwrites the 'default' rsgroup loaded<a name="line.418"></a>
-<span class="sourceLineNo">419</span> // from region group table or zk<a name="line.419"></a>
-<span class="sourceLineNo">420</span> groupList.add(new RSGroupInfo(RSGroupInfo.DEFAULT_GROUP, getDefaultServers(),<a name="line.420"></a>
-<span class="sourceLineNo">421</span> orphanTables));<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span> // populate the data<a name="line.423"></a>
-<span class="sourceLineNo">424</span> HashMap<String, RSGroupInfo> newGroupMap = Maps.newHashMap();<a name="line.424"></a>
-<span class="sourceLineNo">425</span> HashMap<TableName, String> newTableMap = Maps.newHashMap();<a name="line.425"></a>
-<span class="sourceLineNo">426</span> for (RSGroupInfo group : groupList) {<a name="line.426"></a>
-<span class="sourceLineNo">427</span> newGroupMap.put(group.getName(), group);<a name="line.427"></a>
-<span class="sourceLineNo">428</span> for(TableName table: group.getTables()) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span> newTableMap.put(table, group.getName());<a name="line.429"></a>
-<span class="sourceLineNo">430</span> }<a name="line.430"></a>
-<span class="sourceLineNo">431</span> }<a name="line.431"></a>
-<span class="sourceLineNo">432</span> resetRSGroupAndTableMaps(newGroupMap, newTableMap);<a name="line.432"></a>
-<span class="sourceLineNo">433</span> updateCacheOfRSGroups(rsGroupMap.keySet());<a name="line.433"></a>
-<span class="sourceLineNo">434</span> }<a name="line.434"></a>
-<span class="sourceLineNo">435</span><a name="line.435"></a>
-<span class="sourceLineNo">436</span> private synchronized Map<TableName,String> flushConfigTable(Map<String,RSGroupInfo> groupMap)<a name="line.436"></a>
-<span class="sourceLineNo">437</span> throws IOException {<a name="line.437"></a>
-<span class="sourceLineNo">438</span> Map<TableName,String> newTableMap = Maps.newHashMap();<a name="line.438"></a>
-<span class="sourceLineNo">439</span> List<Mutation> mutations = Lists.newArrayList();<a name="line.439"></a>
-<span class="sourceLineNo">440</span><a name="line.440"></a>
-<span class="sourceLineNo">441</span> // populate deletes<a name="line.441"></a>
-<span class="sourceLineNo">442</span> for(String groupName : prevRSGroups) {<a name="line.442"></a>
-<span class="sourceLineNo">443</span> if(!groupMap.containsKey(groupName)) {<a name="line.443"></a>
-<span class="sourceLineNo">444</span> Delete d = new Delete(Bytes.toBytes(groupName));<a name="line.444"></a>
-<span class="sourceLineNo">445</span> mutations.add(d);<a name="line.445"></a>
-<span class="sourceLineNo">446</span> }<a name="line.446"></a>
-<span class="sourceLineNo">447</span> }<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span> // populate puts<a name="line.449"></a>
-<span class="sourceLineNo">450</span> for(RSGroupInfo RSGroupInfo : groupMap.values()) {<a name="line.450"></a>
-<span class="sourceLineNo">451</span> RSGroupProtos.RSGroupInfo proto = RSGroupProtobufUtil.toProtoGroupInfo(RSGroupInfo);<a name="line.451"></a>
-<span class="sourceLineNo">452</span> Put p = new Put(Bytes.toBytes(RSGroupInfo.getName()));<a name="line.452"></a>
-<span class="sourceLineNo">453</span> p.addColumn(META_FAMILY_BYTES, META_QUALIFIER_BYTES, proto.toByteArray());<a name="line.453"></a>
-<span class="sourceLineNo">454</span> mutations.add(p);<a name="line.454"></a>
-<span class="sourceLineNo">455</span> for(TableName entry: RSGroupInfo.getTables()) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span> newTableMap.put(entry, RSGroupInfo.getName());<a name="line.456"></a>
-<span class="sourceLineNo">457</span> }<a name="line.457"></a>
-<span class="sourceLineNo">458</span> }<a name="line.458"></a>
-<span class="sourceLineNo">459</span><a name="line.459"></a>
-<span class="sourceLineNo">460</span> if(mutations.size() > 0) {<a name="line.460"></a>
-<span class="sourceLineNo">461</span> multiMutate(mutations);<a name="line.461"></a>
+<span class="sourceLineNo">357</span> List<String> children = ZKUtil.listChildrenAndWatchForNewChildren(watcher, groupBasePath);<a name="line.357"></a>
+<span class="sourceLineNo">358</span> if (children == null) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span> return RSGroupInfoList;<a name="line.359"></a>
+<span class="sourceLineNo">360</span> }<a name="line.360"></a>
+<span class="sourceLineNo">361</span> for(String znode: children) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span> byte[] data = ZKUtil.getData(watcher, ZNodePaths.joinZNode(groupBasePath, znode));<a name="line.362"></a>
+<span class="sourceLineNo">363</span> if(data.length > 0) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span> ProtobufUtil.expectPBMagicPrefix(data);<a name="line.364"></a>
+<span class="sourceLineNo">365</span> ByteArrayInputStream bis = new ByteArrayInputStream(<a name="line.365"></a>
+<span class="sourceLineNo">366</span> data, ProtobufUtil.lengthOfPBMagic(), data.length);<a name="line.366"></a>
+<span class="sourceLineNo">367</span> RSGroupInfoList.add(RSGroupProtobufUtil.toGroupInfo(<a name="line.367"></a>
+<span class="sourceLineNo">368</span> RSGroupProtos.RSGroupInfo.parseFrom(bis)));<a name="line.368"></a>
+<span class="sourceLineNo">369</span> }<a name="line.369"></a>
+<span class="sourceLineNo">370</span> }<a name="line.370"></a>
+<span class="sourceLineNo">371</span> LOG.debug("Read ZK GroupInfo count:" + RSGroupInfoList.size());<a name="line.371"></a>
+<span class="sourceLineNo">372</span> }<a name="line.372"></a>
+<span class="sourceLineNo">373</span> } catch (KeeperException|DeserializationException|InterruptedException e) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> throw new IOException("Failed to read rsGroupZNode",e);<a name="line.374"></a>
+<span class="sourceLineNo">375</span> }<a name="line.375"></a>
+<span class="sourceLineNo">376</span> return RSGroupInfoList;<a name="line.376"></a>
+<span class="sourceLineNo">377</span> }<a name="line.377"></a>
+<span class="sourceLineNo">378</span><a name="line.378"></a>
+<span class="sourceLineNo">379</span> @Override<a name="line.379"></a>
+<span class="sourceLineNo">380</span> public void refresh() throws IOException {<a name="line.380"></a>
+<span class="sourceLineNo">381</span> refresh(false);<a name="line.381"></a>
+<span class="sourceLineNo">382</span> }<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span> /**<a name="line.384"></a>
+<span class="sourceLineNo">385</span> * Read rsgroup info from the source of truth, the hbase:rsgroup table.<a name="line.385"></a>
+<span class="sourceLineNo">386</span> * Update zk cache. Called on startup of the manager.<a name="line.386"></a>
+<span class="sourceLineNo">387</span> */<a name="line.387"></a>
+<span class="sourceLineNo">388</span> private synchronized void refresh(boolean forceOnline) throws IOException {<a name="line.388"></a>
+<span class="sourceLineNo">389</span> List<RSGroupInfo> groupList = new LinkedList<>();<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span> // Overwrite anything read from zk, group table is source of truth<a name="line.391"></a>
+<span class="sourceLineNo">392</span> // if online read from GROUP table<a name="line.392"></a>
+<span class="sourceLineNo">393</span> if (forceOnline || isOnline()) {<a name="line.393"></a>
+<span class="sourceLineNo">394</span> LOG.debug("Refreshing in Online mode.");<a name="line.394"></a>
+<span class="sourceLineNo">395</span> if (rsGroupTable == null) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span> rsGroupTable = conn.getTable(RSGROUP_TABLE_NAME);<a name="line.396"></a>
+<span class="sourceLineNo">397</span> }<a name="line.397"></a>
+<span class="sourceLineNo">398</span> groupList.addAll(retrieveGroupListFromGroupTable());<a name="line.398"></a>
+<span class="sourceLineNo">399</span> } else {<a name="line.399"></a>
+<span class="sourceLineNo">400</span> LOG.debug("Refreshing in Offline mode.");<a name="line.400"></a>
+<span class="sourceLineNo">401</span> groupList.addAll(retrieveGroupListFromZookeeper());<a name="line.401"></a>
+<span class="sourceLineNo">402</span> }<a name="line.402"></a>
+<span class="sourceLineNo">403</span><a name="line.403"></a>
+<span class="sourceLineNo">404</span> // refresh default group, prune<a name="line.404"></a>
+<span class="sourceLineNo">405</span> NavigableSet<TableName> orphanTables = new TreeSet<>();<a name="line.405"></a>
+<span class="sourceLineNo">406</span> for(String entry: masterServices.getTableDescriptors().getAll().keySet()) {<a name="line.406"></a>
+<span class="sourceLineNo">407</span> orphanTables.add(TableName.valueOf(entry));<a name="line.407"></a>
+<span class="sourceLineNo">408</span> }<a name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span> final List<TableName> specialTables = Arrays.asList(AccessControlLists.ACL_TABLE_NAME,<a name="line.410"></a>
+<span class="sourceLineNo">411</span> TableName.META_TABLE_NAME, TableName.NAMESPACE_TABLE_NAME, RSGROUP_TABLE_NAME);<a name="line.411"></a>
+<span class="sourceLineNo">412</span><a name="line.412"></a>
+<span class="sourceLineNo">413</span> for (TableName table : specialTables) {<a name="line.413"></a>
+<span class="sourceLineNo">414</span> orphanTables.add(table);<a name="line.414"></a>
+<span class="sourceLineNo">415</span> }<a name="line.415"></a>
+<span class="sourceLineNo">416</span> for (RSGroupInfo group: groupList) {<a name="line.416"></a>
+<span class="sourceLineNo">417</span> if(!group.getName().equals(RSGroupInfo.DEFAULT_GROUP)) {<a name="line.417"></a>
+<span class="sourceLineNo">418</span> orphanTables.removeAll(group.getTables());<a name="line.418"></a>
+<span class="sourceLineNo">419</span> }<a name="line.419"></a>
+<span class="sourceLineNo">420</span> }<a name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span> // This is added to the last of the list so it overwrites the 'default' rsgroup loaded<a name="line.422"></a>
+<span class="sourceLineNo">423</span> // from region group table or zk<a name="line.423"></a>
+<span class="sourceLineNo">424</span> groupList.add(new RSGroupInfo(RSGroupInfo.DEFAULT_GROUP, getDefaultServers(),<a name="line.424"></a>
+<span class="sourceLineNo">425</span> orphanTables));<a name="line.425"></a>
+<span class="sourceLineNo">426</span><a name="line.426"></a>
+<span class="sourceLineNo">427</span> // populate the data<a name="line.427"></a>
+<span class="sourceLineNo">428</span> HashMap<String, RSGroupInfo> newGroupMap = Maps.newHashMap();<a name="line.428"></a>
+<span class="sourceLineNo">429</span> HashMap<TableName, String> newTableMap = Maps.newHashMap();<a name="line.429"></a>
+<span class="sourceLineNo">430</span> for (RSGroupInfo group : groupList) {<a name="line.430"></a>
+<span class="sourceLineNo">431</span> newGroupMap.put(group.getName(), group);<a name="line.431"></a>
+<span class="sourceLineNo">432</span> for(TableName table: group.getTables()) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span> newTableMap.put(table, group.getName());<a name="line.433"></a>
+<span class="sourceLineNo">434</span> }<a name="line.434"></a>
+<span class="sourceLineNo">435</span> }<a name="line.435"></a>
+<span class="sourceLineNo">436</span> resetRSGroupAndTableMaps(newGroupMap, newTableMap);<a name="line.436"></a>
+<span class="sourceLineNo">437</span> updateCacheOfRSGroups(rsGroupMap.keySet());<a name="line.437"></a>
+<span class="sourceLineNo">438</span> }<a name="line.438"></a>
+<span class="sourceLineNo">439</span><a name="line.439"></a>
+<span class="sourceLineNo">440</span> private synchronized Map<TableName,String> flushConfigTable(Map<String,RSGroupInfo> groupMap)<a name="line.440"></a>
+<span class="sourceLineNo">441</span> throws IOException {<a name="line.441"></a>
+<span class="sourceLineNo">442</span> Map<TableName,String> newTableMap = Maps.newHashMap();<a name="line.442"></a>
+<span class="sourceLineNo">443</span> List<Mutation> mutations = Lists.newArrayList();<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span> // populate deletes<a name="line.445"></a>
+<span class="sourceLineNo">446</span> for(String groupName : prevRSGroups) {<a name="line.446"></a>
+<span class="sourceLineNo">447</span> if(!groupMap.containsKey(groupName)) {<a name="line.447"></a>
+<span class="sourceLineNo">448</span> Delete d = new Delete(Bytes.toBytes(groupName));<a name="line.448"></a>
+<span class="sourceLineNo">449</span> mutations.add(d);<a name="line.449"></a>
+<span class="sourceLineNo">450</span> }<a name="line.450"></a>
+<span class="sourceLineNo">451</span> }<a name="line.451"></a>
+<span class="sourceLineNo">452</span><a name="line.452"></a>
+<span class="sourceLineNo">453</span> // populate puts<a name="line.453"></a>
+<span class="sourceLineNo">454</span> for(RSGroupInfo RSGroupInfo : groupMap.values()) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span> RSGroupProtos.RSGroupInfo proto = RSGroupProtobufUtil.toProtoGroupInfo(RSGroupInfo);<a name="line.455"></a>
+<span class="sourceLineNo">456</span> Put p = new Put(Bytes.toBytes(RSGroupInfo.getName()));<a name="line.456"></a>
+<span class="sourceLineNo">457</span> p.addColumn(META_FAMILY_BYTES, META_QUALIFIER_BYTES, proto.toByteArray());<a name="line.457"></a>
+<span class="sourceLineNo">458</span> mutations.add(p);<a name="line.458"></a>
+<span class="sourceLineNo">459</span> for(TableName entry: RSGroupInfo.getTables()) {<a name="line.459"></a>
+<span class="sourceLineNo">460</span> newTableMap.put(entry, RSGroupInfo.getName());<a name="line.460"></a>
+<span class="sourceLineNo">461</span> }<a name="line.461"></a>
<span class="sourceLineNo">462</span> }<a name="line.462"></a>
-<span class="sourceLineNo">463</span> return newTableMap;<a name="line.463"></a>
-<span class="sourceLineNo">464</span> }<a name="line.464"></a>
-<span class="sourceLineNo">465</span><a name="line.465"></a>
-<span class="sourceLineNo">466</span> private synchronized void flushConfig()<a name="line.466"></a>
-<span class="sourceLineNo">467</span> throws IOException {<a name="line.467"></a>
-<span class="sourceLineNo">468</span> flushConfig(this.rsGroupMap);<a name="line.468"></a>
-<span class="sourceLineNo">469</span> }<a name="line.469"></a>
-<span class="sourceLineNo">470</span><a name="line.470"></a>
-<span class="sourceLineNo">471</span> private synchronized void flushConfig(Map<String, RSGroupInfo> newGroupMap)<a name="line.471"></a>
-<span class="sourceLineNo">472</span> throws IOException {<a name="line.472"></a>
-<span class="sourceLineNo">473</span> Map<TableName, String> newTableMap;<a name="line.473"></a>
+<span class="sourceLineNo">463</span><a name="line.463"></a>
+<span class="sourceLineNo">464</span> if(mutations.size() > 0) {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> multiMutate(mutations);<a name="line.465"></a>
+<span class="sourceLineNo">466</span> }<a name="line.466"></a>
+<span class="sourceLineNo">467</span> return newTableMap;<a name="line.467"></a>
+<span class="sourceLineNo">468</span> }<a name="line.468"></a>
+<span class="sourceLineNo">469</span><a name="line.469"></a>
+<span class="sourceLineNo">470</span> private synchronized void flushConfig()<a name="line.470"></a>
+<span class="sourceLineNo">471</span> throws IOException {<a name="line.471"></a>
+<span class="sourceLineNo">472</span> flushConfig(this.rsGroupMap);<a name="line.472"></a>
+<span class="sourceLineNo">473</span> }<a name="line.473"></a>
<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span> // For offline mode persistence is still unavailable<a name="line.475"></a>
-<span class="sourceLineNo">476</span> // We're refreshing in-memory state but only for default servers<a name="line.476"></a>
-<span class="sourceLineNo">477</span> if (!isOnline()) {<a name="line.477"></a>
-<span class="sourceLineNo">478</span> Map<String, RSGroupInfo> m = Maps.newHashMap(rsGroupMap);<a name="line.478"></a>
-<span class="sourceLineNo">479</span> RSGroupInfo oldDefaultGroup = m.remove(RSGroupInfo.DEFAULT_GROUP);<a name="line.479"></a>
-<span class="sourceLineNo">480</span> RSGroupInfo newDefaultGroup = newGroupMap.remove(RSGroupInfo.DEFAULT_GROUP);<a name="line.480"></a>
-<span class="sourceLineNo">481</span> if (!m.equals(newGroupMap) ||<a name="line.481"></a>
-<span class="sourceLineNo">482</span> !oldDefaultGroup.getTables().equals(newDefaultGroup.getTables())) {<a name="line.482"></a>
-<span class="sourceLineNo">483</span> throw new IOException("Only default servers can be updated during offline mode");<a name="line.483"></a>
-<span class="sourceLineNo">484</span> }<a name="line.484"></a>
-<span class="sourceLineNo">485</span> newGroupMap.put(RSGroupInfo.DEFAULT_GROUP, newDefaultGroup);<a name="line.485"></a>
-<span class="sourceLineNo">486</span> rsGroupMap = newGroupMap;<a name="line.486"></a>
-<span class="sourceLineNo">487</span> return;<a name="line.487"></a>
-<span class="sourceLineNo">488</span> }<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span> newTableMap = flushConfigTable(newGroupMap);<a name="line.490"></a>
-<span class="sourceLineNo">491</span><a name="line.491"></a>
-<span class="sourceLineNo">492</span> // Make changes visible after having been persisted to the source of truth<a name="line.492"></a>
-<span class="sourceLineNo">493</span> resetRSGroupAndTableMaps(newGroupMap, newTableMap);<a name="line.493"></a>
-<span class="sourceLineNo">494</span><a name="line.494"></a>
-<span class="sourceLineNo">495</span> try {<a name="line.495"></a>
-<span class="sourceLineNo">496</span> String groupBasePath = ZNodePaths.joinZNode(watcher.znodePaths.baseZNode, rsGroupZNode);<a name="line.496"></a>
-<span class="sourceLineNo">497</span> ZKUtil.createAndFailSilent(watcher, groupBasePath, ProtobufMagic.PB_MAGIC);<a name="line.497"></a>
+<span class="sourceLineNo">475</span> private synchronized void flushConfig(Map<String, RSGroupInfo> newGroupMap)<a name="line.475"></a>
+<span class="sourceLineNo">476</span> throws IOException {<a name="line.476"></a>
+<span class="sourceLineNo">477</span> Map<TableName, String> newTableMap;<a name="line.477"></a>
+<span class="sourceLineNo">478</span><a name="line.478"></a>
+<span class="sourceLineNo">479</span> // For offline mode persistence is still unavailable<a name="line.479"></a>
+<span class="sourceLineNo">480</span> // We're refreshing in-memory state but only for default servers<a name="line.480"></a>
+<span class="sourceLineNo">481</span> if (!isOnline()) {<a name="line.481"></a>
+<span class="sourceLineNo">482</span> Map<String, RSGroupInfo> m = Maps.newHashMap(rsGroupMap);<a name="line.482"></a>
+<span class="sourceLineNo">483</span> RSGroupInfo oldDefaultGroup = m.remove(RSGroupInfo.DEFAULT_GROUP);<a name="line.483"></a>
+<span class="sourceLineNo">484</span> RSGroupInfo newDefaultGroup = newGroupMap.remove(RSGroupInfo.DEFAULT_GROUP);<a name="line.484"></a>
+<span class="sourceLineNo">485</span> if (!m.equals(newGroupMap) ||<a name="line.485"></a>
+<span class="sourceLineNo">486</span> !oldDefaultGroup.getTables().equals(newDefaultGroup.getTables())) {<a name="line.486"></a>
+<span class="sourceLineNo">487</span> throw new IOException("Only default servers can be updated during offline mode");<a name="line.487"></a>
+<span class="sourceLineNo">488</span> }<a name="line.488"></a>
+<span class="sourceLineNo">489</span> newGroupMap.put(RSGroupInfo.DEFAULT_GROUP, newDefaultGroup);<a name="line.489"></a>
+<span class="sourceLineNo">490</span> rsGroupMap = newGroupMap;<a name="line.490"></a>
+<span class="sourceLineNo">491</span> return;<a name="line.491"></a>
+<span class="sourceLineNo">492</span> }<a name="line.492"></a>
+<span class="sourceLineNo">493</span><a name="line.493"></a>
+<span class="sourceLineNo">494</span> newTableMap = flushConfigTable(newGroupMap);<a name="line.494"></a>
+<span class="sourceLineNo">495</span><a name="line.495"></a>
+<span class="sourceLineNo">496</span> // Make changes visible after having been persisted to the source of truth<a name="line.496"></a>
+<span class="sourceLineNo">497</span> resetRSGroupAndTableMaps(newGroupMap, newTableMap);<a name="line.497"></a>
<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span> List<ZKUtil.ZKUtilOp> zkOps = new ArrayList<>(newGroupMap.size());<a name="line.499"></a>
-<span class="sourceLineNo">500</span> for(String groupName : prevRSGroups) {<a name="line.500"></a>
-<span class="sourceLineNo">501</span> if(!newGroupMap.containsKey(groupName)) {<a name="line.501"></a>
-<span class="sourceLineNo">502</span> String znode = ZNodePaths.joinZNode(groupBasePath, groupName);<a name="line.502"></a>
-<span class="sourceLineNo">503</span> zkOps.add(ZKUtil.ZKUtilOp.deleteNodeFailSilent(znode));<a name="line.503"></a>
-<span class="sourceLineNo">504</span> }<a name="line.504"></a>
-<span class="sourceLineNo">505</span> }<a name="line.505"></a>
-<span class="sourceLineNo">506</span><a name="line.506"></a>
-<span class="sourceLineNo">507</span><a name="line.507"></a>
-<span class="sourceLineNo">508</span> for (RSGroupInfo RSGroupInfo : newGroupMap.values()) {<a name="line.508"></a>
-<span class="sourceLineNo">509</span> String znode = ZNodePaths.joinZNode(groupBasePath, RSGroupInfo.getName());<a name="line.509"></a>
-<span class="sourceLineNo">510</span> RSGroupProtos.RSGroupInfo proto = RSGroupProtobufUtil.toProtoGroupInfo(RSGroupInfo);<a name="line.510"></a>
-<span class="sourceLineNo">511</span> LOG.debug("Updating znode: "+znode);<a name="line.511"></a>
-<span class="sourceLineNo">512</span> ZKUtil.createAndFailSilent(watcher, znode);<a name="line.512"></a>
-<span class="sourceLineNo">513</span> zkOps.add(ZKUtil.ZKUtilOp.deleteNodeFailSilent(znode));<a name="line.513"></a>
-<span class="sourceLineNo">514</span> zkOps.add(ZKUtil.ZKUtilOp.createAndFailSilent(znode,<a name="line.514"></a>
-<span class="sourceLineNo">515</span> ProtobufUtil.prependPBMagic(proto.toByteArray())));<a name="line.515"></a>
-<span class="sourceLineNo">516</span> }<a name="line.516"></a>
-<span class="sourceLineNo">517</span> LOG.debug("Writing ZK GroupInfo count: " + zkOps.size());<a name="line.517"></a>
-<span class="sourceLineNo">518</span><a name="line.518"></a>
-<span class="sourceLineNo">519</span> ZKUtil.multiOrSequential(watcher, zkOps, false);<a name="line.519"></a>
-<span class="sourceLineNo">520</span> } catch (KeeperException e) {<a name="line.520"></a>
-<span class="sourceLineNo">521</span> LOG.error("Failed to write to rsGroupZNode", e);<a name="line.521"></a>
-<span class="sourceLineNo">522</span> masterServices.abort("Failed to write to rsGroupZNode", e);<a name="line.522"></a>
-<span class="sourceLineNo">523</span> throw new IOException("Failed to write to rsGroupZNode",e);<a name="line.523"></a>
-<span class="sourceLineNo">524</span> }<a name="line.524"></a>
-<span class="sourceLineNo">525</span> updateCacheOfRSGroups(newGroupMap.keySet());<a name="line.525"></a>
-<span class="sourceLineNo">526</span> }<a name="line.526"></a>
-<span class="sourceLineNo">527</span><a name="line.527"></a>
-<span class="sourceLineNo">528</span> /**<a name="line.528"></a>
-<span class="sourceLineNo">529</span> * Make changes visible.<a name="line.529"></a>
-<span class="sourceLineNo">530</span> * Caller must be synchronized on 'this'.<a name="line.530"></a>
-<span class="sourceLineNo">531</span> */<a name="line.531"></a>
-<span class="sourceLineNo">532</span> private void resetRSGroupAndTableMaps(Map<String, RSGroupInfo> newRSGroupMap,<a name="line.532"></a>
-<span class="sourceLineNo">533</span> Map<TableName, String> newTableMap) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span> // Make maps Immutable.<a name="line.534"></a>
-<span class="sourceLineNo">535</span> this.rsGroupMap = Collections.unmodifiableMap(newRSGroupMap);<a name="line.535"></a>
-<span class="sourceLineNo">536</span> this.tableMap = Collections.unmodifiableMap(newTableMap);<a name="line.536"></a>
-<span class="sourceLineNo">537</span> }<a name="line.537"></a>
-<span class="sourceLineNo">538</span><a name="line.538"></a>
-<span class="sourceLineNo">539</span> /**<a name="line.539"></a>
-<span class="sourceLineNo">540</span> * Update cache of rsgroups.<a name="line.540"></a>
-<span class="sourceLineNo">541</span> * Caller must be synchronized on 'this'.<a name="line.541"></a>
-<span class="sourceLineNo">542</span> * @param currentGroups Current list of Groups.<a name="line.542"></a>
-<span class="sourceLineNo">543</span> */<a name="line.543"></a>
-<span class="sourceLineNo">544</span> private void updateCacheOfRSGroups(final Set<String> currentGroups) {<a name="line.544"></a>
-<span class="sourceLineNo">545</span> this.prevRSGroups.clear();<a name="line.545"></a>
-<span class="sourceLineNo">546</span> this.prevRSGroups.addAll(currentGroups);<a name="line.546"></a>
-<span class="sourceLineNo">547</span> }<a name="line.547"></a>
-<span class="sourceLineNo">548</span><a name="line.548"></a>
-<span class="sourceLineNo">549</span> // Called by getDefaultServers. Presume it has lock in place.<a name="line.549"></a>
-<span class="sourceLineNo">550</span> private List<ServerName> getOnlineRS() throws IOException {<a name="line.550"></a>
-<span class="sourceLineNo">551</span> if (masterServices != null) {<a name="line.551"></a>
-<span class="sourceLineNo">552</span> return masterServices.getServerManager().getOnlineServersList();<a name="line.552"></a>
-<span class="sourceLineNo">553</span> }<a name="line.553"></a>
-<span class="sourceLineNo">554</span> LOG.debug("Reading online RS from zookeeper");<a name="line.554"></a>
-<span class="sourceLineNo">555</span> List<ServerName> servers = new LinkedList<>();<a name="line.555"></a>
-<span class="sourceLineNo">556</span> try {<a name="line.556"></a>
-<span class="sourceLineNo">557</span> for (String el: ZKUtil.listChildrenNoWatch(watcher, watcher.znodePaths.rsZNode)) {<a name="line.557"></a>
-<span class="sourceLineNo">558</span> servers.add(ServerName.parseServerName(el));<a name="line.558"></a>
-<span class="sourceLineNo">559</span> }<a name="line.559"></a>
-<span class="sourceLineNo">560</span> } catch (KeeperException e) {<a name="line.560"></a>
-<span class="sourceLineNo">561</span> throw new IOException("Failed to retrieve server list from zookeeper", e);<a name="line.561"></a>
-<span class="sourceLineNo">562</span> }<a name="line.562"></a>
-<span class="sourceLineNo">563</span> return servers;<a name="line.563"></a>
-<span class="sourceLineNo">564</span> }<a name="line.564"></a>
-<span class="sourceLineNo">565</span><a name="line.565"></a>
-<span class="sourceLineNo">566</span> // Called by ServerEventsListenerThread. Presume it has lock on this manager when it runs.<a name="line.566"></a>
-<span class="sourceLineNo">567</span> private SortedSet<Address> getDefaultServers() throws IOException {<a name="line.567"></a>
-<span class="sourceLineNo">568</span> SortedSet<Address> defaultServers = Sets.newTreeSet();<a name="line.568"></a>
-<span class="sourceLineNo">569</span> for (ServerName serverName : getOnlineRS()) {<a name="line.569"></a>
-<span class="sourceLineNo">570</span> Address server =<a name="line.570"></a>
-<span class="sourceLineNo">571</span> Address.fromParts(serverName.getHostname(), serverName.getPort());<a name="line.571"></a>
-<span class="sourceLineNo">572</span> boolean found = false;<a name="line.572"></a>
-<span class="sourceLineNo">573</span> for(RSGroupInfo rsgi: listRSGroups()) {<a name="line.573"></a>
-<span class="sourceLineNo">574</span> if(!RSGroupInfo.DEFAULT_GROUP.equals(rsgi.getName()) &&<a name="line.574"></a>
-<span class="sourceLineNo">575</span> rsgi.containsServer(server)) {<a name="line.575"></a>
-<span class="sourceLineNo">576</span> found = true;<a name="line.576"></a>
-<span class="sourceLineNo">577</span> break;<a name="line.577"></a>
-<span class="sourceLineNo">578</span> }<a name="line.578"></a>
-<span class="sourceLineNo">579</span> }<a name="line.579"></a>
-<span class="sourceLineNo">580</span> if (!found) {<a name="line.580"></a>
-<span class="sourceLineNo">581</span> defaultServers.add(server);<a name="line.581"></a>
-<span class="sourceLineNo">582</span> }<a name="line.582"></a>
-<span class="sourceLineNo">583</span> }<a name="line.583"></a>
-<span class="sourceLineNo">584</span> return defaultServers;<a name="line.584"></a>
-<span class="sourceLineNo">585</span> }<a name="line.585"></a>
-<span class="sourceLineNo">586</span><a name="line.586"></a>
-<span class="sourceLineNo">587</span> // Called by ServerEventsListenerThread. Synchronize on this because redoing<a name="line.587"></a>
-<span class="sourceLineNo">588</span> // the rsGroupMap then writing it out.<a name="line.588"></a>
-<span class="sourceLineNo">589</span> private synchronized void updateDefaultServers(SortedSet<Address> servers) throws IOException {<a name="line.589"></a>
-<span class="sourceLineNo">590</span> RSGroupInfo info = rsGroupMap.get(RSGroupInfo.DEFAULT_GROUP);<a name="line.590"></a>
-<span class="sourceLineNo">591</span> RSGroupInfo newInfo = new RSGroupInfo(info.getName(), servers, info.getTables());<a name="line.591"></a>
-<span class="sourceLineNo">592</span> HashMap<String, RSGroupInfo> newGroupMap = Maps.newHashMap(rsGroupMap);<a name="line.592"></a>
-<span class="sourceLineNo">593</span> newGroupMap.put(newInfo.getName(), newInfo);<a name="line.593"></a>
-<span class="sourceLineNo">594</span> flushConfig(newGroupMap);<a name="line.594"></a>
-<span class="sourceLineNo">595</span> }<a name="line.595"></a>
-<span class="sourceLineNo">596</span><a name="line.596"></a>
-<span class="sourceLineNo">597</span> // Called by FailedOpenUpdaterThread<a name="line.597"></a>
-<span class="sourceLineNo">598</span> private void updateFailedAssignments() {<a name="line.598"></a>
-<span class="sourceLineNo">599</span> // Kick all regions in FAILED_OPEN state<a name="line.599"></a>
-<span class="sourceLineNo">600</span> List<RegionInfo> stuckAssignments = Lists.newArrayList();<a name="line.600"></a>
-<span class="sourceLineNo">601</span> for (RegionStateNode state:<a name="line.601"></a>
-<span class="sourceLineNo">602</span> masterServices.getAssignmentManager().getRegionStates().getRegionsInTransition()) {<a name="line.602"></a>
-<span class="sourceLineNo">603</span> if (state.isStuck()) {<a name="line.603"></a>
-<span class="sourceLineNo">604</span> stuckAssignments.add(state.getRegionInfo());<a name="line.604"></a>
-<span class="sourceLineNo">605</span> }<a name="line.605"></a>
-<span class="sourceLineNo">606</span> }<a name="line.606"></a>
-<span class="sourceLineNo">607</span> for (RegionInfo region: stuckAssignments) {<a name="line.607"></a>
-<span class="sourceLineNo">608</span> LOG.info("Retrying assignment of " + region);<a name="line.608"></a>
-<span class="sourceLineNo">609</span> try {<a name="line.609"></a>
-<span class="sourceLineNo">610</span> masterServices.getAssignmentManager().unassign(region);<a name="line.610"></a>
-<span class="sourceLineNo">611</span> } catch (IOException e) {<a name="line.611"></a>
-<span class="sourceLineNo">612</span> LOG.warn("Unable to reassign " + region, e);<a name="line.612"></a>
-<span class="sourceLineNo">613</span> }<a name="line.613"></a>
-<span class="sourceLineNo">614</span> }<a name="line.614"></a>
-<span class="sourceLineNo">615</span> }<a name="line.615"></a>
-<span class="sourceLineNo">616</span><a name="line.616"></a>
-<span class="sourceLineNo">617</span> /**<a name="line.617"></a>
-<span class="sourceLineNo">618</span> * Calls {@link RSGroupInfoManagerImpl#updateDefaultServers(SortedSet)} to update list of known<a name="line.618"></a>
-<span class="sourceLineNo">619</span> * servers. Notifications about server changes are received by registering {@link ServerListener}.<a name="line.619"></a>
-<span class="sourceLineNo">620</span> * As a listener, we need to return immediately, so the real work of updating the servers is<a name="line.620"></a>
-<span class="sourceLineNo">621</span> * done asynchronously in this thread.<a name="line.621"></a>
-<span class="sourceLineNo">622</span> */<a name="line.622"></a>
-<span class="sourceLineNo">623</span> private class ServerEventsListenerThread extends Thread implements ServerListener {<a name="line.623"></a>
-<span class="sourceLineNo">624</span> private final Logger LOG = LoggerFactory.getLogger(ServerEventsListenerThread.class);<a name="line.624"></a>
-<span class="sourceLineNo">625</span> private boolean changed = false;<a name="line.625"></a>
-<span class="sourceLineNo">626</span><a name="line.626"></a>
-<span class="sourceLineNo">627</span> ServerEventsListenerThread() {<a name="line.627"></a>
-<span class="sourceLineNo">628</span> setDaemon(true);<a name="line.628"></a>
-<span class="sourceLineNo">629</span> }<a name="line.629"></a>
+<span class="sourceLineNo">499</span> try {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> String groupBasePath = ZNodePaths.joinZNode(watcher.znodePaths.baseZNode, rsGroupZNode);<a name="line.500"></a>
+<span class="sourceLineNo">501</span> ZKUtil.createAndFailSilent(watcher, groupBasePath, ProtobufMagic.PB_MAGIC);<a name="line.501"></a>
+<span class="sourceLineNo">502</span><a name="line.502"></a>
+<span class="sourceLineNo">503</span> List<ZKUtil.ZKUtilOp> zkOps = new ArrayList<>(newGroupMap.size());<a name="line.503"></a>
+<span class="sourceLineNo">504</span> for(String groupName : prevRSGroups) {<a name="line.504"></a>
+<span class="sourceLineNo">505</span> if(!newGroupMap.containsKey(groupName)) {<a name="line.505"></a>
+<span class="sourceLineNo">506</span> String znode = ZNodePaths.joinZNode(groupBasePath, groupName);<a name="line.506"></a>
+<span class="sourceLineNo">507</span> zkOps.add(ZKUtil.ZKUtilOp.deleteNodeFailSilent(znode));<a name="line.507"></a>
+<span class="sourceLineNo">508</span> }<a name="line.508"></a>
+<span class="sourceLineNo">509</span> }<a name="line.509"></a>
+<span class="sourceLineNo">510</span><a name="line.510"></a>
+<span class="sourceLineNo">511</span><a name="line.511"></a>
+<span class="sourceLineNo">512</span> for (RSGroupInfo RSGroupInfo : newGroupMap.values()) {<a name="line.512"></a>
+<span class="sourceLineNo">513</span> String znode = ZNodePaths.joinZNode(groupBasePath, RSGroupInfo.getName());<a name="line.513"></a>
+<span class="sourceLineNo">514</span> RSGroupProtos.RSGroupInfo proto = RSGroupProtobufUtil.toProtoGroupInfo(RSGroupInfo);<a name="line.514"></a>
+<span class="sourceLineNo">515</span> LOG.debug("Updating znode: "+znode);<a name="line.515"></a>
+<span class="sourceLineNo">516</span> ZKUtil.createAndFailSilent(watcher, znode);<a name="line.516"></a>
+<span class="sourceLineNo">517</span> zkOps.add(ZKUtil.ZKUtilOp.deleteNodeFailSilent(znode));<a name="line.517"></a>
+<span class="sourceLineNo">518</span> zkOps.add(ZKUtil.ZKUtilOp.createAndFailSilent(znode,<a name="line.518"></a>
+<span class="sourceLineNo">519</span> ProtobufUtil.prependPBMagic(proto.toByteArray())));<a name="line.519"></a>
+<span class="sourceLineNo">520</span> }<a name="line.520"></a>
+<span class="sourceLineNo">521</span> LOG.debug("Writing ZK GroupInfo count: " + zkOps.size());<a name="line.521"></a>
+<span class="sourceLineNo">522</span><a name="line.522"></a>
+<span class="sourceLineNo">523</span> ZKUtil.multiOrSequential(watcher, zkOps, false);<a name="line.523"></a>
+<span class="sourceLineNo">524</span> } catch (KeeperException e) {<a name="line.524"></a>
+<span class="sourceLineNo">525</span> LOG.error("Failed to write to rsGroupZNode", e);<a name="line.525"></a>
+<span class="sourceLineNo">526</span> masterServices.abort("Failed to write to rsGroupZNode", e);<a name="line.526"></a>
+<span class="sourceLineNo">527</span> throw new IOException("Failed to write to rsGroupZNode",e);<a name="line.527"></a>
+<span class="sourceLineNo">528</span> }<a name="line.528"></a>
+<span class="sourceLineNo">529</span> updateCacheOfRSGroups(newGroupMap.keySet());<a name="line.529"></a>
+<span class="sourceLineNo">530</span> }<a name="line.530"></a>
+<span class="sourceLineNo">531</span><a name="line.531"></a>
+<span class="sourceLineNo">532</span> /**<a name="line.532"></a>
+<span class="sourceLineNo">533</span> * Make changes visible.<a name="line.533"></a>
+<span class="sourceLineNo">534</span> * Caller must be synchronized on 'this'.<a name="line.534"></a>
+<span class="sourceLineNo">535</span> */<a name="line.535"></a>
+<span class="sourceLineNo">536</span> private void resetRSGroupAndTableMaps(Map<String, RSGroupInfo> newRSGroupMap,<a name="line.536"></a>
+<span class="sourceLineNo">537</span> Map<TableName, String> newTableMap) {<a name="line.537"></a>
+<span class="sourceLineNo">538</span> // Make maps Immutable.<a name="line.538"></a>
+<span class="sourceLineNo">539</span> this.rsGroupMap = Collections.unmodifiableMap(newRSGroupMap);<a name="line.539"></a>
+<span class="sourceLineNo">540</span> this.tableMap = Collections.unmodifiableMap(newTableMap);<a name="line.540"></a>
+<span class="sourceLineNo">541</span> }<a name="line.541"></a>
+<span class="sourceLineNo">542</span><a name="line.542"></a>
+<span class="sourceLineNo">543</span> /**<a name="line.543"></a>
+<span class="sourceLineNo">544</span> * Update cache of rsgroups.<a name="line.544"></a>
+<span class="sourceLineNo">545</span> * Caller must be synchronized on 'this'.<a name="line.545"></a>
+<span class="sourceLineNo">546</span> * @param currentGroups Current list of Groups.<a name="line.546"></a>
+<span class="sourceLineNo">547</span> */<a name="line.547"></a>
+<span class="sourceLineNo">548</span> private void updateCacheOfRSGroups(final Set<String> currentGroups) {<a name="line.548"></a>
+<span class="sourceLineNo">549</span> this.prevRSGroups.clear();<a name="line.549"></a>
+<span class="sourceLineNo">550</span> this.prevRSGroups.addAll(currentGroups);<a name="line.550"></a>
+<span class="sourceLineNo">551</span> }<a name="line.551"></a>
+<span class="sourceLineNo">552</span><a name="line.552"></a>
+<span class="sourceLineNo">553</span> // Called by getDefaultServers. Presume it has lock in place.<a name="line.553"></a>
+<span class="sourceLineNo">554</span> private List<ServerName> getOnlineRS() throws IOException {<a name="line.554"></a>
+<span class="sourceLineNo">555</span> if (masterServices != null) {<a name="line.555"></a>
+<span class="sourceLineNo">556</span> return masterServices.getServerManager().getOnlineServersList();<a name="line.556"></a>
+<span class="sourceLineNo">557</span> }<a name="line.557"></a>
+<span class="sourceLineNo">558</span> LOG.debug("Reading online RS from zookeeper");<a name="line.558"></a>
+<span class="sourceLineNo">559</span> List<ServerName> servers = new LinkedList<>();<a name="line.559"></a>
+<span class="sourceLineNo">560</span> try {<a name="line.560"></a>
+<span class="sourceLineNo">561</span> for (String el: ZKUtil.listChildrenNoWatch(watcher, watcher.znodePaths.rsZNode)) {<a name="line.561"></a>
+<span class="sourceLineNo">562</span> servers.add(ServerName.parseServerName(el));<a name="line.562"></a>
+<span class="sourceLineNo">563</span> }<a name="line.563"></a>
+<span class="sourceLineNo">564</span> } catch (KeeperException e) {<a name="line.564"></a>
+<span class="sourceLineNo">565</span> throw new IOException("Failed to retrieve server list from zookeeper", e);<a name="line.565"></a>
+<span class="sourceLineNo">566</span> }<a name="line.566"></a>
+<span class="sourceLineNo">567</span> return servers;<a name="line.567"></a>
+<span class="sourceLineNo">568</span> }<a name="line.568"></a>
+<span class="sourceLineNo">569</span><a name="line.569"></a>
+<span class="sourceLineNo">570</span> // Called by ServerEventsListenerThread. Presume it has lock on this manager when it runs.<a name="line.570"></a>
+<span class="sourceLineNo">571</span> private SortedSet<Address> getDefaultServers() throws IOException {<a name="line.571"></a>
+<span class="sourceLineNo">572</span> SortedSet<Address> defaultServers = Sets.newTreeSet();<a name="line.572"></a>
+<span class="sourceLineNo">573</span> for (ServerName serverName : getOnlineRS()) {<a name="line.573"></a>
+<span class="sourceLineNo">574</span> Address server =<a name="line.574"></a>
+<span class="sourceLineNo">575</span> Address.fromParts(serverName.getHostname(), serverName.getPort());<a name="line.575"></a>
+<span class="sourceLineNo">576</span> boolean found = false;<a name="line.576"></a>
+<span class="sourceLineNo">577</span> for(RSGroupInfo rsgi: listRSGroups()) {<a name="line.577"></a>
+<span class="sourceLineNo">578</span> if(!RSGroupInfo.DEFAULT_GROUP.equals(rsgi.getName()) &&<a name="line.578"></a>
+<span class="sourceLineNo">579</span> rsgi.containsServer(server)) {<a name="line.579"></a>
+<span class="sourceLineNo">580</span> found = true;<a name="line.580"></a>
+<span class="sourceLineNo">581</span> break;<a name="line.581"></a>
+<span class="sourceLineNo">582</span> }<a name="line.582"></a>
+<span class="sourceLineNo">583</span> }<a name="line.583"></a>
+<span class="sourceLineNo">584</span> if (!found) {<a name="line.584"></a>
+<span class="sourceLineNo">585</span> defaultServers.add(server);<a name="line.585"></a>
+<span class="sourceLineNo">586</span> }<a name="line.586"></a>
+<span class="sourceLineNo">587</span> }<a name="line.587"></a>
+<span class="sourceLineNo">588</span> return defaultServers;<a name="line.588"></a>
+<span class="sourceLineNo">589</span> }<a name="line.589"></a>
+<span class="sourceLineNo">590</span><a name="line.590"></a>
+<span class="sourceLineNo">591</span> // Called by ServerEventsListenerThread. Synchronize on this because redoing<a name="line.591"></a>
+<span class="sourceLineNo">592</span> // the rsGroupMap then writing it out.<a name="line.592"></a>
+<span class="sourceLineNo">593</span> private synchronized void updateDefaultServers(SortedSet<Address> servers) throws IOException {<a name="line.593"></a>
+<span class="sourceLineNo">594</span> RSGroupInfo info = rsGroupMap.get(RSGroupInfo.DEFAULT_GROUP);<a name="line.594"></a>
+<span class="sourceLineNo">595</span> RSGroupInfo newInfo = new RSGroupInfo(info.getName(), servers, info.getTables());<a name="line.595"></a>
+<span class="sourceLineNo">596</span> HashMap<String, RSGroupInfo> newGroupMap = Maps.newHashMap(rsGroupMap);<a name="line.596"></a>
+<span class="sourceLineNo">597</span> newGroupMap.put(newInfo.getName(), newInfo);<a name="line.597"></a>
+<span class="sourceLineNo">598</span> flushConfig(newGroupMap);<a name="line.598"></a>
+<span class="sourceLineNo">599</span> }<a name="line.599"></a>
+<span class="sourceLineNo">600</span><a name="line.600"></a>
+<span class="sourceLineNo">601</span> // Called by FailedOpenUpdaterThread<a name="line.601"></a>
+<span class="sourceLineNo">602</span> private void updateFailedAssignments() {<a name="line.602"></a>
+<span class="sourceLineNo">603</span> // Kick all regions in FAILED_OPEN state<a name="line.603"></a>
+<span class="sourceLineNo">604</span> List<RegionInfo> stuckAssignments = Lists.newArrayList();<a name="line.604"></a>
+<span class="sourceLineNo">605</span> for (RegionStateNode state:<a name="line.605"></a>
+<span class="sourceLineNo">606</span> masterServices.getAssignmentManager().getRegionStates().getRegionsInTransition()) {<a name="line.606"></a>
+<span class="sourceLineNo">607</span> if (state.isStuck()) {<a name="line.607"></a>
+<span class="sourceLineNo">608</span> stuckAssignments.add(state.getRegionInfo());<a name="line.608"></a>
+<span class="sourceLineNo">609</span> }<a name="line.609"></a>
+<span class="sourceLineNo">610</span> }<a name="line.610"></a>
+<span class="sourceLineNo">611</span> for (RegionInfo region: stuckAssignments) {<a name="line.611"></a>
+<span class="sourceLineNo">612</span> LOG.info("Retrying assignment of " + region);<a name="line.612"></a>
+<span class="sourceLineNo">613</span> try {<a name="line.613"></a>
+<span class="sourceLineNo">614</span> masterServices.getAssignmentManager().unassign(region);<a name="line.614"></a>
+<span class="sourceLineNo">615</span> } catch (IOException e) {<a name="line.615"></a>
+<span class="sourceLineNo">616</span> LOG.warn("Unable to reassign " + region, e);<a name="line.616"></a>
+<span class="sourceLineNo">617</span> }<a name="line.617"></a>
+<span class="sourceLineNo">618</span> }<a name="line.618"></a>
+<span class="sourceLineNo">619</span> }<a name="line.619"></a>
+<span class="sourceLineNo">620</span><a name="line.620"></a>
+<span class="sourceLineNo">621</span> /**<a name="line.621"></a>
+<span class="sourceLineNo">622</span> * Calls {@link RSGroupInfoManagerImpl#updateDefaultServers(SortedSet)} to update list of known<a name="line.622"></a>
+<span class="sourceLineNo">623</span> * servers. Notifications about server changes are received by registering {@link ServerListener}.<a name="line.623"></a>
+<span class="sourceLineNo">624</span> * As a listener, we need to return immediately, so the real work of updating the servers is<a name="line.624"></a>
+<span class="sourceLineNo">625</span> * done asynchronously in this thread.<a name="line.625"></a>
+<span class="sourceLineNo">626</span> */<a name="line.626"></a>
+<span class="sourceLineNo">627</span> private class ServerEventsListenerThread extends Thread implements ServerListener {<a name="line.627"></a>
+<span class="sourceLineNo">628</span> private final Logger LOG = LoggerFactory.getLogger(ServerEventsListenerThread.class);<a name="line.628"></a>
+<span class="sourceLineNo">629</span> private boolean changed = false;<a name="line.629"></a>
<span class="sourceLineNo">630</span><a name="line.630"></a>
-<span class="sourceLineNo">631</span> @Override<a name="line.631"></a>
-<span class="sourceLineNo">632</span> public void serverAdded(ServerName serverName) {<a name="line.632"></a>
-<span class="sourceLineNo">633</span> serverChanged();<a name="line.633"></a>
-<span class="sourceLineNo">634</span> }<a name="line.634"></a>
-<span class="sourceLineNo">635</span><a name="line.635"></a>
-<span class="sourceLineNo">636</span> @Override<a name="line.636"></a>
-<span class="sourceLineNo">637</span> public void serverRemoved(ServerName serverName) {<a name="line.637"></a>
-<span class="sourceLineNo">638</span> serverChanged();<a name="line.638"></a>
-<span class="sourceLineNo">639</span> }<a name="line.639"></a>
-<span class="sourceLineNo">640</span><a name="line.640"></a>
-<span class="sourceLineNo">641</span> private synchronized void serverChanged() {<a name="line.641"></a>
-<span class="sourceLineNo">642</span> changed = true;<a name="line.642"></a>
-<span class="sourceLineNo">643</span> this.notify();<a name="line.643"></a>
-<span class="sourceLineNo">644</span> }<a name="line.644"></a>
-<span class="sourceLineNo">645</span><a name="line.645"></a>
-<span class="sourceLineNo">646</span> @Override<a name="line.646"></a>
-<span class="sourceLineNo">647</span> public void run() {<a name="line.647"></a>
-<span class="sourceLineNo">648</span> setName(ServerEventsListenerThread.class.getName() + "-" + masterServices.getServerName());<a name="line.648"></a>
-<span class="sourceLineNo">649</span> SortedSet<Address> prevDefaultServers = new TreeSet<>();<a name="line.649"></a>
-<span class="sourceLineNo">650</span> while(isMasterRunning(masterServices)) {<a name="line.650"></a>
-<span class="sourceLineNo">651</span> try {<a name="line.651"></a>
-<span class="sourceLineNo">652</span> LOG.info("Updating default servers.");<a name="line.652"></a>
-<span class="sourceLineNo">653</span> SortedSet<Address> servers = RSGroupInfoManagerImpl.this.getDefaultServers();<a name="line.653"></a>
-<span class="sourceLineNo">654</span> if (!servers.equals(prevDefaultServers)) {<a name="line.654"></a>
-<span class="sourceLineNo">655</span> RSGroupInfoManagerImpl.this.updateDefaultServers(servers);<a name="line.655"></a>
-<span class="sourceLineNo">656</span> prevDefaultServers = servers;<a name="line.656"></a>
-<span class="sourceLineNo">657</span> LOG.info("Updated with servers: "+servers.size());<a name="line.657"></a>
-<span class="sourceLineNo">658</span> }<a name="line.658"></a>
-<span class="sourceLineNo">659</span> try {<a name="line.659"></a>
-<span class="sourceLineNo">660</span> synchronized (this) {<a name="line.660"></a>
-<span class="sourceLineNo">661</span> while (!changed) {<a name="line.661"></a>
-<span class="sourceLineNo">662</span> wait();<a name="line.662"></a>
-<span class="sourceLineNo">663</span> }<a name="line.663"></a>
-<span class="sourceLineNo">664</span> changed = false;<a name="line.664"></a>
-<span class="sourceLineNo">665</span> }<a name="line.665"></a>
-<span class="sourceLineNo">666</span> } catch (InterruptedException e) {<a name="line.666"></a>
-<span class="sourceLineNo">667</span> LOG.warn("Interrupted", e);<a name="line.667"></a>
-<span class="sourceLineNo">668</span> }<a name="line.668"></a>
-<span class="sourceLineNo">669</span> } catch (IOException e) {<a name="line.669"></a>
-<span class="sourceLineNo">670</span> LOG.warn("Failed to update default servers", e);<a name="line.670"></a>
-<span class="sourceLineNo">671</span> }<a name="line.671"></a>
-<span class="sourceLineNo">672</span> }<a name="line.672"></a>
-<span class="sourceLineNo">673</span> }<a name="line.673"></a>
-<span class="sourceLineNo">674</span> }<a name="line.674"></a>
-<span class="sourceLineNo">675</span><a name="line.675"></a>
-<span class="sourceLineNo">676</span> private class FailedOpenUpdaterThread extends Thread implements ServerListener {<a name="line.676"></a>
-<span class="sourceLineNo">677</span> private final long waitInterval;<a name="line.677"></a>
-<span class="sourceLineNo">678</span> private volatile boolean hasChanged = false;<a name="line.678"></a>
+<span class="sourceLineNo">631</span> ServerEventsListenerThread() {<a name="line.631"></a>
+<span class="sourceLineNo">632</span> setDaemon(true);<a name="line.632"></a>
+<span class="sourceLineNo">633</span> }<a name="line.633"></a>
+<span class="sourceLineNo">634</span><a name="line.634"></a>
+<span class="sourceLineNo">635</span> @Override<a name="line.635"></a>
+<span class="sourceLineNo">636</span> public void serverAdded(ServerName serverName) {<a name="line.636"></a>
+<span class="sourceLineNo">637</span> serverChanged();<a name="line.637"></a>
+<span class="sourceLineNo">638</span> }<a name="line.638"></a>
+<span class="sourceLineNo">639</span><a name="line.639"></a>
+<span class="sourceLineNo">640</span> @Override<a name="line.640"></a>
+<span class="sourceLineNo">641</span> public void serverRemoved(ServerName serverName) {<a name="line.641"></a>
+<span class="sourceLineNo">642</span> serverChanged();<a name="line.642"></a>
+<span class="sourceLineNo">643</span> }<a name="line.643"></a>
+<span class="sourceLineNo">644</span><a name="line.644"></a>
+<span class="sourceLineNo">645</span> private synchronized void serverChanged() {<a name="line.645"></a>
+<span class="sourceLineNo">646</span> changed = true;<a name="line.646"></a>
+<span class="sourceLineNo">647</span> this.notify();<a name="line.647"></a>
+<span class="sourceLineNo">648</span> }<a name="line.648"></a>
+<span class="sourceLineNo">649</span><a name="line.649"></a>
+<span class="sourceLineNo">650</span> @Override<a name="line.650"></a>
+<span class="sourceLineNo">651</span> public void run() {<a name="line.651"></a>
+<span class="sourceLineNo">652</span> setName(ServerEventsListenerThread.class.getName() + "-" + masterServices.getServerName());<a name="line.652"></a>
+<span class="sourceLineNo">653</span> SortedSet<Address> prevDefaultServers = new TreeSet<>();<a name="line.653"></a>
+<span class="sourceLineNo">654</span> while(isMasterRunning(masterServices)) {<a name="line.654"></a>
+<span class="sourceLineNo">655</span> try {<a name="line.655"></a>
+<span class="sourceLineNo">656</span> LOG.info("Updating default servers.");<a name="line.656"></a>
+<span class="sourceLineNo">657</span> SortedSet<Address> servers = RSGroupInfoManagerImpl.this.getDefaultServers();<a name="line.657"></a>
+<span class="sourceLineNo">658</span> if (!servers.equals(prevDefaultServers)) {<a name="line.658"></a>
+<span class="sourceLineNo">659</span> RSGroupInfoManagerImpl.this.updateDefaultServers(servers);<a name="line.659"></a>
+<span class="sourceLineNo">660</span> prevDefaultServers = servers;<a name="line.660"></a>
+<span class="sourceLineNo">661</span> LOG.info("Updated with servers: "+servers.size());<a name="line.661"></a>
+<span class="sourceLineNo">662</span> }<a name="line.662"></a>
+<span class="sourceLineNo">663</span> try {<a name="line.663"></a>
+<span class="sourceLineNo">664</span> synchronized (this) {<a name="line.664"></a>
+<span class="sourceLineNo">665</span> while (!changed) {<a name="line.665"></a>
+<span class="sourceLineNo">666</span> wait();<a name="line.666"></a>
+<span class="sourceLineNo">667</span> }<a name="line.667"></a>
+<span class="sourceLineNo">668</span> changed = false;<a name="line.668"></a>
+<span class="sourceLineNo">669</span> }<a name="line.669"></a>
+<span class="sourceLineNo">670</span> } catch (InterruptedException e) {<a name="line.670"></a>
+<span class="sourceLineNo">671</span> LOG.warn("Interrupted", e);<a name="line.671"></a>
+<span class="sourceLineNo">672</span> }<a name="line.672"></a>
+<span class="sourceLineNo">673</span> } catch (IOException e) {<a name="line.673"></a>
+<span class="sourceLineNo">674</span> LOG.warn("Failed to update default servers", e);<a name="line.674"></a>
+<span class="sourceLineNo">675</span> }<a name="line.675"></a>
+<span class="sourceLineNo">676</span> }<a name="line.676"></a>
+<span class="sourceLineNo">677</span> }<a name="line.677"></a>
+<span class="sourceLineNo">678</span> }<a name="line.678"></a>
<span class="sourceLineNo">679</span><a name="line.679"></a>
-<span class="sourceLineNo">680</span> public FailedOpenUpdaterThread(Configuration conf) {<a name="line.680"></a>
-<span class="sourceLineNo">681</span> this.waitInterval = conf.getLong(REASSIGN_WAIT_INTERVAL_KEY,<a name="line.681"></a>
-<span class="sourceLineNo">682</span> DEFAULT_REASSIGN_WAIT_INTERVAL);<a name="line.682"></a>
-<span class="sourceLineNo">683</span> setDaemon(true);<a name="line.683"></a>
-<span class="sourceLineNo">684</span> }<a name="line.684"></a>
-<span class="sourceLineNo">685</span><a name="line.685"></a>
-<span class="sourceLineNo">686</span> @Override<a name="line.686"></a>
-<span class="sourceLineNo">687</span> public void serverAdded(ServerName serverName) {<a name="line.687"></a>
-<span class="sourceLineNo">688</span> serverChanged();<a name="line.688"></a>
-<span class="sourceLineNo">689</span> }<a name="line.689"></a>
-<span class="sourceLineNo">690</span><a name="line.690"></a>
-<span class="sourceLineNo">691</span> @Override<a name="line.691"></a>
-<span class="sourceLineNo">692</span> public void serverRemoved(ServerName serverName) {<a name="line.692"></a>
+<span class="sourceLineNo">680</span> private class FailedOpenUpdaterThread extends Thread implements ServerListener {<a name="line.680"></a>
+<span class="sourceLineNo">681</span> private final long waitInterval;<a name="line.681"></a>
+<span class="sourceLineNo">682</span> private volatile boolean hasChanged = false;<a name="line.682"></a>
+<span class="sourceLineNo">683</span><a name="line.683"></a>
+<span class="sourceLineNo">684</span> public FailedOpenUpdaterThread(Configuration conf) {<a name="line.684"></a>
+<span class="sourceLineNo">685</span> this.waitInterval = conf.getLong(REASSIGN_WAIT_INTERVAL_KEY,<a name="line.685"></a>
+<span class="sourceLineNo">686</span> DEFAULT_REASSIGN_WAIT_INTERVAL);<a name="line.686"></a>
+<span class="sourceLineNo">687</span> setDaemon(true);<a name="line.687"></a>
+<span class="sourceLineNo">688</span> }<a name="line.688"></a>
+<span class="sourceLineNo">689</span><a name="line.689"></a>
+<span class="sourceLineNo">690</span> @Override<a name="line.690"></a>
+<span class="sourceLineNo">691</span> public void serverAdded(ServerName serverName) {<a name="line.691"></a>
+<span class="sourceLineNo">692</span> serverChanged();<a name="line.692"></a>
<span class="sourceLineNo">693</span> }<a name="line.693"></a>
<span class="sourceLineNo">694</span><a name="line.694"></a>
<span class="sourceLineNo">695</span> @Override<a name="line.695"></a>
-<span class="sourceLineNo">696</span> public void run() {<a name="line.696"></a>
-<span class="sourceLineNo">697</span> while (isMasterRunning(masterServices)) {<a name="line.697"></a>
-<span class="sourceLineNo">698</span> boolean interrupted = false;<a name="line.698"></a>
-<span class="sourceLineNo">699</span> try {<a name="line.699"></a>
-<span class="sourceLineNo">700</span> synchronized (this) {<a name="line.700"></a>
-<span class="sourceLineNo">701</span> while (!hasChanged) {<a name="line.701"></a>
-<span class="sourceLineNo">702</span> wait();<a name="line.702"></a>
-<span class="sourceLineNo">703</span> }<a name="line.703"></a>
-<span class="sourceLineNo">704</span> hasChanged = false;<a name="line.704"></a>
-<span class="sourceLineNo">705</span> }<a name="line.705"></a>
-<span class="sourceLineNo">706</span> } catch (InterruptedException e) {<a name="line.706"></a>
-<span class="sourceLineNo">707</span> LOG.warn("Interrupted", e);<a name="line.707"></a>
-<span class="sourceLineNo">708</span> interrupted = true;<a name="line.708"></a>
-<span class="sourceLineNo">709</span> }<a name="line.709"></a>
-<span class="sourceLineNo">710</span> if (!isMasterRunning(masterServices) || interrupted) {<a name="line.710"></a>
-<span class="sourceLineNo">711</span> continue;<a name="line.711"></a>
-<span class="sourceLineNo">712</span> }<a name="line.712"></a>
-<span class="sourceLineNo">713</span><a name="line.713"></a>
-<span class="sourceLineNo">714</span> // First, wait a while in case more servers are about to rejoin the cluster<a name="line.714"></a>
-<span class="sourceLineNo">715</span> try {<a name="line.715"></a>
-<span class="sourceLineNo">716</span> Thread.sleep(waitInterval);<a name="line.716"></a>
-<span class="sourceLineNo">717</span> } catch (InterruptedException e) {<a name="line.717"></a>
-<span class="sourceLineNo">718</span> LOG.warn("Interrupted", e);<a name="line.718"></a>
-<span class="sourceLineNo">719</span> }<a name="line.719"></a>
-<span class="sourceLineNo">720</span> if (!isMasterRunning(masterServices)) {<a name="line.720"></a>
-<span class="sourceLineNo">721</span> continue;<a name="line.721"></a>
-<span class="sourceLineNo">722</span> }<a name="line.722"></a>
-<span class="sourceLineNo">723</span><a name="line.723"></a>
-<span class="sourceLineNo">724</span> // Kick all regions in FAILED_OPEN state<a name="line.724"></a>
-<span class="sourceLineNo">725</span> updateFailedAssignments();<a name="line.725"></a>
-<span class="sourceLineNo">726</span> }<a name="line.726"></a>
-<span class="sourceLineNo">727</span> }<a name="line.727"></a>
-<span class="sourceLineNo">728</span><a name="line.728"></a>
-<span class="sourceLineNo">729</span> public void serverChanged() {<a name="line.729"></a>
-<span class="sourceLineNo">730</span> synchronized (this) {<a name="line.730"></a>
-<span class="sourceLineNo">731</span> hasChanged = true;<a name="line.731"></a>
-<span class="sourceLineNo">732</span> this.notify();<a name="line.732"></a>
-<span class="sourceLineNo">733</span> }<a name="line.733"></a>
-<span class="sourceLineNo">734</span> }<a name="line.734"></a>
-<span class="sourceLineNo">735</span> }<a name="line.735"></a>
-<span class="sourceLineNo">736</span><a name="line.736"></a>
-<span class="sourceLineNo">737</span> private class RSGroupStartupWorker extends Thread {<a name="line.737"></a>
-<span class="sourceLineNo">738</span> private final Logger LOG = LoggerFactory.getLogger(RSGroupStartupWorker.class);<a name="line.738"></a>
-<span class="sourceLineNo">739</span> private volatile boolean online = false;<a name="line.739"></a>
+<span class="sourceLineNo">696</span> public void serverRemoved(ServerName serverName) {<a name="line.696"></a>
+<span class="sourceLineNo">697</span> }<a name="line.697"></a>
+<span class="sourceLineNo">698</span><a name="line.698"></a>
+<span class="sourceLineNo">699</span> @Override<a name="line.699"></a>
+<span class="sourceLineNo">700</span> public void run() {<a name="line.700"></a>
+<span class="sourceLineNo">701</span> while (isMasterRunning(masterServices)) {<a name="line.701"></a>
+<span class="sourceLineNo">702</span> boolean interrupted = false;<a name="line.702"></a>
+<span class="sourceLineNo">703</span> try {<a name="line.703"></a>
+<span class="sourceLineNo">704</span> synchronized (this) {<a name="line.704"></a>
+<span class="sourceLineNo">705</span> while (!hasChanged) {<a name="line.705"></a>
+<span class="sourceLineNo">706</span> wait();<a name="line.706"></a>
+<span class="sourceLineNo">707</span> }<a name="line.707"></a>
+<span class="sourceLineNo">708</span> hasChanged = false;<a name="line.708"></a>
+<span class="sourceLineNo">709</span> }<a name="line.709"></a>
+<span class="sourceLineNo">710</span> } catch (InterruptedException e) {<a name="line.710"></a>
+<span class="sourceLineNo">711</span> LOG.warn("Interrupted", e);<a name="line.711"></a>
+<span class="sourceLineNo">712</span> interrupted = true;<a name="line.712"></a>
+<span class="sourceLineNo">713</span> }<a name="line.713"></a>
+<span class="sourceLineNo">714</span> if (!isMasterRunning(masterServices) || interrupted) {<a name="line.714"></a>
+<span class="sourceLineNo">715</span> continue;<a name="line.715"></a>
+<span class="sourceLineNo">716</span> }<a name="line.716"></a>
+<span class="sourceLineNo">717</span><a name="line.717"></a>
+<span class="sourceLineNo">718</span> // First, wait a while in case more servers are about to rejoin the cluster<a name="line.718"></a>
+<span class="sourceLineNo">719</span> try {<a name="line.719"></a>
+<span class="sourceLineNo">720</span> Thread.sleep(waitInterval);<a name="line.720"></a>
+<span class="sourceLineNo">721</span> } catch (InterruptedException e) {<a name="line.721"></a>
+<span class="sourceLineNo">722</span> LOG.warn("Interrupted", e);<a name="line.722"></a>
+<span class="sourceLineNo">723</span> }<a name="line.723"></a>
+<span class="sourceLineNo">724</span> if (!isMasterRunning(masterServices)) {<a name="line.724"></a>
+<span class="sourceLineNo">725</span> continue;<a name="line.725"></a>
+<span class="sourceLineNo">726</span> }<a name="line.726"></a>
+<span class="sourceLineNo">727</span><a name="line.727"></a>
+<span class="sourceLineNo">728</span> // Kick all regions in FAILED_OPEN state<a name="line.728"></a>
+<span class="sourceLineNo">729</span> updateFailedAssignments();<a name="line.729"></a>
+<span class="sourceLineNo">730</span> }<a name="line.730"></a>
+<span class="sourceLineNo">731</span> }<a name="line.731"></a>
+<span class="sourceLineNo">732</span><a name="line.732"></a>
+<span class="sourceLineNo">733</span> public void serverChanged() {<a name="line.733"></a>
+<span class="sourceLineNo">734</span> synchronized (this) {<a name="line.734"></a>
+<span class="sourceLineNo">735</span> hasChanged = true;<a name="line.735"></a>
+<span class="sourceLineNo">736</span> this.notify();<a name="line.736"></a>
+<span class="sourceLineNo">737</span> }<a name="line.737"></a>
+<span class="sourceLineNo">738</span> }<a name="line.738"></a>
+<span class="sourceLineNo">739</span> }<a name="line.739"></a>
<span class="sourceLineNo">740</span><a name="line.740"></a>
-<span class="sourceLineNo">741</span> RSGroupStartupWorker() {<a name="line.741"></a>
-<span class="sourceLineNo">742</span> setDaemon(true);<a name="line.742"></a>
-<span class="sourceLineNo">743</span> }<a name="line.743"></a>
+<span class="sourceLineNo">741</span> private class RSGroupStartupWorker extends Thread {<a name="line.741"></a>
+<span class="sourceLineNo">742</span> private final Logger LOG = LoggerFactory.getLogger(RSGroupStartupWorker.class);<a name="line.742"></a>
+<span class="sourceLineNo">743</span> private volatile boolean online = false;<a name="line.743"></a>
<span class="sourceLineNo">744</span><a name="line.744"></a>
-<span class="sourceLineNo">745</span> @Override<a name="line.745"></a>
-<span class="sourceLineNo">746</span> public void run() {<a name="line.746"></a>
-<span class="sourceLineNo">747</span> setName(RSGroupStartupWorker.class.getName() + "-" + masterServices.getServerName());<a name="line.747"></a>
-<span class="sourceLineNo">748</span> if (waitForGroupTableOnline()) {<a name="line.748"></a>
-<span class="sourceLineNo">749</span> LOG.info("GroupBasedLoadBalancer is now online");<a name="line.749"></a>
-<span class="sourceLineNo">750</span> }<a name="line.750"></a>
-<span class="sourceLineNo">751</span> }<a name="line.751"></a>
-<span class="sourceLineNo">752</span><a name="line.752"></a>
-<span class="sourceLineNo">753</span> private boolean waitForGroupTableOnline() {<a name="line.753"></a>
-<span class="sourceLineNo">754</span> final List<RegionInfo> foundRegions = new LinkedList<>();<a name="line.754"></a>
-<span class="sourceLineNo">755</span> final List<RegionInfo> assignedRegions = new LinkedList<>();<a name="line.755"></a>
-<span class="sourceLineNo">756</span> final AtomicBoolean found = new AtomicBoolean(false);<a name="line.756"></a>
-<span class="sourceLineNo">757</span> final TableStateManager tsm = masterServices.getTableStateManager();<a name="line.757"></a>
-<span class="sourceLineNo">758</span> boolean createSent = false;<a name="line.758"></a>
-<span class="sourceLineNo">759</span> while (!found.get() && isMasterRunning(masterServices)) {<a name="line.759"></a>
-<span class="sourceLineNo">760</span> foundRegions.clear();<a name="line.760"></a>
-<span class="sourceLineNo">761</span> assignedRegions.clear();<a name="line.761"></a>
-<span class="sourceLineNo">762</span> found.set(true);<a name="line.762"></a>
-<span class="sourceLineNo">763</span> try {<a name="line.763"></a>
-<span class="sourceLineNo">764</span> conn.getTable(TableName.NAMESPACE_TABLE_NAME);<a name="line.764"></a>
-<span class="sourceLineNo">765</span> conn.getTable(RSGROUP_TABLE_NAME);<a name="line.765"></a>
-<span class="sourceLineNo">766</span> boolean rootMetaFound =<a name="line.766"></a>
-<span class="sourceLineNo">767</span> masterServices.getMetaTableLocator().verifyMetaRegionLocation(<a name="line.767"></a>
-<span class="sourceLineNo">768</span> conn, masterServices.getZooKeeper(), 1);<a name="line.768"></a>
-<span class="sourceLineNo">769</span> final AtomicBoolean nsFound = new AtomicBoolean(false);<a name="line.769"></a>
-<span class="sourceLineNo">770</span> if (rootMetaFound) {<a name="line.770"></a>
-<span class="sourceLineNo">771</span> MetaTableAccessor.Visitor visitor = new DefaultVisitorBase() {<a name="line.771"></a>
-<span class="sourceLineNo">772</span> @Override<a name="line.772"></a>
-<span class="sourceLineNo">773</span> public boolean visitInternal(Result row) throws IOException {<a name="line.773"></a>
-<span class="sourceLineNo">774</span> RegionInfo info = MetaTableAccessor.getRegionInfo(row);<a name="line.774"></a>
-<span class="sourceLineNo">775</span> if (info != null) {<a name="line.775"></a>
-<span class="sourceLineNo">776</span> Cell serverCell =<a name="line.776"></a>
-<span class="sourceLineNo">777</span> row.getColumnLatestCell(HConstants.CATALOG_FAMILY,<a name="line.777"></a>
-<span class="sourceLineNo">778</span> HConstants.SERVER_QUALIFIER);<a name="line.778"></a>
-<span class="sourceLineNo">779</span> if (RSGROUP_TABLE_NAME.equals(info.getTable()) && serverCell != null) {<a name="line.779"></a>
-<span class="sourceLineNo">780</span> ServerName sn =<a name="line.780"></a>
-<span class="sourceLineNo">781</span> ServerName.parseVersionedServerName(CellUtil.cloneValue(serverCell));<a name="line.781"></a>
-<span class="sourceLineNo">782</span> if (sn == null) {<a name="line.782"></a>
-<span class="sourceLineNo">783</span> found.set(false);<a name="line.783"></a>
-<span class="sourceLineNo">784</span> } else if (tsm.isTableState(RSGROUP_TABLE_NAME, TableState.State.ENABLED)) {<a name="line.784"></a>
-<span class="sourceLineNo">785</span> try {<a name="line.785"></a>
-<span class="sourceLineNo">786</span> ClientProtos.ClientService.BlockingInterface rs = conn.getClient(sn);<a name="line.786"></a>
-<span class="sourceLineNo">787</span> ClientProtos.GetRequest request =<a name="line.787"></a>
-<span class="sourceLineNo">788</span> RequestConverter.buildGetRequest(info.getRegionName(),<a name="line.788"></a>
-<span class="sourceLineNo">789</span> new Get(ROW_KEY));<a name="line.789"></a>
-<span class="sourceLineNo">790</span> rs.get(null, request);<a name="line.790"></a>
-<span class="sourceLineNo">791</span> assignedRegions.add(info);<a name="line.791"></a>
-<span class="sourceLineNo">792</span> } catch(Exception ex) {<a name="line.792"></a>
-<span class="sourceLineNo">793</span> LOG.debug("Caught exception while verifying group region", ex);<a name="line.793"></a>
-<span class="sourceLineNo">794</span> }<a name="line.794"></a>
-<span class="sourceLineNo">795</span> }<a name="line.795"></a>
-<span class="sourceLineNo">796</span> foundRegions.add(info);<a name="line.796"></a>
-<span class="sourceLineNo">797</span> }<a name="line.797"></a>
-<span class="sourceLineNo">798</span> if (TableName.NAMESPACE_TABLE_NAME.equals(info.getTable())) {<a name="line.798"></a>
-<span class="sourceLineNo">799</span> Cell cell = row.getColumnLatestCell(HConstants.CATALOG_FAMILY,<a name="line.799"></a>
-<span class="sourceLineNo">800</span> HConstants.SERVER_QUALIFIER);<a name="line.800"></a>
-<span class="sourceLineNo">801</span> ServerName sn = null;<a name="line.801"></a>
-<span class="sourceLineNo">802</span> if(cell != null) {<a name="line.802"></a>
-<span class="sourceLineNo">803</span> sn = ServerName.parseVersionedServerName(CellUtil.cloneValue(cell));<a name="line.803"></a>
-<span class="sourceLineNo">804</span> }<a name="line.804"></a>
-<span class="sourceLineNo">805</span> if (sn == null) {<a name="line.805"></a>
-<span class="sourceLineNo">806</span> nsFound.set(false);<a name="line.806"></a>
-<span class="sourceLineNo">807</span> } else if (tsm.isTableState(TableName.NAMESPACE_TABLE_NAME,<a name="line.807"></a>
-<span class="sourceLineNo">808</span> TableState.State.ENABLED)) {<a name="line.808"></a>
-<span class="sourceLineNo">809</span> try {<a name="line.809"></a>
-<span class="sourceLineNo">810</span> ClientProtos.ClientService.BlockingInterface rs = conn.getClient(sn);<a name="line.810"></a>
-<span class="sourceLineNo">811</span> ClientProtos.GetRequest request =<a name="line.811"></a>
-<span class="sourceLineNo">812</span> RequestConverter.buildGetRequest(info.getRegionName(),<a name="line.812"></a>
-<span class="sourceLineNo">813</span> new Get(ROW_KEY));<a name="line.813"></a>
-<span class="sourceLineNo">814</span> rs.get(null, request);<a name="line.814"></a>
-<span class="sourceLineNo">815</span> nsFound.set(true);<a name="line.815"></a>
-<span class="sourceLineNo">816</span> } catch(Exception ex) {<a name="line.816"></a>
-<span class="sourceLineNo">817</span> LOG.debug("Caught exception while verifying group region", ex);<a name="line.817"></a>
-<span class="sourceLineNo">818</span> }<a name="line.818"></a>
-<span class="sourceLineNo">819</span> }<a name="line.819"></a>
-<span class="sourceLineNo">820</span> }<a name="line.820"></a>
-<span class="sourceLineNo">821</span> }<a name="line.821"></a>
-<span class="sourceLineNo">822</span> return true;<a name="line.822"></a>
-<span class="sourceLineNo">823</span> }<a name="line.823"></a>
-<span class="sourceLineNo">824</span> };<a name="line.824"></a>
-<span class="sourceLineNo">825</span> MetaTableAccessor.fullScanRegions(conn, visitor);<a name="line.825"></a>
-<span class="sourceLineNo">826</span> // if no regions in meta then we have to create the table<a name="line.826"></a>
-<span class="sourceLineNo">827</span> if (foundRegions.size() < 1 && rootMetaFound && !createSent && nsFound.get()) {<a name="line.827"></a>
-<span class="sourceLineNo">828</span> createRSGroupTable();<a name="line.828"></a>
-<span class="sourceLineNo">829</span> createSent = true;<a name="line.829"></a>
-<span class="sourceLineNo">830</span> }<a name="line.830"></a>
-<span class="sourceLineNo">831</span> LOG.info("RSGroup table=" + RSGROUP_TABLE_NAME + " isOnline=" + found.get()<a name="line.831"></a>
-<span class="sourceLineNo">832</span> + ", regionCount=" + foundRegions.size() + ", assignCount="<a name="line.832"></a>
-<span class="sourceLineNo">833</span> + assignedRegions.size() + ", rootMetaFound=" + rootMetaFound);<a name="line.833"></a>
-<span class="sourceLineNo">834</span> found.set(found.get() && assignedRegions.size() == foundRegions.size()<a name="line.834"></a>
-<span class="sourceLineNo">835</span> && foundRegions.size() > 0);<a name="line.835"></a>
-<span class="sourceLineNo">836</span> } else {<a name="line.836"></a>
-<span class="sourceLineNo">837</span> LOG.info("Waiting for catalog tables to come online");<a name="line.837"></a>
-<span class="sourceLineNo">838</span> found.set(false);<a name="line.838"></a>
-<span class="sourceLineNo">839</span> }<a name="line.839"></a>
-<span class="sourceLineNo">840</span> if (found.get()) {<a name="line.840"></a>
-<span class="sourceLineNo">841</span> LOG.debug("With group table online, refreshing cached information.");<a name="line.841"></a>
-<span class="sourceLineNo">842</span> RSGroupInfoManagerImpl.this.refresh(true);<a name="line.842"></a>
-<span class="sourceLineNo">843</span> online = true;<a name="line.843"></a>
-<span class="sourceLineNo">844</span> //flush any inconsistencies between ZK and HTable<a name="line.844"></a>
-<span class="sourceLineNo">845</span> RSGroupInfoManagerImpl.this.flushConfig();<a name="line.845"></a>
-<span class="sourceLineNo">846</span> }<a name="line.846"></a>
-<span class="sourceLineNo">847</span> } catch (RuntimeException e) {<a name="line.847"></a>
-<span class="sourceLineNo">848</span> throw e;<a name="line.848"></a>
-<span class="sourceLineNo">849</span> } catch(Exception e) {<a name="line.849"></a>
-<span class="sourceLineNo">850</span> found.set(false);<a name="line.850"></a>
-<span class="sourceLineNo">851</span> LOG.warn("Failed to perform check", e);<a name="line.851"></a>
-<span class="sourceLineNo">852</span> }<a name="line.852"></a>
-<span class="sourceLineNo">853</span> try {<a name="line.853"></a>
-<span class="sourceLineNo">854</span> Thread.sleep(100);<a name="line.854"></a>
-<span class="sourceLineNo">855</span> } catch (InterruptedException e) {<a name="line.855"></a>
-<span class="sourceLineNo">856</span> LOG.info("Sleep interrupted", e);<a name="line.856"></a>
-<span class="sourceLineNo">857</span> }<a name="line.857"></a>
-<span class="sourceLineNo">858</span> }<a name="line.858"></a>
-<span class="sourceLineNo">859</span> return found.get();<a name="line.859"></a>
-<span class="sourceLineNo">860</span> }<a name="line.860"></a>
-<span class="sourceLineNo">861</span><a name="line.861"></a>
-<span class="sourceLineNo">862</span> private void createRSGroupTable() throws IOException {<a name="line.862"></a>
-<span class="sourceLineNo">863</span> Long procId = masterServices.createSystemTable(RSGROUP_TABLE_DESC);<a name="line.863"></a>
-<span class="sourceLineNo">864</span> // wait for region to be online<a name="line.864"></a>
-<span class="sourceLineNo">865</span> int tries = 600;<a name="line.865"></a>
-<span class="sourceLineNo">866</span> while (!(masterServices.getMasterProcedureExecutor().isFinished(procId))<a name="line.866"></a>
-<span class="sourceLineNo">867</span> && masterServices.getMasterProcedureExecutor().isRunning()<a name="line.867"></a>
-<span class="sourceLineNo">868</span> && tries > 0) {<a name="line.868"></a>
-<span class="sourceLineNo">869</span> try {<a name="line.869"></a>
-<span class="sourceLineNo">870</span> Thread.sleep(100);<a name="line.870"></a>
-<span class="sourceLineNo">871</span> } catch (InterruptedException e) {<a name="line.871"></a>
-<span class="sourceLineNo">872</span> throw new IOException("Wait interrupted ", e);<a name="line.872"></a>
-<span class="sourceLineNo">873</span> }<a name="line.873"></a>
-<span class="sourceLineNo">874</span> tries--;<a name="line.874"></a>
-<span class="sourceLineNo">875</span> }<a name="line.875"></a>
-<span class="sourceLineNo">876</span>
<TRUNCATED>
[09/12] hbase-site git commit: Published site at
773aff90fdf9edf4687b373d1c7ba859d166a437.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html
index 309a1f7..976c263 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html
@@ -134,277 +134,281 @@
<span class="sourceLineNo">126</span> source.getWALFileLengthProvider(), source.getServerWALsBelongTo(),<a name="line.126"></a>
<span class="sourceLineNo">127</span> source.getSourceMetrics())) {<a name="line.127"></a>
<span class="sourceLineNo">128</span> while (isReaderRunning()) { // loop here to keep reusing stream while we can<a name="line.128"></a>
-<span class="sourceLineNo">129</span> if (!checkQuota()) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span> continue;<a name="line.130"></a>
-<span class="sourceLineNo">131</span> }<a name="line.131"></a>
-<span class="sourceLineNo">132</span> WALEntryBatch batch = readWALEntries(entryStream);<a name="line.132"></a>
-<span class="sourceLineNo">133</span> currentPosition = entryStream.getPosition();<a name="line.133"></a>
-<span class="sourceLineNo">134</span> if (batch != null) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> // need to propagate the batch even it has no entries since it may carry the last<a name="line.135"></a>
-<span class="sourceLineNo">136</span> // sequence id information for serial replication.<a name="line.136"></a>
-<span class="sourceLineNo">137</span> LOG.trace("Read {} WAL entries eligible for replication", batch.getNbEntries());<a name="line.137"></a>
-<span class="sourceLineNo">138</span> entryBatchQueue.put(batch);<a name="line.138"></a>
-<span class="sourceLineNo">139</span> sleepMultiplier = 1;<a name="line.139"></a>
-<span class="sourceLineNo">140</span> } else { // got no entries and didn't advance position in WAL<a name="line.140"></a>
-<span class="sourceLineNo">141</span> handleEmptyWALEntryBatch(entryStream.getCurrentPath());<a name="line.141"></a>
-<span class="sourceLineNo">142</span> entryStream.reset(); // reuse stream<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> } catch (IOException e) { // stream related<a name="line.145"></a>
-<span class="sourceLineNo">146</span> if (sleepMultiplier < maxRetriesMultiplier) {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> LOG.debug("Failed to read stream of replication entries: " + e);<a name="line.147"></a>
-<span class="sourceLineNo">148</span> sleepMultiplier++;<a name="line.148"></a>
-<span class="sourceLineNo">149</span> } else {<a name="line.149"></a>
-<span class="sourceLineNo">150</span> LOG.error("Failed to read stream of replication entries", e);<a name="line.150"></a>
-<span class="sourceLineNo">151</span> handleEofException(e);<a name="line.151"></a>
-<span class="sourceLineNo">152</span> }<a name="line.152"></a>
-<span class="sourceLineNo">153</span> Threads.sleep(sleepForRetries * sleepMultiplier);<a name="line.153"></a>
-<span class="sourceLineNo">154</span> } catch (InterruptedException e) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> LOG.trace("Interrupted while sleeping between WAL reads");<a name="line.155"></a>
-<span class="sourceLineNo">156</span> Thread.currentThread().interrupt();<a name="line.156"></a>
-<span class="sourceLineNo">157</span> }<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><a name="line.160"></a>
-<span class="sourceLineNo">161</span> // returns true if we reach the size limit for batch, i.e, we need to finish the batch and return.<a name="line.161"></a>
-<span class="sourceLineNo">162</span> protected final boolean addEntryToBatch(WALEntryBatch batch, Entry entry) {<a name="line.162"></a>
-<span class="sourceLineNo">163</span> WALEdit edit = entry.getEdit();<a name="line.163"></a>
-<span class="sourceLineNo">164</span> if (edit == null || edit.isEmpty()) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> return false;<a name="line.165"></a>
-<span class="sourceLineNo">166</span> }<a name="line.166"></a>
-<span class="sourceLineNo">167</span> long entrySize = getEntrySize(entry);<a name="line.167"></a>
-<span class="sourceLineNo">168</span> batch.addEntry(entry);<a name="line.168"></a>
-<span class="sourceLineNo">169</span> updateBatchStats(batch, entry, entrySize);<a name="line.169"></a>
-<span class="sourceLineNo">170</span> boolean totalBufferTooLarge = acquireBufferQuota(entrySize);<a name="line.170"></a>
-<span class="sourceLineNo">171</span> // Stop if too many entries or too big<a name="line.171"></a>
-<span class="sourceLineNo">172</span> return totalBufferTooLarge || batch.getHeapSize() >= replicationBatchSizeCapacity ||<a name="line.172"></a>
-<span class="sourceLineNo">173</span> batch.getNbEntries() >= replicationBatchCountCapacity;<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> protected static final boolean switched(WALEntryStream entryStream, Path path) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> Path newPath = entryStream.getCurrentPath();<a name="line.177"></a>
-<span class="sourceLineNo">178</span> return newPath == null || !path.getName().equals(newPath.getName());<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> protected WALEntryBatch readWALEntries(WALEntryStream entryStream)<a name="line.181"></a>
-<span class="sourceLineNo">182</span> throws IOException, InterruptedException {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> Path currentPath = entryStream.getCurrentPath();<a name="line.183"></a>
-<span class="sourceLineNo">184</span> if (!entryStream.hasNext()) {<a name="line.184"></a>
-<span class="sourceLineNo">185</span> // check whether we have switched a file<a name="line.185"></a>
-<span class="sourceLineNo">186</span> if (currentPath != null && switched(entryStream, currentPath)) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span> return WALEntryBatch.endOfFile(currentPath);<a name="line.187"></a>
-<span class="sourceLineNo">188</span> } else {<a name="line.188"></a>
-<span class="sourceLineNo">189</span> return null;<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> if (currentPath != null) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> if (switched(entryStream, currentPath)) {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> return WALEntryBatch.endOfFile(currentPath);<a name="line.194"></a>
-<span class="sourceLineNo">195</span> }<a name="line.195"></a>
-<span class="sourceLineNo">196</span> } else {<a name="line.196"></a>
-<span class="sourceLineNo">197</span> // when reading from the entry stream first time we will enter here<a name="line.197"></a>
-<span class="sourceLineNo">198</span> currentPath = entryStream.getCurrentPath();<a name="line.198"></a>
-<span class="sourceLineNo">199</span> }<a name="line.199"></a>
-<span class="sourceLineNo">200</span> WALEntryBatch batch = createBatch(entryStream);<a name="line.200"></a>
-<span class="sourceLineNo">201</span> for (;;) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span> Entry entry = entryStream.next();<a name="line.202"></a>
-<span class="sourceLineNo">203</span> batch.setLastWalPosition(entryStream.getPosition());<a name="line.203"></a>
-<span class="sourceLineNo">204</span> entry = filterEntry(entry);<a name="line.204"></a>
-<span class="sourceLineNo">205</span> if (entry != null) {<a name="line.205"></a>
-<span class="sourceLineNo">206</span> if (addEntryToBatch(batch, entry)) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span> break;<a name="line.207"></a>
-<span class="sourceLineNo">208</span> }<a name="line.208"></a>
-<span class="sourceLineNo">209</span> }<a name="line.209"></a>
-<span class="sourceLineNo">210</span> boolean hasNext = entryStream.hasNext();<a name="line.210"></a>
-<span class="sourceLineNo">211</span> // always return if we have switched to a new file<a name="line.211"></a>
-<span class="sourceLineNo">212</span> if (switched(entryStream, currentPath)) {<a name="line.212"></a>
-<span class="sourceLineNo">213</span> batch.setEndOfFile(true);<a name="line.213"></a>
-<span class="sourceLineNo">214</span> break;<a name="line.214"></a>
-<span class="sourceLineNo">215</span> }<a name="line.215"></a>
-<span class="sourceLineNo">216</span> if (!hasNext) {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> break;<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> return batch;<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> private void handleEmptyWALEntryBatch(Path currentPath) throws InterruptedException {<a name="line.223"></a>
-<span class="sourceLineNo">224</span> LOG.trace("Didn't read any new entries from WAL");<a name="line.224"></a>
-<span class="sourceLineNo">225</span> if (source.isRecovered()) {<a name="line.225"></a>
-<span class="sourceLineNo">226</span> // we're done with queue recovery, shut ourself down<a name="line.226"></a>
-<span class="sourceLineNo">227</span> setReaderRunning(false);<a name="line.227"></a>
-<span class="sourceLineNo">228</span> // shuts down shipper thread immediately<a name="line.228"></a>
-<span class="sourceLineNo">229</span> entryBatchQueue.put(WALEntryBatch.NO_MORE_DATA);<a name="line.229"></a>
-<span class="sourceLineNo">230</span> } else {<a name="line.230"></a>
-<span class="sourceLineNo">231</span> Thread.sleep(sleepForRetries);<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> // if we get an EOF due to a zero-length log, and there are other logs in queue<a name="line.235"></a>
-<span class="sourceLineNo">236</span> // (highly likely we've closed the current log), we've hit the max retries, and autorecovery is<a name="line.236"></a>
-<span class="sourceLineNo">237</span> // enabled, then dump the log<a name="line.237"></a>
-<span class="sourceLineNo">238</span> private void handleEofException(IOException e) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> if ((e instanceof EOFException || e.getCause() instanceof EOFException) &&<a name="line.239"></a>
-<span class="sourceLineNo">240</span> logQueue.size() > 1 && this.eofAutoRecovery) {<a name="line.240"></a>
-<span class="sourceLineNo">241</span> try {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> if (fs.getFileStatus(logQueue.peek()).getLen() == 0) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> LOG.warn("Forcing removal of 0 length log in queue: " + logQueue.peek());<a name="line.243"></a>
-<span class="sourceLineNo">244</span> logQueue.remove();<a name="line.244"></a>
-<span class="sourceLineNo">245</span> currentPosition = 0;<a name="line.245"></a>
-<span class="sourceLineNo">246</span> }<a name="line.246"></a>
-<span class="sourceLineNo">247</span> } catch (IOException ioe) {<a name="line.247"></a>
-<span class="sourceLineNo">248</span> LOG.warn("Couldn't get file length information about log " + logQueue.peek());<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> }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span> public Path getCurrentPath() {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> // if we've read some WAL entries, get the Path we read from<a name="line.254"></a>
-<span class="sourceLineNo">255</span> WALEntryBatch batchQueueHead = entryBatchQueue.peek();<a name="line.255"></a>
-<span class="sourceLineNo">256</span> if (batchQueueHead != null) {<a name="line.256"></a>
-<span class="sourceLineNo">257</span> return batchQueueHead.getLastWalPath();<a name="line.257"></a>
-<span class="sourceLineNo">258</span> }<a name="line.258"></a>
-<span class="sourceLineNo">259</span> // otherwise, we must be currently reading from the head of the log queue<a name="line.259"></a>
-<span class="sourceLineNo">260</span> return logQueue.peek();<a name="line.260"></a>
-<span class="sourceLineNo">261</span> }<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span> //returns false if we've already exceeded the global quota<a name="line.263"></a>
-<span class="sourceLineNo">264</span> private boolean checkQuota() {<a name="line.264"></a>
-<span class="sourceLineNo">265</span> // try not to go over total quota<a name="line.265"></a>
-<span class="sourceLineNo">266</span> if (totalBufferUsed.get() > totalBufferQuota) {<a name="line.266"></a>
-<span class="sourceLineNo">267</span> Threads.sleep(sleepForRetries);<a name="line.267"></a>
-<span class="sourceLineNo">268</span> return false;<a name="line.268"></a>
-<span class="sourceLineNo">269</span> }<a name="line.269"></a>
-<span class="sourceLineNo">270</span> return true;<a name="line.270"></a>
-<span class="sourceLineNo">271</span> }<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span> protected final WALEntryBatch createBatch(WALEntryStream entryStream) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span> return new WALEntryBatch(replicationBatchCountCapacity, entryStream.getCurrentPath());<a name="line.274"></a>
+<span class="sourceLineNo">129</span> if (!source.isPeerEnabled()) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> Threads.sleep(sleepForRetries);<a name="line.130"></a>
+<span class="sourceLineNo">131</span> continue;<a name="line.131"></a>
+<span class="sourceLineNo">132</span> }<a name="line.132"></a>
+<span class="sourceLineNo">133</span> if (!checkQuota()) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> continue;<a name="line.134"></a>
+<span class="sourceLineNo">135</span> }<a name="line.135"></a>
+<span class="sourceLineNo">136</span> WALEntryBatch batch = readWALEntries(entryStream);<a name="line.136"></a>
+<span class="sourceLineNo">137</span> currentPosition = entryStream.getPosition();<a name="line.137"></a>
+<span class="sourceLineNo">138</span> if (batch != null) {<a name="line.138"></a>
+<span class="sourceLineNo">139</span> // need to propagate the batch even it has no entries since it may carry the last<a name="line.139"></a>
+<span class="sourceLineNo">140</span> // sequence id information for serial replication.<a name="line.140"></a>
+<span class="sourceLineNo">141</span> LOG.trace("Read {} WAL entries eligible for replication", batch.getNbEntries());<a name="line.141"></a>
+<span class="sourceLineNo">142</span> entryBatchQueue.put(batch);<a name="line.142"></a>
+<span class="sourceLineNo">143</span> sleepMultiplier = 1;<a name="line.143"></a>
+<span class="sourceLineNo">144</span> } else { // got no entries and didn't advance position in WAL<a name="line.144"></a>
+<span class="sourceLineNo">145</span> handleEmptyWALEntryBatch(entryStream.getCurrentPath());<a name="line.145"></a>
+<span class="sourceLineNo">146</span> entryStream.reset(); // reuse stream<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> } catch (IOException e) { // stream related<a name="line.149"></a>
+<span class="sourceLineNo">150</span> if (sleepMultiplier < maxRetriesMultiplier) {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> LOG.debug("Failed to read stream of replication entries: " + e);<a name="line.151"></a>
+<span class="sourceLineNo">152</span> sleepMultiplier++;<a name="line.152"></a>
+<span class="sourceLineNo">153</span> } else {<a name="line.153"></a>
+<span class="sourceLineNo">154</span> LOG.error("Failed to read stream of replication entries", e);<a name="line.154"></a>
+<span class="sourceLineNo">155</span> handleEofException(e);<a name="line.155"></a>
+<span class="sourceLineNo">156</span> }<a name="line.156"></a>
+<span class="sourceLineNo">157</span> Threads.sleep(sleepForRetries * sleepMultiplier);<a name="line.157"></a>
+<span class="sourceLineNo">158</span> } catch (InterruptedException e) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> LOG.trace("Interrupted while sleeping between WAL reads");<a name="line.159"></a>
+<span class="sourceLineNo">160</span> Thread.currentThread().interrupt();<a name="line.160"></a>
+<span class="sourceLineNo">161</span> }<a name="line.161"></a>
+<span class="sourceLineNo">162</span> }<a name="line.162"></a>
+<span class="sourceLineNo">163</span> }<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span> // returns true if we reach the size limit for batch, i.e, we need to finish the batch and return.<a name="line.165"></a>
+<span class="sourceLineNo">166</span> protected final boolean addEntryToBatch(WALEntryBatch batch, Entry entry) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span> WALEdit edit = entry.getEdit();<a name="line.167"></a>
+<span class="sourceLineNo">168</span> if (edit == null || edit.isEmpty()) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span> return false;<a name="line.169"></a>
+<span class="sourceLineNo">170</span> }<a name="line.170"></a>
+<span class="sourceLineNo">171</span> long entrySize = getEntrySize(entry);<a name="line.171"></a>
+<span class="sourceLineNo">172</span> batch.addEntry(entry);<a name="line.172"></a>
+<span class="sourceLineNo">173</span> updateBatchStats(batch, entry, entrySize);<a name="line.173"></a>
+<span class="sourceLineNo">174</span> boolean totalBufferTooLarge = acquireBufferQuota(entrySize);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> // Stop if too many entries or too big<a name="line.175"></a>
+<span class="sourceLineNo">176</span> return totalBufferTooLarge || batch.getHeapSize() >= replicationBatchSizeCapacity ||<a name="line.176"></a>
+<span class="sourceLineNo">177</span> batch.getNbEntries() >= replicationBatchCountCapacity;<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> protected static final boolean switched(WALEntryStream entryStream, Path path) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> Path newPath = entryStream.getCurrentPath();<a name="line.181"></a>
+<span class="sourceLineNo">182</span> return newPath == null || !path.getName().equals(newPath.getName());<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> protected WALEntryBatch readWALEntries(WALEntryStream entryStream)<a name="line.185"></a>
+<span class="sourceLineNo">186</span> throws IOException, InterruptedException {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> Path currentPath = entryStream.getCurrentPath();<a name="line.187"></a>
+<span class="sourceLineNo">188</span> if (!entryStream.hasNext()) {<a name="line.188"></a>
+<span class="sourceLineNo">189</span> // check whether we have switched a file<a name="line.189"></a>
+<span class="sourceLineNo">190</span> if (currentPath != null && switched(entryStream, currentPath)) {<a name="line.190"></a>
+<span class="sourceLineNo">191</span> return WALEntryBatch.endOfFile(currentPath);<a name="line.191"></a>
+<span class="sourceLineNo">192</span> } else {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> return null;<a name="line.193"></a>
+<span class="sourceLineNo">194</span> }<a name="line.194"></a>
+<span class="sourceLineNo">195</span> }<a name="line.195"></a>
+<span class="sourceLineNo">196</span> if (currentPath != null) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> if (switched(entryStream, currentPath)) {<a name="line.197"></a>
+<span class="sourceLineNo">198</span> return WALEntryBatch.endOfFile(currentPath);<a name="line.198"></a>
+<span class="sourceLineNo">199</span> }<a name="line.199"></a>
+<span class="sourceLineNo">200</span> } else {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> // when reading from the entry stream first time we will enter here<a name="line.201"></a>
+<span class="sourceLineNo">202</span> currentPath = entryStream.getCurrentPath();<a name="line.202"></a>
+<span class="sourceLineNo">203</span> }<a name="line.203"></a>
+<span class="sourceLineNo">204</span> WALEntryBatch batch = createBatch(entryStream);<a name="line.204"></a>
+<span class="sourceLineNo">205</span> for (;;) {<a name="line.205"></a>
+<span class="sourceLineNo">206</span> Entry entry = entryStream.next();<a name="line.206"></a>
+<span class="sourceLineNo">207</span> batch.setLastWalPosition(entryStream.getPosition());<a name="line.207"></a>
+<span class="sourceLineNo">208</span> entry = filterEntry(entry);<a name="line.208"></a>
+<span class="sourceLineNo">209</span> if (entry != null) {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> if (addEntryToBatch(batch, entry)) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> break;<a name="line.211"></a>
+<span class="sourceLineNo">212</span> }<a name="line.212"></a>
+<span class="sourceLineNo">213</span> }<a name="line.213"></a>
+<span class="sourceLineNo">214</span> boolean hasNext = entryStream.hasNext();<a name="line.214"></a>
+<span class="sourceLineNo">215</span> // always return if we have switched to a new file<a name="line.215"></a>
+<span class="sourceLineNo">216</span> if (switched(entryStream, currentPath)) {<a name="line.216"></a>
+<span class="sourceLineNo">217</span> batch.setEndOfFile(true);<a name="line.217"></a>
+<span class="sourceLineNo">218</span> break;<a name="line.218"></a>
+<span class="sourceLineNo">219</span> }<a name="line.219"></a>
+<span class="sourceLineNo">220</span> if (!hasNext) {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> break;<a name="line.221"></a>
+<span class="sourceLineNo">222</span> }<a name="line.222"></a>
+<span class="sourceLineNo">223</span> }<a name="line.223"></a>
+<span class="sourceLineNo">224</span> return batch;<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> private void handleEmptyWALEntryBatch(Path currentPath) throws InterruptedException {<a name="line.227"></a>
+<span class="sourceLineNo">228</span> LOG.trace("Didn't read any new entries from WAL");<a name="line.228"></a>
+<span class="sourceLineNo">229</span> if (source.isRecovered()) {<a name="line.229"></a>
+<span class="sourceLineNo">230</span> // we're done with queue recovery, shut ourself down<a name="line.230"></a>
+<span class="sourceLineNo">231</span> setReaderRunning(false);<a name="line.231"></a>
+<span class="sourceLineNo">232</span> // shuts down shipper thread immediately<a name="line.232"></a>
+<span class="sourceLineNo">233</span> entryBatchQueue.put(WALEntryBatch.NO_MORE_DATA);<a name="line.233"></a>
+<span class="sourceLineNo">234</span> } else {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> Thread.sleep(sleepForRetries);<a name="line.235"></a>
+<span class="sourceLineNo">236</span> }<a name="line.236"></a>
+<span class="sourceLineNo">237</span> }<a name="line.237"></a>
+<span class="sourceLineNo">238</span><a name="line.238"></a>
+<span class="sourceLineNo">239</span> // if we get an EOF due to a zero-length log, and there are other logs in queue<a name="line.239"></a>
+<span class="sourceLineNo">240</span> // (highly likely we've closed the current log), we've hit the max retries, and autorecovery is<a name="line.240"></a>
+<span class="sourceLineNo">241</span> // enabled, then dump the log<a name="line.241"></a>
+<span class="sourceLineNo">242</span> private void handleEofException(IOException e) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> if ((e instanceof EOFException || e.getCause() instanceof EOFException) &&<a name="line.243"></a>
+<span class="sourceLineNo">244</span> logQueue.size() > 1 && this.eofAutoRecovery) {<a name="line.244"></a>
+<span class="sourceLineNo">245</span> try {<a name="line.245"></a>
+<span class="sourceLineNo">246</span> if (fs.getFileStatus(logQueue.peek()).getLen() == 0) {<a name="line.246"></a>
+<span class="sourceLineNo">247</span> LOG.warn("Forcing removal of 0 length log in queue: " + logQueue.peek());<a name="line.247"></a>
+<span class="sourceLineNo">248</span> logQueue.remove();<a name="line.248"></a>
+<span class="sourceLineNo">249</span> currentPosition = 0;<a name="line.249"></a>
+<span class="sourceLineNo">250</span> }<a name="line.250"></a>
+<span class="sourceLineNo">251</span> } catch (IOException ioe) {<a name="line.251"></a>
+<span class="sourceLineNo">252</span> LOG.warn("Couldn't get file length information about log " + logQueue.peek());<a name="line.252"></a>
+<span class="sourceLineNo">253</span> }<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><a name="line.256"></a>
+<span class="sourceLineNo">257</span> public Path getCurrentPath() {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> // if we've read some WAL entries, get the Path we read from<a name="line.258"></a>
+<span class="sourceLineNo">259</span> WALEntryBatch batchQueueHead = entryBatchQueue.peek();<a name="line.259"></a>
+<span class="sourceLineNo">260</span> if (batchQueueHead != null) {<a name="line.260"></a>
+<span class="sourceLineNo">261</span> return batchQueueHead.getLastWalPath();<a name="line.261"></a>
+<span class="sourceLineNo">262</span> }<a name="line.262"></a>
+<span class="sourceLineNo">263</span> // otherwise, we must be currently reading from the head of the log queue<a name="line.263"></a>
+<span class="sourceLineNo">264</span> return logQueue.peek();<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> //returns false if we've already exceeded the global quota<a name="line.267"></a>
+<span class="sourceLineNo">268</span> private boolean checkQuota() {<a name="line.268"></a>
+<span class="sourceLineNo">269</span> // try not to go over total quota<a name="line.269"></a>
+<span class="sourceLineNo">270</span> if (totalBufferUsed.get() > totalBufferQuota) {<a name="line.270"></a>
+<span class="sourceLineNo">271</span> Threads.sleep(sleepForRetries);<a name="line.271"></a>
+<span class="sourceLineNo">272</span> return false;<a name="line.272"></a>
+<span class="sourceLineNo">273</span> }<a name="line.273"></a>
+<span class="sourceLineNo">274</span> return true;<a name="line.274"></a>
<span class="sourceLineNo">275</span> }<a name="line.275"></a>
<span class="sourceLineNo">276</span><a name="line.276"></a>
-<span class="sourceLineNo">277</span> protected final Entry filterEntry(Entry entry) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> Entry filtered = filter.filter(entry);<a name="line.278"></a>
-<span class="sourceLineNo">279</span> if (entry != null && filtered == null) {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> source.getSourceMetrics().incrLogEditsFiltered();<a name="line.280"></a>
-<span class="sourceLineNo">281</span> }<a name="line.281"></a>
-<span class="sourceLineNo">282</span> return filtered;<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> /**<a name="line.285"></a>
-<span class="sourceLineNo">286</span> * Retrieves the next batch of WAL entries from the queue, waiting up to the specified time for a<a name="line.286"></a>
-<span class="sourceLineNo">287</span> * batch to become available<a name="line.287"></a>
-<span class="sourceLineNo">288</span> * @return A batch of entries, along with the position in the log after reading the batch<a name="line.288"></a>
-<span class="sourceLineNo">289</span> * @throws InterruptedException if interrupted while waiting<a name="line.289"></a>
-<span class="sourceLineNo">290</span> */<a name="line.290"></a>
-<span class="sourceLineNo">291</span> public WALEntryBatch take() throws InterruptedException {<a name="line.291"></a>
-<span class="sourceLineNo">292</span> return entryBatchQueue.take();<a name="line.292"></a>
-<span class="sourceLineNo">293</span> }<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span> private long getEntrySize(Entry entry) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> WALEdit edit = entry.getEdit();<a name="line.296"></a>
-<span class="sourceLineNo">297</span> return edit.heapSize() + calculateTotalSizeOfStoreFiles(edit);<a name="line.297"></a>
-<span class="sourceLineNo">298</span> }<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span> private void updateBatchStats(WALEntryBatch batch, Entry entry, long entrySize) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span> WALEdit edit = entry.getEdit();<a name="line.301"></a>
-<span class="sourceLineNo">302</span> batch.incrementHeapSize(entrySize);<a name="line.302"></a>
-<span class="sourceLineNo">303</span> Pair<Integer, Integer> nbRowsAndHFiles = countDistinctRowKeysAndHFiles(edit);<a name="line.303"></a>
-<span class="sourceLineNo">304</span> batch.incrementNbRowKeys(nbRowsAndHFiles.getFirst());<a name="line.304"></a>
-<span class="sourceLineNo">305</span> batch.incrementNbHFiles(nbRowsAndHFiles.getSecond());<a name="line.305"></a>
-<span class="sourceLineNo">306</span> }<a name="line.306"></a>
-<span class="sourceLineNo">307</span><a name="line.307"></a>
-<span class="sourceLineNo">308</span> /**<a name="line.308"></a>
-<span class="sourceLineNo">309</span> * Count the number of different row keys in the given edit because of mini-batching. We assume<a name="line.309"></a>
-<span class="sourceLineNo">310</span> * that there's at least one Cell in the WALEdit.<a name="line.310"></a>
-<span class="sourceLineNo">311</span> * @param edit edit to count row keys from<a name="line.311"></a>
-<span class="sourceLineNo">312</span> * @return number of different row keys and HFiles<a name="line.312"></a>
-<span class="sourceLineNo">313</span> */<a name="line.313"></a>
-<span class="sourceLineNo">314</span> private Pair<Integer, Integer> countDistinctRowKeysAndHFiles(WALEdit edit) {<a name="line.314"></a>
-<span class="sourceLineNo">315</span> List<Cell> cells = edit.getCells();<a name="line.315"></a>
-<span class="sourceLineNo">316</span> int distinctRowKeys = 1;<a name="line.316"></a>
-<span class="sourceLineNo">317</span> int totalHFileEntries = 0;<a name="line.317"></a>
-<span class="sourceLineNo">318</span> Cell lastCell = cells.get(0);<a name="line.318"></a>
-<span class="sourceLineNo">319</span><a name="line.319"></a>
-<span class="sourceLineNo">320</span> int totalCells = edit.size();<a name="line.320"></a>
-<span class="sourceLineNo">321</span> for (int i = 0; i < totalCells; i++) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span> // Count HFiles to be replicated<a name="line.322"></a>
-<span class="sourceLineNo">323</span> if (CellUtil.matchingQualifier(cells.get(i), WALEdit.BULK_LOAD)) {<a name="line.323"></a>
-<span class="sourceLineNo">324</span> try {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> BulkLoadDescriptor bld = WALEdit.getBulkLoadDescriptor(cells.get(i));<a name="line.325"></a>
-<span class="sourceLineNo">326</span> List<StoreDescriptor> stores = bld.getStoresList();<a name="line.326"></a>
-<span class="sourceLineNo">327</span> int totalStores = stores.size();<a name="line.327"></a>
-<span class="sourceLineNo">328</span> for (int j = 0; j < totalStores; j++) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> totalHFileEntries += stores.get(j).getStoreFileList().size();<a name="line.329"></a>
-<span class="sourceLineNo">330</span> }<a name="line.330"></a>
-<span class="sourceLineNo">331</span> } catch (IOException e) {<a name="line.331"></a>
-<span class="sourceLineNo">332</span> LOG.error("Failed to deserialize bulk load entry from wal edit. "<a name="line.332"></a>
-<span class="sourceLineNo">333</span> + "Then its hfiles count will not be added into metric.");<a name="line.333"></a>
-<span class="sourceLineNo">334</span> }<a name="line.334"></a>
-<span class="sourceLineNo">335</span> }<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span> if (!CellUtil.matchingRows(cells.get(i), lastCell)) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span> distinctRowKeys++;<a name="line.338"></a>
+<span class="sourceLineNo">277</span> protected final WALEntryBatch createBatch(WALEntryStream entryStream) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> return new WALEntryBatch(replicationBatchCountCapacity, entryStream.getCurrentPath());<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> protected final Entry filterEntry(Entry entry) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span> Entry filtered = filter.filter(entry);<a name="line.282"></a>
+<span class="sourceLineNo">283</span> if (entry != null && filtered == null) {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> source.getSourceMetrics().incrLogEditsFiltered();<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span> return filtered;<a name="line.286"></a>
+<span class="sourceLineNo">287</span> }<a name="line.287"></a>
+<span class="sourceLineNo">288</span><a name="line.288"></a>
+<span class="sourceLineNo">289</span> /**<a name="line.289"></a>
+<span class="sourceLineNo">290</span> * Retrieves the next batch of WAL entries from the queue, waiting up to the specified time for a<a name="line.290"></a>
+<span class="sourceLineNo">291</span> * batch to become available<a name="line.291"></a>
+<span class="sourceLineNo">292</span> * @return A batch of entries, along with the position in the log after reading the batch<a name="line.292"></a>
+<span class="sourceLineNo">293</span> * @throws InterruptedException if interrupted while waiting<a name="line.293"></a>
+<span class="sourceLineNo">294</span> */<a name="line.294"></a>
+<span class="sourceLineNo">295</span> public WALEntryBatch take() throws InterruptedException {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> return entryBatchQueue.take();<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span> private long getEntrySize(Entry entry) {<a name="line.299"></a>
+<span class="sourceLineNo">300</span> WALEdit edit = entry.getEdit();<a name="line.300"></a>
+<span class="sourceLineNo">301</span> return edit.heapSize() + calculateTotalSizeOfStoreFiles(edit);<a name="line.301"></a>
+<span class="sourceLineNo">302</span> }<a name="line.302"></a>
+<span class="sourceLineNo">303</span><a name="line.303"></a>
+<span class="sourceLineNo">304</span> private void updateBatchStats(WALEntryBatch batch, Entry entry, long entrySize) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> WALEdit edit = entry.getEdit();<a name="line.305"></a>
+<span class="sourceLineNo">306</span> batch.incrementHeapSize(entrySize);<a name="line.306"></a>
+<span class="sourceLineNo">307</span> Pair<Integer, Integer> nbRowsAndHFiles = countDistinctRowKeysAndHFiles(edit);<a name="line.307"></a>
+<span class="sourceLineNo">308</span> batch.incrementNbRowKeys(nbRowsAndHFiles.getFirst());<a name="line.308"></a>
+<span class="sourceLineNo">309</span> batch.incrementNbHFiles(nbRowsAndHFiles.getSecond());<a name="line.309"></a>
+<span class="sourceLineNo">310</span> }<a name="line.310"></a>
+<span class="sourceLineNo">311</span><a name="line.311"></a>
+<span class="sourceLineNo">312</span> /**<a name="line.312"></a>
+<span class="sourceLineNo">313</span> * Count the number of different row keys in the given edit because of mini-batching. We assume<a name="line.313"></a>
+<span class="sourceLineNo">314</span> * that there's at least one Cell in the WALEdit.<a name="line.314"></a>
+<span class="sourceLineNo">315</span> * @param edit edit to count row keys from<a name="line.315"></a>
+<span class="sourceLineNo">316</span> * @return number of different row keys and HFiles<a name="line.316"></a>
+<span class="sourceLineNo">317</span> */<a name="line.317"></a>
+<span class="sourceLineNo">318</span> private Pair<Integer, Integer> countDistinctRowKeysAndHFiles(WALEdit edit) {<a name="line.318"></a>
+<span class="sourceLineNo">319</span> List<Cell> cells = edit.getCells();<a name="line.319"></a>
+<span class="sourceLineNo">320</span> int distinctRowKeys = 1;<a name="line.320"></a>
+<span class="sourceLineNo">321</span> int totalHFileEntries = 0;<a name="line.321"></a>
+<span class="sourceLineNo">322</span> Cell lastCell = cells.get(0);<a name="line.322"></a>
+<span class="sourceLineNo">323</span><a name="line.323"></a>
+<span class="sourceLineNo">324</span> int totalCells = edit.size();<a name="line.324"></a>
+<span class="sourceLineNo">325</span> for (int i = 0; i < totalCells; i++) {<a name="line.325"></a>
+<span class="sourceLineNo">326</span> // Count HFiles to be replicated<a name="line.326"></a>
+<span class="sourceLineNo">327</span> if (CellUtil.matchingQualifier(cells.get(i), WALEdit.BULK_LOAD)) {<a name="line.327"></a>
+<span class="sourceLineNo">328</span> try {<a name="line.328"></a>
+<span class="sourceLineNo">329</span> BulkLoadDescriptor bld = WALEdit.getBulkLoadDescriptor(cells.get(i));<a name="line.329"></a>
+<span class="sourceLineNo">330</span> List<StoreDescriptor> stores = bld.getStoresList();<a name="line.330"></a>
+<span class="sourceLineNo">331</span> int totalStores = stores.size();<a name="line.331"></a>
+<span class="sourceLineNo">332</span> for (int j = 0; j < totalStores; j++) {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> totalHFileEntries += stores.get(j).getStoreFileList().size();<a name="line.333"></a>
+<span class="sourceLineNo">334</span> }<a name="line.334"></a>
+<span class="sourceLineNo">335</span> } catch (IOException e) {<a name="line.335"></a>
+<span class="sourceLineNo">336</span> LOG.error("Failed to deserialize bulk load entry from wal edit. "<a name="line.336"></a>
+<span class="sourceLineNo">337</span> + "Then its hfiles count will not be added into metric.");<a name="line.337"></a>
+<span class="sourceLineNo">338</span> }<a name="line.338"></a>
<span class="sourceLineNo">339</span> }<a name="line.339"></a>
-<span class="sourceLineNo">340</span> lastCell = cells.get(i);<a name="line.340"></a>
-<span class="sourceLineNo">341</span> }<a name="line.341"></a>
-<span class="sourceLineNo">342</span><a name="line.342"></a>
-<span class="sourceLineNo">343</span> Pair<Integer, Integer> result = new Pair<>(distinctRowKeys, totalHFileEntries);<a name="line.343"></a>
-<span class="sourceLineNo">344</span> return result;<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span> if (!CellUtil.matchingRows(cells.get(i), lastCell)) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span> distinctRowKeys++;<a name="line.342"></a>
+<span class="sourceLineNo">343</span> }<a name="line.343"></a>
+<span class="sourceLineNo">344</span> lastCell = cells.get(i);<a name="line.344"></a>
+<span class="sourceLineNo">345</span> }<a name="line.345"></a>
<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span> /**<a name="line.347"></a>
-<span class="sourceLineNo">348</span> * Calculate the total size of all the store files<a name="line.348"></a>
-<span class="sourceLineNo">349</span> * @param edit edit to count row keys from<a name="line.349"></a>
-<span class="sourceLineNo">350</span> * @return the total size of the store files<a name="line.350"></a>
-<span class="sourceLineNo">351</span> */<a name="line.351"></a>
-<span class="sourceLineNo">352</span> private int calculateTotalSizeOfStoreFiles(WALEdit edit) {<a name="line.352"></a>
-<span class="sourceLineNo">353</span> List<Cell> cells = edit.getCells();<a name="line.353"></a>
-<span class="sourceLineNo">354</span> int totalStoreFilesSize = 0;<a name="line.354"></a>
-<span class="sourceLineNo">355</span><a name="line.355"></a>
-<span class="sourceLineNo">356</span> int totalCells = edit.size();<a name="line.356"></a>
-<span class="sourceLineNo">357</span> for (int i = 0; i < totalCells; i++) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> if (CellUtil.matchingQualifier(cells.get(i), WALEdit.BULK_LOAD)) {<a name="line.358"></a>
-<span class="sourceLineNo">359</span> try {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> BulkLoadDescriptor bld = WALEdit.getBulkLoadDescriptor(cells.get(i));<a name="line.360"></a>
-<span class="sourceLineNo">361</span> List<StoreDescriptor> stores = bld.getStoresList();<a name="line.361"></a>
-<span class="sourceLineNo">362</span> int totalStores = stores.size();<a name="line.362"></a>
-<span class="sourceLineNo">363</span> for (int j = 0; j < totalStores; j++) {<a name="line.363"></a>
-<span class="sourceLineNo">364</span> totalStoreFilesSize =<a name="line.364"></a>
-<span class="sourceLineNo">365</span> (int) (totalStoreFilesSize + stores.get(j).getStoreFileSizeBytes());<a name="line.365"></a>
-<span class="sourceLineNo">366</span> }<a name="line.366"></a>
-<span class="sourceLineNo">367</span> } catch (IOException e) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> LOG.error("Failed to deserialize bulk load entry from wal edit. "<a name="line.368"></a>
-<span class="sourceLineNo">369</span> + "Size of HFiles part of cell will not be considered in replication "<a name="line.369"></a>
-<span class="sourceLineNo">370</span> + "request size calculation.",<a name="line.370"></a>
-<span class="sourceLineNo">371</span> e);<a name="line.371"></a>
-<span class="sourceLineNo">372</span> }<a name="line.372"></a>
-<span class="sourceLineNo">373</span> }<a name="line.373"></a>
-<span class="sourceLineNo">374</span> }<a name="line.374"></a>
-<span class="sourceLineNo">375</span> return totalStoreFilesSize;<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> /**<a name="line.378"></a>
-<span class="sourceLineNo">379</span> * @param size delta size for grown buffer<a name="line.379"></a>
-<span class="sourceLineNo">380</span> * @return true if we should clear buffer and push all<a name="line.380"></a>
-<span class="sourceLineNo">381</span> */<a name="line.381"></a>
-<span class="sourceLineNo">382</span> private boolean acquireBufferQuota(long size) {<a name="line.382"></a>
-<span class="sourceLineNo">383</span> return totalBufferUsed.addAndGet(size) >= totalBufferQuota;<a name="line.383"></a>
-<span class="sourceLineNo">384</span> }<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> * @return whether the reader thread is running<a name="line.387"></a>
-<span class="sourceLineNo">388</span> */<a name="line.388"></a>
-<span class="sourceLineNo">389</span> public boolean isReaderRunning() {<a name="line.389"></a>
-<span class="sourceLineNo">390</span> return isReaderRunning && !isInterrupted();<a name="line.390"></a>
-<span class="sourceLineNo">391</span> }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span> /**<a name="line.393"></a>
-<span class="sourceLineNo">394</span> * @param readerRunning the readerRunning to set<a name="line.394"></a>
-<span class="sourceLineNo">395</span> */<a name="line.395"></a>
-<span class="sourceLineNo">396</span> public void setReaderRunning(boolean readerRunning) {<a name="line.396"></a>
-<span class="sourceLineNo">397</span> this.isReaderRunning = readerRunning;<a name="line.397"></a>
-<span class="sourceLineNo">398</span> }<a name="line.398"></a>
-<span class="sourceLineNo">399</span>}<a name="line.399"></a>
+<span class="sourceLineNo">347</span> Pair<Integer, Integer> result = new Pair<>(distinctRowKeys, totalHFileEntries);<a name="line.347"></a>
+<span class="sourceLineNo">348</span> return result;<a name="line.348"></a>
+<span class="sourceLineNo">349</span> }<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span> /**<a name="line.351"></a>
+<span class="sourceLineNo">352</span> * Calculate the total size of all the store files<a name="line.352"></a>
+<span class="sourceLineNo">353</span> * @param edit edit to count row keys from<a name="line.353"></a>
+<span class="sourceLineNo">354</span> * @return the total size of the store files<a name="line.354"></a>
+<span class="sourceLineNo">355</span> */<a name="line.355"></a>
+<span class="sourceLineNo">356</span> private int calculateTotalSizeOfStoreFiles(WALEdit edit) {<a name="line.356"></a>
+<span class="sourceLineNo">357</span> List<Cell> cells = edit.getCells();<a name="line.357"></a>
+<span class="sourceLineNo">358</span> int totalStoreFilesSize = 0;<a name="line.358"></a>
+<span class="sourceLineNo">359</span><a name="line.359"></a>
+<span class="sourceLineNo">360</span> int totalCells = edit.size();<a name="line.360"></a>
+<span class="sourceLineNo">361</span> for (int i = 0; i < totalCells; i++) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span> if (CellUtil.matchingQualifier(cells.get(i), WALEdit.BULK_LOAD)) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span> try {<a name="line.363"></a>
+<span class="sourceLineNo">364</span> BulkLoadDescriptor bld = WALEdit.getBulkLoadDescriptor(cells.get(i));<a name="line.364"></a>
+<span class="sourceLineNo">365</span> List<StoreDescriptor> stores = bld.getStoresList();<a name="line.365"></a>
+<span class="sourceLineNo">366</span> int totalStores = stores.size();<a name="line.366"></a>
+<span class="sourceLineNo">367</span> for (int j = 0; j < totalStores; j++) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> totalStoreFilesSize =<a name="line.368"></a>
+<span class="sourceLineNo">369</span> (int) (totalStoreFilesSize + stores.get(j).getStoreFileSizeBytes());<a name="line.369"></a>
+<span class="sourceLineNo">370</span> }<a name="line.370"></a>
+<span class="sourceLineNo">371</span> } catch (IOException e) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span> LOG.error("Failed to deserialize bulk load entry from wal edit. "<a name="line.372"></a>
+<span class="sourceLineNo">373</span> + "Size of HFiles part of cell will not be considered in replication "<a name="line.373"></a>
+<span class="sourceLineNo">374</span> + "request size calculation.",<a name="line.374"></a>
+<span class="sourceLineNo">375</span> e);<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> }<a name="line.378"></a>
+<span class="sourceLineNo">379</span> return totalStoreFilesSize;<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> /**<a name="line.382"></a>
+<span class="sourceLineNo">383</span> * @param size delta size for grown buffer<a name="line.383"></a>
+<span class="sourceLineNo">384</span> * @return true if we should clear buffer and push all<a name="line.384"></a>
+<span class="sourceLineNo">385</span> */<a name="line.385"></a>
+<span class="sourceLineNo">386</span> private boolean acquireBufferQuota(long size) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> return totalBufferUsed.addAndGet(size) >= totalBufferQuota;<a name="line.387"></a>
+<span class="sourceLineNo">388</span> }<a name="line.388"></a>
+<span class="sourceLineNo">389</span><a name="line.389"></a>
+<span class="sourceLineNo">390</span> /**<a name="line.390"></a>
+<span class="sourceLineNo">391</span> * @return whether the reader thread is running<a name="line.391"></a>
+<span class="sourceLineNo">392</span> */<a name="line.392"></a>
+<span class="sourceLineNo">393</span> public boolean isReaderRunning() {<a name="line.393"></a>
+<span class="sourceLineNo">394</span> return isReaderRunning && !isInterrupted();<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>
+<span class="sourceLineNo">397</span> /**<a name="line.397"></a>
+<span class="sourceLineNo">398</span> * @param readerRunning the readerRunning to set<a name="line.398"></a>
+<span class="sourceLineNo">399</span> */<a name="line.399"></a>
+<span class="sourceLineNo">400</span> public void setReaderRunning(boolean readerRunning) {<a name="line.400"></a>
+<span class="sourceLineNo">401</span> this.isReaderRunning = readerRunning;<a name="line.401"></a>
+<span class="sourceLineNo">402</span> }<a name="line.402"></a>
+<span class="sourceLineNo">403</span>}<a name="line.403"></a>
[05/12] hbase-site git commit: Published site at
773aff90fdf9edf4687b373d1c7ba859d166a437.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5269c877/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html
index 506f6cc..3ca913b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.html
@@ -362,580 +362,584 @@
<span class="sourceLineNo">354</span> //Overwrite any info stored by table, this takes precedence<a name="line.354"></a>
<span class="sourceLineNo">355</span> try {<a name="line.355"></a>
<span class="sourceLineNo">356</span> if(ZKUtil.checkExists(watcher, groupBasePath) != -1) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span> for(String znode: ZKUtil.listChildrenAndWatchForNewChildren(watcher, groupBasePath)) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> byte[] data = ZKUtil.getData(watcher, ZNodePaths.joinZNode(groupBasePath, znode));<a name="line.358"></a>
-<span class="sourceLineNo">359</span> if(data.length > 0) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> ProtobufUtil.expectPBMagicPrefix(data);<a name="line.360"></a>
-<span class="sourceLineNo">361</span> ByteArrayInputStream bis = new ByteArrayInputStream(<a name="line.361"></a>
-<span class="sourceLineNo">362</span> data, ProtobufUtil.lengthOfPBMagic(), data.length);<a name="line.362"></a>
-<span class="sourceLineNo">363</span> RSGroupInfoList.add(RSGroupProtobufUtil.toGroupInfo(<a name="line.363"></a>
-<span class="sourceLineNo">364</span> RSGroupProtos.RSGroupInfo.parseFrom(bis)));<a name="line.364"></a>
-<span class="sourceLineNo">365</span> }<a name="line.365"></a>
-<span class="sourceLineNo">366</span> }<a name="line.366"></a>
-<span class="sourceLineNo">367</span> LOG.debug("Read ZK GroupInfo count:" + RSGroupInfoList.size());<a name="line.367"></a>
-<span class="sourceLineNo">368</span> }<a name="line.368"></a>
-<span class="sourceLineNo">369</span> } catch (KeeperException|DeserializationException|InterruptedException e) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span> throw new IOException("Failed to read rsGroupZNode",e);<a name="line.370"></a>
-<span class="sourceLineNo">371</span> }<a name="line.371"></a>
-<span class="sourceLineNo">372</span> return RSGroupInfoList;<a name="line.372"></a>
-<span class="sourceLineNo">373</span> }<a name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span> @Override<a name="line.375"></a>
-<span class="sourceLineNo">376</span> public void refresh() throws IOException {<a name="line.376"></a>
-<span class="sourceLineNo">377</span> refresh(false);<a name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span> /**<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * Read rsgroup info from the source of truth, the hbase:rsgroup table.<a name="line.381"></a>
-<span class="sourceLineNo">382</span> * Update zk cache. Called on startup of the manager.<a name="line.382"></a>
-<span class="sourceLineNo">383</span> */<a name="line.383"></a>
-<span class="sourceLineNo">384</span> private synchronized void refresh(boolean forceOnline) throws IOException {<a name="line.384"></a>
-<span class="sourceLineNo">385</span> List<RSGroupInfo> groupList = new LinkedList<>();<a name="line.385"></a>
-<span class="sourceLineNo">386</span><a name="line.386"></a>
-<span class="sourceLineNo">387</span> // Overwrite anything read from zk, group table is source of truth<a name="line.387"></a>
-<span class="sourceLineNo">388</span> // if online read from GROUP table<a name="line.388"></a>
-<span class="sourceLineNo">389</span> if (forceOnline || isOnline()) {<a name="line.389"></a>
-<span class="sourceLineNo">390</span> LOG.debug("Refreshing in Online mode.");<a name="line.390"></a>
-<span class="sourceLineNo">391</span> if (rsGroupTable == null) {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> rsGroupTable = conn.getTable(RSGROUP_TABLE_NAME);<a name="line.392"></a>
-<span class="sourceLineNo">393</span> }<a name="line.393"></a>
-<span class="sourceLineNo">394</span> groupList.addAll(retrieveGroupListFromGroupTable());<a name="line.394"></a>
-<span class="sourceLineNo">395</span> } else {<a name="line.395"></a>
-<span class="sourceLineNo">396</span> LOG.debug("Refreshing in Offline mode.");<a name="line.396"></a>
-<span class="sourceLineNo">397</span> groupList.addAll(retrieveGroupListFromZookeeper());<a name="line.397"></a>
-<span class="sourceLineNo">398</span> }<a name="line.398"></a>
-<span class="sourceLineNo">399</span><a name="line.399"></a>
-<span class="sourceLineNo">400</span> // refresh default group, prune<a name="line.400"></a>
-<span class="sourceLineNo">401</span> NavigableSet<TableName> orphanTables = new TreeSet<>();<a name="line.401"></a>
-<span class="sourceLineNo">402</span> for(String entry: masterServices.getTableDescriptors().getAll().keySet()) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span> orphanTables.add(TableName.valueOf(entry));<a name="line.403"></a>
-<span class="sourceLineNo">404</span> }<a name="line.404"></a>
-<span class="sourceLineNo">405</span><a name="line.405"></a>
-<span class="sourceLineNo">406</span> final List<TableName> specialTables = Arrays.asList(AccessControlLists.ACL_TABLE_NAME,<a name="line.406"></a>
-<span class="sourceLineNo">407</span> TableName.META_TABLE_NAME, TableName.NAMESPACE_TABLE_NAME, RSGROUP_TABLE_NAME);<a name="line.407"></a>
-<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span> for (TableName table : specialTables) {<a name="line.409"></a>
-<span class="sourceLineNo">410</span> orphanTables.add(table);<a name="line.410"></a>
-<span class="sourceLineNo">411</span> }<a name="line.411"></a>
-<span class="sourceLineNo">412</span> for (RSGroupInfo group: groupList) {<a name="line.412"></a>
-<span class="sourceLineNo">413</span> if(!group.getName().equals(RSGroupInfo.DEFAULT_GROUP)) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> orphanTables.removeAll(group.getTables());<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span> }<a name="line.416"></a>
-<span class="sourceLineNo">417</span><a name="line.417"></a>
-<span class="sourceLineNo">418</span> // This is added to the last of the list so it overwrites the 'default' rsgroup loaded<a name="line.418"></a>
-<span class="sourceLineNo">419</span> // from region group table or zk<a name="line.419"></a>
-<span class="sourceLineNo">420</span> groupList.add(new RSGroupInfo(RSGroupInfo.DEFAULT_GROUP, getDefaultServers(),<a name="line.420"></a>
-<span class="sourceLineNo">421</span> orphanTables));<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span> // populate the data<a name="line.423"></a>
-<span class="sourceLineNo">424</span> HashMap<String, RSGroupInfo> newGroupMap = Maps.newHashMap();<a name="line.424"></a>
-<span class="sourceLineNo">425</span> HashMap<TableName, String> newTableMap = Maps.newHashMap();<a name="line.425"></a>
-<span class="sourceLineNo">426</span> for (RSGroupInfo group : groupList) {<a name="line.426"></a>
-<span class="sourceLineNo">427</span> newGroupMap.put(group.getName(), group);<a name="line.427"></a>
-<span class="sourceLineNo">428</span> for(TableName table: group.getTables()) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span> newTableMap.put(table, group.getName());<a name="line.429"></a>
-<span class="sourceLineNo">430</span> }<a name="line.430"></a>
-<span class="sourceLineNo">431</span> }<a name="line.431"></a>
-<span class="sourceLineNo">432</span> resetRSGroupAndTableMaps(newGroupMap, newTableMap);<a name="line.432"></a>
-<span class="sourceLineNo">433</span> updateCacheOfRSGroups(rsGroupMap.keySet());<a name="line.433"></a>
-<span class="sourceLineNo">434</span> }<a name="line.434"></a>
-<span class="sourceLineNo">435</span><a name="line.435"></a>
-<span class="sourceLineNo">436</span> private synchronized Map<TableName,String> flushConfigTable(Map<String,RSGroupInfo> groupMap)<a name="line.436"></a>
-<span class="sourceLineNo">437</span> throws IOException {<a name="line.437"></a>
-<span class="sourceLineNo">438</span> Map<TableName,String> newTableMap = Maps.newHashMap();<a name="line.438"></a>
-<span class="sourceLineNo">439</span> List<Mutation> mutations = Lists.newArrayList();<a name="line.439"></a>
-<span class="sourceLineNo">440</span><a name="line.440"></a>
-<span class="sourceLineNo">441</span> // populate deletes<a name="line.441"></a>
-<span class="sourceLineNo">442</span> for(String groupName : prevRSGroups) {<a name="line.442"></a>
-<span class="sourceLineNo">443</span> if(!groupMap.containsKey(groupName)) {<a name="line.443"></a>
-<span class="sourceLineNo">444</span> Delete d = new Delete(Bytes.toBytes(groupName));<a name="line.444"></a>
-<span class="sourceLineNo">445</span> mutations.add(d);<a name="line.445"></a>
-<span class="sourceLineNo">446</span> }<a name="line.446"></a>
-<span class="sourceLineNo">447</span> }<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span> // populate puts<a name="line.449"></a>
-<span class="sourceLineNo">450</span> for(RSGroupInfo RSGroupInfo : groupMap.values()) {<a name="line.450"></a>
-<span class="sourceLineNo">451</span> RSGroupProtos.RSGroupInfo proto = RSGroupProtobufUtil.toProtoGroupInfo(RSGroupInfo);<a name="line.451"></a>
-<span class="sourceLineNo">452</span> Put p = new Put(Bytes.toBytes(RSGroupInfo.getName()));<a name="line.452"></a>
-<span class="sourceLineNo">453</span> p.addColumn(META_FAMILY_BYTES, META_QUALIFIER_BYTES, proto.toByteArray());<a name="line.453"></a>
-<span class="sourceLineNo">454</span> mutations.add(p);<a name="line.454"></a>
-<span class="sourceLineNo">455</span> for(TableName entry: RSGroupInfo.getTables()) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span> newTableMap.put(entry, RSGroupInfo.getName());<a name="line.456"></a>
-<span class="sourceLineNo">457</span> }<a name="line.457"></a>
-<span class="sourceLineNo">458</span> }<a name="line.458"></a>
-<span class="sourceLineNo">459</span><a name="line.459"></a>
-<span class="sourceLineNo">460</span> if(mutations.size() > 0) {<a name="line.460"></a>
-<span class="sourceLineNo">461</span> multiMutate(mutations);<a name="line.461"></a>
+<span class="sourceLineNo">357</span> List<String> children = ZKUtil.listChildrenAndWatchForNewChildren(watcher, groupBasePath);<a name="line.357"></a>
+<span class="sourceLineNo">358</span> if (children == null) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span> return RSGroupInfoList;<a name="line.359"></a>
+<span class="sourceLineNo">360</span> }<a name="line.360"></a>
+<span class="sourceLineNo">361</span> for(String znode: children) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span> byte[] data = ZKUtil.getData(watcher, ZNodePaths.joinZNode(groupBasePath, znode));<a name="line.362"></a>
+<span class="sourceLineNo">363</span> if(data.length > 0) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span> ProtobufUtil.expectPBMagicPrefix(data);<a name="line.364"></a>
+<span class="sourceLineNo">365</span> ByteArrayInputStream bis = new ByteArrayInputStream(<a name="line.365"></a>
+<span class="sourceLineNo">366</span> data, ProtobufUtil.lengthOfPBMagic(), data.length);<a name="line.366"></a>
+<span class="sourceLineNo">367</span> RSGroupInfoList.add(RSGroupProtobufUtil.toGroupInfo(<a name="line.367"></a>
+<span class="sourceLineNo">368</span> RSGroupProtos.RSGroupInfo.parseFrom(bis)));<a name="line.368"></a>
+<span class="sourceLineNo">369</span> }<a name="line.369"></a>
+<span class="sourceLineNo">370</span> }<a name="line.370"></a>
+<span class="sourceLineNo">371</span> LOG.debug("Read ZK GroupInfo count:" + RSGroupInfoList.size());<a name="line.371"></a>
+<span class="sourceLineNo">372</span> }<a name="line.372"></a>
+<span class="sourceLineNo">373</span> } catch (KeeperException|DeserializationException|InterruptedException e) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> throw new IOException("Failed to read rsGroupZNode",e);<a name="line.374"></a>
+<span class="sourceLineNo">375</span> }<a name="line.375"></a>
+<span class="sourceLineNo">376</span> return RSGroupInfoList;<a name="line.376"></a>
+<span class="sourceLineNo">377</span> }<a name="line.377"></a>
+<span class="sourceLineNo">378</span><a name="line.378"></a>
+<span class="sourceLineNo">379</span> @Override<a name="line.379"></a>
+<span class="sourceLineNo">380</span> public void refresh() throws IOException {<a name="line.380"></a>
+<span class="sourceLineNo">381</span> refresh(false);<a name="line.381"></a>
+<span class="sourceLineNo">382</span> }<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span> /**<a name="line.384"></a>
+<span class="sourceLineNo">385</span> * Read rsgroup info from the source of truth, the hbase:rsgroup table.<a name="line.385"></a>
+<span class="sourceLineNo">386</span> * Update zk cache. Called on startup of the manager.<a name="line.386"></a>
+<span class="sourceLineNo">387</span> */<a name="line.387"></a>
+<span class="sourceLineNo">388</span> private synchronized void refresh(boolean forceOnline) throws IOException {<a name="line.388"></a>
+<span class="sourceLineNo">389</span> List<RSGroupInfo> groupList = new LinkedList<>();<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span> // Overwrite anything read from zk, group table is source of truth<a name="line.391"></a>
+<span class="sourceLineNo">392</span> // if online read from GROUP table<a name="line.392"></a>
+<span class="sourceLineNo">393</span> if (forceOnline || isOnline()) {<a name="line.393"></a>
+<span class="sourceLineNo">394</span> LOG.debug("Refreshing in Online mode.");<a name="line.394"></a>
+<span class="sourceLineNo">395</span> if (rsGroupTable == null) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span> rsGroupTable = conn.getTable(RSGROUP_TABLE_NAME);<a name="line.396"></a>
+<span class="sourceLineNo">397</span> }<a name="line.397"></a>
+<span class="sourceLineNo">398</span> groupList.addAll(retrieveGroupListFromGroupTable());<a name="line.398"></a>
+<span class="sourceLineNo">399</span> } else {<a name="line.399"></a>
+<span class="sourceLineNo">400</span> LOG.debug("Refreshing in Offline mode.");<a name="line.400"></a>
+<span class="sourceLineNo">401</span> groupList.addAll(retrieveGroupListFromZookeeper());<a name="line.401"></a>
+<span class="sourceLineNo">402</span> }<a name="line.402"></a>
+<span class="sourceLineNo">403</span><a name="line.403"></a>
+<span class="sourceLineNo">404</span> // refresh default group, prune<a name="line.404"></a>
+<span class="sourceLineNo">405</span> NavigableSet<TableName> orphanTables = new TreeSet<>();<a name="line.405"></a>
+<span class="sourceLineNo">406</span> for(String entry: masterServices.getTableDescriptors().getAll().keySet()) {<a name="line.406"></a>
+<span class="sourceLineNo">407</span> orphanTables.add(TableName.valueOf(entry));<a name="line.407"></a>
+<span class="sourceLineNo">408</span> }<a name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span> final List<TableName> specialTables = Arrays.asList(AccessControlLists.ACL_TABLE_NAME,<a name="line.410"></a>
+<span class="sourceLineNo">411</span> TableName.META_TABLE_NAME, TableName.NAMESPACE_TABLE_NAME, RSGROUP_TABLE_NAME);<a name="line.411"></a>
+<span class="sourceLineNo">412</span><a name="line.412"></a>
+<span class="sourceLineNo">413</span> for (TableName table : specialTables) {<a name="line.413"></a>
+<span class="sourceLineNo">414</span> orphanTables.add(table);<a name="line.414"></a>
+<span class="sourceLineNo">415</span> }<a name="line.415"></a>
+<span class="sourceLineNo">416</span> for (RSGroupInfo group: groupList) {<a name="line.416"></a>
+<span class="sourceLineNo">417</span> if(!group.getName().equals(RSGroupInfo.DEFAULT_GROUP)) {<a name="line.417"></a>
+<span class="sourceLineNo">418</span> orphanTables.removeAll(group.getTables());<a name="line.418"></a>
+<span class="sourceLineNo">419</span> }<a name="line.419"></a>
+<span class="sourceLineNo">420</span> }<a name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span> // This is added to the last of the list so it overwrites the 'default' rsgroup loaded<a name="line.422"></a>
+<span class="sourceLineNo">423</span> // from region group table or zk<a name="line.423"></a>
+<span class="sourceLineNo">424</span> groupList.add(new RSGroupInfo(RSGroupInfo.DEFAULT_GROUP, getDefaultServers(),<a name="line.424"></a>
+<span class="sourceLineNo">425</span> orphanTables));<a name="line.425"></a>
+<span class="sourceLineNo">426</span><a name="line.426"></a>
+<span class="sourceLineNo">427</span> // populate the data<a name="line.427"></a>
+<span class="sourceLineNo">428</span> HashMap<String, RSGroupInfo> newGroupMap = Maps.newHashMap();<a name="line.428"></a>
+<span class="sourceLineNo">429</span> HashMap<TableName, String> newTableMap = Maps.newHashMap();<a name="line.429"></a>
+<span class="sourceLineNo">430</span> for (RSGroupInfo group : groupList) {<a name="line.430"></a>
+<span class="sourceLineNo">431</span> newGroupMap.put(group.getName(), group);<a name="line.431"></a>
+<span class="sourceLineNo">432</span> for(TableName table: group.getTables()) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span> newTableMap.put(table, group.getName());<a name="line.433"></a>
+<span class="sourceLineNo">434</span> }<a name="line.434"></a>
+<span class="sourceLineNo">435</span> }<a name="line.435"></a>
+<span class="sourceLineNo">436</span> resetRSGroupAndTableMaps(newGroupMap, newTableMap);<a name="line.436"></a>
+<span class="sourceLineNo">437</span> updateCacheOfRSGroups(rsGroupMap.keySet());<a name="line.437"></a>
+<span class="sourceLineNo">438</span> }<a name="line.438"></a>
+<span class="sourceLineNo">439</span><a name="line.439"></a>
+<span class="sourceLineNo">440</span> private synchronized Map<TableName,String> flushConfigTable(Map<String,RSGroupInfo> groupMap)<a name="line.440"></a>
+<span class="sourceLineNo">441</span> throws IOException {<a name="line.441"></a>
+<span class="sourceLineNo">442</span> Map<TableName,String> newTableMap = Maps.newHashMap();<a name="line.442"></a>
+<span class="sourceLineNo">443</span> List<Mutation> mutations = Lists.newArrayList();<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span> // populate deletes<a name="line.445"></a>
+<span class="sourceLineNo">446</span> for(String groupName : prevRSGroups) {<a name="line.446"></a>
+<span class="sourceLineNo">447</span> if(!groupMap.containsKey(groupName)) {<a name="line.447"></a>
+<span class="sourceLineNo">448</span> Delete d = new Delete(Bytes.toBytes(groupName));<a name="line.448"></a>
+<span class="sourceLineNo">449</span> mutations.add(d);<a name="line.449"></a>
+<span class="sourceLineNo">450</span> }<a name="line.450"></a>
+<span class="sourceLineNo">451</span> }<a name="line.451"></a>
+<span class="sourceLineNo">452</span><a name="line.452"></a>
+<span class="sourceLineNo">453</span> // populate puts<a name="line.453"></a>
+<span class="sourceLineNo">454</span> for(RSGroupInfo RSGroupInfo : groupMap.values()) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span> RSGroupProtos.RSGroupInfo proto = RSGroupProtobufUtil.toProtoGroupInfo(RSGroupInfo);<a name="line.455"></a>
+<span class="sourceLineNo">456</span> Put p = new Put(Bytes.toBytes(RSGroupInfo.getName()));<a name="line.456"></a>
+<span class="sourceLineNo">457</span> p.addColumn(META_FAMILY_BYTES, META_QUALIFIER_BYTES, proto.toByteArray());<a name="line.457"></a>
+<span class="sourceLineNo">458</span> mutations.add(p);<a name="line.458"></a>
+<span class="sourceLineNo">459</span> for(TableName entry: RSGroupInfo.getTables()) {<a name="line.459"></a>
+<span class="sourceLineNo">460</span> newTableMap.put(entry, RSGroupInfo.getName());<a name="line.460"></a>
+<span class="sourceLineNo">461</span> }<a name="line.461"></a>
<span class="sourceLineNo">462</span> }<a name="line.462"></a>
-<span class="sourceLineNo">463</span> return newTableMap;<a name="line.463"></a>
-<span class="sourceLineNo">464</span> }<a name="line.464"></a>
-<span class="sourceLineNo">465</span><a name="line.465"></a>
-<span class="sourceLineNo">466</span> private synchronized void flushConfig()<a name="line.466"></a>
-<span class="sourceLineNo">467</span> throws IOException {<a name="line.467"></a>
-<span class="sourceLineNo">468</span> flushConfig(this.rsGroupMap);<a name="line.468"></a>
-<span class="sourceLineNo">469</span> }<a name="line.469"></a>
-<span class="sourceLineNo">470</span><a name="line.470"></a>
-<span class="sourceLineNo">471</span> private synchronized void flushConfig(Map<String, RSGroupInfo> newGroupMap)<a name="line.471"></a>
-<span class="sourceLineNo">472</span> throws IOException {<a name="line.472"></a>
-<span class="sourceLineNo">473</span> Map<TableName, String> newTableMap;<a name="line.473"></a>
+<span class="sourceLineNo">463</span><a name="line.463"></a>
+<span class="sourceLineNo">464</span> if(mutations.size() > 0) {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> multiMutate(mutations);<a name="line.465"></a>
+<span class="sourceLineNo">466</span> }<a name="line.466"></a>
+<span class="sourceLineNo">467</span> return newTableMap;<a name="line.467"></a>
+<span class="sourceLineNo">468</span> }<a name="line.468"></a>
+<span class="sourceLineNo">469</span><a name="line.469"></a>
+<span class="sourceLineNo">470</span> private synchronized void flushConfig()<a name="line.470"></a>
+<span class="sourceLineNo">471</span> throws IOException {<a name="line.471"></a>
+<span class="sourceLineNo">472</span> flushConfig(this.rsGroupMap);<a name="line.472"></a>
+<span class="sourceLineNo">473</span> }<a name="line.473"></a>
<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span> // For offline mode persistence is still unavailable<a name="line.475"></a>
-<span class="sourceLineNo">476</span> // We're refreshing in-memory state but only for default servers<a name="line.476"></a>
-<span class="sourceLineNo">477</span> if (!isOnline()) {<a name="line.477"></a>
-<span class="sourceLineNo">478</span> Map<String, RSGroupInfo> m = Maps.newHashMap(rsGroupMap);<a name="line.478"></a>
-<span class="sourceLineNo">479</span> RSGroupInfo oldDefaultGroup = m.remove(RSGroupInfo.DEFAULT_GROUP);<a name="line.479"></a>
-<span class="sourceLineNo">480</span> RSGroupInfo newDefaultGroup = newGroupMap.remove(RSGroupInfo.DEFAULT_GROUP);<a name="line.480"></a>
-<span class="sourceLineNo">481</span> if (!m.equals(newGroupMap) ||<a name="line.481"></a>
-<span class="sourceLineNo">482</span> !oldDefaultGroup.getTables().equals(newDefaultGroup.getTables())) {<a name="line.482"></a>
-<span class="sourceLineNo">483</span> throw new IOException("Only default servers can be updated during offline mode");<a name="line.483"></a>
-<span class="sourceLineNo">484</span> }<a name="line.484"></a>
-<span class="sourceLineNo">485</span> newGroupMap.put(RSGroupInfo.DEFAULT_GROUP, newDefaultGroup);<a name="line.485"></a>
-<span class="sourceLineNo">486</span> rsGroupMap = newGroupMap;<a name="line.486"></a>
-<span class="sourceLineNo">487</span> return;<a name="line.487"></a>
-<span class="sourceLineNo">488</span> }<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span> newTableMap = flushConfigTable(newGroupMap);<a name="line.490"></a>
-<span class="sourceLineNo">491</span><a name="line.491"></a>
-<span class="sourceLineNo">492</span> // Make changes visible after having been persisted to the source of truth<a name="line.492"></a>
-<span class="sourceLineNo">493</span> resetRSGroupAndTableMaps(newGroupMap, newTableMap);<a name="line.493"></a>
-<span class="sourceLineNo">494</span><a name="line.494"></a>
-<span class="sourceLineNo">495</span> try {<a name="line.495"></a>
-<span class="sourceLineNo">496</span> String groupBasePath = ZNodePaths.joinZNode(watcher.znodePaths.baseZNode, rsGroupZNode);<a name="line.496"></a>
-<span class="sourceLineNo">497</span> ZKUtil.createAndFailSilent(watcher, groupBasePath, ProtobufMagic.PB_MAGIC);<a name="line.497"></a>
+<span class="sourceLineNo">475</span> private synchronized void flushConfig(Map<String, RSGroupInfo> newGroupMap)<a name="line.475"></a>
+<span class="sourceLineNo">476</span> throws IOException {<a name="line.476"></a>
+<span class="sourceLineNo">477</span> Map<TableName, String> newTableMap;<a name="line.477"></a>
+<span class="sourceLineNo">478</span><a name="line.478"></a>
+<span class="sourceLineNo">479</span> // For offline mode persistence is still unavailable<a name="line.479"></a>
+<span class="sourceLineNo">480</span> // We're refreshing in-memory state but only for default servers<a name="line.480"></a>
+<span class="sourceLineNo">481</span> if (!isOnline()) {<a name="line.481"></a>
+<span class="sourceLineNo">482</span> Map<String, RSGroupInfo> m = Maps.newHashMap(rsGroupMap);<a name="line.482"></a>
+<span class="sourceLineNo">483</span> RSGroupInfo oldDefaultGroup = m.remove(RSGroupInfo.DEFAULT_GROUP);<a name="line.483"></a>
+<span class="sourceLineNo">484</span> RSGroupInfo newDefaultGroup = newGroupMap.remove(RSGroupInfo.DEFAULT_GROUP);<a name="line.484"></a>
+<span class="sourceLineNo">485</span> if (!m.equals(newGroupMap) ||<a name="line.485"></a>
+<span class="sourceLineNo">486</span> !oldDefaultGroup.getTables().equals(newDefaultGroup.getTables())) {<a name="line.486"></a>
+<span class="sourceLineNo">487</span> throw new IOException("Only default servers can be updated during offline mode");<a name="line.487"></a>
+<span class="sourceLineNo">488</span> }<a name="line.488"></a>
+<span class="sourceLineNo">489</span> newGroupMap.put(RSGroupInfo.DEFAULT_GROUP, newDefaultGroup);<a name="line.489"></a>
+<span class="sourceLineNo">490</span> rsGroupMap = newGroupMap;<a name="line.490"></a>
+<span class="sourceLineNo">491</span> return;<a name="line.491"></a>
+<span class="sourceLineNo">492</span> }<a name="line.492"></a>
+<span class="sourceLineNo">493</span><a name="line.493"></a>
+<span class="sourceLineNo">494</span> newTableMap = flushConfigTable(newGroupMap);<a name="line.494"></a>
+<span class="sourceLineNo">495</span><a name="line.495"></a>
+<span class="sourceLineNo">496</span> // Make changes visible after having been persisted to the source of truth<a name="line.496"></a>
+<span class="sourceLineNo">497</span> resetRSGroupAndTableMaps(newGroupMap, newTableMap);<a name="line.497"></a>
<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span> List<ZKUtil.ZKUtilOp> zkOps = new ArrayList<>(newGroupMap.size());<a name="line.499"></a>
-<span class="sourceLineNo">500</span> for(String groupName : prevRSGroups) {<a name="line.500"></a>
-<span class="sourceLineNo">501</span> if(!newGroupMap.containsKey(groupName)) {<a name="line.501"></a>
-<span class="sourceLineNo">502</span> String znode = ZNodePaths.joinZNode(groupBasePath, groupName);<a name="line.502"></a>
-<span class="sourceLineNo">503</span> zkOps.add(ZKUtil.ZKUtilOp.deleteNodeFailSilent(znode));<a name="line.503"></a>
-<span class="sourceLineNo">504</span> }<a name="line.504"></a>
-<span class="sourceLineNo">505</span> }<a name="line.505"></a>
-<span class="sourceLineNo">506</span><a name="line.506"></a>
-<span class="sourceLineNo">507</span><a name="line.507"></a>
-<span class="sourceLineNo">508</span> for (RSGroupInfo RSGroupInfo : newGroupMap.values()) {<a name="line.508"></a>
-<span class="sourceLineNo">509</span> String znode = ZNodePaths.joinZNode(groupBasePath, RSGroupInfo.getName());<a name="line.509"></a>
-<span class="sourceLineNo">510</span> RSGroupProtos.RSGroupInfo proto = RSGroupProtobufUtil.toProtoGroupInfo(RSGroupInfo);<a name="line.510"></a>
-<span class="sourceLineNo">511</span> LOG.debug("Updating znode: "+znode);<a name="line.511"></a>
-<span class="sourceLineNo">512</span> ZKUtil.createAndFailSilent(watcher, znode);<a name="line.512"></a>
-<span class="sourceLineNo">513</span> zkOps.add(ZKUtil.ZKUtilOp.deleteNodeFailSilent(znode));<a name="line.513"></a>
-<span class="sourceLineNo">514</span> zkOps.add(ZKUtil.ZKUtilOp.createAndFailSilent(znode,<a name="line.514"></a>
-<span class="sourceLineNo">515</span> ProtobufUtil.prependPBMagic(proto.toByteArray())));<a name="line.515"></a>
-<span class="sourceLineNo">516</span> }<a name="line.516"></a>
-<span class="sourceLineNo">517</span> LOG.debug("Writing ZK GroupInfo count: " + zkOps.size());<a name="line.517"></a>
-<span class="sourceLineNo">518</span><a name="line.518"></a>
-<span class="sourceLineNo">519</span> ZKUtil.multiOrSequential(watcher, zkOps, false);<a name="line.519"></a>
-<span class="sourceLineNo">520</span> } catch (KeeperException e) {<a name="line.520"></a>
-<span class="sourceLineNo">521</span> LOG.error("Failed to write to rsGroupZNode", e);<a name="line.521"></a>
-<span class="sourceLineNo">522</span> masterServices.abort("Failed to write to rsGroupZNode", e);<a name="line.522"></a>
-<span class="sourceLineNo">523</span> throw new IOException("Failed to write to rsGroupZNode",e);<a name="line.523"></a>
-<span class="sourceLineNo">524</span> }<a name="line.524"></a>
-<span class="sourceLineNo">525</span> updateCacheOfRSGroups(newGroupMap.keySet());<a name="line.525"></a>
-<span class="sourceLineNo">526</span> }<a name="line.526"></a>
-<span class="sourceLineNo">527</span><a name="line.527"></a>
-<span class="sourceLineNo">528</span> /**<a name="line.528"></a>
-<span class="sourceLineNo">529</span> * Make changes visible.<a name="line.529"></a>
-<span class="sourceLineNo">530</span> * Caller must be synchronized on 'this'.<a name="line.530"></a>
-<span class="sourceLineNo">531</span> */<a name="line.531"></a>
-<span class="sourceLineNo">532</span> private void resetRSGroupAndTableMaps(Map<String, RSGroupInfo> newRSGroupMap,<a name="line.532"></a>
-<span class="sourceLineNo">533</span> Map<TableName, String> newTableMap) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span> // Make maps Immutable.<a name="line.534"></a>
-<span class="sourceLineNo">535</span> this.rsGroupMap = Collections.unmodifiableMap(newRSGroupMap);<a name="line.535"></a>
-<span class="sourceLineNo">536</span> this.tableMap = Collections.unmodifiableMap(newTableMap);<a name="line.536"></a>
-<span class="sourceLineNo">537</span> }<a name="line.537"></a>
-<span class="sourceLineNo">538</span><a name="line.538"></a>
-<span class="sourceLineNo">539</span> /**<a name="line.539"></a>
-<span class="sourceLineNo">540</span> * Update cache of rsgroups.<a name="line.540"></a>
-<span class="sourceLineNo">541</span> * Caller must be synchronized on 'this'.<a name="line.541"></a>
-<span class="sourceLineNo">542</span> * @param currentGroups Current list of Groups.<a name="line.542"></a>
-<span class="sourceLineNo">543</span> */<a name="line.543"></a>
-<span class="sourceLineNo">544</span> private void updateCacheOfRSGroups(final Set<String> currentGroups) {<a name="line.544"></a>
-<span class="sourceLineNo">545</span> this.prevRSGroups.clear();<a name="line.545"></a>
-<span class="sourceLineNo">546</span> this.prevRSGroups.addAll(currentGroups);<a name="line.546"></a>
-<span class="sourceLineNo">547</span> }<a name="line.547"></a>
-<span class="sourceLineNo">548</span><a name="line.548"></a>
-<span class="sourceLineNo">549</span> // Called by getDefaultServers. Presume it has lock in place.<a name="line.549"></a>
-<span class="sourceLineNo">550</span> private List<ServerName> getOnlineRS() throws IOException {<a name="line.550"></a>
-<span class="sourceLineNo">551</span> if (masterServices != null) {<a name="line.551"></a>
-<span class="sourceLineNo">552</span> return masterServices.getServerManager().getOnlineServersList();<a name="line.552"></a>
-<span class="sourceLineNo">553</span> }<a name="line.553"></a>
-<span class="sourceLineNo">554</span> LOG.debug("Reading online RS from zookeeper");<a name="line.554"></a>
-<span class="sourceLineNo">555</span> List<ServerName> servers = new LinkedList<>();<a name="line.555"></a>
-<span class="sourceLineNo">556</span> try {<a name="line.556"></a>
-<span class="sourceLineNo">557</span> for (String el: ZKUtil.listChildrenNoWatch(watcher, watcher.znodePaths.rsZNode)) {<a name="line.557"></a>
-<span class="sourceLineNo">558</span> servers.add(ServerName.parseServerName(el));<a name="line.558"></a>
-<span class="sourceLineNo">559</span> }<a name="line.559"></a>
-<span class="sourceLineNo">560</span> } catch (KeeperException e) {<a name="line.560"></a>
-<span class="sourceLineNo">561</span> throw new IOException("Failed to retrieve server list from zookeeper", e);<a name="line.561"></a>
-<span class="sourceLineNo">562</span> }<a name="line.562"></a>
-<span class="sourceLineNo">563</span> return servers;<a name="line.563"></a>
-<span class="sourceLineNo">564</span> }<a name="line.564"></a>
-<span class="sourceLineNo">565</span><a name="line.565"></a>
-<span class="sourceLineNo">566</span> // Called by ServerEventsListenerThread. Presume it has lock on this manager when it runs.<a name="line.566"></a>
-<span class="sourceLineNo">567</span> private SortedSet<Address> getDefaultServers() throws IOException {<a name="line.567"></a>
-<span class="sourceLineNo">568</span> SortedSet<Address> defaultServers = Sets.newTreeSet();<a name="line.568"></a>
-<span class="sourceLineNo">569</span> for (ServerName serverName : getOnlineRS()) {<a name="line.569"></a>
-<span class="sourceLineNo">570</span> Address server =<a name="line.570"></a>
-<span class="sourceLineNo">571</span> Address.fromParts(serverName.getHostname(), serverName.getPort());<a name="line.571"></a>
-<span class="sourceLineNo">572</span> boolean found = false;<a name="line.572"></a>
-<span class="sourceLineNo">573</span> for(RSGroupInfo rsgi: listRSGroups()) {<a name="line.573"></a>
-<span class="sourceLineNo">574</span> if(!RSGroupInfo.DEFAULT_GROUP.equals(rsgi.getName()) &&<a name="line.574"></a>
-<span class="sourceLineNo">575</span> rsgi.containsServer(server)) {<a name="line.575"></a>
-<span class="sourceLineNo">576</span> found = true;<a name="line.576"></a>
-<span class="sourceLineNo">577</span> break;<a name="line.577"></a>
-<span class="sourceLineNo">578</span> }<a name="line.578"></a>
-<span class="sourceLineNo">579</span> }<a name="line.579"></a>
-<span class="sourceLineNo">580</span> if (!found) {<a name="line.580"></a>
-<span class="sourceLineNo">581</span> defaultServers.add(server);<a name="line.581"></a>
-<span class="sourceLineNo">582</span> }<a name="line.582"></a>
-<span class="sourceLineNo">583</span> }<a name="line.583"></a>
-<span class="sourceLineNo">584</span> return defaultServers;<a name="line.584"></a>
-<span class="sourceLineNo">585</span> }<a name="line.585"></a>
-<span class="sourceLineNo">586</span><a name="line.586"></a>
-<span class="sourceLineNo">587</span> // Called by ServerEventsListenerThread. Synchronize on this because redoing<a name="line.587"></a>
-<span class="sourceLineNo">588</span> // the rsGroupMap then writing it out.<a name="line.588"></a>
-<span class="sourceLineNo">589</span> private synchronized void updateDefaultServers(SortedSet<Address> servers) throws IOException {<a name="line.589"></a>
-<span class="sourceLineNo">590</span> RSGroupInfo info = rsGroupMap.get(RSGroupInfo.DEFAULT_GROUP);<a name="line.590"></a>
-<span class="sourceLineNo">591</span> RSGroupInfo newInfo = new RSGroupInfo(info.getName(), servers, info.getTables());<a name="line.591"></a>
-<span class="sourceLineNo">592</span> HashMap<String, RSGroupInfo> newGroupMap = Maps.newHashMap(rsGroupMap);<a name="line.592"></a>
-<span class="sourceLineNo">593</span> newGroupMap.put(newInfo.getName(), newInfo);<a name="line.593"></a>
-<span class="sourceLineNo">594</span> flushConfig(newGroupMap);<a name="line.594"></a>
-<span class="sourceLineNo">595</span> }<a name="line.595"></a>
-<span class="sourceLineNo">596</span><a name="line.596"></a>
-<span class="sourceLineNo">597</span> // Called by FailedOpenUpdaterThread<a name="line.597"></a>
-<span class="sourceLineNo">598</span> private void updateFailedAssignments() {<a name="line.598"></a>
-<span class="sourceLineNo">599</span> // Kick all regions in FAILED_OPEN state<a name="line.599"></a>
-<span class="sourceLineNo">600</span> List<RegionInfo> stuckAssignments = Lists.newArrayList();<a name="line.600"></a>
-<span class="sourceLineNo">601</span> for (RegionStateNode state:<a name="line.601"></a>
-<span class="sourceLineNo">602</span> masterServices.getAssignmentManager().getRegionStates().getRegionsInTransition()) {<a name="line.602"></a>
-<span class="sourceLineNo">603</span> if (state.isStuck()) {<a name="line.603"></a>
-<span class="sourceLineNo">604</span> stuckAssignments.add(state.getRegionInfo());<a name="line.604"></a>
-<span class="sourceLineNo">605</span> }<a name="line.605"></a>
-<span class="sourceLineNo">606</span> }<a name="line.606"></a>
-<span class="sourceLineNo">607</span> for (RegionInfo region: stuckAssignments) {<a name="line.607"></a>
-<span class="sourceLineNo">608</span> LOG.info("Retrying assignment of " + region);<a name="line.608"></a>
-<span class="sourceLineNo">609</span> try {<a name="line.609"></a>
-<span class="sourceLineNo">610</span> masterServices.getAssignmentManager().unassign(region);<a name="line.610"></a>
-<span class="sourceLineNo">611</span> } catch (IOException e) {<a name="line.611"></a>
-<span class="sourceLineNo">612</span> LOG.warn("Unable to reassign " + region, e);<a name="line.612"></a>
-<span class="sourceLineNo">613</span> }<a name="line.613"></a>
-<span class="sourceLineNo">614</span> }<a name="line.614"></a>
-<span class="sourceLineNo">615</span> }<a name="line.615"></a>
-<span class="sourceLineNo">616</span><a name="line.616"></a>
-<span class="sourceLineNo">617</span> /**<a name="line.617"></a>
-<span class="sourceLineNo">618</span> * Calls {@link RSGroupInfoManagerImpl#updateDefaultServers(SortedSet)} to update list of known<a name="line.618"></a>
-<span class="sourceLineNo">619</span> * servers. Notifications about server changes are received by registering {@link ServerListener}.<a name="line.619"></a>
-<span class="sourceLineNo">620</span> * As a listener, we need to return immediately, so the real work of updating the servers is<a name="line.620"></a>
-<span class="sourceLineNo">621</span> * done asynchronously in this thread.<a name="line.621"></a>
-<span class="sourceLineNo">622</span> */<a name="line.622"></a>
-<span class="sourceLineNo">623</span> private class ServerEventsListenerThread extends Thread implements ServerListener {<a name="line.623"></a>
-<span class="sourceLineNo">624</span> private final Logger LOG = LoggerFactory.getLogger(ServerEventsListenerThread.class);<a name="line.624"></a>
-<span class="sourceLineNo">625</span> private boolean changed = false;<a name="line.625"></a>
-<span class="sourceLineNo">626</span><a name="line.626"></a>
-<span class="sourceLineNo">627</span> ServerEventsListenerThread() {<a name="line.627"></a>
-<span class="sourceLineNo">628</span> setDaemon(true);<a name="line.628"></a>
-<span class="sourceLineNo">629</span> }<a name="line.629"></a>
+<span class="sourceLineNo">499</span> try {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> String groupBasePath = ZNodePaths.joinZNode(watcher.znodePaths.baseZNode, rsGroupZNode);<a name="line.500"></a>
+<span class="sourceLineNo">501</span> ZKUtil.createAndFailSilent(watcher, groupBasePath, ProtobufMagic.PB_MAGIC);<a name="line.501"></a>
+<span class="sourceLineNo">502</span><a name="line.502"></a>
+<span class="sourceLineNo">503</span> List<ZKUtil.ZKUtilOp> zkOps = new ArrayList<>(newGroupMap.size());<a name="line.503"></a>
+<span class="sourceLineNo">504</span> for(String groupName : prevRSGroups) {<a name="line.504"></a>
+<span class="sourceLineNo">505</span> if(!newGroupMap.containsKey(groupName)) {<a name="line.505"></a>
+<span class="sourceLineNo">506</span> String znode = ZNodePaths.joinZNode(groupBasePath, groupName);<a name="line.506"></a>
+<span class="sourceLineNo">507</span> zkOps.add(ZKUtil.ZKUtilOp.deleteNodeFailSilent(znode));<a name="line.507"></a>
+<span class="sourceLineNo">508</span> }<a name="line.508"></a>
+<span class="sourceLineNo">509</span> }<a name="line.509"></a>
+<span class="sourceLineNo">510</span><a name="line.510"></a>
+<span class="sourceLineNo">511</span><a name="line.511"></a>
+<span class="sourceLineNo">512</span> for (RSGroupInfo RSGroupInfo : newGroupMap.values()) {<a name="line.512"></a>
+<span class="sourceLineNo">513</span> String znode = ZNodePaths.joinZNode(groupBasePath, RSGroupInfo.getName());<a name="line.513"></a>
+<span class="sourceLineNo">514</span> RSGroupProtos.RSGroupInfo proto = RSGroupProtobufUtil.toProtoGroupInfo(RSGroupInfo);<a name="line.514"></a>
+<span class="sourceLineNo">515</span> LOG.debug("Updating znode: "+znode);<a name="line.515"></a>
+<span class="sourceLineNo">516</span> ZKUtil.createAndFailSilent(watcher, znode);<a name="line.516"></a>
+<span class="sourceLineNo">517</span> zkOps.add(ZKUtil.ZKUtilOp.deleteNodeFailSilent(znode));<a name="line.517"></a>
+<span class="sourceLineNo">518</span> zkOps.add(ZKUtil.ZKUtilOp.createAndFailSilent(znode,<a name="line.518"></a>
+<span class="sourceLineNo">519</span> ProtobufUtil.prependPBMagic(proto.toByteArray())));<a name="line.519"></a>
+<span class="sourceLineNo">520</span> }<a name="line.520"></a>
+<span class="sourceLineNo">521</span> LOG.debug("Writing ZK GroupInfo count: " + zkOps.size());<a name="line.521"></a>
+<span class="sourceLineNo">522</span><a name="line.522"></a>
+<span class="sourceLineNo">523</span> ZKUtil.multiOrSequential(watcher, zkOps, false);<a name="line.523"></a>
+<span class="sourceLineNo">524</span> } catch (KeeperException e) {<a name="line.524"></a>
+<span class="sourceLineNo">525</span> LOG.error("Failed to write to rsGroupZNode", e);<a name="line.525"></a>
+<span class="sourceLineNo">526</span> masterServices.abort("Failed to write to rsGroupZNode", e);<a name="line.526"></a>
+<span class="sourceLineNo">527</span> throw new IOException("Failed to write to rsGroupZNode",e);<a name="line.527"></a>
+<span class="sourceLineNo">528</span> }<a name="line.528"></a>
+<span class="sourceLineNo">529</span> updateCacheOfRSGroups(newGroupMap.keySet());<a name="line.529"></a>
+<span class="sourceLineNo">530</span> }<a name="line.530"></a>
+<span class="sourceLineNo">531</span><a name="line.531"></a>
+<span class="sourceLineNo">532</span> /**<a name="line.532"></a>
+<span class="sourceLineNo">533</span> * Make changes visible.<a name="line.533"></a>
+<span class="sourceLineNo">534</span> * Caller must be synchronized on 'this'.<a name="line.534"></a>
+<span class="sourceLineNo">535</span> */<a name="line.535"></a>
+<span class="sourceLineNo">536</span> private void resetRSGroupAndTableMaps(Map<String, RSGroupInfo> newRSGroupMap,<a name="line.536"></a>
+<span class="sourceLineNo">537</span> Map<TableName, String> newTableMap) {<a name="line.537"></a>
+<span class="sourceLineNo">538</span> // Make maps Immutable.<a name="line.538"></a>
+<span class="sourceLineNo">539</span> this.rsGroupMap = Collections.unmodifiableMap(newRSGroupMap);<a name="line.539"></a>
+<span class="sourceLineNo">540</span> this.tableMap = Collections.unmodifiableMap(newTableMap);<a name="line.540"></a>
+<span class="sourceLineNo">541</span> }<a name="line.541"></a>
+<span class="sourceLineNo">542</span><a name="line.542"></a>
+<span class="sourceLineNo">543</span> /**<a name="line.543"></a>
+<span class="sourceLineNo">544</span> * Update cache of rsgroups.<a name="line.544"></a>
+<span class="sourceLineNo">545</span> * Caller must be synchronized on 'this'.<a name="line.545"></a>
+<span class="sourceLineNo">546</span> * @param currentGroups Current list of Groups.<a name="line.546"></a>
+<span class="sourceLineNo">547</span> */<a name="line.547"></a>
+<span class="sourceLineNo">548</span> private void updateCacheOfRSGroups(final Set<String> currentGroups) {<a name="line.548"></a>
+<span class="sourceLineNo">549</span> this.prevRSGroups.clear();<a name="line.549"></a>
+<span class="sourceLineNo">550</span> this.prevRSGroups.addAll(currentGroups);<a name="line.550"></a>
+<span class="sourceLineNo">551</span> }<a name="line.551"></a>
+<span class="sourceLineNo">552</span><a name="line.552"></a>
+<span class="sourceLineNo">553</span> // Called by getDefaultServers. Presume it has lock in place.<a name="line.553"></a>
+<span class="sourceLineNo">554</span> private List<ServerName> getOnlineRS() throws IOException {<a name="line.554"></a>
+<span class="sourceLineNo">555</span> if (masterServices != null) {<a name="line.555"></a>
+<span class="sourceLineNo">556</span> return masterServices.getServerManager().getOnlineServersList();<a name="line.556"></a>
+<span class="sourceLineNo">557</span> }<a name="line.557"></a>
+<span class="sourceLineNo">558</span> LOG.debug("Reading online RS from zookeeper");<a name="line.558"></a>
+<span class="sourceLineNo">559</span> List<ServerName> servers = new LinkedList<>();<a name="line.559"></a>
+<span class="sourceLineNo">560</span> try {<a name="line.560"></a>
+<span class="sourceLineNo">561</span> for (String el: ZKUtil.listChildrenNoWatch(watcher, watcher.znodePaths.rsZNode)) {<a name="line.561"></a>
+<span class="sourceLineNo">562</span> servers.add(ServerName.parseServerName(el));<a name="line.562"></a>
+<span class="sourceLineNo">563</span> }<a name="line.563"></a>
+<span class="sourceLineNo">564</span> } catch (KeeperException e) {<a name="line.564"></a>
+<span class="sourceLineNo">565</span> throw new IOException("Failed to retrieve server list from zookeeper", e);<a name="line.565"></a>
+<span class="sourceLineNo">566</span> }<a name="line.566"></a>
+<span class="sourceLineNo">567</span> return servers;<a name="line.567"></a>
+<span class="sourceLineNo">568</span> }<a name="line.568"></a>
+<span class="sourceLineNo">569</span><a name="line.569"></a>
+<span class="sourceLineNo">570</span> // Called by ServerEventsListenerThread. Presume it has lock on this manager when it runs.<a name="line.570"></a>
+<span class="sourceLineNo">571</span> private SortedSet<Address> getDefaultServers() throws IOException {<a name="line.571"></a>
+<span class="sourceLineNo">572</span> SortedSet<Address> defaultServers = Sets.newTreeSet();<a name="line.572"></a>
+<span class="sourceLineNo">573</span> for (ServerName serverName : getOnlineRS()) {<a name="line.573"></a>
+<span class="sourceLineNo">574</span> Address server =<a name="line.574"></a>
+<span class="sourceLineNo">575</span> Address.fromParts(serverName.getHostname(), serverName.getPort());<a name="line.575"></a>
+<span class="sourceLineNo">576</span> boolean found = false;<a name="line.576"></a>
+<span class="sourceLineNo">577</span> for(RSGroupInfo rsgi: listRSGroups()) {<a name="line.577"></a>
+<span class="sourceLineNo">578</span> if(!RSGroupInfo.DEFAULT_GROUP.equals(rsgi.getName()) &&<a name="line.578"></a>
+<span class="sourceLineNo">579</span> rsgi.containsServer(server)) {<a name="line.579"></a>
+<span class="sourceLineNo">580</span> found = true;<a name="line.580"></a>
+<span class="sourceLineNo">581</span> break;<a name="line.581"></a>
+<span class="sourceLineNo">582</span> }<a name="line.582"></a>
+<span class="sourceLineNo">583</span> }<a name="line.583"></a>
+<span class="sourceLineNo">584</span> if (!found) {<a name="line.584"></a>
+<span class="sourceLineNo">585</span> defaultServers.add(server);<a name="line.585"></a>
+<span class="sourceLineNo">586</span> }<a name="line.586"></a>
+<span class="sourceLineNo">587</span> }<a name="line.587"></a>
+<span class="sourceLineNo">588</span> return defaultServers;<a name="line.588"></a>
+<span class="sourceLineNo">589</span> }<a name="line.589"></a>
+<span class="sourceLineNo">590</span><a name="line.590"></a>
+<span class="sourceLineNo">591</span> // Called by ServerEventsListenerThread. Synchronize on this because redoing<a name="line.591"></a>
+<span class="sourceLineNo">592</span> // the rsGroupMap then writing it out.<a name="line.592"></a>
+<span class="sourceLineNo">593</span> private synchronized void updateDefaultServers(SortedSet<Address> servers) throws IOException {<a name="line.593"></a>
+<span class="sourceLineNo">594</span> RSGroupInfo info = rsGroupMap.get(RSGroupInfo.DEFAULT_GROUP);<a name="line.594"></a>
+<span class="sourceLineNo">595</span> RSGroupInfo newInfo = new RSGroupInfo(info.getName(), servers, info.getTables());<a name="line.595"></a>
+<span class="sourceLineNo">596</span> HashMap<String, RSGroupInfo> newGroupMap = Maps.newHashMap(rsGroupMap);<a name="line.596"></a>
+<span class="sourceLineNo">597</span> newGroupMap.put(newInfo.getName(), newInfo);<a name="line.597"></a>
+<span class="sourceLineNo">598</span> flushConfig(newGroupMap);<a name="line.598"></a>
+<span class="sourceLineNo">599</span> }<a name="line.599"></a>
+<span class="sourceLineNo">600</span><a name="line.600"></a>
+<span class="sourceLineNo">601</span> // Called by FailedOpenUpdaterThread<a name="line.601"></a>
+<span class="sourceLineNo">602</span> private void updateFailedAssignments() {<a name="line.602"></a>
+<span class="sourceLineNo">603</span> // Kick all regions in FAILED_OPEN state<a name="line.603"></a>
+<span class="sourceLineNo">604</span> List<RegionInfo> stuckAssignments = Lists.newArrayList();<a name="line.604"></a>
+<span class="sourceLineNo">605</span> for (RegionStateNode state:<a name="line.605"></a>
+<span class="sourceLineNo">606</span> masterServices.getAssignmentManager().getRegionStates().getRegionsInTransition()) {<a name="line.606"></a>
+<span class="sourceLineNo">607</span> if (state.isStuck()) {<a name="line.607"></a>
+<span class="sourceLineNo">608</span> stuckAssignments.add(state.getRegionInfo());<a name="line.608"></a>
+<span class="sourceLineNo">609</span> }<a name="line.609"></a>
+<span class="sourceLineNo">610</span> }<a name="line.610"></a>
+<span class="sourceLineNo">611</span> for (RegionInfo region: stuckAssignments) {<a name="line.611"></a>
+<span class="sourceLineNo">612</span> LOG.info("Retrying assignment of " + region);<a name="line.612"></a>
+<span class="sourceLineNo">613</span> try {<a name="line.613"></a>
+<span class="sourceLineNo">614</span> masterServices.getAssignmentManager().unassign(region);<a name="line.614"></a>
+<span class="sourceLineNo">615</span> } catch (IOException e) {<a name="line.615"></a>
+<span class="sourceLineNo">616</span> LOG.warn("Unable to reassign " + region, e);<a name="line.616"></a>
+<span class="sourceLineNo">617</span> }<a name="line.617"></a>
+<span class="sourceLineNo">618</span> }<a name="line.618"></a>
+<span class="sourceLineNo">619</span> }<a name="line.619"></a>
+<span class="sourceLineNo">620</span><a name="line.620"></a>
+<span class="sourceLineNo">621</span> /**<a name="line.621"></a>
+<span class="sourceLineNo">622</span> * Calls {@link RSGroupInfoManagerImpl#updateDefaultServers(SortedSet)} to update list of known<a name="line.622"></a>
+<span class="sourceLineNo">623</span> * servers. Notifications about server changes are received by registering {@link ServerListener}.<a name="line.623"></a>
+<span class="sourceLineNo">624</span> * As a listener, we need to return immediately, so the real work of updating the servers is<a name="line.624"></a>
+<span class="sourceLineNo">625</span> * done asynchronously in this thread.<a name="line.625"></a>
+<span class="sourceLineNo">626</span> */<a name="line.626"></a>
+<span class="sourceLineNo">627</span> private class ServerEventsListenerThread extends Thread implements ServerListener {<a name="line.627"></a>
+<span class="sourceLineNo">628</span> private final Logger LOG = LoggerFactory.getLogger(ServerEventsListenerThread.class);<a name="line.628"></a>
+<span class="sourceLineNo">629</span> private boolean changed = false;<a name="line.629"></a>
<span class="sourceLineNo">630</span><a name="line.630"></a>
-<span class="sourceLineNo">631</span> @Override<a name="line.631"></a>
-<span class="sourceLineNo">632</span> public void serverAdded(ServerName serverName) {<a name="line.632"></a>
-<span class="sourceLineNo">633</span> serverChanged();<a name="line.633"></a>
-<span class="sourceLineNo">634</span> }<a name="line.634"></a>
-<span class="sourceLineNo">635</span><a name="line.635"></a>
-<span class="sourceLineNo">636</span> @Override<a name="line.636"></a>
-<span class="sourceLineNo">637</span> public void serverRemoved(ServerName serverName) {<a name="line.637"></a>
-<span class="sourceLineNo">638</span> serverChanged();<a name="line.638"></a>
-<span class="sourceLineNo">639</span> }<a name="line.639"></a>
-<span class="sourceLineNo">640</span><a name="line.640"></a>
-<span class="sourceLineNo">641</span> private synchronized void serverChanged() {<a name="line.641"></a>
-<span class="sourceLineNo">642</span> changed = true;<a name="line.642"></a>
-<span class="sourceLineNo">643</span> this.notify();<a name="line.643"></a>
-<span class="sourceLineNo">644</span> }<a name="line.644"></a>
-<span class="sourceLineNo">645</span><a name="line.645"></a>
-<span class="sourceLineNo">646</span> @Override<a name="line.646"></a>
-<span class="sourceLineNo">647</span> public void run() {<a name="line.647"></a>
-<span class="sourceLineNo">648</span> setName(ServerEventsListenerThread.class.getName() + "-" + masterServices.getServerName());<a name="line.648"></a>
-<span class="sourceLineNo">649</span> SortedSet<Address> prevDefaultServers = new TreeSet<>();<a name="line.649"></a>
-<span class="sourceLineNo">650</span> while(isMasterRunning(masterServices)) {<a name="line.650"></a>
-<span class="sourceLineNo">651</span> try {<a name="line.651"></a>
-<span class="sourceLineNo">652</span> LOG.info("Updating default servers.");<a name="line.652"></a>
-<span class="sourceLineNo">653</span> SortedSet<Address> servers = RSGroupInfoManagerImpl.this.getDefaultServers();<a name="line.653"></a>
-<span class="sourceLineNo">654</span> if (!servers.equals(prevDefaultServers)) {<a name="line.654"></a>
-<span class="sourceLineNo">655</span> RSGroupInfoManagerImpl.this.updateDefaultServers(servers);<a name="line.655"></a>
-<span class="sourceLineNo">656</span> prevDefaultServers = servers;<a name="line.656"></a>
-<span class="sourceLineNo">657</span> LOG.info("Updated with servers: "+servers.size());<a name="line.657"></a>
-<span class="sourceLineNo">658</span> }<a name="line.658"></a>
-<span class="sourceLineNo">659</span> try {<a name="line.659"></a>
-<span class="sourceLineNo">660</span> synchronized (this) {<a name="line.660"></a>
-<span class="sourceLineNo">661</span> while (!changed) {<a name="line.661"></a>
-<span class="sourceLineNo">662</span> wait();<a name="line.662"></a>
-<span class="sourceLineNo">663</span> }<a name="line.663"></a>
-<span class="sourceLineNo">664</span> changed = false;<a name="line.664"></a>
-<span class="sourceLineNo">665</span> }<a name="line.665"></a>
-<span class="sourceLineNo">666</span> } catch (InterruptedException e) {<a name="line.666"></a>
-<span class="sourceLineNo">667</span> LOG.warn("Interrupted", e);<a name="line.667"></a>
-<span class="sourceLineNo">668</span> }<a name="line.668"></a>
-<span class="sourceLineNo">669</span> } catch (IOException e) {<a name="line.669"></a>
-<span class="sourceLineNo">670</span> LOG.warn("Failed to update default servers", e);<a name="line.670"></a>
-<span class="sourceLineNo">671</span> }<a name="line.671"></a>
-<span class="sourceLineNo">672</span> }<a name="line.672"></a>
-<span class="sourceLineNo">673</span> }<a name="line.673"></a>
-<span class="sourceLineNo">674</span> }<a name="line.674"></a>
-<span class="sourceLineNo">675</span><a name="line.675"></a>
-<span class="sourceLineNo">676</span> private class FailedOpenUpdaterThread extends Thread implements ServerListener {<a name="line.676"></a>
-<span class="sourceLineNo">677</span> private final long waitInterval;<a name="line.677"></a>
-<span class="sourceLineNo">678</span> private volatile boolean hasChanged = false;<a name="line.678"></a>
+<span class="sourceLineNo">631</span> ServerEventsListenerThread() {<a name="line.631"></a>
+<span class="sourceLineNo">632</span> setDaemon(true);<a name="line.632"></a>
+<span class="sourceLineNo">633</span> }<a name="line.633"></a>
+<span class="sourceLineNo">634</span><a name="line.634"></a>
+<span class="sourceLineNo">635</span> @Override<a name="line.635"></a>
+<span class="sourceLineNo">636</span> public void serverAdded(ServerName serverName) {<a name="line.636"></a>
+<span class="sourceLineNo">637</span> serverChanged();<a name="line.637"></a>
+<span class="sourceLineNo">638</span> }<a name="line.638"></a>
+<span class="sourceLineNo">639</span><a name="line.639"></a>
+<span class="sourceLineNo">640</span> @Override<a name="line.640"></a>
+<span class="sourceLineNo">641</span> public void serverRemoved(ServerName serverName) {<a name="line.641"></a>
+<span class="sourceLineNo">642</span> serverChanged();<a name="line.642"></a>
+<span class="sourceLineNo">643</span> }<a name="line.643"></a>
+<span class="sourceLineNo">644</span><a name="line.644"></a>
+<span class="sourceLineNo">645</span> private synchronized void serverChanged() {<a name="line.645"></a>
+<span class="sourceLineNo">646</span> changed = true;<a name="line.646"></a>
+<span class="sourceLineNo">647</span> this.notify();<a name="line.647"></a>
+<span class="sourceLineNo">648</span> }<a name="line.648"></a>
+<span class="sourceLineNo">649</span><a name="line.649"></a>
+<span class="sourceLineNo">650</span> @Override<a name="line.650"></a>
+<span class="sourceLineNo">651</span> public void run() {<a name="line.651"></a>
+<span class="sourceLineNo">652</span> setName(ServerEventsListenerThread.class.getName() + "-" + masterServices.getServerName());<a name="line.652"></a>
+<span class="sourceLineNo">653</span> SortedSet<Address> prevDefaultServers = new TreeSet<>();<a name="line.653"></a>
+<span class="sourceLineNo">654</span> while(isMasterRunning(masterServices)) {<a name="line.654"></a>
+<span class="sourceLineNo">655</span> try {<a name="line.655"></a>
+<span class="sourceLineNo">656</span> LOG.info("Updating default servers.");<a name="line.656"></a>
+<span class="sourceLineNo">657</span> SortedSet<Address> servers = RSGroupInfoManagerImpl.this.getDefaultServers();<a name="line.657"></a>
+<span class="sourceLineNo">658</span> if (!servers.equals(prevDefaultServers)) {<a name="line.658"></a>
+<span class="sourceLineNo">659</span> RSGroupInfoManagerImpl.this.updateDefaultServers(servers);<a name="line.659"></a>
+<span class="sourceLineNo">660</span> prevDefaultServers = servers;<a name="line.660"></a>
+<span class="sourceLineNo">661</span> LOG.info("Updated with servers: "+servers.size());<a name="line.661"></a>
+<span class="sourceLineNo">662</span> }<a name="line.662"></a>
+<span class="sourceLineNo">663</span> try {<a name="line.663"></a>
+<span class="sourceLineNo">664</span> synchronized (this) {<a name="line.664"></a>
+<span class="sourceLineNo">665</span> while (!changed) {<a name="line.665"></a>
+<span class="sourceLineNo">666</span> wait();<a name="line.666"></a>
+<span class="sourceLineNo">667</span> }<a name="line.667"></a>
+<span class="sourceLineNo">668</span> changed = false;<a name="line.668"></a>
+<span class="sourceLineNo">669</span> }<a name="line.669"></a>
+<span class="sourceLineNo">670</span> } catch (InterruptedException e) {<a name="line.670"></a>
+<span class="sourceLineNo">671</span> LOG.warn("Interrupted", e);<a name="line.671"></a>
+<span class="sourceLineNo">672</span> }<a name="line.672"></a>
+<span class="sourceLineNo">673</span> } catch (IOException e) {<a name="line.673"></a>
+<span class="sourceLineNo">674</span> LOG.warn("Failed to update default servers", e);<a name="line.674"></a>
+<span class="sourceLineNo">675</span> }<a name="line.675"></a>
+<span class="sourceLineNo">676</span> }<a name="line.676"></a>
+<span class="sourceLineNo">677</span> }<a name="line.677"></a>
+<span class="sourceLineNo">678</span> }<a name="line.678"></a>
<span class="sourceLineNo">679</span><a name="line.679"></a>
-<span class="sourceLineNo">680</span> public FailedOpenUpdaterThread(Configuration conf) {<a name="line.680"></a>
-<span class="sourceLineNo">681</span> this.waitInterval = conf.getLong(REASSIGN_WAIT_INTERVAL_KEY,<a name="line.681"></a>
-<span class="sourceLineNo">682</span> DEFAULT_REASSIGN_WAIT_INTERVAL);<a name="line.682"></a>
-<span class="sourceLineNo">683</span> setDaemon(true);<a name="line.683"></a>
-<span class="sourceLineNo">684</span> }<a name="line.684"></a>
-<span class="sourceLineNo">685</span><a name="line.685"></a>
-<span class="sourceLineNo">686</span> @Override<a name="line.686"></a>
-<span class="sourceLineNo">687</span> public void serverAdded(ServerName serverName) {<a name="line.687"></a>
-<span class="sourceLineNo">688</span> serverChanged();<a name="line.688"></a>
-<span class="sourceLineNo">689</span> }<a name="line.689"></a>
-<span class="sourceLineNo">690</span><a name="line.690"></a>
-<span class="sourceLineNo">691</span> @Override<a name="line.691"></a>
-<span class="sourceLineNo">692</span> public void serverRemoved(ServerName serverName) {<a name="line.692"></a>
+<span class="sourceLineNo">680</span> private class FailedOpenUpdaterThread extends Thread implements ServerListener {<a name="line.680"></a>
+<span class="sourceLineNo">681</span> private final long waitInterval;<a name="line.681"></a>
+<span class="sourceLineNo">682</span> private volatile boolean hasChanged = false;<a name="line.682"></a>
+<span class="sourceLineNo">683</span><a name="line.683"></a>
+<span class="sourceLineNo">684</span> public FailedOpenUpdaterThread(Configuration conf) {<a name="line.684"></a>
+<span class="sourceLineNo">685</span> this.waitInterval = conf.getLong(REASSIGN_WAIT_INTERVAL_KEY,<a name="line.685"></a>
+<span class="sourceLineNo">686</span> DEFAULT_REASSIGN_WAIT_INTERVAL);<a name="line.686"></a>
+<span class="sourceLineNo">687</span> setDaemon(true);<a name="line.687"></a>
+<span class="sourceLineNo">688</span> }<a name="line.688"></a>
+<span class="sourceLineNo">689</span><a name="line.689"></a>
+<span class="sourceLineNo">690</span> @Override<a name="line.690"></a>
+<span class="sourceLineNo">691</span> public void serverAdded(ServerName serverName) {<a name="line.691"></a>
+<span class="sourceLineNo">692</span> serverChanged();<a name="line.692"></a>
<span class="sourceLineNo">693</span> }<a name="line.693"></a>
<span class="sourceLineNo">694</span><a name="line.694"></a>
<span class="sourceLineNo">695</span> @Override<a name="line.695"></a>
-<span class="sourceLineNo">696</span> public void run() {<a name="line.696"></a>
-<span class="sourceLineNo">697</span> while (isMasterRunning(masterServices)) {<a name="line.697"></a>
-<span class="sourceLineNo">698</span> boolean interrupted = false;<a name="line.698"></a>
-<span class="sourceLineNo">699</span> try {<a name="line.699"></a>
-<span class="sourceLineNo">700</span> synchronized (this) {<a name="line.700"></a>
-<span class="sourceLineNo">701</span> while (!hasChanged) {<a name="line.701"></a>
-<span class="sourceLineNo">702</span> wait();<a name="line.702"></a>
-<span class="sourceLineNo">703</span> }<a name="line.703"></a>
-<span class="sourceLineNo">704</span> hasChanged = false;<a name="line.704"></a>
-<span class="sourceLineNo">705</span> }<a name="line.705"></a>
-<span class="sourceLineNo">706</span> } catch (InterruptedException e) {<a name="line.706"></a>
-<span class="sourceLineNo">707</span> LOG.warn("Interrupted", e);<a name="line.707"></a>
-<span class="sourceLineNo">708</span> interrupted = true;<a name="line.708"></a>
-<span class="sourceLineNo">709</span> }<a name="line.709"></a>
-<span class="sourceLineNo">710</span> if (!isMasterRunning(masterServices) || interrupted) {<a name="line.710"></a>
-<span class="sourceLineNo">711</span> continue;<a name="line.711"></a>
-<span class="sourceLineNo">712</span> }<a name="line.712"></a>
-<span class="sourceLineNo">713</span><a name="line.713"></a>
-<span class="sourceLineNo">714</span> // First, wait a while in case more servers are about to rejoin the cluster<a name="line.714"></a>
-<span class="sourceLineNo">715</span> try {<a name="line.715"></a>
-<span class="sourceLineNo">716</span> Thread.sleep(waitInterval);<a name="line.716"></a>
-<span class="sourceLineNo">717</span> } catch (InterruptedException e) {<a name="line.717"></a>
-<span class="sourceLineNo">718</span> LOG.warn("Interrupted", e);<a name="line.718"></a>
-<span class="sourceLineNo">719</span> }<a name="line.719"></a>
-<span class="sourceLineNo">720</span> if (!isMasterRunning(masterServices)) {<a name="line.720"></a>
-<span class="sourceLineNo">721</span> continue;<a name="line.721"></a>
-<span class="sourceLineNo">722</span> }<a name="line.722"></a>
-<span class="sourceLineNo">723</span><a name="line.723"></a>
-<span class="sourceLineNo">724</span> // Kick all regions in FAILED_OPEN state<a name="line.724"></a>
-<span class="sourceLineNo">725</span> updateFailedAssignments();<a name="line.725"></a>
-<span class="sourceLineNo">726</span> }<a name="line.726"></a>
-<span class="sourceLineNo">727</span> }<a name="line.727"></a>
-<span class="sourceLineNo">728</span><a name="line.728"></a>
-<span class="sourceLineNo">729</span> public void serverChanged() {<a name="line.729"></a>
-<span class="sourceLineNo">730</span> synchronized (this) {<a name="line.730"></a>
-<span class="sourceLineNo">731</span> hasChanged = true;<a name="line.731"></a>
-<span class="sourceLineNo">732</span> this.notify();<a name="line.732"></a>
-<span class="sourceLineNo">733</span> }<a name="line.733"></a>
-<span class="sourceLineNo">734</span> }<a name="line.734"></a>
-<span class="sourceLineNo">735</span> }<a name="line.735"></a>
-<span class="sourceLineNo">736</span><a name="line.736"></a>
-<span class="sourceLineNo">737</span> private class RSGroupStartupWorker extends Thread {<a name="line.737"></a>
-<span class="sourceLineNo">738</span> private final Logger LOG = LoggerFactory.getLogger(RSGroupStartupWorker.class);<a name="line.738"></a>
-<span class="sourceLineNo">739</span> private volatile boolean online = false;<a name="line.739"></a>
+<span class="sourceLineNo">696</span> public void serverRemoved(ServerName serverName) {<a name="line.696"></a>
+<span class="sourceLineNo">697</span> }<a name="line.697"></a>
+<span class="sourceLineNo">698</span><a name="line.698"></a>
+<span class="sourceLineNo">699</span> @Override<a name="line.699"></a>
+<span class="sourceLineNo">700</span> public void run() {<a name="line.700"></a>
+<span class="sourceLineNo">701</span> while (isMasterRunning(masterServices)) {<a name="line.701"></a>
+<span class="sourceLineNo">702</span> boolean interrupted = false;<a name="line.702"></a>
+<span class="sourceLineNo">703</span> try {<a name="line.703"></a>
+<span class="sourceLineNo">704</span> synchronized (this) {<a name="line.704"></a>
+<span class="sourceLineNo">705</span> while (!hasChanged) {<a name="line.705"></a>
+<span class="sourceLineNo">706</span> wait();<a name="line.706"></a>
+<span class="sourceLineNo">707</span> }<a name="line.707"></a>
+<span class="sourceLineNo">708</span> hasChanged = false;<a name="line.708"></a>
+<span class="sourceLineNo">709</span> }<a name="line.709"></a>
+<span class="sourceLineNo">710</span> } catch (InterruptedException e) {<a name="line.710"></a>
+<span class="sourceLineNo">711</span> LOG.warn("Interrupted", e);<a name="line.711"></a>
+<span class="sourceLineNo">712</span> interrupted = true;<a name="line.712"></a>
+<span class="sourceLineNo">713</span> }<a name="line.713"></a>
+<span class="sourceLineNo">714</span> if (!isMasterRunning(masterServices) || interrupted) {<a name="line.714"></a>
+<span class="sourceLineNo">715</span> continue;<a name="line.715"></a>
+<span class="sourceLineNo">716</span> }<a name="line.716"></a>
+<span class="sourceLineNo">717</span><a name="line.717"></a>
+<span class="sourceLineNo">718</span> // First, wait a while in case more servers are about to rejoin the cluster<a name="line.718"></a>
+<span class="sourceLineNo">719</span> try {<a name="line.719"></a>
+<span class="sourceLineNo">720</span> Thread.sleep(waitInterval);<a name="line.720"></a>
+<span class="sourceLineNo">721</span> } catch (InterruptedException e) {<a name="line.721"></a>
+<span class="sourceLineNo">722</span> LOG.warn("Interrupted", e);<a name="line.722"></a>
+<span class="sourceLineNo">723</span> }<a name="line.723"></a>
+<span class="sourceLineNo">724</span> if (!isMasterRunning(masterServices)) {<a name="line.724"></a>
+<span class="sourceLineNo">725</span> continue;<a name="line.725"></a>
+<span class="sourceLineNo">726</span> }<a name="line.726"></a>
+<span class="sourceLineNo">727</span><a name="line.727"></a>
+<span class="sourceLineNo">728</span> // Kick all regions in FAILED_OPEN state<a name="line.728"></a>
+<span class="sourceLineNo">729</span> updateFailedAssignments();<a name="line.729"></a>
+<span class="sourceLineNo">730</span> }<a name="line.730"></a>
+<span class="sourceLineNo">731</span> }<a name="line.731"></a>
+<span class="sourceLineNo">732</span><a name="line.732"></a>
+<span class="sourceLineNo">733</span> public void serverChanged() {<a name="line.733"></a>
+<span class="sourceLineNo">734</span> synchronized (this) {<a name="line.734"></a>
+<span class="sourceLineNo">735</span> hasChanged = true;<a name="line.735"></a>
+<span class="sourceLineNo">736</span> this.notify();<a name="line.736"></a>
+<span class="sourceLineNo">737</span> }<a name="line.737"></a>
+<span class="sourceLineNo">738</span> }<a name="line.738"></a>
+<span class="sourceLineNo">739</span> }<a name="line.739"></a>
<span class="sourceLineNo">740</span><a name="line.740"></a>
-<span class="sourceLineNo">741</span> RSGroupStartupWorker() {<a name="line.741"></a>
-<span class="sourceLineNo">742</span> setDaemon(true);<a name="line.742"></a>
-<span class="sourceLineNo">743</span> }<a name="line.743"></a>
+<span class="sourceLineNo">741</span> private class RSGroupStartupWorker extends Thread {<a name="line.741"></a>
+<span class="sourceLineNo">742</span> private final Logger LOG = LoggerFactory.getLogger(RSGroupStartupWorker.class);<a name="line.742"></a>
+<span class="sourceLineNo">743</span> private volatile boolean online = false;<a name="line.743"></a>
<span class="sourceLineNo">744</span><a name="line.744"></a>
-<span class="sourceLineNo">745</span> @Override<a name="line.745"></a>
-<span class="sourceLineNo">746</span> public void run() {<a name="line.746"></a>
-<span class="sourceLineNo">747</span> setName(RSGroupStartupWorker.class.getName() + "-" + masterServices.getServerName());<a name="line.747"></a>
-<span class="sourceLineNo">748</span> if (waitForGroupTableOnline()) {<a name="line.748"></a>
-<span class="sourceLineNo">749</span> LOG.info("GroupBasedLoadBalancer is now online");<a name="line.749"></a>
-<span class="sourceLineNo">750</span> }<a name="line.750"></a>
-<span class="sourceLineNo">751</span> }<a name="line.751"></a>
-<span class="sourceLineNo">752</span><a name="line.752"></a>
-<span class="sourceLineNo">753</span> private boolean waitForGroupTableOnline() {<a name="line.753"></a>
-<span class="sourceLineNo">754</span> final List<RegionInfo> foundRegions = new LinkedList<>();<a name="line.754"></a>
-<span class="sourceLineNo">755</span> final List<RegionInfo> assignedRegions = new LinkedList<>();<a name="line.755"></a>
-<span class="sourceLineNo">756</span> final AtomicBoolean found = new AtomicBoolean(false);<a name="line.756"></a>
-<span class="sourceLineNo">757</span> final TableStateManager tsm = masterServices.getTableStateManager();<a name="line.757"></a>
-<span class="sourceLineNo">758</span> boolean createSent = false;<a name="line.758"></a>
-<span class="sourceLineNo">759</span> while (!found.get() && isMasterRunning(masterServices)) {<a name="line.759"></a>
-<span class="sourceLineNo">760</span> foundRegions.clear();<a name="line.760"></a>
-<span class="sourceLineNo">761</span> assignedRegions.clear();<a name="line.761"></a>
-<span class="sourceLineNo">762</span> found.set(true);<a name="line.762"></a>
-<span class="sourceLineNo">763</span> try {<a name="line.763"></a>
-<span class="sourceLineNo">764</span> conn.getTable(TableName.NAMESPACE_TABLE_NAME);<a name="line.764"></a>
-<span class="sourceLineNo">765</span> conn.getTable(RSGROUP_TABLE_NAME);<a name="line.765"></a>
-<span class="sourceLineNo">766</span> boolean rootMetaFound =<a name="line.766"></a>
-<span class="sourceLineNo">767</span> masterServices.getMetaTableLocator().verifyMetaRegionLocation(<a name="line.767"></a>
-<span class="sourceLineNo">768</span> conn, masterServices.getZooKeeper(), 1);<a name="line.768"></a>
-<span class="sourceLineNo">769</span> final AtomicBoolean nsFound = new AtomicBoolean(false);<a name="line.769"></a>
-<span class="sourceLineNo">770</span> if (rootMetaFound) {<a name="line.770"></a>
-<span class="sourceLineNo">771</span> MetaTableAccessor.Visitor visitor = new DefaultVisitorBase() {<a name="line.771"></a>
-<span class="sourceLineNo">772</span> @Override<a name="line.772"></a>
-<span class="sourceLineNo">773</span> public boolean visitInternal(Result row) throws IOException {<a name="line.773"></a>
-<span class="sourceLineNo">774</span> RegionInfo info = MetaTableAccessor.getRegionInfo(row);<a name="line.774"></a>
-<span class="sourceLineNo">775</span> if (info != null) {<a name="line.775"></a>
-<span class="sourceLineNo">776</span> Cell serverCell =<a name="line.776"></a>
-<span class="sourceLineNo">777</span> row.getColumnLatestCell(HConstants.CATALOG_FAMILY,<a name="line.777"></a>
-<span class="sourceLineNo">778</span> HConstants.SERVER_QUALIFIER);<a name="line.778"></a>
-<span class="sourceLineNo">779</span> if (RSGROUP_TABLE_NAME.equals(info.getTable()) && serverCell != null) {<a name="line.779"></a>
-<span class="sourceLineNo">780</span> ServerName sn =<a name="line.780"></a>
-<span class="sourceLineNo">781</span> ServerName.parseVersionedServerName(CellUtil.cloneValue(serverCell));<a name="line.781"></a>
-<span class="sourceLineNo">782</span> if (sn == null) {<a name="line.782"></a>
-<span class="sourceLineNo">783</span> found.set(false);<a name="line.783"></a>
-<span class="sourceLineNo">784</span> } else if (tsm.isTableState(RSGROUP_TABLE_NAME, TableState.State.ENABLED)) {<a name="line.784"></a>
-<span class="sourceLineNo">785</span> try {<a name="line.785"></a>
-<span class="sourceLineNo">786</span> ClientProtos.ClientService.BlockingInterface rs = conn.getClient(sn);<a name="line.786"></a>
-<span class="sourceLineNo">787</span> ClientProtos.GetRequest request =<a name="line.787"></a>
-<span class="sourceLineNo">788</span> RequestConverter.buildGetRequest(info.getRegionName(),<a name="line.788"></a>
-<span class="sourceLineNo">789</span> new Get(ROW_KEY));<a name="line.789"></a>
-<span class="sourceLineNo">790</span> rs.get(null, request);<a name="line.790"></a>
-<span class="sourceLineNo">791</span> assignedRegions.add(info);<a name="line.791"></a>
-<span class="sourceLineNo">792</span> } catch(Exception ex) {<a name="line.792"></a>
-<span class="sourceLineNo">793</span> LOG.debug("Caught exception while verifying group region", ex);<a name="line.793"></a>
-<span class="sourceLineNo">794</span> }<a name="line.794"></a>
-<span class="sourceLineNo">795</span> }<a name="line.795"></a>
-<span class="sourceLineNo">796</span> foundRegions.add(info);<a name="line.796"></a>
-<span class="sourceLineNo">797</span> }<a name="line.797"></a>
-<span class="sourceLineNo">798</span> if (TableName.NAMESPACE_TABLE_NAME.equals(info.getTable())) {<a name="line.798"></a>
-<span class="sourceLineNo">799</span> Cell cell = row.getColumnLatestCell(HConstants.CATALOG_FAMILY,<a name="line.799"></a>
-<span class="sourceLineNo">800</span> HConstants.SERVER_QUALIFIER);<a name="line.800"></a>
-<span class="sourceLineNo">801</span> ServerName sn = null;<a name="line.801"></a>
-<span class="sourceLineNo">802</span> if(cell != null) {<a name="line.802"></a>
-<span class="sourceLineNo">803</span> sn = ServerName.parseVersionedServerName(CellUtil.cloneValue(cell));<a name="line.803"></a>
-<span class="sourceLineNo">804</span> }<a name="line.804"></a>
-<span class="sourceLineNo">805</span> if (sn == null) {<a name="line.805"></a>
-<span class="sourceLineNo">806</span> nsFound.set(false);<a name="line.806"></a>
-<span class="sourceLineNo">807</span> } else if (tsm.isTableState(TableName.NAMESPACE_TABLE_NAME,<a name="line.807"></a>
-<span class="sourceLineNo">808</span> TableState.State.ENABLED)) {<a name="line.808"></a>
-<span class="sourceLineNo">809</span> try {<a name="line.809"></a>
-<span class="sourceLineNo">810</span> ClientProtos.ClientService.BlockingInterface rs = conn.getClient(sn);<a name="line.810"></a>
-<span class="sourceLineNo">811</span> ClientProtos.GetRequest request =<a name="line.811"></a>
-<span class="sourceLineNo">812</span> RequestConverter.buildGetRequest(info.getRegionName(),<a name="line.812"></a>
-<span class="sourceLineNo">813</span> new Get(ROW_KEY));<a name="line.813"></a>
-<span class="sourceLineNo">814</span> rs.get(null, request);<a name="line.814"></a>
-<span class="sourceLineNo">815</span> nsFound.set(true);<a name="line.815"></a>
-<span class="sourceLineNo">816</span> } catch(Exception ex) {<a name="line.816"></a>
-<span class="sourceLineNo">817</span> LOG.debug("Caught exception while verifying group region", ex);<a name="line.817"></a>
-<span class="sourceLineNo">818</span> }<a name="line.818"></a>
-<span class="sourceLineNo">819</span> }<a name="line.819"></a>
-<span class="sourceLineNo">820</span> }<a name="line.820"></a>
-<span class="sourceLineNo">821</span> }<a name="line.821"></a>
-<span class="sourceLineNo">822</span> return true;<a name="line.822"></a>
-<span class="sourceLineNo">823</span> }<a name="line.823"></a>
-<span class="sourceLineNo">824</span> };<a name="line.824"></a>
-<span class="sourceLineNo">825</span> MetaTableAccessor.fullScanRegions(conn, visitor);<a name="line.825"></a>
-<span class="sourceLineNo">826</span> // if no regions in meta then we have to create the table<a name="line.826"></a>
-<span class="sourceLineNo">827</span> if (foundRegions.size() < 1 && rootMetaFound && !createSent && nsFound.get()) {<a name="line.827"></a>
-<span class="sourceLineNo">828</span> createRSGroupTable();<a name="line.828"></a>
-<span class="sourceLineNo">829</span> createSent = true;<a name="line.829"></a>
-<span class="sourceLineNo">830</span> }<a name="line.830"></a>
-<span class="sourceLineNo">831</span> LOG.info("RSGroup table=" + RSGROUP_TABLE_NAME + " isOnline=" + found.get()<a name="line.831"></a>
-<span class="sourceLineNo">832</span> + ", regionCount=" + foundRegions.size() + ", assignCount="<a name="line.832"></a>
-<span class="sourceLineNo">833</span> + assignedRegions.size() + ", rootMetaFound=" + rootMetaFound);<a name="line.833"></a>
-<span class="sourceLineNo">834</span> found.set(found.get() && assignedRegions.size() == foundRegions.size()<a name="line.834"></a>
-<span class="sourceLineNo">835</span> && foundRegions.size() > 0);<a name="line.835"></a>
-<span class="sourceLineNo">836</span> } else {<a name="line.836"></a>
-<span class="sourceLineNo">837</span> LOG.info("Waiting for catalog tables to come online");<a name="line.837"></a>
-<span class="sourceLineNo">838</span> found.set(false);<a name="line.838"></a>
-<span class="sourceLineNo">839</span> }<a name="line.839"></a>
-<span class="sourceLineNo">840</span> if (found.get()) {<a name="line.840"></a>
-<span class="sourceLineNo">841</span> LOG.debug("With group table online, refreshing cached information.");<a name="line.841"></a>
-<span class="sourceLineNo">842</span> RSGroupInfoManagerImpl.this.refresh(true);<a name="line.842"></a>
-<span class="sourceLineNo">843</span> online = true;<a name="line.843"></a>
-<span class="sourceLineNo">844</span> //flush any inconsistencies between ZK and HTable<a name="line.844"></a>
-<span class="sourceLineNo">845</span> RSGroupInfoManagerImpl.this.flushConfig();<a name="line.845"></a>
-<span class="sourceLineNo">846</span> }<a name="line.846"></a>
-<span class="sourceLineNo">847</span> } catch (RuntimeException e) {<a name="line.847"></a>
-<span class="sourceLineNo">848</span> throw e;<a name="line.848"></a>
-<span class="sourceLineNo">849</span> } catch(Exception e) {<a name="line.849"></a>
-<span class="sourceLineNo">850</span> found.set(false);<a name="line.850"></a>
-<span class="sourceLineNo">851</span> LOG.warn("Failed to perform check", e);<a name="line.851"></a>
-<span class="sourceLineNo">852</span> }<a name="line.852"></a>
-<span class="sourceLineNo">853</span> try {<a name="line.853"></a>
-<span class="sourceLineNo">854</span> Thread.sleep(100);<a name="line.854"></a>
-<span class="sourceLineNo">855</span> } catch (InterruptedException e) {<a name="line.855"></a>
-<span class="sourceLineNo">856</span> LOG.info("Sleep interrupted", e);<a name="line.856"></a>
-<span class="sourceLineNo">857</span> }<a name="line.857"></a>
-<span class="sourceLineNo">858</span> }<a name="line.858"></a>
-<span class="sourceLineNo">859</span> return found.get();<a name="line.859"></a>
-<span class="sourceLineNo">860</span> }<a name="line.860"></a>
-<span class="sourceLineNo">861</span><a name="line.861"></a>
-<span class="sourceLineNo">862</span> private void createRSGroupTable() throws IOException {<a name="line.862"></a>
-<span class="sourceLineNo">863</span> Long procId = masterServices.createSystemTable(RSGROUP_TABLE_DESC);<a name="line.863"></a>
-<span class="sourceLineNo">864</span> // wait for region to be online<a name="line.864"></a>
-<span class="sourceLineNo">865</span> int tries = 600;<a name="line.865"></a>
-<span class="sourceLineNo">866</span> while (!(masterServices.getMasterProcedureExecutor().isFinished(procId))<a name="line.866"></a>
-<span class="sourceLineNo">867</span> && masterServices.getMasterProcedureExecutor().isRunning()<a name="line.867"></a>
-<span class="sourceLineNo">868</span> && tries > 0) {<a name="line.868"></a>
-<span class="sourceLineNo">869</span> try {<a name="line.869"></a>
-<span class="sourceLineNo">870</span> Thread.sleep(100);<a name="line.870"></a>
-<span class="sourceLineNo">871</span> } catch (InterruptedException e) {<a name="line.871"></a>
-<span class="sourceLineNo">872</span> throw new IOException("Wait interrupted ", e);<a name="line.872"></a>
-<span class="sourceLineNo">873</span> }<a name="line.873"></a>
-<span class="sourceLineNo">874</span> tries--;<a name="line.874"></a>
-<span class="sourceLineNo">875</span> }<a name="line.875"></a>
-<span class="sourceLineNo">876</span> if(tries <= 0) {<a name="line.876"></a>
-<span class="sourceLineNo">877</span> throw new IOException("Failed to create
<TRUNCATED>