You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2015/12/30 23:15:34 UTC
[13/51] [partial] hbase-site git commit: Published site at
07b623670647686084f8f5fd2038e2bafcfdac54.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e5c3dcd1/devapidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationPeerZKImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationPeerZKImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationPeerZKImpl.html
index e3fb4bf..de5b0bb 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationPeerZKImpl.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationPeerZKImpl.html
@@ -63,8 +63,8 @@
<span class="sourceLineNo">055</span> private TableCFsTracker tableCFsTracker;<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> * Constructor that takes all the objects required to communicate with the<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * specified peer, except for the region server addresses.<a name="line.59"></a>
+<span class="sourceLineNo">058</span> * Constructor that takes all the objects required to communicate with the specified peer, except<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * for the region server addresses.<a name="line.59"></a>
<span class="sourceLineNo">060</span> * @param conf configuration object to this peer<a name="line.60"></a>
<span class="sourceLineNo">061</span> * @param id string representation of this peer's identifier<a name="line.61"></a>
<span class="sourceLineNo">062</span> * @param peerConfig configuration for the replication peer<a name="line.62"></a>
@@ -75,214 +75,230 @@
<span class="sourceLineNo">067</span> this.peerConfig = peerConfig;<a name="line.67"></a>
<span class="sourceLineNo">068</span> this.id = id;<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">070</span> <a name="line.70"></a>
<span class="sourceLineNo">071</span> /**<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * start a state tracker to check whether this peer is enabled or not<a name="line.72"></a>
-<span class="sourceLineNo">073</span> *<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * @param zookeeper zk watcher for the local cluster<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * @param peerStateNode path to zk node which stores peer state<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * @throws KeeperException<a name="line.76"></a>
-<span class="sourceLineNo">077</span> */<a name="line.77"></a>
-<span class="sourceLineNo">078</span> public void startStateTracker(ZooKeeperWatcher zookeeper, String peerStateNode)<a name="line.78"></a>
-<span class="sourceLineNo">079</span> throws KeeperException {<a name="line.79"></a>
-<span class="sourceLineNo">080</span> ensurePeerEnabled(zookeeper, peerStateNode);<a name="line.80"></a>
-<span class="sourceLineNo">081</span> this.peerStateTracker = new PeerStateTracker(peerStateNode, zookeeper, this);<a name="line.81"></a>
-<span class="sourceLineNo">082</span> this.peerStateTracker.start();<a name="line.82"></a>
-<span class="sourceLineNo">083</span> try {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> this.readPeerStateZnode();<a name="line.84"></a>
-<span class="sourceLineNo">085</span> } catch (DeserializationException e) {<a name="line.85"></a>
-<span class="sourceLineNo">086</span> throw ZKUtil.convert(e);<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><a name="line.89"></a>
-<span class="sourceLineNo">090</span> private void readPeerStateZnode() throws DeserializationException {<a name="line.90"></a>
-<span class="sourceLineNo">091</span> this.peerState =<a name="line.91"></a>
-<span class="sourceLineNo">092</span> isStateEnabled(this.peerStateTracker.getData(false))<a name="line.92"></a>
-<span class="sourceLineNo">093</span> ? PeerState.ENABLED<a name="line.93"></a>
-<span class="sourceLineNo">094</span> : PeerState.DISABLED;<a name="line.94"></a>
-<span class="sourceLineNo">095</span> }<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> * start a table-cfs tracker to listen the (table, cf-list) map change<a name="line.98"></a>
-<span class="sourceLineNo">099</span> *<a name="line.99"></a>
-<span class="sourceLineNo">100</span> * @param zookeeper zk watcher for the local cluster<a name="line.100"></a>
-<span class="sourceLineNo">101</span> * @param tableCFsNode path to zk node which stores table-cfs<a name="line.101"></a>
-<span class="sourceLineNo">102</span> * @throws KeeperException<a name="line.102"></a>
-<span class="sourceLineNo">103</span> */<a name="line.103"></a>
-<span class="sourceLineNo">104</span> public void startTableCFsTracker(ZooKeeperWatcher zookeeper, String tableCFsNode)<a name="line.104"></a>
-<span class="sourceLineNo">105</span> throws KeeperException {<a name="line.105"></a>
-<span class="sourceLineNo">106</span> this.tableCFsTracker = new TableCFsTracker(tableCFsNode, zookeeper,<a name="line.106"></a>
-<span class="sourceLineNo">107</span> this);<a name="line.107"></a>
-<span class="sourceLineNo">108</span> this.tableCFsTracker.start();<a name="line.108"></a>
-<span class="sourceLineNo">109</span> this.readTableCFsZnode();<a name="line.109"></a>
-<span class="sourceLineNo">110</span> }<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span> private void readTableCFsZnode() {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> String currentTableCFs = Bytes.toString(tableCFsTracker.getData(false));<a name="line.113"></a>
-<span class="sourceLineNo">114</span> this.tableCFs = ReplicationAdmin.parseTableCFsFromConfig(currentTableCFs);<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> @Override<a name="line.117"></a>
-<span class="sourceLineNo">118</span> public PeerState getPeerState() {<a name="line.118"></a>
-<span class="sourceLineNo">119</span> return peerState;<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> /**<a name="line.122"></a>
-<span class="sourceLineNo">123</span> * Get the identifier of this peer<a name="line.123"></a>
-<span class="sourceLineNo">124</span> * @return string representation of the id (short)<a name="line.124"></a>
-<span class="sourceLineNo">125</span> */<a name="line.125"></a>
-<span class="sourceLineNo">126</span> @Override<a name="line.126"></a>
-<span class="sourceLineNo">127</span> public String getId() {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> return id;<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> * Get the peer config object<a name="line.132"></a>
-<span class="sourceLineNo">133</span> * @return the ReplicationPeerConfig for this peer<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> public ReplicationPeerConfig getPeerConfig() {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> return peerConfig;<a name="line.137"></a>
-<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> /**<a name="line.140"></a>
-<span class="sourceLineNo">141</span> * Get the configuration object required to communicate with this peer<a name="line.141"></a>
-<span class="sourceLineNo">142</span> * @return configuration object<a name="line.142"></a>
-<span class="sourceLineNo">143</span> */<a name="line.143"></a>
-<span class="sourceLineNo">144</span> @Override<a name="line.144"></a>
-<span class="sourceLineNo">145</span> public Configuration getConfiguration() {<a name="line.145"></a>
-<span class="sourceLineNo">146</span> return conf;<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> * Get replicable (table, cf-list) map of this peer<a name="line.150"></a>
-<span class="sourceLineNo">151</span> * @return the replicable (table, cf-list) map<a name="line.151"></a>
-<span class="sourceLineNo">152</span> */<a name="line.152"></a>
-<span class="sourceLineNo">153</span> @Override<a name="line.153"></a>
-<span class="sourceLineNo">154</span> public Map<TableName, List<String>> getTableCFs() {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> return this.tableCFs;<a name="line.155"></a>
-<span class="sourceLineNo">156</span> }<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span> @Override<a name="line.158"></a>
-<span class="sourceLineNo">159</span> public void abort(String why, Throwable e) {<a name="line.159"></a>
-<span class="sourceLineNo">160</span> LOG.fatal("The ReplicationPeer coresponding to peer " + peerConfig<a name="line.160"></a>
-<span class="sourceLineNo">161</span> + " was aborted for the following reason(s):" + why, e);<a name="line.161"></a>
-<span class="sourceLineNo">162</span> }<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span> @Override<a name="line.164"></a>
-<span class="sourceLineNo">165</span> public boolean isAborted() {<a name="line.165"></a>
-<span class="sourceLineNo">166</span> // Currently the replication peer is never "Aborted", we just log when the<a name="line.166"></a>
-<span class="sourceLineNo">167</span> // abort method is called.<a name="line.167"></a>
-<span class="sourceLineNo">168</span> return false;<a name="line.168"></a>
-<span class="sourceLineNo">169</span> }<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span> @Override<a name="line.171"></a>
-<span class="sourceLineNo">172</span> public void close() throws IOException {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> // TODO: stop zkw?<a name="line.173"></a>
-<span class="sourceLineNo">174</span> }<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span> /**<a name="line.176"></a>
-<span class="sourceLineNo">177</span> * Parse the raw data from ZK to get a peer's state<a name="line.177"></a>
-<span class="sourceLineNo">178</span> * @param bytes raw ZK data<a name="line.178"></a>
-<span class="sourceLineNo">179</span> * @return True if the passed in <code>bytes</code> are those of a pb serialized ENABLED state.<a name="line.179"></a>
-<span class="sourceLineNo">180</span> * @throws DeserializationException<a name="line.180"></a>
-<span class="sourceLineNo">181</span> */<a name="line.181"></a>
-<span class="sourceLineNo">182</span> public static boolean isStateEnabled(final byte[] bytes) throws DeserializationException {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> ZooKeeperProtos.ReplicationState.State state = parseStateFrom(bytes);<a name="line.183"></a>
-<span class="sourceLineNo">184</span> return ZooKeeperProtos.ReplicationState.State.ENABLED == state;<a name="line.184"></a>
+<span class="sourceLineNo">072</span> * Constructor that takes all the objects required to communicate with the specified peer, except<a name="line.72"></a>
+<span class="sourceLineNo">073</span> * for the region server addresses.<a name="line.73"></a>
+<span class="sourceLineNo">074</span> * @param conf configuration object to this peer<a name="line.74"></a>
+<span class="sourceLineNo">075</span> * @param id string representation of this peer's identifier<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * @param peerConfig configuration for the replication peer<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * @param tableCFs table-cf configuration for this peer<a name="line.77"></a>
+<span class="sourceLineNo">078</span> */<a name="line.78"></a>
+<span class="sourceLineNo">079</span> public ReplicationPeerZKImpl(Configuration conf, String id, ReplicationPeerConfig peerConfig,<a name="line.79"></a>
+<span class="sourceLineNo">080</span> Map<TableName, List<String>> tableCFs) throws ReplicationException {<a name="line.80"></a>
+<span class="sourceLineNo">081</span> this.conf = conf;<a name="line.81"></a>
+<span class="sourceLineNo">082</span> this.peerConfig = peerConfig;<a name="line.82"></a>
+<span class="sourceLineNo">083</span> this.id = id;<a name="line.83"></a>
+<span class="sourceLineNo">084</span> this.tableCFs = tableCFs;<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> * start a state tracker to check whether this peer is enabled or not<a name="line.88"></a>
+<span class="sourceLineNo">089</span> *<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * @param zookeeper zk watcher for the local cluster<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * @param peerStateNode path to zk node which stores peer state<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * @throws KeeperException<a name="line.92"></a>
+<span class="sourceLineNo">093</span> */<a name="line.93"></a>
+<span class="sourceLineNo">094</span> public void startStateTracker(ZooKeeperWatcher zookeeper, String peerStateNode)<a name="line.94"></a>
+<span class="sourceLineNo">095</span> throws KeeperException {<a name="line.95"></a>
+<span class="sourceLineNo">096</span> ensurePeerEnabled(zookeeper, peerStateNode);<a name="line.96"></a>
+<span class="sourceLineNo">097</span> this.peerStateTracker = new PeerStateTracker(peerStateNode, zookeeper, this);<a name="line.97"></a>
+<span class="sourceLineNo">098</span> this.peerStateTracker.start();<a name="line.98"></a>
+<span class="sourceLineNo">099</span> try {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> this.readPeerStateZnode();<a name="line.100"></a>
+<span class="sourceLineNo">101</span> } catch (DeserializationException e) {<a name="line.101"></a>
+<span class="sourceLineNo">102</span> throw ZKUtil.convert(e);<a name="line.102"></a>
+<span class="sourceLineNo">103</span> }<a name="line.103"></a>
+<span class="sourceLineNo">104</span> }<a name="line.104"></a>
+<span class="sourceLineNo">105</span><a name="line.105"></a>
+<span class="sourceLineNo">106</span> private void readPeerStateZnode() throws DeserializationException {<a name="line.106"></a>
+<span class="sourceLineNo">107</span> this.peerState =<a name="line.107"></a>
+<span class="sourceLineNo">108</span> isStateEnabled(this.peerStateTracker.getData(false))<a name="line.108"></a>
+<span class="sourceLineNo">109</span> ? PeerState.ENABLED<a name="line.109"></a>
+<span class="sourceLineNo">110</span> : PeerState.DISABLED;<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> * start a table-cfs tracker to listen the (table, cf-list) map change<a name="line.114"></a>
+<span class="sourceLineNo">115</span> *<a name="line.115"></a>
+<span class="sourceLineNo">116</span> * @param zookeeper zk watcher for the local cluster<a name="line.116"></a>
+<span class="sourceLineNo">117</span> * @param tableCFsNode path to zk node which stores table-cfs<a name="line.117"></a>
+<span class="sourceLineNo">118</span> * @throws KeeperException<a name="line.118"></a>
+<span class="sourceLineNo">119</span> */<a name="line.119"></a>
+<span class="sourceLineNo">120</span> public void startTableCFsTracker(ZooKeeperWatcher zookeeper, String tableCFsNode)<a name="line.120"></a>
+<span class="sourceLineNo">121</span> throws KeeperException {<a name="line.121"></a>
+<span class="sourceLineNo">122</span> this.tableCFsTracker = new TableCFsTracker(tableCFsNode, zookeeper,<a name="line.122"></a>
+<span class="sourceLineNo">123</span> this);<a name="line.123"></a>
+<span class="sourceLineNo">124</span> this.tableCFsTracker.start();<a name="line.124"></a>
+<span class="sourceLineNo">125</span> this.readTableCFsZnode();<a name="line.125"></a>
+<span class="sourceLineNo">126</span> }<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span> private void readTableCFsZnode() {<a name="line.128"></a>
+<span class="sourceLineNo">129</span> String currentTableCFs = Bytes.toString(tableCFsTracker.getData(false));<a name="line.129"></a>
+<span class="sourceLineNo">130</span> this.tableCFs = ReplicationAdmin.parseTableCFsFromConfig(currentTableCFs);<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> @Override<a name="line.133"></a>
+<span class="sourceLineNo">134</span> public PeerState getPeerState() {<a name="line.134"></a>
+<span class="sourceLineNo">135</span> return peerState;<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> /**<a name="line.138"></a>
+<span class="sourceLineNo">139</span> * Get the identifier of this peer<a name="line.139"></a>
+<span class="sourceLineNo">140</span> * @return string representation of the id (short)<a name="line.140"></a>
+<span class="sourceLineNo">141</span> */<a name="line.141"></a>
+<span class="sourceLineNo">142</span> @Override<a name="line.142"></a>
+<span class="sourceLineNo">143</span> public String getId() {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> return id;<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> * Get the peer config object<a name="line.148"></a>
+<span class="sourceLineNo">149</span> * @return the ReplicationPeerConfig for this peer<a name="line.149"></a>
+<span class="sourceLineNo">150</span> */<a name="line.150"></a>
+<span class="sourceLineNo">151</span> @Override<a name="line.151"></a>
+<span class="sourceLineNo">152</span> public ReplicationPeerConfig getPeerConfig() {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> return peerConfig;<a name="line.153"></a>
+<span class="sourceLineNo">154</span> }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span> /**<a name="line.156"></a>
+<span class="sourceLineNo">157</span> * Get the configuration object required to communicate with this peer<a name="line.157"></a>
+<span class="sourceLineNo">158</span> * @return configuration object<a name="line.158"></a>
+<span class="sourceLineNo">159</span> */<a name="line.159"></a>
+<span class="sourceLineNo">160</span> @Override<a name="line.160"></a>
+<span class="sourceLineNo">161</span> public Configuration getConfiguration() {<a name="line.161"></a>
+<span class="sourceLineNo">162</span> return conf;<a name="line.162"></a>
+<span class="sourceLineNo">163</span> }<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span> /**<a name="line.165"></a>
+<span class="sourceLineNo">166</span> * Get replicable (table, cf-list) map of this peer<a name="line.166"></a>
+<span class="sourceLineNo">167</span> * @return the replicable (table, cf-list) map<a name="line.167"></a>
+<span class="sourceLineNo">168</span> */<a name="line.168"></a>
+<span class="sourceLineNo">169</span> @Override<a name="line.169"></a>
+<span class="sourceLineNo">170</span> public Map<TableName, List<String>> getTableCFs() {<a name="line.170"></a>
+<span class="sourceLineNo">171</span> return this.tableCFs;<a name="line.171"></a>
+<span class="sourceLineNo">172</span> }<a name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span> @Override<a name="line.174"></a>
+<span class="sourceLineNo">175</span> public void abort(String why, Throwable e) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span> LOG.fatal("The ReplicationPeer coresponding to peer " + peerConfig<a name="line.176"></a>
+<span class="sourceLineNo">177</span> + " was aborted for the following reason(s):" + why, e);<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
+<span class="sourceLineNo">179</span><a name="line.179"></a>
+<span class="sourceLineNo">180</span> @Override<a name="line.180"></a>
+<span class="sourceLineNo">181</span> public boolean isAborted() {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> // Currently the replication peer is never "Aborted", we just log when the<a name="line.182"></a>
+<span class="sourceLineNo">183</span> // abort method is called.<a name="line.183"></a>
+<span class="sourceLineNo">184</span> return false;<a name="line.184"></a>
<span class="sourceLineNo">185</span> }<a name="line.185"></a>
<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span> /**<a name="line.187"></a>
-<span class="sourceLineNo">188</span> * @param bytes Content of a state znode.<a name="line.188"></a>
-<span class="sourceLineNo">189</span> * @return State parsed from the passed bytes.<a name="line.189"></a>
-<span class="sourceLineNo">190</span> * @throws DeserializationException<a name="line.190"></a>
-<span class="sourceLineNo">191</span> */<a name="line.191"></a>
-<span class="sourceLineNo">192</span> private static ZooKeeperProtos.ReplicationState.State parseStateFrom(final byte[] bytes)<a name="line.192"></a>
-<span class="sourceLineNo">193</span> throws DeserializationException {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> ProtobufUtil.expectPBMagicPrefix(bytes);<a name="line.194"></a>
-<span class="sourceLineNo">195</span> int pblen = ProtobufUtil.lengthOfPBMagic();<a name="line.195"></a>
-<span class="sourceLineNo">196</span> ZooKeeperProtos.ReplicationState.Builder builder =<a name="line.196"></a>
-<span class="sourceLineNo">197</span> ZooKeeperProtos.ReplicationState.newBuilder();<a name="line.197"></a>
-<span class="sourceLineNo">198</span> ZooKeeperProtos.ReplicationState state;<a name="line.198"></a>
-<span class="sourceLineNo">199</span> try {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> ProtobufUtil.mergeFrom(builder, bytes, pblen, bytes.length - pblen);<a name="line.200"></a>
-<span class="sourceLineNo">201</span> state = builder.build();<a name="line.201"></a>
-<span class="sourceLineNo">202</span> return state.getState();<a name="line.202"></a>
-<span class="sourceLineNo">203</span> } catch (IOException e) {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> throw new DeserializationException(e);<a name="line.204"></a>
-<span class="sourceLineNo">205</span> }<a name="line.205"></a>
-<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span><a name="line.207"></a>
-<span class="sourceLineNo">208</span> /**<a name="line.208"></a>
-<span class="sourceLineNo">209</span> * Utility method to ensure an ENABLED znode is in place; if not present, we create it.<a name="line.209"></a>
-<span class="sourceLineNo">210</span> * @param zookeeper<a name="line.210"></a>
-<span class="sourceLineNo">211</span> * @param path Path to znode to check<a name="line.211"></a>
-<span class="sourceLineNo">212</span> * @return True if we created the znode.<a name="line.212"></a>
-<span class="sourceLineNo">213</span> * @throws NodeExistsException<a name="line.213"></a>
-<span class="sourceLineNo">214</span> * @throws KeeperException<a name="line.214"></a>
-<span class="sourceLineNo">215</span> */<a name="line.215"></a>
-<span class="sourceLineNo">216</span> private static boolean ensurePeerEnabled(final ZooKeeperWatcher zookeeper, final String path)<a name="line.216"></a>
-<span class="sourceLineNo">217</span> throws NodeExistsException, KeeperException {<a name="line.217"></a>
-<span class="sourceLineNo">218</span> if (ZKUtil.checkExists(zookeeper, path) == -1) {<a name="line.218"></a>
-<span class="sourceLineNo">219</span> // There is a race b/w PeerWatcher and ReplicationZookeeper#add method to create the<a name="line.219"></a>
-<span class="sourceLineNo">220</span> // peer-state znode. This happens while adding a peer.<a name="line.220"></a>
-<span class="sourceLineNo">221</span> // The peer state data is set as "ENABLED" by default.<a name="line.221"></a>
-<span class="sourceLineNo">222</span> ZKUtil.createNodeIfNotExistsAndWatch(zookeeper, path,<a name="line.222"></a>
-<span class="sourceLineNo">223</span> ReplicationStateZKBase.ENABLED_ZNODE_BYTES);<a name="line.223"></a>
-<span class="sourceLineNo">224</span> return true;<a name="line.224"></a>
-<span class="sourceLineNo">225</span> }<a name="line.225"></a>
-<span class="sourceLineNo">226</span> return false;<a name="line.226"></a>
-<span class="sourceLineNo">227</span> }<a name="line.227"></a>
-<span class="sourceLineNo">228</span><a name="line.228"></a>
-<span class="sourceLineNo">229</span> /**<a name="line.229"></a>
-<span class="sourceLineNo">230</span> * Tracker for state of this peer<a name="line.230"></a>
+<span class="sourceLineNo">187</span> @Override<a name="line.187"></a>
+<span class="sourceLineNo">188</span> public void close() throws IOException {<a name="line.188"></a>
+<span class="sourceLineNo">189</span> // TODO: stop zkw?<a name="line.189"></a>
+<span class="sourceLineNo">190</span> }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span> /**<a name="line.192"></a>
+<span class="sourceLineNo">193</span> * Parse the raw data from ZK to get a peer's state<a name="line.193"></a>
+<span class="sourceLineNo">194</span> * @param bytes raw ZK data<a name="line.194"></a>
+<span class="sourceLineNo">195</span> * @return True if the passed in <code>bytes</code> are those of a pb serialized ENABLED state.<a name="line.195"></a>
+<span class="sourceLineNo">196</span> * @throws DeserializationException<a name="line.196"></a>
+<span class="sourceLineNo">197</span> */<a name="line.197"></a>
+<span class="sourceLineNo">198</span> public static boolean isStateEnabled(final byte[] bytes) throws DeserializationException {<a name="line.198"></a>
+<span class="sourceLineNo">199</span> ZooKeeperProtos.ReplicationState.State state = parseStateFrom(bytes);<a name="line.199"></a>
+<span class="sourceLineNo">200</span> return ZooKeeperProtos.ReplicationState.State.ENABLED == state;<a name="line.200"></a>
+<span class="sourceLineNo">201</span> }<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span> /**<a name="line.203"></a>
+<span class="sourceLineNo">204</span> * @param bytes Content of a state znode.<a name="line.204"></a>
+<span class="sourceLineNo">205</span> * @return State parsed from the passed bytes.<a name="line.205"></a>
+<span class="sourceLineNo">206</span> * @throws DeserializationException<a name="line.206"></a>
+<span class="sourceLineNo">207</span> */<a name="line.207"></a>
+<span class="sourceLineNo">208</span> private static ZooKeeperProtos.ReplicationState.State parseStateFrom(final byte[] bytes)<a name="line.208"></a>
+<span class="sourceLineNo">209</span> throws DeserializationException {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> ProtobufUtil.expectPBMagicPrefix(bytes);<a name="line.210"></a>
+<span class="sourceLineNo">211</span> int pblen = ProtobufUtil.lengthOfPBMagic();<a name="line.211"></a>
+<span class="sourceLineNo">212</span> ZooKeeperProtos.ReplicationState.Builder builder =<a name="line.212"></a>
+<span class="sourceLineNo">213</span> ZooKeeperProtos.ReplicationState.newBuilder();<a name="line.213"></a>
+<span class="sourceLineNo">214</span> ZooKeeperProtos.ReplicationState state;<a name="line.214"></a>
+<span class="sourceLineNo">215</span> try {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> ProtobufUtil.mergeFrom(builder, bytes, pblen, bytes.length - pblen);<a name="line.216"></a>
+<span class="sourceLineNo">217</span> state = builder.build();<a name="line.217"></a>
+<span class="sourceLineNo">218</span> return state.getState();<a name="line.218"></a>
+<span class="sourceLineNo">219</span> } catch (IOException e) {<a name="line.219"></a>
+<span class="sourceLineNo">220</span> throw new DeserializationException(e);<a name="line.220"></a>
+<span class="sourceLineNo">221</span> }<a name="line.221"></a>
+<span class="sourceLineNo">222</span> }<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span> /**<a name="line.224"></a>
+<span class="sourceLineNo">225</span> * Utility method to ensure an ENABLED znode is in place; if not present, we create it.<a name="line.225"></a>
+<span class="sourceLineNo">226</span> * @param zookeeper<a name="line.226"></a>
+<span class="sourceLineNo">227</span> * @param path Path to znode to check<a name="line.227"></a>
+<span class="sourceLineNo">228</span> * @return True if we created the znode.<a name="line.228"></a>
+<span class="sourceLineNo">229</span> * @throws NodeExistsException<a name="line.229"></a>
+<span class="sourceLineNo">230</span> * @throws KeeperException<a name="line.230"></a>
<span class="sourceLineNo">231</span> */<a name="line.231"></a>
-<span class="sourceLineNo">232</span> public class PeerStateTracker extends ZooKeeperNodeTracker {<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span> public PeerStateTracker(String peerStateZNode, ZooKeeperWatcher watcher,<a name="line.234"></a>
-<span class="sourceLineNo">235</span> Abortable abortable) {<a name="line.235"></a>
-<span class="sourceLineNo">236</span> super(watcher, peerStateZNode, abortable);<a name="line.236"></a>
-<span class="sourceLineNo">237</span> }<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span> @Override<a name="line.239"></a>
-<span class="sourceLineNo">240</span> public synchronized void nodeDataChanged(String path) {<a name="line.240"></a>
-<span class="sourceLineNo">241</span> if (path.equals(node)) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> super.nodeDataChanged(path);<a name="line.242"></a>
-<span class="sourceLineNo">243</span> try {<a name="line.243"></a>
-<span class="sourceLineNo">244</span> readPeerStateZnode();<a name="line.244"></a>
-<span class="sourceLineNo">245</span> } catch (DeserializationException e) {<a name="line.245"></a>
-<span class="sourceLineNo">246</span> LOG.warn("Failed deserializing the content of " + path, e);<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span> }<a name="line.248"></a>
-<span class="sourceLineNo">249</span> }<a name="line.249"></a>
-<span class="sourceLineNo">250</span> }<a name="line.250"></a>
-<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span> /**<a name="line.252"></a>
-<span class="sourceLineNo">253</span> * Tracker for (table, cf-list) map of this peer<a name="line.253"></a>
-<span class="sourceLineNo">254</span> */<a name="line.254"></a>
-<span class="sourceLineNo">255</span> public class TableCFsTracker extends ZooKeeperNodeTracker {<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span> public TableCFsTracker(String tableCFsZNode, ZooKeeperWatcher watcher,<a name="line.257"></a>
-<span class="sourceLineNo">258</span> Abortable abortable) {<a name="line.258"></a>
-<span class="sourceLineNo">259</span> super(watcher, tableCFsZNode, abortable);<a name="line.259"></a>
-<span class="sourceLineNo">260</span> }<a name="line.260"></a>
-<span class="sourceLineNo">261</span> <a name="line.261"></a>
-<span class="sourceLineNo">262</span> @Override<a name="line.262"></a>
-<span class="sourceLineNo">263</span> public synchronized void nodeCreated(String path) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> if (path.equals(node)) {<a name="line.264"></a>
-<span class="sourceLineNo">265</span> super.nodeCreated(path);<a name="line.265"></a>
-<span class="sourceLineNo">266</span> readTableCFsZnode();<a name="line.266"></a>
-<span class="sourceLineNo">267</span> }<a name="line.267"></a>
-<span class="sourceLineNo">268</span> }<a name="line.268"></a>
-<span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span> @Override<a name="line.270"></a>
-<span class="sourceLineNo">271</span> public synchronized void nodeDataChanged(String path) {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> if (path.equals(node)) {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> super.nodeDataChanged(path);<a name="line.273"></a>
-<span class="sourceLineNo">274</span> }<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></a>
-<span class="sourceLineNo">277</span>}<a name="line.277"></a>
+<span class="sourceLineNo">232</span> private static boolean ensurePeerEnabled(final ZooKeeperWatcher zookeeper, final String path)<a name="line.232"></a>
+<span class="sourceLineNo">233</span> throws NodeExistsException, KeeperException {<a name="line.233"></a>
+<span class="sourceLineNo">234</span> if (ZKUtil.checkExists(zookeeper, path) == -1) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> // There is a race b/w PeerWatcher and ReplicationZookeeper#add method to create the<a name="line.235"></a>
+<span class="sourceLineNo">236</span> // peer-state znode. This happens while adding a peer.<a name="line.236"></a>
+<span class="sourceLineNo">237</span> // The peer state data is set as "ENABLED" by default.<a name="line.237"></a>
+<span class="sourceLineNo">238</span> ZKUtil.createNodeIfNotExistsAndWatch(zookeeper, path,<a name="line.238"></a>
+<span class="sourceLineNo">239</span> ReplicationStateZKBase.ENABLED_ZNODE_BYTES);<a name="line.239"></a>
+<span class="sourceLineNo">240</span> return true;<a name="line.240"></a>
+<span class="sourceLineNo">241</span> }<a name="line.241"></a>
+<span class="sourceLineNo">242</span> return false;<a name="line.242"></a>
+<span class="sourceLineNo">243</span> }<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span> /**<a name="line.245"></a>
+<span class="sourceLineNo">246</span> * Tracker for state of this peer<a name="line.246"></a>
+<span class="sourceLineNo">247</span> */<a name="line.247"></a>
+<span class="sourceLineNo">248</span> public class PeerStateTracker extends ZooKeeperNodeTracker {<a name="line.248"></a>
+<span class="sourceLineNo">249</span><a name="line.249"></a>
+<span class="sourceLineNo">250</span> public PeerStateTracker(String peerStateZNode, ZooKeeperWatcher watcher,<a name="line.250"></a>
+<span class="sourceLineNo">251</span> Abortable abortable) {<a name="line.251"></a>
+<span class="sourceLineNo">252</span> super(watcher, peerStateZNode, abortable);<a name="line.252"></a>
+<span class="sourceLineNo">253</span> }<a name="line.253"></a>
+<span class="sourceLineNo">254</span><a name="line.254"></a>
+<span class="sourceLineNo">255</span> @Override<a name="line.255"></a>
+<span class="sourceLineNo">256</span> public synchronized void nodeDataChanged(String path) {<a name="line.256"></a>
+<span class="sourceLineNo">257</span> if (path.equals(node)) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> super.nodeDataChanged(path);<a name="line.258"></a>
+<span class="sourceLineNo">259</span> try {<a name="line.259"></a>
+<span class="sourceLineNo">260</span> readPeerStateZnode();<a name="line.260"></a>
+<span class="sourceLineNo">261</span> } catch (DeserializationException e) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> LOG.warn("Failed deserializing the content of " + path, e);<a name="line.262"></a>
+<span class="sourceLineNo">263</span> }<a name="line.263"></a>
+<span class="sourceLineNo">264</span> }<a name="line.264"></a>
+<span class="sourceLineNo">265</span> }<a name="line.265"></a>
+<span class="sourceLineNo">266</span> }<a name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
+<span class="sourceLineNo">268</span> /**<a name="line.268"></a>
+<span class="sourceLineNo">269</span> * Tracker for (table, cf-list) map of this peer<a name="line.269"></a>
+<span class="sourceLineNo">270</span> */<a name="line.270"></a>
+<span class="sourceLineNo">271</span> public class TableCFsTracker extends ZooKeeperNodeTracker {<a name="line.271"></a>
+<span class="sourceLineNo">272</span><a name="line.272"></a>
+<span class="sourceLineNo">273</span> public TableCFsTracker(String tableCFsZNode, ZooKeeperWatcher watcher,<a name="line.273"></a>
+<span class="sourceLineNo">274</span> Abortable abortable) {<a name="line.274"></a>
+<span class="sourceLineNo">275</span> super(watcher, tableCFsZNode, abortable);<a name="line.275"></a>
+<span class="sourceLineNo">276</span> }<a name="line.276"></a>
+<span class="sourceLineNo">277</span> <a name="line.277"></a>
+<span class="sourceLineNo">278</span> @Override<a name="line.278"></a>
+<span class="sourceLineNo">279</span> public synchronized void nodeCreated(String path) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> if (path.equals(node)) {<a name="line.280"></a>
+<span class="sourceLineNo">281</span> super.nodeCreated(path);<a name="line.281"></a>
+<span class="sourceLineNo">282</span> readTableCFsZnode();<a name="line.282"></a>
+<span class="sourceLineNo">283</span> }<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span> @Override<a name="line.286"></a>
+<span class="sourceLineNo">287</span> public synchronized void nodeDataChanged(String path) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> if (path.equals(node)) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> super.nodeDataChanged(path);<a name="line.289"></a>
+<span class="sourceLineNo">290</span> }<a name="line.290"></a>
+<span class="sourceLineNo">291</span> }<a name="line.291"></a>
+<span class="sourceLineNo">292</span> }<a name="line.292"></a>
+<span class="sourceLineNo">293</span>}<a name="line.293"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e5c3dcd1/devapidocs/src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html b/devapidocs/src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html
index 46aa2e0..49a5e90 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html
@@ -151,197 +151,218 @@
<span class="sourceLineNo">143</span> throw new InvalidToken("Token has expired");<a name="line.143"></a>
<span class="sourceLineNo">144</span> }<a name="line.144"></a>
<span class="sourceLineNo">145</span> AuthenticationKey masterKey = allKeys.get(identifier.getKeyId());<a name="line.145"></a>
-<span class="sourceLineNo">146</span> if (masterKey == null) {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> throw new InvalidToken("Unknown master key for token (id="+<a name="line.147"></a>
-<span class="sourceLineNo">148</span> identifier.getKeyId()+")");<a name="line.148"></a>
-<span class="sourceLineNo">149</span> }<a name="line.149"></a>
-<span class="sourceLineNo">150</span> // regenerate the password<a name="line.150"></a>
-<span class="sourceLineNo">151</span> return createPassword(identifier.getBytes(),<a name="line.151"></a>
-<span class="sourceLineNo">152</span> masterKey.getKey());<a name="line.152"></a>
-<span class="sourceLineNo">153</span> }<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span> @Override<a name="line.155"></a>
-<span class="sourceLineNo">156</span> public AuthenticationTokenIdentifier createIdentifier() {<a name="line.156"></a>
-<span class="sourceLineNo">157</span> return new AuthenticationTokenIdentifier();<a name="line.157"></a>
-<span class="sourceLineNo">158</span> }<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span> public Token<AuthenticationTokenIdentifier> generateToken(String username) {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> AuthenticationTokenIdentifier ident =<a name="line.161"></a>
-<span class="sourceLineNo">162</span> new AuthenticationTokenIdentifier(username);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> Token<AuthenticationTokenIdentifier> token =<a name="line.163"></a>
-<span class="sourceLineNo">164</span> new Token<AuthenticationTokenIdentifier>(ident, this);<a name="line.164"></a>
-<span class="sourceLineNo">165</span> if (clusterId.hasId()) {<a name="line.165"></a>
-<span class="sourceLineNo">166</span> token.setService(new Text(clusterId.getId()));<a name="line.166"></a>
-<span class="sourceLineNo">167</span> }<a name="line.167"></a>
-<span class="sourceLineNo">168</span> return token;<a name="line.168"></a>
-<span class="sourceLineNo">169</span> }<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span> public synchronized void addKey(AuthenticationKey key) throws IOException {<a name="line.171"></a>
-<span class="sourceLineNo">172</span> // ignore zk changes when running as master<a name="line.172"></a>
-<span class="sourceLineNo">173</span> if (leaderElector.isMaster()) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span> if (LOG.isDebugEnabled()) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span> LOG.debug("Running as master, ignoring new key "+key.getKeyId());<a name="line.175"></a>
-<span class="sourceLineNo">176</span> }<a name="line.176"></a>
-<span class="sourceLineNo">177</span> return;<a name="line.177"></a>
-<span class="sourceLineNo">178</span> }<a name="line.178"></a>
-<span class="sourceLineNo">179</span><a name="line.179"></a>
-<span class="sourceLineNo">180</span> if (LOG.isDebugEnabled()) {<a name="line.180"></a>
-<span class="sourceLineNo">181</span> LOG.debug("Adding key "+key.getKeyId());<a name="line.181"></a>
-<span class="sourceLineNo">182</span> }<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span> allKeys.put(key.getKeyId(), key);<a name="line.184"></a>
-<span class="sourceLineNo">185</span> if (currentKey == null || key.getKeyId() > currentKey.getKeyId()) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> currentKey = key;<a name="line.186"></a>
-<span class="sourceLineNo">187</span> }<a name="line.187"></a>
-<span class="sourceLineNo">188</span> // update current sequence<a name="line.188"></a>
-<span class="sourceLineNo">189</span> if (key.getKeyId() > idSeq) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> idSeq = key.getKeyId();<a name="line.190"></a>
-<span class="sourceLineNo">191</span> }<a name="line.191"></a>
-<span class="sourceLineNo">192</span> }<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span> synchronized boolean removeKey(Integer keyId) {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> // ignore zk changes when running as master<a name="line.195"></a>
-<span class="sourceLineNo">196</span> if (leaderElector.isMaster()) {<a name="line.196"></a>
-<span class="sourceLineNo">197</span> if (LOG.isDebugEnabled()) {<a name="line.197"></a>
-<span class="sourceLineNo">198</span> LOG.debug("Running as master, ignoring removed key "+keyId);<a name="line.198"></a>
-<span class="sourceLineNo">199</span> }<a name="line.199"></a>
-<span class="sourceLineNo">200</span> return false;<a name="line.200"></a>
-<span class="sourceLineNo">201</span> }<a name="line.201"></a>
-<span class="sourceLineNo">202</span><a name="line.202"></a>
-<span class="sourceLineNo">203</span> if (LOG.isDebugEnabled()) {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> LOG.debug("Removing key "+keyId);<a name="line.204"></a>
-<span class="sourceLineNo">205</span> }<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span> allKeys.remove(keyId);<a name="line.207"></a>
-<span class="sourceLineNo">208</span> return true;<a name="line.208"></a>
-<span class="sourceLineNo">209</span> }<a name="line.209"></a>
-<span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span> AuthenticationKey getCurrentKey() {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> return currentKey;<a name="line.212"></a>
+<span class="sourceLineNo">146</span> if(masterKey == null) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> if(zkWatcher.getWatcher().isAborted()) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> LOG.error("ZookeeperWatcher is abort");<a name="line.148"></a>
+<span class="sourceLineNo">149</span> throw new InvalidToken("Token keys could not be sync from zookeeper"<a name="line.149"></a>
+<span class="sourceLineNo">150</span> + " because of ZookeeperWatcher abort");<a name="line.150"></a>
+<span class="sourceLineNo">151</span> }<a name="line.151"></a>
+<span class="sourceLineNo">152</span> synchronized (this) {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> if (!leaderElector.isAlive() || leaderElector.isStopped()) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span> LOG.warn("Thread leaderElector[" + leaderElector.getName() + ":"<a name="line.154"></a>
+<span class="sourceLineNo">155</span> + leaderElector.getId() + "] is stoped or not alive");<a name="line.155"></a>
+<span class="sourceLineNo">156</span> leaderElector.start();<a name="line.156"></a>
+<span class="sourceLineNo">157</span> LOG.info("Thread leaderElector [" + leaderElector.getName() + ":"<a name="line.157"></a>
+<span class="sourceLineNo">158</span> + leaderElector.getId() + "] is started");<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span> }<a name="line.160"></a>
+<span class="sourceLineNo">161</span> zkWatcher.refreshKeys();<a name="line.161"></a>
+<span class="sourceLineNo">162</span> if (LOG.isDebugEnabled()) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> LOG.debug("Sync token keys from zookeeper");<a name="line.163"></a>
+<span class="sourceLineNo">164</span> }<a name="line.164"></a>
+<span class="sourceLineNo">165</span> masterKey = allKeys.get(identifier.getKeyId());<a name="line.165"></a>
+<span class="sourceLineNo">166</span> }<a name="line.166"></a>
+<span class="sourceLineNo">167</span> if (masterKey == null) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> throw new InvalidToken("Unknown master key for token (id="+<a name="line.168"></a>
+<span class="sourceLineNo">169</span> identifier.getKeyId()+")");<a name="line.169"></a>
+<span class="sourceLineNo">170</span> }<a name="line.170"></a>
+<span class="sourceLineNo">171</span> // regenerate the password<a name="line.171"></a>
+<span class="sourceLineNo">172</span> return createPassword(identifier.getBytes(),<a name="line.172"></a>
+<span class="sourceLineNo">173</span> masterKey.getKey());<a name="line.173"></a>
+<span class="sourceLineNo">174</span> }<a name="line.174"></a>
+<span class="sourceLineNo">175</span><a name="line.175"></a>
+<span class="sourceLineNo">176</span> @Override<a name="line.176"></a>
+<span class="sourceLineNo">177</span> public AuthenticationTokenIdentifier createIdentifier() {<a name="line.177"></a>
+<span class="sourceLineNo">178</span> return new AuthenticationTokenIdentifier();<a name="line.178"></a>
+<span class="sourceLineNo">179</span> }<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> public Token<AuthenticationTokenIdentifier> generateToken(String username) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> AuthenticationTokenIdentifier ident =<a name="line.182"></a>
+<span class="sourceLineNo">183</span> new AuthenticationTokenIdentifier(username);<a name="line.183"></a>
+<span class="sourceLineNo">184</span> Token<AuthenticationTokenIdentifier> token =<a name="line.184"></a>
+<span class="sourceLineNo">185</span> new Token<AuthenticationTokenIdentifier>(ident, this);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> if (clusterId.hasId()) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> token.setService(new Text(clusterId.getId()));<a name="line.187"></a>
+<span class="sourceLineNo">188</span> }<a name="line.188"></a>
+<span class="sourceLineNo">189</span> return token;<a name="line.189"></a>
+<span class="sourceLineNo">190</span> }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span> public synchronized void addKey(AuthenticationKey key) throws IOException {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> // ignore zk changes when running as master<a name="line.193"></a>
+<span class="sourceLineNo">194</span> if (leaderElector.isMaster()) {<a name="line.194"></a>
+<span class="sourceLineNo">195</span> if (LOG.isDebugEnabled()) {<a name="line.195"></a>
+<span class="sourceLineNo">196</span> LOG.debug("Running as master, ignoring new key "+key.getKeyId());<a name="line.196"></a>
+<span class="sourceLineNo">197</span> }<a name="line.197"></a>
+<span class="sourceLineNo">198</span> return;<a name="line.198"></a>
+<span class="sourceLineNo">199</span> }<a name="line.199"></a>
+<span class="sourceLineNo">200</span><a name="line.200"></a>
+<span class="sourceLineNo">201</span> if (LOG.isDebugEnabled()) {<a name="line.201"></a>
+<span class="sourceLineNo">202</span> LOG.debug("Adding key "+key.getKeyId());<a name="line.202"></a>
+<span class="sourceLineNo">203</span> }<a name="line.203"></a>
+<span class="sourceLineNo">204</span><a name="line.204"></a>
+<span class="sourceLineNo">205</span> allKeys.put(key.getKeyId(), key);<a name="line.205"></a>
+<span class="sourceLineNo">206</span> if (currentKey == null || key.getKeyId() > currentKey.getKeyId()) {<a name="line.206"></a>
+<span class="sourceLineNo">207</span> currentKey = key;<a name="line.207"></a>
+<span class="sourceLineNo">208</span> }<a name="line.208"></a>
+<span class="sourceLineNo">209</span> // update current sequence<a name="line.209"></a>
+<span class="sourceLineNo">210</span> if (key.getKeyId() > idSeq) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> idSeq = key.getKeyId();<a name="line.211"></a>
+<span class="sourceLineNo">212</span> }<a name="line.212"></a>
<span class="sourceLineNo">213</span> }<a name="line.213"></a>
<span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span> AuthenticationKey getKey(int keyId) {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> return allKeys.get(keyId);<a name="line.216"></a>
-<span class="sourceLineNo">217</span> }<a name="line.217"></a>
-<span class="sourceLineNo">218</span><a name="line.218"></a>
-<span class="sourceLineNo">219</span> synchronized void removeExpiredKeys() {<a name="line.219"></a>
-<span class="sourceLineNo">220</span> if (!leaderElector.isMaster()) {<a name="line.220"></a>
-<span class="sourceLineNo">221</span> LOG.info("Skipping removeExpiredKeys() because not running as master.");<a name="line.221"></a>
-<span class="sourceLineNo">222</span> return;<a name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> long now = EnvironmentEdgeManager.currentTime();<a name="line.225"></a>
-<span class="sourceLineNo">226</span> Iterator<AuthenticationKey> iter = allKeys.values().iterator();<a name="line.226"></a>
-<span class="sourceLineNo">227</span> while (iter.hasNext()) {<a name="line.227"></a>
-<span class="sourceLineNo">228</span> AuthenticationKey key = iter.next();<a name="line.228"></a>
-<span class="sourceLineNo">229</span> if (key.getExpiration() < now) {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> if (LOG.isDebugEnabled()) {<a name="line.230"></a>
-<span class="sourceLineNo">231</span> LOG.debug("Removing expired key "+key.getKeyId());<a name="line.231"></a>
-<span class="sourceLineNo">232</span> }<a name="line.232"></a>
-<span class="sourceLineNo">233</span> iter.remove();<a name="line.233"></a>
-<span class="sourceLineNo">234</span> zkWatcher.removeKeyFromZK(key);<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span> }<a name="line.236"></a>
-<span class="sourceLineNo">237</span> }<a name="line.237"></a>
-<span class="sourceLineNo">238</span> <a name="line.238"></a>
-<span class="sourceLineNo">239</span> synchronized boolean isCurrentKeyRolled() {<a name="line.239"></a>
-<span class="sourceLineNo">240</span> return currentKey != null;<a name="line.240"></a>
-<span class="sourceLineNo">241</span> }<a name="line.241"></a>
-<span class="sourceLineNo">242</span><a name="line.242"></a>
-<span class="sourceLineNo">243</span> synchronized void rollCurrentKey() {<a name="line.243"></a>
-<span class="sourceLineNo">244</span> if (!leaderElector.isMaster()) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span> LOG.info("Skipping rollCurrentKey() because not running as master.");<a name="line.245"></a>
-<span class="sourceLineNo">246</span> return;<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span> long now = EnvironmentEdgeManager.currentTime();<a name="line.249"></a>
-<span class="sourceLineNo">250</span> AuthenticationKey prev = currentKey;<a name="line.250"></a>
-<span class="sourceLineNo">251</span> AuthenticationKey newKey = new AuthenticationKey(++idSeq,<a name="line.251"></a>
-<span class="sourceLineNo">252</span> Long.MAX_VALUE, // don't allow to expire until it's replaced by a new key<a name="line.252"></a>
-<span class="sourceLineNo">253</span> generateSecret());<a name="line.253"></a>
-<span class="sourceLineNo">254</span> allKeys.put(newKey.getKeyId(), newKey);<a name="line.254"></a>
-<span class="sourceLineNo">255</span> currentKey = newKey;<a name="line.255"></a>
-<span class="sourceLineNo">256</span> zkWatcher.addKeyToZK(newKey);<a name="line.256"></a>
-<span class="sourceLineNo">257</span> lastKeyUpdate = now;<a name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span> if (prev != null) {<a name="line.259"></a>
-<span class="sourceLineNo">260</span> // make sure previous key is still stored<a name="line.260"></a>
-<span class="sourceLineNo">261</span> prev.setExpiration(now + tokenMaxLifetime);<a name="line.261"></a>
-<span class="sourceLineNo">262</span> allKeys.put(prev.getKeyId(), prev);<a name="line.262"></a>
-<span class="sourceLineNo">263</span> zkWatcher.updateKeyInZK(prev);<a name="line.263"></a>
-<span class="sourceLineNo">264</span> }<a name="line.264"></a>
-<span class="sourceLineNo">265</span> }<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span> public static SecretKey createSecretKey(byte[] raw) {<a name="line.267"></a>
-<span class="sourceLineNo">268</span> return SecretManager.createSecretKey(raw);<a name="line.268"></a>
-<span class="sourceLineNo">269</span> }<a name="line.269"></a>
-<span class="sourceLineNo">270</span><a name="line.270"></a>
-<span class="sourceLineNo">271</span> private class LeaderElector extends Thread implements Stoppable {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> private boolean stopped = false;<a name="line.272"></a>
-<span class="sourceLineNo">273</span> /** Flag indicating whether we're in charge of rolling/expiring keys */<a name="line.273"></a>
-<span class="sourceLineNo">274</span> private boolean isMaster = false;<a name="line.274"></a>
-<span class="sourceLineNo">275</span> private ZKLeaderManager zkLeader;<a name="line.275"></a>
-<span class="sourceLineNo">276</span><a name="line.276"></a>
-<span class="sourceLineNo">277</span> public LeaderElector(ZooKeeperWatcher watcher, String serverName) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> setDaemon(true);<a name="line.278"></a>
-<span class="sourceLineNo">279</span> setName("ZKSecretWatcher-leaderElector");<a name="line.279"></a>
-<span class="sourceLineNo">280</span> zkLeader = new ZKLeaderManager(watcher,<a name="line.280"></a>
-<span class="sourceLineNo">281</span> ZKUtil.joinZNode(zkWatcher.getRootKeyZNode(), "keymaster"),<a name="line.281"></a>
-<span class="sourceLineNo">282</span> Bytes.toBytes(serverName), this);<a name="line.282"></a>
-<span class="sourceLineNo">283</span> }<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span> public boolean isMaster() {<a name="line.285"></a>
-<span class="sourceLineNo">286</span> return isMaster;<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> @Override<a name="line.289"></a>
-<span class="sourceLineNo">290</span> public boolean isStopped() {<a name="line.290"></a>
-<span class="sourceLineNo">291</span> return stopped;<a name="line.291"></a>
-<span class="sourceLineNo">292</span> }<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span> @Override<a name="line.294"></a>
-<span class="sourceLineNo">295</span> public void stop(String reason) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> if (stopped) {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> return;<a name="line.297"></a>
-<span class="sourceLineNo">298</span> }<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span> stopped = true;<a name="line.300"></a>
-<span class="sourceLineNo">301</span> // prevent further key generation when stopping<a name="line.301"></a>
-<span class="sourceLineNo">302</span> if (isMaster) {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> zkLeader.stepDownAsLeader();<a name="line.303"></a>
-<span class="sourceLineNo">304</span> }<a name="line.304"></a>
-<span class="sourceLineNo">305</span> isMaster = false;<a name="line.305"></a>
-<span class="sourceLineNo">306</span> LOG.info("Stopping leader election, because: "+reason);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> interrupt();<a name="line.307"></a>
+<span class="sourceLineNo">215</span> synchronized boolean removeKey(Integer keyId) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> // ignore zk changes when running as master<a name="line.216"></a>
+<span class="sourceLineNo">217</span> if (leaderElector.isMaster()) {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> if (LOG.isDebugEnabled()) {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> LOG.debug("Running as master, ignoring removed key "+keyId);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span> return false;<a name="line.221"></a>
+<span class="sourceLineNo">222</span> }<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span> if (LOG.isDebugEnabled()) {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> LOG.debug("Removing key "+keyId);<a name="line.225"></a>
+<span class="sourceLineNo">226</span> }<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span> allKeys.remove(keyId);<a name="line.228"></a>
+<span class="sourceLineNo">229</span> return true;<a name="line.229"></a>
+<span class="sourceLineNo">230</span> }<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span> AuthenticationKey getCurrentKey() {<a name="line.232"></a>
+<span class="sourceLineNo">233</span> return currentKey;<a name="line.233"></a>
+<span class="sourceLineNo">234</span> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span><a name="line.235"></a>
+<span class="sourceLineNo">236</span> AuthenticationKey getKey(int keyId) {<a name="line.236"></a>
+<span class="sourceLineNo">237</span> return allKeys.get(keyId);<a name="line.237"></a>
+<span class="sourceLineNo">238</span> }<a name="line.238"></a>
+<span class="sourceLineNo">239</span><a name="line.239"></a>
+<span class="sourceLineNo">240</span> synchronized void removeExpiredKeys() {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> if (!leaderElector.isMaster()) {<a name="line.241"></a>
+<span class="sourceLineNo">242</span> LOG.info("Skipping removeExpiredKeys() because not running as master.");<a name="line.242"></a>
+<span class="sourceLineNo">243</span> return;<a name="line.243"></a>
+<span class="sourceLineNo">244</span> }<a name="line.244"></a>
+<span class="sourceLineNo">245</span><a name="line.245"></a>
+<span class="sourceLineNo">246</span> long now = EnvironmentEdgeManager.currentTime();<a name="line.246"></a>
+<span class="sourceLineNo">247</span> Iterator<AuthenticationKey> iter = allKeys.values().iterator();<a name="line.247"></a>
+<span class="sourceLineNo">248</span> while (iter.hasNext()) {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> AuthenticationKey key = iter.next();<a name="line.249"></a>
+<span class="sourceLineNo">250</span> if (key.getExpiration() < now) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span> if (LOG.isDebugEnabled()) {<a name="line.251"></a>
+<span class="sourceLineNo">252</span> LOG.debug("Removing expired key "+key.getKeyId());<a name="line.252"></a>
+<span class="sourceLineNo">253</span> }<a name="line.253"></a>
+<span class="sourceLineNo">254</span> iter.remove();<a name="line.254"></a>
+<span class="sourceLineNo">255</span> zkWatcher.removeKeyFromZK(key);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">258</span> }<a name="line.258"></a>
+<span class="sourceLineNo">259</span> <a name="line.259"></a>
+<span class="sourceLineNo">260</span> synchronized boolean isCurrentKeyRolled() {<a name="line.260"></a>
+<span class="sourceLineNo">261</span> return currentKey != null;<a name="line.261"></a>
+<span class="sourceLineNo">262</span> }<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span> synchronized void rollCurrentKey() {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> if (!leaderElector.isMaster()) {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> LOG.info("Skipping rollCurrentKey() because not running as master.");<a name="line.266"></a>
+<span class="sourceLineNo">267</span> return;<a name="line.267"></a>
+<span class="sourceLineNo">268</span> }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> long now = EnvironmentEdgeManager.currentTime();<a name="line.270"></a>
+<span class="sourceLineNo">271</span> AuthenticationKey prev = currentKey;<a name="line.271"></a>
+<span class="sourceLineNo">272</span> AuthenticationKey newKey = new AuthenticationKey(++idSeq,<a name="line.272"></a>
+<span class="sourceLineNo">273</span> Long.MAX_VALUE, // don't allow to expire until it's replaced by a new key<a name="line.273"></a>
+<span class="sourceLineNo">274</span> generateSecret());<a name="line.274"></a>
+<span class="sourceLineNo">275</span> allKeys.put(newKey.getKeyId(), newKey);<a name="line.275"></a>
+<span class="sourceLineNo">276</span> currentKey = newKey;<a name="line.276"></a>
+<span class="sourceLineNo">277</span> zkWatcher.addKeyToZK(newKey);<a name="line.277"></a>
+<span class="sourceLineNo">278</span> lastKeyUpdate = now;<a name="line.278"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span> if (prev != null) {<a name="line.280"></a>
+<span class="sourceLineNo">281</span> // make sure previous key is still stored<a name="line.281"></a>
+<span class="sourceLineNo">282</span> prev.setExpiration(now + tokenMaxLifetime);<a name="line.282"></a>
+<span class="sourceLineNo">283</span> allKeys.put(prev.getKeyId(), prev);<a name="line.283"></a>
+<span class="sourceLineNo">284</span> zkWatcher.updateKeyInZK(prev);<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span> }<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span> public static SecretKey createSecretKey(byte[] raw) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> return SecretManager.createSecretKey(raw);<a name="line.289"></a>
+<span class="sourceLineNo">290</span> }<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span> private class LeaderElector extends Thread implements Stoppable {<a name="line.292"></a>
+<span class="sourceLineNo">293</span> private boolean stopped = false;<a name="line.293"></a>
+<span class="sourceLineNo">294</span> /** Flag indicating whether we're in charge of rolling/expiring keys */<a name="line.294"></a>
+<span class="sourceLineNo">295</span> private boolean isMaster = false;<a name="line.295"></a>
+<span class="sourceLineNo">296</span> private ZKLeaderManager zkLeader;<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span> public LeaderElector(ZooKeeperWatcher watcher, String serverName) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span> setDaemon(true);<a name="line.299"></a>
+<span class="sourceLineNo">300</span> setName("ZKSecretWatcher-leaderElector");<a name="line.300"></a>
+<span class="sourceLineNo">301</span> zkLeader = new ZKLeaderManager(watcher,<a name="line.301"></a>
+<span class="sourceLineNo">302</span> ZKUtil.joinZNode(zkWatcher.getRootKeyZNode(), "keymaster"),<a name="line.302"></a>
+<span class="sourceLineNo">303</span> Bytes.toBytes(serverName), this);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> }<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span> public boolean isMaster() {<a name="line.306"></a>
+<span class="sourceLineNo">307</span> return isMaster;<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> public void run() {<a name="line.310"></a>
-<span class="sourceLineNo">311</span> zkLeader.start();<a name="line.311"></a>
-<span class="sourceLineNo">312</span> zkLeader.waitToBecomeLeader();<a name="line.312"></a>
-<span class="sourceLineNo">313</span> isMaster = true;<a name="line.313"></a>
+<span class="sourceLineNo">310</span> @Override<a name="line.310"></a>
+<span class="sourceLineNo">311</span> public boolean isStopped() {<a name="line.311"></a>
+<span class="sourceLineNo">312</span> return stopped;<a name="line.312"></a>
+<span class="sourceLineNo">313</span> }<a name="line.313"></a>
<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span> while (!stopped) {<a name="line.315"></a>
-<span class="sourceLineNo">316</span> long now = EnvironmentEdgeManager.currentTime();<a name="line.316"></a>
-<span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span> // clear any expired<a name="line.318"></a>
-<span class="sourceLineNo">319</span> removeExpiredKeys();<a name="line.319"></a>
+<span class="sourceLineNo">315</span> @Override<a name="line.315"></a>
+<span class="sourceLineNo">316</span> public void stop(String reason) {<a name="line.316"></a>
+<span class="sourceLineNo">317</span> if (stopped) {<a name="line.317"></a>
+<span class="sourceLineNo">318</span> return;<a name="line.318"></a>
+<span class="sourceLineNo">319</span> }<a name="line.319"></a>
<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span> if (lastKeyUpdate + keyUpdateInterval < now) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span> // roll a new master key<a name="line.322"></a>
-<span class="sourceLineNo">323</span> rollCurrentKey();<a name="line.323"></a>
-<span class="sourceLineNo">324</span> }<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span> try {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> Thread.sleep(5000);<a name="line.327"></a>
-<span class="sourceLineNo">328</span> } catch (InterruptedException ie) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> if (LOG.isDebugEnabled()) {<a name="line.329"></a>
-<span class="sourceLineNo">330</span> LOG.debug("Interrupted waiting for next update", ie);<a name="line.330"></a>
-<span class="sourceLineNo">331</span> }<a name="line.331"></a>
-<span class="sourceLineNo">332</span> }<a name="line.332"></a>
-<span class="sourceLineNo">333</span> }<a name="line.333"></a>
-<span class="sourceLineNo">334</span> }<a name="line.334"></a>
-<span class="sourceLineNo">335</span> }<a name="line.335"></a>
-<span class="sourceLineNo">336</span>}<a name="line.336"></a>
+<span class="sourceLineNo">321</span> stopped = true;<a name="line.321"></a>
+<span class="sourceLineNo">322</span> // prevent further key generation when stopping<a name="line.322"></a>
+<span class="sourceLineNo">323</span> if (isMaster) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span> zkLeader.stepDownAsLeader();<a name="line.324"></a>
+<span class="sourceLineNo">325</span> }<a name="line.325"></a>
+<span class="sourceLineNo">326</span> isMaster = false;<a name="line.326"></a>
+<span class="sourceLineNo">327</span> LOG.info("Stopping leader election, because: "+reason);<a name="line.327"></a>
+<span class="sourceLineNo">328</span> interrupt();<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> public void run() {<a name="line.331"></a>
+<span class="sourceLineNo">332</span> zkLeader.start();<a name="line.332"></a>
+<span class="sourceLineNo">333</span> zkLeader.waitToBecomeLeader();<a name="line.333"></a>
+<span class="sourceLineNo">334</span> isMaster = true;<a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span> while (!stopped) {<a name="line.336"></a>
+<span class="sourceLineNo">337</span> long now = EnvironmentEdgeManager.currentTime();<a name="line.337"></a>
+<span class="sourceLineNo">338</span><a name="line.338"></a>
+<span class="sourceLineNo">339</span> // clear any expired<a name="line.339"></a>
+<span class="sourceLineNo">340</span> removeExpiredKeys();<a name="line.340"></a>
+<span class="sourceLineNo">341</span><a name="line.341"></a>
+<span class="sourceLineNo">342</span> if (lastKeyUpdate + keyUpdateInterval < now) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> // roll a new master key<a name="line.343"></a>
+<span class="sourceLineNo">344</span> rollCurrentKey();<a name="line.344"></a>
+<span class="sourceLineNo">345</span> }<a name="line.345"></a>
+<span class="sourceLineNo">346</span><a name="line.346"></a>
+<span class="sourceLineNo">347</span> try {<a name="line.347"></a>
+<span class="sourceLineNo">348</span> Thread.sleep(5000);<a name="line.348"></a>
+<span class="sourceLineNo">349</span> } catch (InterruptedException ie) {<a name="line.349"></a>
+<span class="sourceLineNo">350</span> if (LOG.isDebugEnabled()) {<a name="line.350"></a>
+<span class="sourceLineNo">351</span> LOG.debug("Interrupted waiting for next update", ie);<a name="line.351"></a>
+<span class="sourceLineNo">352</span> }<a name="line.352"></a>
+<span class="sourceLineNo">353</span> }<a name="line.353"></a>
+<span class="sourceLineNo">354</span> }<a name="line.354"></a>
+<span class="sourceLineNo">355</span> }<a name="line.355"></a>
+<span class="sourceLineNo">356</span> }<a name="line.356"></a>
+<span class="sourceLineNo">357</span>}<a name="line.357"></a>