hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject [16/51] [partial] hbase-site git commit: Published site at d6fd85945130516ba10fe4854ce080e5a2329983.
Date Thu, 31 Mar 2016 16:18:18 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d69509/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/SecureProtobufLogReader.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/SecureProtobufLogReader.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/SecureProtobufLogReader.html
index 599450e..bd6ecee 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/SecureProtobufLogReader.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/SecureProtobufLogReader.html
@@ -56,104 +56,106 @@
 <span class="sourceLineNo">048</span>  static {<a name="line.48"></a>
 <span class="sourceLineNo">049</span>    writerClsNames.add(ProtobufLogWriter.class.getSimpleName());<a name="line.49"></a>
 <span class="sourceLineNo">050</span>    writerClsNames.add(SecureProtobufLogWriter.class.getSimpleName());<a name="line.50"></a>
-<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>  @Override<a name="line.53"></a>
-<span class="sourceLineNo">054</span>  public List&lt;String&gt; getWriterClsNames() {<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    return writerClsNames;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>  }<a name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>  @Override<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  protected WALHdrContext readHeader(WALHeader.Builder builder, FSDataInputStream stream)<a name="line.59"></a>
-<span class="sourceLineNo">060</span>      throws IOException {<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    WALHdrContext hdrCtxt = super.readHeader(builder, stream);<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    WALHdrResult result = hdrCtxt.getResult();<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    // We need to unconditionally handle the case where the WAL has a key in<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    // the header, meaning it is encrypted, even if ENABLE_WAL_ENCRYPTION is<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    // no longer set in the site configuration.<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    if (result == WALHdrResult.SUCCESS &amp;&amp; builder.hasEncryptionKey()) {<a name="line.66"></a>
-<span class="sourceLineNo">067</span>      // Serialized header data has been merged into the builder from the<a name="line.67"></a>
-<span class="sourceLineNo">068</span>      // stream.<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>      EncryptionTest.testKeyProvider(conf);<a name="line.70"></a>
-<span class="sourceLineNo">071</span>      EncryptionTest.testCipherProvider(conf);<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span>      // Retrieve a usable key<a name="line.73"></a>
+<span class="sourceLineNo">051</span>    writerClsNames.add(AsyncProtobufLogWriter.class.getSimpleName());<a name="line.51"></a>
+<span class="sourceLineNo">052</span>    writerClsNames.add(SecureAsyncProtobufLogWriter.class.getSimpleName());<a name="line.52"></a>
+<span class="sourceLineNo">053</span>  }<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span>  @Override<a name="line.55"></a>
+<span class="sourceLineNo">056</span>  public List&lt;String&gt; getWriterClsNames() {<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    return writerClsNames;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>  }<a name="line.58"></a>
+<span class="sourceLineNo">059</span><a name="line.59"></a>
+<span class="sourceLineNo">060</span>  @Override<a name="line.60"></a>
+<span class="sourceLineNo">061</span>  protected WALHdrContext readHeader(WALHeader.Builder builder, FSDataInputStream stream)<a name="line.61"></a>
+<span class="sourceLineNo">062</span>      throws IOException {<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    WALHdrContext hdrCtxt = super.readHeader(builder, stream);<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    WALHdrResult result = hdrCtxt.getResult();<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    // We need to unconditionally handle the case where the WAL has a key in<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    // the header, meaning it is encrypted, even if ENABLE_WAL_ENCRYPTION is<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    // no longer set in the site configuration.<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    if (result == WALHdrResult.SUCCESS &amp;&amp; builder.hasEncryptionKey()) {<a name="line.68"></a>
+<span class="sourceLineNo">069</span>      // Serialized header data has been merged into the builder from the<a name="line.69"></a>
+<span class="sourceLineNo">070</span>      // stream.<a name="line.70"></a>
+<span class="sourceLineNo">071</span><a name="line.71"></a>
+<span class="sourceLineNo">072</span>      EncryptionTest.testKeyProvider(conf);<a name="line.72"></a>
+<span class="sourceLineNo">073</span>      EncryptionTest.testCipherProvider(conf);<a name="line.73"></a>
 <span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span>      byte[] keyBytes = builder.getEncryptionKey().toByteArray();<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      Key key = null;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      String walKeyName = conf.get(HConstants.CRYPTO_WAL_KEY_NAME_CONF_KEY);<a name="line.77"></a>
-<span class="sourceLineNo">078</span>      // First try the WAL key, if one is configured<a name="line.78"></a>
-<span class="sourceLineNo">079</span>      if (walKeyName != null) {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>        try {<a name="line.80"></a>
-<span class="sourceLineNo">081</span>          key = EncryptionUtil.unwrapWALKey(conf, walKeyName, keyBytes);<a name="line.81"></a>
-<span class="sourceLineNo">082</span>        } catch (KeyException e) {<a name="line.82"></a>
-<span class="sourceLineNo">083</span>          if (LOG.isDebugEnabled()) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span>            LOG.debug("Unable to unwrap key with WAL key '" + walKeyName + "'");<a name="line.84"></a>
-<span class="sourceLineNo">085</span>          }<a name="line.85"></a>
-<span class="sourceLineNo">086</span>          key = null;<a name="line.86"></a>
-<span class="sourceLineNo">087</span>        }<a name="line.87"></a>
-<span class="sourceLineNo">088</span>      }<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      if (key == null) {<a name="line.89"></a>
-<span class="sourceLineNo">090</span>        String masterKeyName = conf.get(HConstants.CRYPTO_MASTERKEY_NAME_CONF_KEY,<a name="line.90"></a>
-<span class="sourceLineNo">091</span>          User.getCurrent().getShortName());<a name="line.91"></a>
-<span class="sourceLineNo">092</span>        try {<a name="line.92"></a>
-<span class="sourceLineNo">093</span>          // Then, try the cluster master key<a name="line.93"></a>
-<span class="sourceLineNo">094</span>          key = EncryptionUtil.unwrapWALKey(conf, masterKeyName, keyBytes);<a name="line.94"></a>
-<span class="sourceLineNo">095</span>        } catch (KeyException e) {<a name="line.95"></a>
-<span class="sourceLineNo">096</span>          // If the current master key fails to unwrap, try the alternate, if<a name="line.96"></a>
-<span class="sourceLineNo">097</span>          // one is configured<a name="line.97"></a>
-<span class="sourceLineNo">098</span>          if (LOG.isDebugEnabled()) {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>            LOG.debug("Unable to unwrap key with current master key '" + masterKeyName + "'");<a name="line.99"></a>
-<span class="sourceLineNo">100</span>          }<a name="line.100"></a>
-<span class="sourceLineNo">101</span>          String alternateKeyName =<a name="line.101"></a>
-<span class="sourceLineNo">102</span>            conf.get(HConstants.CRYPTO_MASTERKEY_ALTERNATE_NAME_CONF_KEY);<a name="line.102"></a>
-<span class="sourceLineNo">103</span>          if (alternateKeyName != null) {<a name="line.103"></a>
-<span class="sourceLineNo">104</span>            try {<a name="line.104"></a>
-<span class="sourceLineNo">105</span>              key = EncryptionUtil.unwrapWALKey(conf, alternateKeyName, keyBytes);<a name="line.105"></a>
-<span class="sourceLineNo">106</span>            } catch (KeyException ex) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>              throw new IOException(ex);<a name="line.107"></a>
-<span class="sourceLineNo">108</span>            }<a name="line.108"></a>
-<span class="sourceLineNo">109</span>          } else {<a name="line.109"></a>
-<span class="sourceLineNo">110</span>            throw new IOException(e);<a name="line.110"></a>
-<span class="sourceLineNo">111</span>          }<a name="line.111"></a>
-<span class="sourceLineNo">112</span>        }<a name="line.112"></a>
-<span class="sourceLineNo">113</span>      }<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span>      // Use the algorithm the key wants<a name="line.115"></a>
+<span class="sourceLineNo">075</span>      // Retrieve a usable key<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span>      byte[] keyBytes = builder.getEncryptionKey().toByteArray();<a name="line.77"></a>
+<span class="sourceLineNo">078</span>      Key key = null;<a name="line.78"></a>
+<span class="sourceLineNo">079</span>      String walKeyName = conf.get(HConstants.CRYPTO_WAL_KEY_NAME_CONF_KEY);<a name="line.79"></a>
+<span class="sourceLineNo">080</span>      // First try the WAL key, if one is configured<a name="line.80"></a>
+<span class="sourceLineNo">081</span>      if (walKeyName != null) {<a name="line.81"></a>
+<span class="sourceLineNo">082</span>        try {<a name="line.82"></a>
+<span class="sourceLineNo">083</span>          key = EncryptionUtil.unwrapWALKey(conf, walKeyName, keyBytes);<a name="line.83"></a>
+<span class="sourceLineNo">084</span>        } catch (KeyException e) {<a name="line.84"></a>
+<span class="sourceLineNo">085</span>          if (LOG.isDebugEnabled()) {<a name="line.85"></a>
+<span class="sourceLineNo">086</span>            LOG.debug("Unable to unwrap key with WAL key '" + walKeyName + "'");<a name="line.86"></a>
+<span class="sourceLineNo">087</span>          }<a name="line.87"></a>
+<span class="sourceLineNo">088</span>          key = null;<a name="line.88"></a>
+<span class="sourceLineNo">089</span>        }<a name="line.89"></a>
+<span class="sourceLineNo">090</span>      }<a name="line.90"></a>
+<span class="sourceLineNo">091</span>      if (key == null) {<a name="line.91"></a>
+<span class="sourceLineNo">092</span>        String masterKeyName = conf.get(HConstants.CRYPTO_MASTERKEY_NAME_CONF_KEY,<a name="line.92"></a>
+<span class="sourceLineNo">093</span>          User.getCurrent().getShortName());<a name="line.93"></a>
+<span class="sourceLineNo">094</span>        try {<a name="line.94"></a>
+<span class="sourceLineNo">095</span>          // Then, try the cluster master key<a name="line.95"></a>
+<span class="sourceLineNo">096</span>          key = EncryptionUtil.unwrapWALKey(conf, masterKeyName, keyBytes);<a name="line.96"></a>
+<span class="sourceLineNo">097</span>        } catch (KeyException e) {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>          // If the current master key fails to unwrap, try the alternate, if<a name="line.98"></a>
+<span class="sourceLineNo">099</span>          // one is configured<a name="line.99"></a>
+<span class="sourceLineNo">100</span>          if (LOG.isDebugEnabled()) {<a name="line.100"></a>
+<span class="sourceLineNo">101</span>            LOG.debug("Unable to unwrap key with current master key '" + masterKeyName + "'");<a name="line.101"></a>
+<span class="sourceLineNo">102</span>          }<a name="line.102"></a>
+<span class="sourceLineNo">103</span>          String alternateKeyName =<a name="line.103"></a>
+<span class="sourceLineNo">104</span>            conf.get(HConstants.CRYPTO_MASTERKEY_ALTERNATE_NAME_CONF_KEY);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>          if (alternateKeyName != null) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span>            try {<a name="line.106"></a>
+<span class="sourceLineNo">107</span>              key = EncryptionUtil.unwrapWALKey(conf, alternateKeyName, keyBytes);<a name="line.107"></a>
+<span class="sourceLineNo">108</span>            } catch (KeyException ex) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>              throw new IOException(ex);<a name="line.109"></a>
+<span class="sourceLineNo">110</span>            }<a name="line.110"></a>
+<span class="sourceLineNo">111</span>          } else {<a name="line.111"></a>
+<span class="sourceLineNo">112</span>            throw new IOException(e);<a name="line.112"></a>
+<span class="sourceLineNo">113</span>          }<a name="line.113"></a>
+<span class="sourceLineNo">114</span>        }<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      }<a name="line.115"></a>
 <span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>      Cipher cipher = Encryption.getCipher(conf, key.getAlgorithm());<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      if (cipher == null) {<a name="line.118"></a>
-<span class="sourceLineNo">119</span>        throw new IOException("Cipher '" + key.getAlgorithm() + "' is not available");<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>      // Set up the decryptor for this WAL<a name="line.122"></a>
+<span class="sourceLineNo">117</span>      // Use the algorithm the key wants<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span>      Cipher cipher = Encryption.getCipher(conf, key.getAlgorithm());<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      if (cipher == null) {<a name="line.120"></a>
+<span class="sourceLineNo">121</span>        throw new IOException("Cipher '" + key.getAlgorithm() + "' is not available");<a name="line.121"></a>
+<span class="sourceLineNo">122</span>      }<a name="line.122"></a>
 <span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>      decryptor = cipher.getDecryptor();<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      decryptor.setKey(key);<a name="line.125"></a>
