hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject [07/51] [partial] hbase-site git commit: Published site at 7bb68b9031591cf378954a0eb8f71a8b9be01f9c.
Date Tue, 09 Feb 2016 17:27:53 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/358717f6/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/FSWALEntry.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/FSWALEntry.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/FSWALEntry.html
index 99f20c6..e7ca16c 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/FSWALEntry.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/FSWALEntry.html
@@ -135,20 +135,17 @@
 <span class="sourceLineNo">127</span>      }<a name="line.127"></a>
 <span class="sourceLineNo">128</span>    }<a name="line.128"></a>
 <span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>    // This has to stay in this order<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    WALKey key = getKey();<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    key.setLogSeqNum(regionSequenceId);<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    key.setWriteEntry(we);<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    return regionSequenceId;<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>  /**<a name="line.137"></a>
-<span class="sourceLineNo">138</span>   * @return the family names which are effected by this edit.<a name="line.138"></a>
-<span class="sourceLineNo">139</span>   */<a name="line.139"></a>
-<span class="sourceLineNo">140</span>  Set&lt;byte[]&gt; getFamilyNames() {<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    return familyNames;<a name="line.141"></a>
-<span class="sourceLineNo">142</span>  }<a name="line.142"></a>
-<span class="sourceLineNo">143</span>}<a name="line.143"></a>
+<span class="sourceLineNo">130</span>    getKey().setWriteEntry(we);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    return regionSequenceId;<a name="line.131"></a>
+<span class="sourceLineNo">132</span>  }<a name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span>  /**<a name="line.134"></a>
+<span class="sourceLineNo">135</span>   * @return the family names which are effected by this edit.<a name="line.135"></a>
+<span class="sourceLineNo">136</span>   */<a name="line.136"></a>
+<span class="sourceLineNo">137</span>  Set&lt;byte[]&gt; getFamilyNames() {<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    return familyNames;<a name="line.138"></a>
+<span class="sourceLineNo">139</span>  }<a name="line.139"></a>
+<span class="sourceLineNo">140</span>}<a name="line.140"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/358717f6/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/HLogKey.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/HLogKey.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/HLogKey.html
index dec4c09..fc31eaa 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/HLogKey.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/HLogKey.html
@@ -174,7 +174,7 @@
 <span class="sourceLineNo">166</span>          this.tablename.getName().length, out,<a name="line.166"></a>
 <span class="sourceLineNo">167</span>          compressionContext.tableDict);<a name="line.167"></a>
 <span class="sourceLineNo">168</span>    }<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    out.writeLong(this.logSeqNum);<a name="line.169"></a>
+<span class="sourceLineNo">169</span>    out.writeLong(getSequenceId());<a name="line.169"></a>
 <span class="sourceLineNo">170</span>    out.writeLong(this.writeTime);<a name="line.170"></a>
 <span class="sourceLineNo">171</span>    // Don't need to write the clusters information as we are using protobufs from 0.95<a name="line.171"></a>
 <span class="sourceLineNo">172</span>    // Writing only the first clusterId for testing the legacy read<a name="line.172"></a>
@@ -221,7 +221,7 @@
 <span class="sourceLineNo">213</span>      tablenameBytes = Compressor.readCompressed(in, compressionContext.tableDict);<a name="line.213"></a>
 <span class="sourceLineNo">214</span>    }<a name="line.214"></a>
 <span class="sourceLineNo">215</span><a name="line.215"></a>
-<span class="sourceLineNo">216</span>    this.logSeqNum = in.readLong();<a name="line.216"></a>
+<span class="sourceLineNo">216</span>    setSequenceId(in.readLong());<a name="line.216"></a>
 <span class="sourceLineNo">217</span>    this.writeTime = in.readLong();<a name="line.217"></a>
 <span class="sourceLineNo">218</span><a name="line.218"></a>
 <span class="sourceLineNo">219</span>    this.clusterIds.clear();<a name="line.219"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/358717f6/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/WALUtil.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/WALUtil.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/WALUtil.html
