http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/src-html/org/apache/hadoop/hbase/Server.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/Server.html b/devapidocs/src-html/org/apache/hadoop/hbase/Server.html index 3650589..649f0eb 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/Server.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/Server.html @@ -31,7 +31,7 @@ <span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.client.ClusterConnection;<a name="line.23"></a> <span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.24"></a> <span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.zookeeper.MetaTableLocator;<a name="line.25"></a> -<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;<a name="line.26"></a> +<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.zookeeper.ZKWatcher;<a name="line.26"></a> <span class="sourceLineNo">027</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.27"></a> <span class="sourceLineNo">028</span><a name="line.28"></a> <span class="sourceLineNo">029</span>import java.io.IOException;<a name="line.29"></a> @@ -51,7 +51,7 @@ <span class="sourceLineNo">043</span> /**<a name="line.43"></a> <span class="sourceLineNo">044</span> * Gets the ZooKeeper instance for this server.<a name="line.44"></a> <span class="sourceLineNo">045</span> */<a name="line.45"></a> -<span class="sourceLineNo">046</span> ZooKeeperWatcher getZooKeeper();<a name="line.46"></a> +<span class="sourceLineNo">046</span> ZKWatcher getZooKeeper();<a name="line.46"></a> <span class="sourceLineNo">047</span><a name="line.47"></a> <span class="sourceLineNo">048</span> /**<a name="line.48"></a> <span class="sourceLineNo">049</span> * Returns a reference to the servers' connection.<a name="line.49"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/src-html/org/apache/hadoop/hbase/Version.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html index 3f72936..cf8dcf8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html @@ -16,11 +16,11 @@ <span class="sourceLineNo">008</span>@InterfaceAudience.Private<a name="line.8"></a> <span class="sourceLineNo">009</span>public class Version {<a name="line.9"></a> <span class="sourceLineNo">010</span> public static final String version = "3.0.0-SNAPSHOT";<a name="line.10"></a> -<span class="sourceLineNo">011</span> public static final String revision = "e8ae6d4b73191a7ce03c99bccc4eb45b611ce844";<a name="line.11"></a> +<span class="sourceLineNo">011</span> public static final String revision = "777b653b45e54c89dd69e86eff2b261054465623";<a name="line.11"></a> <span class="sourceLineNo">012</span> public static final String user = "jenkins";<a name="line.12"></a> -<span class="sourceLineNo">013</span> public static final String date = "Fri Nov 17 14:47:22 UTC 2017";<a name="line.13"></a> +<span class="sourceLineNo">013</span> public static final String date = "Sat Nov 18 14:42:07 UTC 2017";<a name="line.13"></a> <span class="sourceLineNo">014</span> public static final String url = "git://asf920.gq1.ygridcore.net/home/jenkins/jenkins-slave/workspace/hbase_generate_website/hbase";<a name="line.14"></a> -<span class="sourceLineNo">015</span> public static final String srcChecksum = "601e5a7bc50a5c4f488a0da69c87919e";<a name="line.15"></a> +<span class="sourceLineNo">015</span> public static final String srcChecksum = "6ee647139f28b719fcd23773238722ce";<a name="line.15"></a> <span class="sourceLineNo">016</span>}<a name="line.16"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/src-html/org/apache/hadoop/hbase/ZKNamespaceManager.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/ZKNamespaceManager.html b/devapidocs/src-html/org/apache/hadoop/hbase/ZKNamespaceManager.html index a24e89c..db3c69f 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/ZKNamespaceManager.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/ZKNamespaceManager.html @@ -35,8 +35,8 @@ <span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.27"></a> <span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.28"></a> <span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.zookeeper.ZNodePaths;<a name="line.29"></a> -<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.zookeeper.ZooKeeperListener;<a name="line.30"></a> -<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;<a name="line.31"></a> +<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.zookeeper.ZKListener;<a name="line.30"></a> +<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.zookeeper.ZKWatcher;<a name="line.31"></a> <span class="sourceLineNo">032</span>import org.apache.zookeeper.KeeperException;<a name="line.32"></a> <span class="sourceLineNo">033</span><a name="line.33"></a> <span class="sourceLineNo">034</span>import java.io.IOException;<a name="line.34"></a> @@ -56,12 +56,12 @@ <span class="sourceLineNo">048</span> *<a name="line.48"></a> <span class="sourceLineNo">049</span> */<a name="line.49"></a> <span class="sourceLineNo">050</span>@InterfaceAudience.Private<a name="line.50"></a> -<span class="sourceLineNo">051</span>public class ZKNamespaceManager extends ZooKeeperListener {<a name="line.51"></a> +<span class="sourceLineNo">051</span>public class ZKNamespaceManager extends ZKListener {<a name="line.51"></a> <span class="sourceLineNo">052</span> private static final Log LOG = LogFactory.getLog(ZKNamespaceManager.class);<a name="line.52"></a> <span class="sourceLineNo">053</span> private final String nsZNode;<a name="line.53"></a> <span class="sourceLineNo">054</span> private volatile NavigableMap<String,NamespaceDescriptor> cache;<a name="line.54"></a> <span class="sourceLineNo">055</span><a name="line.55"></a> -<span class="sourceLineNo">056</span> public ZKNamespaceManager(ZooKeeperWatcher zkw) throws IOException {<a name="line.56"></a> +<span class="sourceLineNo">056</span> public ZKNamespaceManager(ZKWatcher zkw) throws IOException {<a name="line.56"></a> <span class="sourceLineNo">057</span> super(zkw);<a name="line.57"></a> <span class="sourceLineNo">058</span> nsZNode = zkw.znodePaths.namespaceZNode;<a name="line.58"></a> <span class="sourceLineNo">059</span> cache = new ConcurrentSkipListMap<>();<a name="line.59"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/src-html/org/apache/hadoop/hbase/ZNodeClearer.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/ZNodeClearer.html b/devapidocs/src-html/org/apache/hadoop/hbase/ZNodeClearer.html index 9e6e2b9..886dc47 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/ZNodeClearer.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/ZNodeClearer.html @@ -40,8 +40,8 @@ <span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.master.balancer.BaseLoadBalancer;<a name="line.32"></a> <span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;<a name="line.33"></a> <span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.34"></a> -<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.zookeeper.ZNodePaths;<a name="line.35"></a> -<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;<a name="line.36"></a> +<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.zookeeper.ZKWatcher;<a name="line.35"></a> +<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.zookeeper.ZNodePaths;<a name="line.36"></a> <span class="sourceLineNo">037</span>import org.apache.zookeeper.KeeperException;<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> @@ -140,7 +140,7 @@ <span class="sourceLineNo">132</span> * @param rsZnodePath from HBASE_ZNODE_FILE<a name="line.132"></a> <span class="sourceLineNo">133</span> * @return String representation of ServerName or null if fails<a name="line.133"></a> <span class="sourceLineNo">134</span> */<a name="line.134"></a> -<span class="sourceLineNo">135</span> <a name="line.135"></a> +<span class="sourceLineNo">135</span><a name="line.135"></a> <span class="sourceLineNo">136</span> public static String parseMasterServerName(String rsZnodePath) {<a name="line.136"></a> <span class="sourceLineNo">137</span> String masterServerName = null;<a name="line.137"></a> <span class="sourceLineNo">138</span> try {<a name="line.138"></a> @@ -149,12 +149,12 @@ <span class="sourceLineNo">141</span> } catch (IndexOutOfBoundsException e) {<a name="line.141"></a> <span class="sourceLineNo">142</span> LOG.warn("String " + rsZnodePath + " has wrong format", e);<a name="line.142"></a> <span class="sourceLineNo">143</span> }<a name="line.143"></a> -<span class="sourceLineNo">144</span> return masterServerName; <a name="line.144"></a> +<span class="sourceLineNo">144</span> return masterServerName;<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">146</span><a name="line.146"></a> <span class="sourceLineNo">147</span> /**<a name="line.147"></a> -<span class="sourceLineNo">148</span> * <a name="line.148"></a> -<span class="sourceLineNo">149</span> * @return true if cluster is configured with master-rs collocation <a name="line.149"></a> +<span class="sourceLineNo">148</span> *<a name="line.148"></a> +<span class="sourceLineNo">149</span> * @return true if cluster is configured with master-rs collocation<a name="line.149"></a> <span class="sourceLineNo">150</span> */<a name="line.150"></a> <span class="sourceLineNo">151</span> private static boolean tablesOnMaster(Configuration conf) {<a name="line.151"></a> <span class="sourceLineNo">152</span> boolean tablesOnMaster = true;<a name="line.152"></a> @@ -175,9 +175,9 @@ <span class="sourceLineNo">167</span> Configuration tempConf = new Configuration(conf);<a name="line.167"></a> <span class="sourceLineNo">168</span> tempConf.setInt("zookeeper.recovery.retry", 0);<a name="line.168"></a> <span class="sourceLineNo">169</span><a name="line.169"></a> -<span class="sourceLineNo">170</span> ZooKeeperWatcher zkw;<a name="line.170"></a> +<span class="sourceLineNo">170</span> ZKWatcher zkw;<a name="line.170"></a> <span class="sourceLineNo">171</span> try {<a name="line.171"></a> -<span class="sourceLineNo">172</span> zkw = new ZooKeeperWatcher(tempConf, "clean znode for master",<a name="line.172"></a> +<span class="sourceLineNo">172</span> zkw = new ZKWatcher(tempConf, "clean znode for master",<a name="line.172"></a> <span class="sourceLineNo">173</span> new Abortable() {<a name="line.173"></a> <span class="sourceLineNo">174</span> @Override public void abort(String why, Throwable e) {}<a name="line.174"></a> <span class="sourceLineNo">175</span> @Override public boolean isAborted() { return false; }<a name="line.175"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/src-html/org/apache/hadoop/hbase/backup/example/HFileArchiveManager.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/backup/example/HFileArchiveManager.html b/devapidocs/src-html/org/apache/hadoop/hbase/backup/example/HFileArchiveManager.html index 4186401..0d8a89a 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/example/HFileArchiveManager.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/example/HFileArchiveManager.html @@ -31,12 +31,12 @@ <span class="sourceLineNo">023</span>import org.apache.commons.logging.LogFactory;<a name="line.23"></a> <span class="sourceLineNo">024</span>import org.apache.hadoop.conf.Configuration;<a name="line.24"></a> <span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.ZooKeeperConnectionException;<a name="line.25"></a> -<span class="sourceLineNo">026</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.26"></a> -<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.27"></a> -<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.28"></a> -<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.29"></a> -<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.zookeeper.ZNodePaths;<a name="line.30"></a> -<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;<a name="line.31"></a> +<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.zookeeper.ZKWatcher;<a name="line.26"></a> +<span class="sourceLineNo">027</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.27"></a> +<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.28"></a> +<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.29"></a> +<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.30"></a> +<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.zookeeper.ZNodePaths;<a name="line.31"></a> <span class="sourceLineNo">032</span>import org.apache.zookeeper.KeeperException;<a name="line.32"></a> <span class="sourceLineNo">033</span><a name="line.33"></a> <span class="sourceLineNo">034</span>/**<a name="line.34"></a> @@ -50,12 +50,12 @@ <span class="sourceLineNo">042</span><a name="line.42"></a> <span class="sourceLineNo">043</span> private final String archiveZnode;<a name="line.43"></a> <span class="sourceLineNo">044</span> private static final Log LOG = LogFactory.getLog(HFileArchiveManager.class);<a name="line.44"></a> -<span class="sourceLineNo">045</span> private final ZooKeeperWatcher zooKeeper;<a name="line.45"></a> +<span class="sourceLineNo">045</span> private final ZKWatcher zooKeeper;<a name="line.45"></a> <span class="sourceLineNo">046</span> private volatile boolean stopped = false;<a name="line.46"></a> <span class="sourceLineNo">047</span><a name="line.47"></a> <span class="sourceLineNo">048</span> public HFileArchiveManager(Connection connection, Configuration conf)<a name="line.48"></a> <span class="sourceLineNo">049</span> throws ZooKeeperConnectionException, IOException {<a name="line.49"></a> -<span class="sourceLineNo">050</span> this.zooKeeper = new ZooKeeperWatcher(conf, "hfileArchiveManager-on-" + connection.toString(),<a name="line.50"></a> +<span class="sourceLineNo">050</span> this.zooKeeper = new ZKWatcher(conf, "hfileArchiveManager-on-" + connection.toString(),<a name="line.50"></a> <span class="sourceLineNo">051</span> connection);<a name="line.51"></a> <span class="sourceLineNo">052</span> this.archiveZnode = ZKTableArchiveClient.getArchiveZNode(this.zooKeeper.getConfiguration(),<a name="line.52"></a> <span class="sourceLineNo">053</span> this.zooKeeper);<a name="line.53"></a> @@ -112,7 +112,7 @@ <span class="sourceLineNo">104</span> * @param table table name on which to enable archiving<a name="line.104"></a> <span class="sourceLineNo">105</span> * @throws KeeperException<a name="line.105"></a> <span class="sourceLineNo">106</span> */<a name="line.106"></a> -<span class="sourceLineNo">107</span> private void enable(ZooKeeperWatcher zooKeeper, byte[] table)<a name="line.107"></a> +<span class="sourceLineNo">107</span> private void enable(ZKWatcher zooKeeper, byte[] table)<a name="line.107"></a> <span class="sourceLineNo">108</span> throws KeeperException {<a name="line.108"></a> <span class="sourceLineNo">109</span> LOG.debug("Ensuring archiving znode exists");<a name="line.109"></a> <span class="sourceLineNo">110</span> ZKUtil.createAndFailSilent(zooKeeper, archiveZnode);<a name="line.110"></a> @@ -131,7 +131,7 @@ <span class="sourceLineNo">123</span> * @param table name of the table to disable<a name="line.123"></a> <span class="sourceLineNo">124</span> * @throws KeeperException if an unexpected ZK connection issues occurs<a name="line.124"></a> <span class="sourceLineNo">125</span> */<a name="line.125"></a> -<span class="sourceLineNo">126</span> private void disable(ZooKeeperWatcher zooKeeper, byte[] table) throws KeeperException {<a name="line.126"></a> +<span class="sourceLineNo">126</span> private void disable(ZKWatcher zooKeeper, byte[] table) throws KeeperException {<a name="line.126"></a> <span class="sourceLineNo">127</span> // ensure the latest state of the archive node is found<a name="line.127"></a> <span class="sourceLineNo">128</span> zooKeeper.sync(archiveZnode);<a name="line.128"></a> <span class="sourceLineNo">129</span><a name="line.129"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/src-html/org/apache/hadoop/hbase/backup/example/TableHFileArchiveTracker.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/backup/example/TableHFileArchiveTracker.html b/devapidocs/src-html/org/apache/hadoop/hbase/backup/example/TableHFileArchiveTracker.html index 21c7598..f286b3d 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/example/TableHFileArchiveTracker.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/example/TableHFileArchiveTracker.html @@ -30,12 +30,12 @@ <span class="sourceLineNo">022</span><a name="line.22"></a> <span class="sourceLineNo">023</span>import org.apache.commons.logging.Log;<a name="line.23"></a> <span class="sourceLineNo">024</span>import org.apache.commons.logging.LogFactory;<a name="line.24"></a> -<span class="sourceLineNo">025</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.25"></a> -<span class="sourceLineNo">026</span>import org.apache.hadoop.conf.Configuration;<a name="line.26"></a> -<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.ZooKeeperConnectionException;<a name="line.27"></a> -<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.28"></a> -<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.zookeeper.ZooKeeperListener;<a name="line.29"></a> -<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;<a name="line.30"></a> +<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.zookeeper.ZKWatcher;<a name="line.25"></a> +<span class="sourceLineNo">026</span>import org.apache.yetus.audience.InterfaceAudience;<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.ZooKeeperConnectionException;<a name="line.28"></a> +<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.29"></a> +<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.zookeeper.ZKListener;<a name="line.30"></a> <span class="sourceLineNo">031</span>import org.apache.zookeeper.KeeperException;<a name="line.31"></a> <span class="sourceLineNo">032</span><a name="line.32"></a> <span class="sourceLineNo">033</span>/**<a name="line.33"></a> @@ -46,14 +46,14 @@ <span class="sourceLineNo">038</span> * archive.<a name="line.38"></a> <span class="sourceLineNo">039</span> */<a name="line.39"></a> <span class="sourceLineNo">040</span>@InterfaceAudience.Private<a name="line.40"></a> -<span class="sourceLineNo">041</span>public class TableHFileArchiveTracker extends ZooKeeperListener {<a name="line.41"></a> +<span class="sourceLineNo">041</span>public class TableHFileArchiveTracker extends ZKListener {<a name="line.41"></a> <span class="sourceLineNo">042</span> private static final Log LOG = LogFactory.getLog(TableHFileArchiveTracker.class);<a name="line.42"></a> <span class="sourceLineNo">043</span> public static final String HFILE_ARCHIVE_ZNODE_PARENT = "hfilearchive";<a name="line.43"></a> <span class="sourceLineNo">044</span> private HFileArchiveTableMonitor monitor;<a name="line.44"></a> <span class="sourceLineNo">045</span> private String archiveHFileZNode;<a name="line.45"></a> <span class="sourceLineNo">046</span> private boolean stopped = false;<a name="line.46"></a> <span class="sourceLineNo">047</span><a name="line.47"></a> -<span class="sourceLineNo">048</span> private TableHFileArchiveTracker(ZooKeeperWatcher watcher, HFileArchiveTableMonitor monitor) {<a name="line.48"></a> +<span class="sourceLineNo">048</span> private TableHFileArchiveTracker(ZKWatcher watcher, HFileArchiveTableMonitor monitor) {<a name="line.48"></a> <span class="sourceLineNo">049</span> super(watcher);<a name="line.49"></a> <span class="sourceLineNo">050</span> watcher.registerListener(this);<a name="line.50"></a> <span class="sourceLineNo">051</span> this.monitor = monitor;<a name="line.51"></a> @@ -243,7 +243,7 @@ <span class="sourceLineNo">235</span> */<a name="line.235"></a> <span class="sourceLineNo">236</span> public static TableHFileArchiveTracker create(Configuration conf)<a name="line.236"></a> <span class="sourceLineNo">237</span> throws ZooKeeperConnectionException, IOException {<a name="line.237"></a> -<span class="sourceLineNo">238</span> ZooKeeperWatcher zkw = new ZooKeeperWatcher(conf, "hfileArchiveCleaner", null);<a name="line.238"></a> +<span class="sourceLineNo">238</span> ZKWatcher zkw = new ZKWatcher(conf, "hfileArchiveCleaner", null);<a name="line.238"></a> <span class="sourceLineNo">239</span> return create(zkw, new HFileArchiveTableMonitor());<a name="line.239"></a> <span class="sourceLineNo">240</span> }<a name="line.240"></a> <span class="sourceLineNo">241</span><a name="line.241"></a> @@ -255,12 +255,12 @@ <span class="sourceLineNo">247</span> * @return ZooKeeper tracker to monitor for this server if this server should archive hfiles for a<a name="line.247"></a> <span class="sourceLineNo">248</span> * given table<a name="line.248"></a> <span class="sourceLineNo">249</span> */<a name="line.249"></a> -<span class="sourceLineNo">250</span> private static TableHFileArchiveTracker create(ZooKeeperWatcher zkw,<a name="line.250"></a> +<span class="sourceLineNo">250</span> private static TableHFileArchiveTracker create(ZKWatcher zkw,<a name="line.250"></a> <span class="sourceLineNo">251</span> HFileArchiveTableMonitor monitor) {<a name="line.251"></a> <span class="sourceLineNo">252</span> return new TableHFileArchiveTracker(zkw, monitor);<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> public ZooKeeperWatcher getZooKeeperWatcher() {<a name="line.255"></a> +<span class="sourceLineNo">255</span> public ZKWatcher getZooKeeperWatcher() {<a name="line.255"></a> <span class="sourceLineNo">256</span> return this.watcher;<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> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48aaec11/devapidocs/src-html/org/apache/hadoop/hbase/backup/example/ZKTableArchiveClient.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/backup/example/ZKTableArchiveClient.html b/devapidocs/src-html/org/apache/hadoop/hbase/backup/example/ZKTableArchiveClient.html index a52be34..bf9f804 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/example/ZKTableArchiveClient.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/example/ZKTableArchiveClient.html @@ -27,13 +27,13 @@ <span class="sourceLineNo">019</span><a name="line.19"></a> <span class="sourceLineNo">020</span>import java.io.IOException;<a name="line.20"></a> <span class="sourceLineNo">021</span><a name="line.21"></a> -<span class="sourceLineNo">022</span>import org.apache.yetus.audience.InterfaceAudience;<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.conf.Configured;<a name="line.24"></a> -<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.client.ClusterConnection;<a name="line.25"></a> -<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.26"></a> -<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.zookeeper.ZNodePaths;<a name="line.27"></a> -<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;<a name="line.28"></a> +<span class="sourceLineNo">022</span>import org.apache.hadoop.hbase.zookeeper.ZKWatcher;<a name="line.22"></a> +<span class="sourceLineNo">023</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.23"></a> +<span class="sourceLineNo">024</span>import org.apache.hadoop.conf.Configuration;<a name="line.24"></a> +<span class="sourceLineNo">025</span>import org.apache.hadoop.conf.Configured;<a name="line.25"></a> +<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.client.ClusterConnection;<a name="line.26"></a> +<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.27"></a> +<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.zookeeper.ZNodePaths;<a name="line.28"></a> <span class="sourceLineNo">029</span>import org.apache.zookeeper.KeeperException;<a name="line.29"></a> <span class="sourceLineNo">030</span><a name="line.30"></a> <span class="sourceLineNo">031</span>/**<a name="line.31"></a> @@ -156,7 +156,7 @@ <span class="sourceLineNo">148</span> * @param zooKeeper zookeeper to used for building the full path<a name="line.148"></a> <span class="sourceLineNo">149</span> * @return get the znode for long-term archival of a table for<a name="line.149"></a> <span class="sourceLineNo">150</span> */<a name="line.150"></a> -<span class="sourceLineNo">151</span> public static String getArchiveZNode(Configuration conf, ZooKeeperWatcher zooKeeper) {<a name="line.151"></a> +<span class="sourceLineNo">151</span> public static String getArchiveZNode(Configuration conf, ZKWatcher zooKeeper) {<a name="line.151"></a> <span class="sourceLineNo">152</span> return ZNodePaths.joinZNode(zooKeeper.znodePaths.baseZNode, conf.get(<a name="line.152"></a> <span class="sourceLineNo">153</span> ZOOKEEPER_ZNODE_HFILE_ARCHIVE_KEY, TableHFileArchiveTracker.HFILE_ARCHIVE_ZNODE_PARENT));<a name="line.153"></a> <span class="sourceLineNo">154</span> }<a name="line.154"></a>