-<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span>      if (LOG.isTraceEnabled()) {<a name="line.127"></a>
-<span class="sourceLineNo">128</span>        LOG.trace("Initialized secure protobuf WAL: cipher=" + cipher.getName());<a name="line.128"></a>
-<span class="sourceLineNo">129</span>      }<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>    return hdrCtxt;<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>  @Override<a name="line.135"></a>
-<span class="sourceLineNo">136</span>  protected void initAfterCompression(String cellCodecClsName) throws IOException {<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    if (decryptor != null &amp;&amp; cellCodecClsName.equals(SecureWALCellCodec.class.getName())) {<a name="line.137"></a>
-<span class="sourceLineNo">138</span>      WALCellCodec codec = SecureWALCellCodec.getCodec(this.conf, decryptor);<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      this.cellDecoder = codec.getDecoder(this.inputStream);<a name="line.139"></a>
-<span class="sourceLineNo">140</span>      // We do not support compression with WAL encryption<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      this.compressionContext = null;<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      this.hasCompression = false;<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    } else {<a name="line.143"></a>
-<span class="sourceLineNo">144</span>      super.initAfterCompression(cellCodecClsName);<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    }<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">124</span>      // Set up the decryptor for this WAL<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span>      decryptor = cipher.getDecryptor();<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      decryptor.setKey(key);<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span>      if (LOG.isTraceEnabled()) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>        LOG.trace("Initialized secure protobuf WAL: cipher=" + cipher.getName());<a name="line.130"></a>
+<span class="sourceLineNo">131</span>      }<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>    return hdrCtxt;<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>  @Override<a name="line.137"></a>
+<span class="sourceLineNo">138</span>  protected void initAfterCompression(String cellCodecClsName) throws IOException {<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    if (decryptor != null &amp;&amp; cellCodecClsName.equals(SecureWALCellCodec.class.getName())) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>      WALCellCodec codec = SecureWALCellCodec.getCodec(this.conf, decryptor);<a name="line.140"></a>
+<span class="sourceLineNo">141</span>      this.cellDecoder = codec.getDecoder(this.inputStream);<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      // We do not support compression with WAL encryption<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      this.compressionContext = null;<a name="line.143"></a>
+<span class="sourceLineNo">144</span>      this.hasCompression = false;<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    } else {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>      super.initAfterCompression(cellCodecClsName);<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    }<a name="line.147"></a>
+<span class="sourceLineNo">148</span>  }<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span>}<a name="line.150"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d69509/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/SecureProtobufLogWriter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/SecureProtobufLogWriter.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/SecureProtobufLogWriter.html
index 1ba7c3a..408fe47 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/SecureProtobufLogWriter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/SecureProtobufLogWriter.html
@@ -27,84 +27,34 @@
 <span class="sourceLineNo">019</span>package org.apache.hadoop.hbase.regionserver.wal;<a name="line.19"></a>
 <span class="sourceLineNo">020</span><a name="line.20"></a>
 <span class="sourceLineNo">021</span>import java.io.IOException;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import java.security.Key;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import java.security.SecureRandom;<a name="line.23"></a>