index 434f303..f41db15 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/WALUtil.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/WALUtil.html
@@ -45,9 +45,9 @@
 <span class="sourceLineNo">037</span>import com.google.protobuf.TextFormat;<a name="line.37"></a>
 <span class="sourceLineNo">038</span><a name="line.38"></a>
 <span class="sourceLineNo">039</span>/**<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * Helper methods to ease Region Server integration with the write ahead log.<a name="line.40"></a>
+<span class="sourceLineNo">040</span> * Helper methods to ease Region Server integration with the Write Ahead Log (WAL).<a name="line.40"></a>
 <span class="sourceLineNo">041</span> * Note that methods in this class specifically should not require access to anything<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * other than the API found in {@link WAL}.<a name="line.42"></a>
+<span class="sourceLineNo">042</span> * other than the API found in {@link WAL}. For internal use only.<a name="line.42"></a>
 <span class="sourceLineNo">043</span> */<a name="line.43"></a>
 <span class="sourceLineNo">044</span>@InterfaceAudience.Private<a name="line.44"></a>
 <span class="sourceLineNo">045</span>public class WALUtil {<a name="line.45"></a>
@@ -59,89 +59,111 @@
 <span class="sourceLineNo">051</span><a name="line.51"></a>
 <span class="sourceLineNo">052</span>  /**<a name="line.52"></a>
 <span class="sourceLineNo">053</span>   * Write the marker that a compaction has succeeded and is about to be committed.<a name="line.53"></a>
-<span class="sourceLineNo">054</span>   * This provides info to the HMaster to allow it to recover the compaction if<a name="line.54"></a>
-<span class="sourceLineNo">055</span>   * this regionserver dies in the middle (This part is not yet implemented). It also prevents<a name="line.55"></a>
-<span class="sourceLineNo">056</span>   * the compaction from finishing if this regionserver has already lost its lease on the log.<a name="line.56"></a>
-<span class="sourceLineNo">057</span>   * @param mvcc Used by WAL to get sequence Id for the waledit.<a name="line.57"></a>
-<span class="sourceLineNo">058</span>   */<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  public static long writeCompactionMarker(WAL wal, HTableDescriptor htd, HRegionInfo hri,<a name="line.59"></a>
-<span class="sourceLineNo">060</span>      final CompactionDescriptor c, MultiVersionConcurrencyControl mvcc)<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  throws IOException {<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    long trx = writeMarker(wal, htd, hri, WALEdit.createCompaction(hri, c), mvcc, true);<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    if (LOG.isTraceEnabled()) {<a name="line.63"></a>
-<span class="sourceLineNo">064</span>      LOG.trace("Appended compaction marker " + TextFormat.shortDebugString(c));<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    }<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    return trx;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  }<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span>  /**<a name="line.69"></a>
-<span class="sourceLineNo">070</span>   * Write a flush marker indicating a start / abort or a complete of a region flush<a name="line.70"></a>
-<span class="sourceLineNo">071</span>   */<a name="line.71"></a>
-<span class="sourceLineNo">072</span>  public static long writeFlushMarker(WAL wal, HTableDescriptor htd, HRegionInfo hri,<a name="line.72"></a>
-<span class="sourceLineNo">073</span>      final FlushDescriptor f, boolean sync, MultiVersionConcurrencyControl mvcc)<a name="line.73"></a>
-<span class="sourceLineNo">074</span>  throws IOException {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    long trx = writeMarker(wal, htd, hri, WALEdit.createFlushWALEdit(hri, f), mvcc, sync);<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    if (LOG.isTraceEnabled()) {<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      LOG.trace("Appended flush marker " + TextFormat.shortDebugString(f));<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    }<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    return trx;<a name="line.79"></a>
-<span class="sourceLineNo">080</span>  }<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span>  /**<a name="line.82"></a>
-<span class="sourceLineNo">083</span>   * Write a region open marker indicating that the region is opened<a name="line.83"></a>
-<span class="sourceLineNo">084</span>   */<a name="line.84"></a>
-<span class="sourceLineNo">085</span>  public static long writeRegionEventMarker(WAL wal, HTableDescriptor htd, HRegionInfo hri,<a name="line.85"></a>
-<span class="sourceLineNo">086</span>      final RegionEventDescriptor r, final MultiVersionConcurrencyControl mvcc)<a name="line.86"></a>
-<span class="sourceLineNo">087</span>  throws IOException {<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    long trx = writeMarker(wal, htd, hri, WALEdit.createRegionEventWALEdit(hri, r), mvcc, true);<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    if (LOG.isTraceEnabled()) {<a name="line.89"></a>
-<span class="sourceLineNo">090</span>      LOG.trace("Appended region event marker " + TextFormat.shortDebugString(r));<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    }<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    return trx;<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>  /**<a name="line.95"></a>
-<span class="sourceLineNo">096</span>   * Write a log marker that a bulk load has succeeded and is about to be committed.<a name="line.96"></a>
-<span class="sourceLineNo">097</span>   *<a name="line.97"></a>
-<span class="sourceLineNo">098</span>   * @param wal        The log to write into.<a name="line.98"></a>
-<span class="sourceLineNo">099</span>   * @param htd        A description of the table that we are bulk loading into.<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   * @param hri       A description of the region in the table that we are bulk loading into.<a name="line.100"></a>
-<span class="sourceLineNo">101</span>   * @param desc A protocol buffers based description of the client's bulk loading request<a name="line.101"></a>
-<span class="sourceLineNo">102</span>   * @return txid of this transaction or if nothing to do, the last txid<a name="line.102"></a>
-<span class="sourceLineNo">103</span>   * @throws IOException We will throw an IOException if we can not append to the HLog.<a name="line.103"></a>
-<span class="sourceLineNo">104</span>   */<a name="line.104"></a>
-<span class="sourceLineNo">105</span>  public static long writeBulkLoadMarkerAndSync(final WAL wal, final HTableDescriptor htd,<a name="line.105"></a>
-<span class="sourceLineNo">106</span>      final HRegionInfo hri, final WALProtos.BulkLoadDescriptor desc,<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      final MultiVersionConcurrencyControl mvcc)<a name="line.107"></a>
-<span class="sourceLineNo">108</span>  throws IOException {<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    long trx = writeMarker(wal, htd, hri, WALEdit.createBulkLoadEvent(hri, desc), mvcc, true);<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    if (LOG.isTraceEnabled()) {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      LOG.trace("Appended Bulk Load marker " + TextFormat.shortDebugString(desc));<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    }<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    return trx;<a name="line.113"></a>
-<span class="sourceLineNo">114</span>  }<a name="line.114"></a>
-<span class="sourceLineNo">115</span><a name="line.115"></a>
-<span class="sourceLineNo">116</span>  private static long writeMarker(final WAL wal, final HTableDescriptor htd, final HRegionInfo hri,<a name="line.116"></a>
-<span class="sourceLineNo">117</span>      final WALEdit edit, final MultiVersionConcurrencyControl mvcc, final boolean sync)<a name="line.117"></a>
-<span class="sourceLineNo">118</span>  throws IOException {<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    // TODO: Pass in current time to use?<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    WALKey key =<a name="line.120"></a>
-<span class="sourceLineNo">121</span>      new HLogKey(hri.getEncodedNameAsBytes(), hri.getTable(), System.currentTimeMillis(), mvcc);<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    // Add it to the log but the false specifies that we don't need to add it to the memstore<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    long trx = MultiVersionConcurrencyControl.NONE;<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    try {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      trx = wal.append(htd, hri, key, edit, false);<a name="line.125"></a>
-<span class="sourceLineNo">126</span>      if (sync) wal.sync(trx);<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    } finally {<a name="line.127"></a>
-<span class="sourceLineNo">128</span>      // If you get hung here, is it a real WAL or a mocked WAL? If the latter, you need to<a name="line.128"></a>
-<span class="sourceLineNo">129</span>      // trip the latch that is inside in getWriteEntry up in your mock. See down in the append<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      // called from onEvent in FSHLog.<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      MultiVersionConcurrencyControl.WriteEntry we = key.getWriteEntry();<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      if (mvcc != null &amp;&amp; we != null) mvcc.complete(we);<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    }<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    return trx;<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">054</span>   * This provides info to the HMaster to allow it to recover the compaction if this regionserver<a name="line.54"></a>
+<span class="sourceLineNo">055</span>   * dies in the middle. It also prevents the compaction from finishing if this regionserver has<a name="line.55"></a>
+<span class="sourceLineNo">056</span>   * already lost its lease on the log.<a name="line.56"></a>
+<span class="sourceLineNo">057</span>   *<a name="line.57"></a>
+<span class="sourceLineNo">058</span>   * &lt;p&gt;This write is for internal use only. Not for external client consumption.<a name="line.58"></a>
+<span class="sourceLineNo">059</span>   * @param mvcc Used by WAL to get sequence Id for the waledit.<a name="line.59"></a>
+<span class="sourceLineNo">060</span>   */<a name="line.60"></a>
+<span class="sourceLineNo">061</span>  public static WALKey writeCompactionMarker(WAL wal, HTableDescriptor htd, HRegionInfo hri,<a name="line.61"></a>
+<span class="sourceLineNo">062</span>      final CompactionDescriptor c, MultiVersionConcurrencyControl mvcc)<a name="line.62"></a>
+<span class="sourceLineNo">063</span>  throws IOException {<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    WALKey walKey = writeMarker(wal, htd, hri, WALEdit.createCompaction(hri, c), mvcc);<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    if (LOG.isTraceEnabled()) {<a name="line.65"></a>
+<span class="sourceLineNo">066</span>      LOG.trace("Appended compaction marker " + TextFormat.shortDebugString(c));<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    }<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    return walKey;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  }<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>  /**<a name="line.71"></a>
+<span class="sourceLineNo">072</span>   * Write a flush marker indicating a start / abort or a complete of a region flush<a name="line.72"></a>
+<span class="sourceLineNo">073</span>   *<a name="line.73"></a>
+<span class="sourceLineNo">074</span>   * &lt;p&gt;This write is for internal use only. Not for external client consumption.<a name="line.74"></a>
+<span class="sourceLineNo">075</span>   */<a name="line.75"></a>
+<span class="sourceLineNo">076</span>  public static WALKey writeFlushMarker(WAL wal, HTableDescriptor htd, HRegionInfo hri,<a name="line.76"></a>
+<span class="sourceLineNo">077</span>      final FlushDescriptor f, boolean sync, MultiVersionConcurrencyControl mvcc)<a name="line.77"></a>
+<span class="sourceLineNo">078</span>  throws IOException {<a name="line.78"></a>
+<span class="sourceLineNo">079</span>    WALKey walKey =<a name="line.79"></a>
+<span class="sourceLineNo">080</span>      doFullAppendTransaction(wal, htd, hri, WALEdit.createFlushWALEdit(hri, f), mvcc, sync);<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    if (LOG.isTraceEnabled()) {<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      LOG.trace("Appended flush marker " + TextFormat.shortDebugString(f));<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    }<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    return walKey;<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  }<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span>  /**<a name="line.87"></a>
+<span class="sourceLineNo">088</span>   * Write a region open marker indicating that the region is opened.<a name="line.88"></a>
+<span class="sourceLineNo">089</span>   * This write is for internal use only. Not for external client consumption.<a name="line.89"></a>
+<span class="sourceLineNo">090</span>   */<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  public static WALKey writeRegionEventMarker(WAL wal, HTableDescriptor htd, HRegionInfo hri,<a name="line.91"></a>
+<span class="sourceLineNo">092</span>      final RegionEventDescriptor r, final MultiVersionConcurrencyControl mvcc)<a name="line.92"></a>
+<span class="sourceLineNo">093</span>  throws IOException {<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    WALKey walKey = writeMarker(wal, htd, hri, WALEdit.createRegionEventWALEdit(hri, r), mvcc);<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    if (LOG.isTraceEnabled()) {<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      LOG.trace("Appended region event marker " + TextFormat.shortDebugString(r));<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    }<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    return walKey;<a name="line.98"></a>
+<span class="sourceLineNo">099</span>  }<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span>  /**<a name="line.101"></a>
+<span class="sourceLineNo">102</span>   * Write a log marker that a bulk load has succeeded and is about to be committed.<a name="line.102"></a>
+<span class="sourceLineNo">103</span>   * This write is for internal use only. Not for external client consumption.<a name="line.103"></a>
+<span class="sourceLineNo">104</span>   * @param wal The log to write into.<a name="line.104"></a>
+<span class="sourceLineNo">105</span>   * @param htd A description of the table that we are bulk loading into.<a name="line.105"></a>
+<span class="sourceLineNo">106</span>   * @param hri A description of the region in the table that we are bulk loading into.<a name="line.106"></a>
+<span class="sourceLineNo">107</span>   * @param desc A protocol buffers based description of the client's bulk loading request<a name="line.107"></a>
+<span class="sourceLineNo">108</span>   * @return walKey with sequenceid filled out for this bulk load marker<a name="line.108"></a>
+<span class="sourceLineNo">109</span>   * @throws IOException We will throw an IOException if we can not append to the HLog.<a name="line.109"></a>
+<span class="sourceLineNo">110</span>   */<a name="line.110"></a>
+<span class="sourceLineNo">111</span>  public static WALKey writeBulkLoadMarkerAndSync(final WAL wal, final HTableDescriptor htd,<a name="line.111"></a>
+<span class="sourceLineNo">112</span>      final HRegionInfo hri, final WALProtos.BulkLoadDescriptor desc,<a name="line.112"></a>
+<span class="sourceLineNo">113</span>      final MultiVersionConcurrencyControl mvcc)<a name="line.113"></a>
+<span class="sourceLineNo">114</span>  throws IOException {<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    WALKey walKey = writeMarker(wal, htd, hri, WALEdit.createBulkLoadEvent(hri, desc), mvcc);<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    if (LOG.isTraceEnabled()) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>      LOG.trace("Appended Bulk Load marker " + TextFormat.shortDebugString(desc));<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    }<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    return walKey;<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>  private static WALKey writeMarker(final WAL wal, final HTableDescriptor htd,<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      final HRegionInfo hri, final WALEdit edit, final MultiVersionConcurrencyControl mvcc)<a name="line.123"></a>
+<span class="sourceLineNo">124</span>  throws IOException {<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    // If sync == true in below, then timeout is not used; safe to pass UNSPECIFIED_TIMEOUT<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    return doFullAppendTransaction(wal, htd, hri, edit, mvcc, true);<a name="line.126"></a>
+<span class="sourceLineNo">127</span>  }<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span>  /**<a name="line.129"></a>
+<span class="sourceLineNo">130</span>   * A 'full' WAL transaction involves starting an mvcc transaction followed by an append,<a name="line.130"></a>
+<span class="sourceLineNo">131</span>   * an optional sync, and then a call to complete the mvcc transaction. This method does it all.<a name="line.131"></a>
+<span class="sourceLineNo">132</span>   * Good for case of adding a single edit or marker to the WAL.<a name="line.132"></a>
+<span class="sourceLineNo">133</span>   *<a name="line.133"></a>
+<span class="sourceLineNo">134</span>   * &lt;p&gt;This write is for internal use only. Not for external client consumption.<a name="line.134"></a>
+<span class="sourceLineNo">135</span>   * @return WALKey that was added to the WAL.<a name="line.135"></a>
+<span class="sourceLineNo">136</span>   */<a name="line.136"></a>
+<span class="sourceLineNo">137</span>  public static WALKey doFullAppendTransaction(final WAL wal, final HTableDescriptor htd,<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      final HRegionInfo hri, final WALEdit edit, final MultiVersionConcurrencyControl mvcc,<a name="line.138"></a>
+<span class="sourceLineNo">139</span>      final boolean sync)<a name="line.139"></a>
+<span class="sourceLineNo">140</span>  throws IOException {<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    // TODO: Pass in current time to use?<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    WALKey walKey =<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      new WALKey(hri.getEncodedNameAsBytes(), hri.getTable(), System.currentTimeMillis(), mvcc);<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    long trx = MultiVersionConcurrencyControl.NONE;<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    try {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>      trx = wal.append(htd, hri, walKey, edit, false);<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      if (sync) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span>        wal.sync(trx);<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      }<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      // Call complete only here because these are markers only. They are not for clients to read.<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      mvcc.complete(walKey.getWriteEntry());<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    } catch (IOException ioe) {<a name="line.152"></a>
+<span class="sourceLineNo">153</span>      mvcc.complete(walKey.getWriteEntry());<a name="line.153"></a>
+<span class="sourceLineNo">154</span>      throw ioe;<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    }<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    return walKey;<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/358717f6/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
index c6f2f44..5c3eb42 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
@@ -67,15 +67,15 @@
 <span class="sourceLineNo">059</span>  requiredArguments = {<a name="line.59"></a>
 <span class="sourceLineNo">060</span>    @org.jamon.annotations.Argument(name = "master", type = "HMaster")},<a name="line.60"></a>
 <span class="sourceLineNo">061</span>  optionalArguments = {<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    @org.jamon.annotations.Argument(name = "frags", type = "Map&lt;String,Integer&gt;"),<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    @org.jamon.annotations.Argument(name = "servers", type = "List&lt;ServerName&gt;"),<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"),<a name="line.66"></a>
+<span class="sourceLineNo">062</span>    @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    @org.jamon.annotations.Argument(name = "frags", type = "Map&lt;String,Integer&gt;"),<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    @org.jamon.annotations.Argument(name = "deadServers", type = "Set&lt;ServerName&gt;"),<a name="line.66"></a>
 <span class="sourceLineNo">067</span>    @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    @org.jamon.annotations.Argument(name = "deadServers", type = "Set&lt;ServerName&gt;"),<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean")})<a name="line.70"></a>
+<span class="sourceLineNo">068</span>    @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    @org.jamon.annotations.Argument(name = "servers", type = "List&lt;ServerName&gt;"),<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName")})<a name="line.70"></a>
 <span class="sourceLineNo">071</span>public class MasterStatusTmpl<a name="line.71"></a>
 <span class="sourceLineNo">072</span>  extends org.jamon.AbstractTemplateProxy<a name="line.72"></a>
 <span class="sourceLineNo">073</span>{<a name="line.73"></a>
@@ -116,91 +116,91 @@
 <span class="sourceLineNo">108</span>      return m_master;<a name="line.108"></a>
 <span class="sourceLineNo">109</span>    }<a name="line.109"></a>
 <span class="sourceLineNo">110</span>    private HMaster m_master;<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    // 21, 1<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    public void setFrags(Map&lt;String,Integer&gt; frags)<a name="line.112"></a>
+<span class="sourceLineNo">111</span>    // 27, 1<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    public void setFormat(String format)<a name="line.112"></a>
 <span class="sourceLineNo">113</span>    {<a name="line.113"></a>
-<span class="sourceLineNo">114</span>      // 21, 1<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      m_frags = frags;<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      m_frags__IsNotDefault = true;<a name="line.116"></a>
+<span class="sourceLineNo">114</span>      // 27, 1<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      m_format = format;<a name="line.115"></a>
+<span class="sourceLineNo">116</span>      m_format__IsNotDefault = true;<a name="line.116"></a>
 <span class="sourceLineNo">117</span>    }<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    public Map&lt;String,Integer&gt; getFrags()<a name="line.118"></a>
+<span class="sourceLineNo">118</span>    public String getFormat()<a name="line.118"></a>
 <span class="sourceLineNo">119</span>    {<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      return m_frags;<a name="line.120"></a>
+<span class="sourceLineNo">120</span>      return m_format;<a name="line.120"></a>
 <span class="sourceLineNo">121</span>    }<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    private Map&lt;String,Integer&gt; m_frags;<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    public boolean getFrags__IsNotDefault()<a name="line.123"></a>
+<span class="sourceLineNo">122</span>    private String m_format;<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    public boolean getFormat__IsNotDefault()<a name="line.123"></a>
 <span class="sourceLineNo">124</span>    {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      return m_frags__IsNotDefault;<a name="line.125"></a>
+<span class="sourceLineNo">125</span>      return m_format__IsNotDefault;<a name="line.125"></a>
 <span class="sourceLineNo">126</span>    }<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    private boolean m_frags__IsNotDefault;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    // 28, 1<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    public void setServerManager(ServerManager serverManager)<a name="line.129"></a>
+<span class="sourceLineNo">127</span>    private boolean m_format__IsNotDefault;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    // 29, 1<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.129"></a>
 <span class="sourceLineNo">130</span>    {<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      // 28, 1<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      m_serverManager = serverManager;<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      m_serverManager__IsNotDefault = true;<a name="line.133"></a>
+<span class="sourceLineNo">131</span>      // 29, 1<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      m_assignmentManager = assignmentManager;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      m_assignmentManager__IsNotDefault = true;<a name="line.133"></a>
 <span class="sourceLineNo">134</span>    }<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    public ServerManager getServerManager()<a name="line.135"></a>
+<span class="sourceLineNo">135</span>    public AssignmentManager getAssignmentManager()<a name="line.135"></a>
 <span class="sourceLineNo">136</span>    {<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      return m_serverManager;<a name="line.137"></a>
+<span class="sourceLineNo">137</span>      return m_assignmentManager;<a name="line.137"></a>
 <span class="sourceLineNo">138</span>    }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    private ServerManager m_serverManager;<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    public boolean getServerManager__IsNotDefault()<a name="line.140"></a>
+<span class="sourceLineNo">139</span>    private AssignmentManager m_assignmentManager;<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    public boolean getAssignmentManager__IsNotDefault()<a name="line.140"></a>
 <span class="sourceLineNo">141</span>    {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      return m_serverManager__IsNotDefault;<a name="line.142"></a>
+<span class="sourceLineNo">142</span>      return m_assignmentManager__IsNotDefault;<a name="line.142"></a>
 <span class="sourceLineNo">143</span>    }<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    private boolean m_serverManager__IsNotDefault;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    // 29, 1<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.146"></a>
+<span class="sourceLineNo">144</span>    private boolean m_assignmentManager__IsNotDefault;<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    // 21, 1<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    public void setFrags(Map&lt;String,Integer&gt; frags)<a name="line.146"></a>
 <span class="sourceLineNo">147</span>    {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      // 29, 1<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      m_assignmentManager = assignmentManager;<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      m_assignmentManager__IsNotDefault = true;<a name="line.150"></a>
+<span class="sourceLineNo">148</span>      // 21, 1<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      m_frags = frags;<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      m_frags__IsNotDefault = true;<a name="line.150"></a>
 <span class="sourceLineNo">151</span>    }<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    public AssignmentManager getAssignmentManager()<a name="line.152"></a>
+<span class="sourceLineNo">152</span>    public Map&lt;String,Integer&gt; getFrags()<a name="line.152"></a>
 <span class="sourceLineNo">153</span>    {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      return m_assignmentManager;<a name="line.154"></a>
+<span class="sourceLineNo">154</span>      return m_frags;<a name="line.154"></a>
 <span class="sourceLineNo">155</span>    }<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    private AssignmentManager m_assignmentManager;<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    public boolean getAssignmentManager__IsNotDefault()<a name="line.157"></a>
+<span class="sourceLineNo">156</span>    private Map&lt;String,Integer&gt; m_frags;<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    public boolean getFrags__IsNotDefault()<a name="line.157"></a>
 <span class="sourceLineNo">158</span>    {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>      return m_assignmentManager__IsNotDefault;<a name="line.159"></a>
+<span class="sourceLineNo">159</span>      return m_frags__IsNotDefault;<a name="line.159"></a>
 <span class="sourceLineNo">160</span>    }<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    private boolean m_assignmentManager__IsNotDefault;<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    // 23, 1<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    public void setServers(List&lt;ServerName&gt; servers)<a name="line.163"></a>
+<span class="sourceLineNo">161</span>    private boolean m_frags__IsNotDefault;<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    // 28, 1<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    public void setServerManager(ServerManager serverManager)<a name="line.163"></a>
 <span class="sourceLineNo">164</span>    {<a name="line.164"></a>
-<span class="sourceLineNo">165</span>      // 23, 1<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      m_servers = servers;<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      m_servers__IsNotDefault = true;<a name="line.167"></a>
+<span class="sourceLineNo">165</span>      // 28, 1<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      m_serverManager = serverManager;<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      m_serverManager__IsNotDefault = true;<a name="line.167"></a>
 <span class="sourceLineNo">168</span>    }<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    public List&lt;ServerName&gt; getServers()<a name="line.169"></a>
+<span class="sourceLineNo">169</span>    public ServerManager getServerManager()<a name="line.169"></a>
 <span class="sourceLineNo">170</span>    {<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      return m_servers;<a name="line.171"></a>
+<span class="sourceLineNo">171</span>      return m_serverManager;<a name="line.171"></a>
 <span class="sourceLineNo">172</span>    }<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    private List&lt;ServerName&gt; m_servers;<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    public boolean getServers__IsNotDefault()<a name="line.174"></a>
+<span class="sourceLineNo">173</span>    private ServerManager m_serverManager;<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    public boolean getServerManager__IsNotDefault()<a name="line.174"></a>
 <span class="sourceLineNo">175</span>    {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>      return m_servers__IsNotDefault;<a name="line.176"></a>
+<span class="sourceLineNo">176</span>      return m_serverManager__IsNotDefault;<a name="line.176"></a>
 <span class="sourceLineNo">177</span>    }<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    private boolean m_servers__IsNotDefault;<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    // 22, 1<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    public void setMetaLocation(ServerName metaLocation)<a name="line.180"></a>
+<span class="sourceLineNo">178</span>    private boolean m_serverManager__IsNotDefault;<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    // 24, 1<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    public void setDeadServers(Set&lt;ServerName&gt; deadServers)<a name="line.180"></a>
 <span class="sourceLineNo">181</span>    {<a name="line.181"></a>
-<span class="sourceLineNo">182</span>      // 22, 1<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      m_metaLocation = metaLocation;<a name="line.183"></a>
-<span class="sourceLineNo">184</span>      m_metaLocation__IsNotDefault = true;<a name="line.184"></a>
+<span class="sourceLineNo">182</span>      // 24, 1<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      m_deadServers = deadServers;<a name="line.183"></a>
+<span class="sourceLineNo">184</span>      m_deadServers__IsNotDefault = true;<a name="line.184"></a>
 <span class="sourceLineNo">185</span>    }<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    public ServerName getMetaLocation()<a name="line.186"></a>
+<span class="sourceLineNo">186</span>    public Set&lt;ServerName&gt; getDeadServers()<a name="line.186"></a>
 <span class="sourceLineNo">187</span>    {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      return m_metaLocation;<a name="line.188"></a>
+<span class="sourceLineNo">188</span>      return m_deadServers;<a name="line.188"></a>
 <span class="sourceLineNo">189</span>    }<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    private ServerName m_metaLocation;<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    public boolean getMetaLocation__IsNotDefault()<a name="line.191"></a>
+<span class="sourceLineNo">190</span>    private Set&lt;ServerName&gt; m_deadServers;<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    public boolean getDeadServers__IsNotDefault()<a name="line.191"></a>
 <span class="sourceLineNo">192</span>    {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      return m_metaLocation__IsNotDefault;<a name="line.193"></a>
+<span class="sourceLineNo">193</span>      return m_deadServers__IsNotDefault;<a name="line.193"></a>
 <span class="sourceLineNo">194</span>    }<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    private boolean m_metaLocation__IsNotDefault;<a name="line.195"></a>
+<span class="sourceLineNo">195</span>    private boolean m_deadServers__IsNotDefault;<a name="line.195"></a>
 <span class="sourceLineNo">196</span>    // 26, 1<a name="line.196"></a>
 <span class="sourceLineNo">197</span>    public void setFilter(String filter)<a name="line.197"></a>
 <span class="sourceLineNo">198</span>    {<a name="line.198"></a>
@@ -218,57 +218,57 @@
 <span class="sourceLineNo">210</span>      return m_filter__IsNotDefault;<a name="line.210"></a>
 <span class="sourceLineNo">211</span>    }<a name="line.211"></a>
 <span class="sourceLineNo">212</span>    private boolean m_filter__IsNotDefault;<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    // 24, 1<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    public void setDeadServers(Set&lt;ServerName&gt; deadServers)<a name="line.214"></a>
+<span class="sourceLineNo">213</span>    // 25, 1<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.214"></a>
 <span class="sourceLineNo">215</span>    {<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      // 24, 1<a name="line.216"></a>
-<span class="sourceLineNo">217</span>      m_deadServers = deadServers;<a name="line.217"></a>
-<span class="sourceLineNo">218</span>      m_deadServers__IsNotDefault = true;<a name="line.218"></a>
+<span class="sourceLineNo">216</span>      // 25, 1<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.218"></a>
 <span class="sourceLineNo">219</span>    }<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    public Set&lt;ServerName&gt; getDeadServers()<a name="line.220"></a>
+<span class="sourceLineNo">220</span>    public boolean getCatalogJanitorEnabled()<a name="line.220"></a>
 <span class="sourceLineNo">221</span>    {<a name="line.221"></a>
-<span class="sourceLineNo">222</span>      return m_deadServers;<a name="line.222"></a>
+<span class="sourceLineNo">222</span>      return m_catalogJanitorEnabled;<a name="line.222"></a>
 <span class="sourceLineNo">223</span>    }<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    private Set&lt;ServerName&gt; m_deadServers;<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    public boolean getDeadServers__IsNotDefault()<a name="line.225"></a>
+<span class="sourceLineNo">224</span>    private boolean m_catalogJanitorEnabled;<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.225"></a>
 <span class="sourceLineNo">226</span>    {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      return m_deadServers__IsNotDefault;<a name="line.227"></a>
+<span class="sourceLineNo">227</span>      return m_catalogJanitorEnabled__IsNotDefault;<a name="line.227"></a>
 <span class="sourceLineNo">228</span>    }<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    private boolean m_deadServers__IsNotDefault;<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    // 27, 1<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    public void setFormat(String format)<a name="line.231"></a>
+<span class="sourceLineNo">229</span>    private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    // 23, 1<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    public void setServers(List&lt;ServerName&gt; servers)<a name="line.231"></a>
 <span class="sourceLineNo">232</span>    {<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      // 27, 1<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      m_format = format;<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      m_format__IsNotDefault = true;<a name="line.235"></a>
+<span class="sourceLineNo">233</span>      // 23, 1<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      m_servers = servers;<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      m_servers__IsNotDefault = true;<a name="line.235"></a>
 <span class="sourceLineNo">236</span>    }<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    public String getFormat()<a name="line.237"></a>
+<span class="sourceLineNo">237</span>    public List&lt;ServerName&gt; getServers()<a name="line.237"></a>
 <span class="sourceLineNo">238</span>    {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      return m_format;<a name="line.239"></a>
+<span class="sourceLineNo">239</span>      return m_servers;<a name="line.239"></a>
 <span class="sourceLineNo">240</span>    }<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    private String m_format;<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    public boolean getFormat__IsNotDefault()<a name="line.242"></a>
+<span class="sourceLineNo">241</span>    private List&lt;ServerName&gt; m_servers;<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    public boolean getServers__IsNotDefault()<a name="line.242"></a>
 <span class="sourceLineNo">243</span>    {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      return m_format__IsNotDefault;<a name="line.244"></a>
+<span class="sourceLineNo">244</span>      return m_servers__IsNotDefault;<a name="line.244"></a>
 <span class="sourceLineNo">245</span>    }<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    private boolean m_format__IsNotDefault;<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    // 25, 1<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.248"></a>
+<span class="sourceLineNo">246</span>    private boolean m_servers__IsNotDefault;<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    // 22, 1<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    public void setMetaLocation(ServerName metaLocation)<a name="line.248"></a>
 <span class="sourceLineNo">249</span>    {<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      // 25, 1<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.252"></a>
+<span class="sourceLineNo">250</span>      // 22, 1<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      m_metaLocation = metaLocation;<a name="line.251"></a>
+<span class="sourceLineNo">252</span>      m_metaLocation__IsNotDefault = true;<a name="line.252"></a>
 <span class="sourceLineNo">253</span>    }<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    public boolean getCatalogJanitorEnabled()<a name="line.254"></a>
+<span class="sourceLineNo">254</span>    public ServerName getMetaLocation()<a name="line.254"></a>
 <span class="sourceLineNo">255</span>    {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      return m_catalogJanitorEnabled;<a name="line.256"></a>
+<span class="sourceLineNo">256</span>      return m_metaLocation;<a name="line.256"></a>
 <span class="sourceLineNo">257</span>    }<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    private boolean m_catalogJanitorEnabled;<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.259"></a>
+<span class="sourceLineNo">258</span>    private ServerName m_metaLocation;<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    public boolean getMetaLocation__IsNotDefault()<a name="line.259"></a>
 <span class="sourceLineNo">260</span>    {<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      return m_catalogJanitorEnabled__IsNotDefault;<a name="line.261"></a>
+<span class="sourceLineNo">261</span>      return m_metaLocation__IsNotDefault;<a name="line.261"></a>
 <span class="sourceLineNo">262</span>    }<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.263"></a>
+<span class="sourceLineNo">263</span>    private boolean m_metaLocation__IsNotDefault;<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>  protected org.jamon.AbstractTemplateProxy.ImplData makeImplData()<a name="line.266"></a>
@@ -280,38 +280,38 @@
 <span class="sourceLineNo">272</span>    return (ImplData) super.getImplData();<a name="line.272"></a>
 <span class="sourceLineNo">273</span>  }<a name="line.273"></a>
 <span class="sourceLineNo">274</span>  <a name="line.274"></a>
-<span class="sourceLineNo">275</span>  protected Map&lt;String,Integer&gt; frags;<a name="line.275"></a>
-<span class="sourceLineNo">276</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFrags(Map&lt;String,Integer&gt; p_frags)<a name="line.276"></a>
+<span class="sourceLineNo">275</span>  protected String format;<a name="line.275"></a>
+<span class="sourceLineNo">276</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)<a name="line.276"></a>
 <span class="sourceLineNo">277</span>  {<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    (getImplData()).setFrags(p_frags);<a name="line.278"></a>
+<span class="sourceLineNo">278</span>    (getImplData()).setFormat(p_format);<a name="line.278"></a>
 <span class="sourceLineNo">279</span>    return this;<a name="line.279"></a>
 <span class="sourceLineNo">280</span>  }<a name="line.280"></a>
 <span class="sourceLineNo">281</span>  <a name="line.281"></a>
-<span class="sourceLineNo">282</span>  protected ServerManager serverManager;<a name="line.282"></a>
-<span class="sourceLineNo">283</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.283"></a>
+<span class="sourceLineNo">282</span>  protected AssignmentManager assignmentManager;<a name="line.282"></a>
+<span class="sourceLineNo">283</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.283"></a>
 <span class="sourceLineNo">284</span>  {<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    (getImplData()).setServerManager(p_serverManager);<a name="line.285"></a>
+<span class="sourceLineNo">285</span>    (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.285"></a>
 <span class="sourceLineNo">286</span>    return this;<a name="line.286"></a>
 <span class="sourceLineNo">287</span>  }<a name="line.287"></a>
 <span class="sourceLineNo">288</span>  <a name="line.288"></a>
-<span class="sourceLineNo">289</span>  protected AssignmentManager assignmentManager;<a name="line.289"></a>
-<span class="sourceLineNo">290</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.290"></a>
+<span class="sourceLineNo">289</span>  protected Map&lt;String,Integer&gt; frags;<a name="line.289"></a>
+<span class="sourceLineNo">290</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFrags(Map&lt;String,Integer&gt; p_frags)<a name="line.290"></a>
 <span class="sourceLineNo">291</span>  {<a name="line.291"></a>
-<span class="sourceLineNo">292</span>    (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.292"></a>
+<span class="sourceLineNo">292</span>    (getImplData()).setFrags(p_frags);<a name="line.292"></a>
 <span class="sourceLineNo">293</span>    return this;<a name="line.293"></a>
 <span class="sourceLineNo">294</span>  }<a name="line.294"></a>
 <span class="sourceLineNo">295</span>  <a name="line.295"></a>
-<span class="sourceLineNo">296</span>  protected List&lt;ServerName&gt; servers;<a name="line.296"></a>
-<span class="sourceLineNo">297</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List&lt;ServerName&gt; p_servers)<a name="line.297"></a>
+<span class="sourceLineNo">296</span>  protected ServerManager serverManager;<a name="line.296"></a>
+<span class="sourceLineNo">297</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.297"></a>
 <span class="sourceLineNo">298</span>  {<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    (getImplData()).setServers(p_servers);<a name="line.299"></a>
+<span class="sourceLineNo">299</span>    (getImplData()).setServerManager(p_serverManager);<a name="line.299"></a>
 <span class="sourceLineNo">300</span>    return this;<a name="line.300"></a>
 <span class="sourceLineNo">301</span>  }<a name="line.301"></a>
 <span class="sourceLineNo">302</span>  <a name="line.302"></a>
-<span class="sourceLineNo">303</span>  protected ServerName metaLocation;<a name="line.303"></a>
-<span class="sourceLineNo">304</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.304"></a>
+<span class="sourceLineNo">303</span>  protected Set&lt;ServerName&gt; deadServers;<a name="line.303"></a>
+<span class="sourceLineNo">304</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set&lt;ServerName&gt; p_deadServers)<a name="line.304"></a>
 <span class="sourceLineNo">305</span>  {<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    (getImplData()).setMetaLocation(p_metaLocation);<a name="line.306"></a>
+<span class="sourceLineNo">306</span>    (getImplData()).setDeadServers(p_deadServers);<a name="line.306"></a>
 <span class="sourceLineNo">307</span>    return this;<a name="line.307"></a>
 <span class="sourceLineNo">308</span>  }<a name="line.308"></a>
 <span class="sourceLineNo">309</span>  <a name="line.309"></a>
@@ -322,24 +322,24 @@
 <span class="sourceLineNo">314</span>    return this;<a name="line.314"></a>
 <span class="sourceLineNo">315</span>  }<a name="line.315"></a>
 <span class="sourceLineNo">316</span>  <a name="line.316"></a>
-<span class="sourceLineNo">317</span>  protected Set&lt;ServerName&gt; deadServers;<a name="line.317"></a>
-<span class="sourceLineNo">318</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set&lt;ServerName&gt; p_deadServers)<a name="line.318"></a>
+<span class="sourceLineNo">317</span>  protected boolean catalogJanitorEnabled;<a name="line.317"></a>
+<span class="sourceLineNo">318</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.318"></a>
 <span class="sourceLineNo">319</span>  {<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    (getImplData()).setDeadServers(p_deadServers);<a name="line.320"></a>
+<span class="sourceLineNo">320</span>    (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a name="line.320"></a>
 <span class="sourceLineNo">321</span>    return this;<a name="line.321"></a>
 <span class="sourceLineNo">322</span>  }<a name="line.322"></a>
 <span class="sourceLineNo">323</span>  <a name="line.323"></a>
-<span class="sourceLineNo">324</span>  protected String format;<a name="line.324"></a>
-<span class="sourceLineNo">325</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)<a name="line.325"></a>
+<span class="sourceLineNo">324</span>  protected List&lt;ServerName&gt; servers;<a name="line.324"></a>
+<span class="sourceLineNo">325</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List&lt;ServerName&gt; p_servers)<a name="line.325"></a>
 <span class="sourceLineNo">326</span>  {<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    (getImplData()).setFormat(p_format);<a name="line.327"></a>
+<span class="sourceLineNo">327</span>    (getImplData()).setServers(p_servers);<a name="line.327"></a>
 <span class="sourceLineNo">328</span>    return this;<a name="line.328"></a>
 <span class="sourceLineNo">329</span>  }<a name="line.329"></a>
 <span class="sourceLineNo">330</span>  <a name="line.330"></a>
-<span class="sourceLineNo">331</span>  protected boolean catalogJanitorEnabled;<a name="line.331"></a>
-<span class="sourceLineNo">332</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.332"></a>
+<span class="sourceLineNo">331</span>  protected ServerName metaLocation;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.332"></a>
 <span class="sourceLineNo">333</span>  {<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a name="line.334"></a>
+<span class="sourceLineNo">334</span>    (getImplData()).setMetaLocation(p_metaLocation);<a name="line.334"></a>
 <span class="sourceLineNo">335</span>    return this;<a name="line.335"></a>
 <span class="sourceLineNo">336</span>  }<a name="line.336"></a>
 <span class="sourceLineNo">337</span>  <a name="line.337"></a>


Mime
View raw message