-<span class="sourceLineNo">024</span><a name="line.24"></a>
-<span class="sourceLineNo">025</span>import javax.crypto.spec.SecretKeySpec;<a name="line.25"></a>
-<span class="sourceLineNo">026</span><a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.conf.Configuration;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.util.ByteStringer;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.util.EncryptionTest;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.commons.logging.Log;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.commons.logging.LogFactory;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.HConstants;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.io.crypto.Cipher;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.io.crypto.Encryption;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.io.crypto.Encryptor;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALHeader;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.security.EncryptionUtil;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.security.User;<a name="line.40"></a>
-<span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span>@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.CONFIG)<a name="line.42"></a>
-<span class="sourceLineNo">043</span>public class SecureProtobufLogWriter extends ProtobufLogWriter {<a name="line.43"></a>
+<span class="sourceLineNo">022</span><a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.hadoop.conf.Configuration;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.io.crypto.Encryptor;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALHeader;<a name="line.27"></a>
+<span class="sourceLineNo">028</span><a name="line.28"></a>
+<span class="sourceLineNo">029</span>@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.CONFIG)<a name="line.29"></a>
+<span class="sourceLineNo">030</span>public class SecureProtobufLogWriter extends ProtobufLogWriter {<a name="line.30"></a>
+<span class="sourceLineNo">031</span><a name="line.31"></a>
+<span class="sourceLineNo">032</span>  private Encryptor encryptor = null;<a name="line.32"></a>
+<span class="sourceLineNo">033</span><a name="line.33"></a>
+<span class="sourceLineNo">034</span>  @Override<a name="line.34"></a>
+<span class="sourceLineNo">035</span>  protected WALHeader buildWALHeader(Configuration conf, WALHeader.Builder builder)<a name="line.35"></a>
+<span class="sourceLineNo">036</span>      throws IOException {<a name="line.36"></a>
+<span class="sourceLineNo">037</span>    return super.buildSecureWALHeader(conf, builder);<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>  @Override<a name="line.40"></a>
+<span class="sourceLineNo">041</span>  protected void setEncryptor(Encryptor encryptor) {<a name="line.41"></a>
+<span class="sourceLineNo">042</span>    this.encryptor = encryptor;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>  }<a name="line.43"></a>
 <span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>  private static final Log LOG = LogFactory.getLog(SecureProtobufLogWriter.class);<a name="line.45"></a>
-<span class="sourceLineNo">046</span>  private Encryptor encryptor = null;<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>  @Override<a name="line.48"></a>
-<span class="sourceLineNo">049</span>  protected WALHeader buildWALHeader(Configuration conf, WALHeader.Builder builder)<a name="line.49"></a>
-<span class="sourceLineNo">050</span>      throws IOException {<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    builder.setWriterClsName(SecureProtobufLogWriter.class.getSimpleName());<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    if (conf.getBoolean(HConstants.ENABLE_WAL_ENCRYPTION, false)) {<a name="line.52"></a>
-<span class="sourceLineNo">053</span>      EncryptionTest.testKeyProvider(conf);<a name="line.53"></a>
-<span class="sourceLineNo">054</span>      EncryptionTest.testCipherProvider(conf);<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span>      // Get an instance of our cipher<a name="line.56"></a>
-<span class="sourceLineNo">057</span>      final String cipherName =<a name="line.57"></a>
-<span class="sourceLineNo">058</span>          conf.get(HConstants.CRYPTO_WAL_ALGORITHM_CONF_KEY, HConstants.CIPHER_AES);<a name="line.58"></a>
-<span class="sourceLineNo">059</span>      Cipher cipher = Encryption.getCipher(conf, cipherName);<a name="line.59"></a>
-<span class="sourceLineNo">060</span>      if (cipher == null) {<a name="line.60"></a>
-<span class="sourceLineNo">061</span>        throw new RuntimeException("Cipher '" + cipherName + "' is not available");<a name="line.61"></a>
-<span class="sourceLineNo">062</span>      }<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>      // Generate an encryption key for this WAL<a name="line.64"></a>
-<span class="sourceLineNo">065</span>      SecureRandom rng = new SecureRandom();<a name="line.65"></a>
-<span class="sourceLineNo">066</span>      byte[] keyBytes = new byte[cipher.getKeyLength()];<a name="line.66"></a>
-<span class="sourceLineNo">067</span>      rng.nextBytes(keyBytes);<a name="line.67"></a>
-<span class="sourceLineNo">068</span>      Key key = new SecretKeySpec(keyBytes, cipher.getName());<a name="line.68"></a>
-<span class="sourceLineNo">069</span>      builder.setEncryptionKey(ByteStringer.wrap(EncryptionUtil.wrapKey(conf,<a name="line.69"></a>
-<span class="sourceLineNo">070</span>          conf.get(HConstants.CRYPTO_WAL_KEY_NAME_CONF_KEY,<a name="line.70"></a>
-<span class="sourceLineNo">071</span>              conf.get(HConstants.CRYPTO_MASTERKEY_NAME_CONF_KEY,<a name="line.71"></a>
-<span class="sourceLineNo">072</span>                  User.getCurrent().getShortName())),<a name="line.72"></a>
-<span class="sourceLineNo">073</span>          key)));<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span>      // Set up the encryptor<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      encryptor = cipher.getEncryptor();<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      encryptor.setKey(key);<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span>      if (LOG.isTraceEnabled()) {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>        LOG.trace("Initialized secure protobuf WAL: cipher=" + cipher.getName());<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>    builder.setCellCodecClsName(SecureWALCellCodec.class.getName());<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    return super.buildWALHeader(conf, builder);<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>  @Override<a name="line.87"></a>
-<span class="sourceLineNo">088</span>  protected void initAfterHeader(boolean doCompress) throws IOException {<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    if (conf.getBoolean(HConstants.ENABLE_WAL_ENCRYPTION, false) &amp;&amp; encryptor != null) {<a name="line.89"></a>
-<span class="sourceLineNo">090</span>      WALCellCodec codec = SecureWALCellCodec.getCodec(this.conf, encryptor);<a name="line.90"></a>
-<span class="sourceLineNo">091</span>      this.cellEncoder = codec.getEncoder(this.output);<a name="line.91"></a>
-<span class="sourceLineNo">092</span>      // We do not support compression<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      this.compressionContext = null;<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    } else {<a name="line.94"></a>
-<span class="sourceLineNo">095</span>      super.initAfterHeader(doCompress);<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    }<a name="line.96"></a>
-<span class="sourceLineNo">097</span>  }<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">045</span>  @Override<a name="line.45"></a>
+<span class="sourceLineNo">046</span>  protected void initAfterHeader(boolean doCompress) throws IOException {<a name="line.46"></a>
+<span class="sourceLineNo">047</span>    super.secureInitAfterHeader(doCompress, encryptor);<a name="line.47"></a>
+<span class="sourceLineNo">048</span>  }<a name="line.48"></a>
+<span class="sourceLineNo">049</span>}<a name="line.49"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8d69509/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 7617738..8500016 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,14 +67,14 @@
 <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 = "format", type = "String"),<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"),<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    @org.jamon.annotations.Argument(name = "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">062</span>    @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"),<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 = "serverManager", type = "ServerManager"),<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    @org.jamon.annotations.Argument(name = "deadServers", type = "Set&lt;ServerName&gt;"),<a name="line.67"></a>
 <span class="sourceLineNo">068</span>    @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    @org.jamon.annotations.Argument(name = "servers", type = "List&lt;ServerName&gt;"),<a name="line.69"></a>
+<span class="sourceLineNo">069</span>    @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.69"></a>
 <span class="sourceLineNo">070</span>    @org.jamon.annotations.Argument(name = "frags", type = "Map&lt;String,Integer&gt;")})<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>
@@ -116,108 +116,108 @@
 <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>    // 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">111</span>    // 25, 1<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.112"></a>
 <span class="sourceLineNo">113</span>    {<a name="line.113"></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">114</span>      // 25, 1<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.115"></a>
+<span class="sourceLineNo">116</span>      m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.116"></a>
 <span class="sourceLineNo">117</span>    }<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    public String getFormat()<a name="line.118"></a>
+<span class="sourceLineNo">118</span>    public boolean getCatalogJanitorEnabled()<a name="line.118"></a>
 <span class="sourceLineNo">119</span>    {<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      return m_format;<a name="line.120"></a>
+<span class="sourceLineNo">120</span>      return m_catalogJanitorEnabled;<a name="line.120"></a>
 <span class="sourceLineNo">121</span>    }<a name="line.121"></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">122</span>    private boolean m_catalogJanitorEnabled;<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.123"></a>
 <span class="sourceLineNo">124</span>    {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      return m_format__IsNotDefault;<a name="line.125"></a>
+<span class="sourceLineNo">125</span>      return m_catalogJanitorEnabled__IsNotDefault;<a name="line.125"></a>
 <span class="sourceLineNo">126</span>    }<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    private boolean m_format__IsNotDefault;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    // 22, 1<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    public void setMetaLocation(ServerName metaLocation)<a name="line.129"></a>
+<span class="sourceLineNo">127</span>    private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    // 27, 1<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    public void setFormat(String format)<a name="line.129"></a>
 <span class="sourceLineNo">130</span>    {<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      // 22, 1<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      m_metaLocation = metaLocation;<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      m_metaLocation__IsNotDefault = true;<a name="line.133"></a>
+<span class="sourceLineNo">131</span>      // 27, 1<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      m_format = format;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      m_format__IsNotDefault = true;<a name="line.133"></a>
 <span class="sourceLineNo">134</span>    }<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    public ServerName getMetaLocation()<a name="line.135"></a>
+<span class="sourceLineNo">135</span>    public String getFormat()<a name="line.135"></a>
 <span class="sourceLineNo">136</span>    {<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      return m_metaLocation;<a name="line.137"></a>
+<span class="sourceLineNo">137</span>      return m_format;<a name="line.137"></a>
 <span class="sourceLineNo">138</span>    }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    private ServerName m_metaLocation;<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    public boolean getMetaLocation__IsNotDefault()<a name="line.140"></a>
+<span class="sourceLineNo">139</span>    private String m_format;<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    public boolean getFormat__IsNotDefault()<a name="line.140"></a>
 <span class="sourceLineNo">141</span>    {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      return m_metaLocation__IsNotDefault;<a name="line.142"></a>
+<span class="sourceLineNo">142</span>      return m_format__IsNotDefault;<a name="line.142"></a>
 <span class="sourceLineNo">143</span>    }<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    private boolean m_metaLocation__IsNotDefault;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    // 25, 1<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.146"></a>
+<span class="sourceLineNo">144</span>    private boolean m_format__IsNotDefault;<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    // 22, 1<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    public void setMetaLocation(ServerName metaLocation)<a name="line.146"></a>
 <span class="sourceLineNo">147</span>    {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      // 25, 1<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.150"></a>
+<span class="sourceLineNo">148</span>      // 22, 1<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      m_metaLocation = metaLocation;<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      m_metaLocation__IsNotDefault = true;<a name="line.150"></a>
 <span class="sourceLineNo">151</span>    }<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    public boolean getCatalogJanitorEnabled()<a name="line.152"></a>
+<span class="sourceLineNo">152</span>    public ServerName getMetaLocation()<a name="line.152"></a>
 <span class="sourceLineNo">153</span>    {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      return m_catalogJanitorEnabled;<a name="line.154"></a>
+<span class="sourceLineNo">154</span>      return m_metaLocation;<a name="line.154"></a>
 <span class="sourceLineNo">155</span>    }<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    private boolean m_catalogJanitorEnabled;<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.157"></a>
+<span class="sourceLineNo">156</span>    private ServerName m_metaLocation;<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    public boolean getMetaLocation__IsNotDefault()<a name="line.157"></a>
 <span class="sourceLineNo">158</span>    {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>      return m_catalogJanitorEnabled__IsNotDefault;<a name="line.159"></a>
+<span class="sourceLineNo">159</span>      return m_metaLocation__IsNotDefault;<a name="line.159"></a>
 <span class="sourceLineNo">160</span>    }<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    private boolean m_catalogJanitorEnabled__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">161</span>    private boolean m_metaLocation__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">164</span>    {<a name="line.164"></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">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">168</span>    }<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    public ServerManager getServerManager()<a name="line.169"></a>
+<span class="sourceLineNo">169</span>    public List&lt;ServerName&gt; getServers()<a name="line.169"></a>
 <span class="sourceLineNo">170</span>    {<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      return m_serverManager;<a name="line.171"></a>
+<span class="sourceLineNo">171</span>      return m_servers;<a name="line.171"></a>
 <span class="sourceLineNo">172</span>    }<a name="line.172"></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">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">175</span>    {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>      return m_serverManager__IsNotDefault;<a name="line.176"></a>
+<span class="sourceLineNo">176</span>      return m_servers__IsNotDefault;<a name="line.176"></a>
 <span class="sourceLineNo">177</span>    }<a name="line.177"></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">178</span>    private boolean m_servers__IsNotDefault;<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    // 28, 1<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    public void setServerManager(ServerManager serverManager)<a name="line.180"></a>
 <span class="sourceLineNo">181</span>    {<a name="line.181"></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">182</span>      // 28, 1<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      m_serverManager = serverManager;<a name="line.183"></a>
+<span class="sourceLineNo">184</span>      m_serverManager__IsNotDefault = true;<a name="line.184"></a>
 <span class="sourceLineNo">185</span>    }<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    public Set&lt;ServerName&gt; getDeadServers()<a name="line.186"></a>
+<span class="sourceLineNo">186</span>    public ServerManager getServerManager()<a name="line.186"></a>
 <span class="sourceLineNo">187</span>    {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      return m_deadServers;<a name="line.188"></a>
+<span class="sourceLineNo">188</span>      return m_serverManager;<a name="line.188"></a>
 <span class="sourceLineNo">189</span>    }<a name="line.189"></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">190</span>    private ServerManager m_serverManager;<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    public boolean getServerManager__IsNotDefault()<a name="line.191"></a>
 <span class="sourceLineNo">192</span>    {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      return m_deadServers__IsNotDefault;<a name="line.193"></a>
+<span class="sourceLineNo">193</span>      return m_serverManager__IsNotDefault;<a name="line.193"></a>
 <span class="sourceLineNo">194</span>    }<a name="line.194"></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">195</span>    private boolean m_serverManager__IsNotDefault;<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    // 24, 1<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    public void setDeadServers(Set&lt;ServerName&gt; deadServers)<a name="line.197"></a>
 <span class="sourceLineNo">198</span>    {<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      // 26, 1<a name="line.199"></a>
-<span class="sourceLineNo">200</span>      m_filter = filter;<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      m_filter__IsNotDefault = true;<a name="line.201"></a>
+<span class="sourceLineNo">199</span>      // 24, 1<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      m_deadServers = deadServers;<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      m_deadServers__IsNotDefault = true;<a name="line.201"></a>
 <span class="sourceLineNo">202</span>    }<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    public String getFilter()<a name="line.203"></a>
+<span class="sourceLineNo">203</span>    public Set&lt;ServerName&gt; getDeadServers()<a name="line.203"></a>
 <span class="sourceLineNo">204</span>    {<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      return m_filter;<a name="line.205"></a>
+<span class="sourceLineNo">205</span>      return m_deadServers;<a name="line.205"></a>
 <span class="sourceLineNo">206</span>    }<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    private String m_filter;<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    public boolean getFilter__IsNotDefault()<a name="line.208"></a>
+<span class="sourceLineNo">207</span>    private Set&lt;ServerName&gt; m_deadServers;<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    public boolean getDeadServers__IsNotDefault()<a name="line.208"></a>
 <span class="sourceLineNo">209</span>    {<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      return m_filter__IsNotDefault;<a name="line.210"></a>
+<span class="sourceLineNo">210</span>      return m_deadServers__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">212</span>    private boolean m_deadServers__IsNotDefault;<a name="line.212"></a>
 <span class="sourceLineNo">213</span>    // 29, 1<a name="line.213"></a>
 <span class="sourceLineNo">214</span>    public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.214"></a>
 <span class="sourceLineNo">215</span>    {<a name="line.215"></a>
@@ -235,23 +235,23 @@
 <span class="sourceLineNo">227</span>      return m_assignmentManager__IsNotDefault;<a name="line.227"></a>
 <span class="sourceLineNo">228</span>    }<a name="line.228"></a>
 <span class="sourceLineNo">229</span>    private boolean m_assignmentManager__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">230</span>    // 26, 1<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    public void setFilter(String filter)<a name="line.231"></a>
 <span class="sourceLineNo">232</span>    {<a name="line.232"></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">233</span>      // 26, 1<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      m_filter = filter;<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      m_filter__IsNotDefault = true;<a name="line.235"></a>
 <span class="sourceLineNo">236</span>    }<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    public List&lt;ServerName&gt; getServers()<a name="line.237"></a>
+<span class="sourceLineNo">237</span>    public String getFilter()<a name="line.237"></a>
 <span class="sourceLineNo">238</span>    {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      return m_servers;<a name="line.239"></a>
+<span class="sourceLineNo">239</span>      return m_filter;<a name="line.239"></a>
 <span class="sourceLineNo">240</span>    }<a name="line.240"></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">241</span>    private String m_filter;<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    public boolean getFilter__IsNotDefault()<a name="line.242"></a>
 <span class="sourceLineNo">243</span>    {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      return m_servers__IsNotDefault;<a name="line.244"></a>
+<span class="sourceLineNo">244</span>      return m_filter__IsNotDefault;<a name="line.244"></a>
 <span class="sourceLineNo">245</span>    }<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    private boolean m_servers__IsNotDefault;<a name="line.246"></a>
+<span class="sourceLineNo">246</span>    private boolean m_filter__IsNotDefault;<a name="line.246"></a>
 <span class="sourceLineNo">247</span>    // 21, 1<a name="line.247"></a>
 <span class="sourceLineNo">248</span>    public void setFrags(Map&lt;String,Integer&gt; frags)<a name="line.248"></a>
 <span class="sourceLineNo">249</span>    {<a name="line.249"></a>
@@ -280,45 +280,45 @@
 <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 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">275</span>  protected boolean catalogJanitorEnabled;<a name="line.275"></a>
+<span class="sourceLineNo">276</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.276"></a>
 <span class="sourceLineNo">277</span>  {<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    (getImplData()).setFormat(p_format);<a name="line.278"></a>
+<span class="sourceLineNo">278</span>    (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<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 ServerName metaLocation;<a name="line.282"></a>
-<span class="sourceLineNo">283</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.283"></a>
+<span class="sourceLineNo">282</span>  protected String format;<a name="line.282"></a>
+<span class="sourceLineNo">283</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)<a name="line.283"></a>
 <span class="sourceLineNo">284</span>  {<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    (getImplData()).setMetaLocation(p_metaLocation);<a name="line.285"></a>
+<span class="sourceLineNo">285</span>    (getImplData()).setFormat(p_format);<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 boolean catalogJanitorEnabled;<a name="line.289"></a>
-<span class="sourceLineNo">290</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.290"></a>
+<span class="sourceLineNo">289</span>  protected ServerName metaLocation;<a name="line.289"></a>
+<span class="sourceLineNo">290</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.290"></a>
 <span class="sourceLineNo">291</span>  {<a name="line.291"></a>
-<span class="sourceLineNo">292</span>    (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a name="line.292"></a>
+<span class="sourceLineNo">292</span>    (getImplData()).setMetaLocation(p_metaLocation);<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 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">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">298</span>  {<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    (getImplData()).setServerManager(p_serverManager);<a name="line.299"></a>
+<span class="sourceLineNo">299</span>    (getImplData()).setServers(p_servers);<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 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">303</span>  protected ServerManager serverManager;<a name="line.303"></a>
+<span class="sourceLineNo">304</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.304"></a>
 <span class="sourceLineNo">305</span>  {<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    (getImplData()).setDeadServers(p_deadServers);<a name="line.306"></a>
+<span class="sourceLineNo">306</span>    (getImplData()).setServerManager(p_serverManager);<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>
-<span class="sourceLineNo">310</span>  protected String filter;<a name="line.310"></a>
-<span class="sourceLineNo">311</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.311"></a>
+<span class="sourceLineNo">310</span>  protected Set&lt;ServerName&gt; deadServers;<a name="line.310"></a>
+<span class="sourceLineNo">311</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set&lt;ServerName&gt; p_deadServers)<a name="line.311"></a>
 <span class="sourceLineNo">312</span>  {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    (getImplData()).setFilter(p_filter);<a name="line.313"></a>
+<span class="sourceLineNo">313</span>    (getImplData()).setDeadServers(p_deadServers);<a name="line.313"></a>
 <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>
@@ -329,10 +329,10 @@
 <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 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">324</span>  protected String filter;<a name="line.324"></a>
+<span class="sourceLineNo">325</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.325"></a>
 <span class="sourceLineNo">326</span>  {<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    (getImplData()).setServers(p_servers);<a name="line.327"></a>
+<span class="sourceLineNo">327</span>    (getImplData()).setFilter(p_filter);<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>


Mime
View raw message