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 2016/01/22 18:00:52 UTC
[10/13] hbase-site git commit: Published site at
f9e69b51e1997c6de2ed74f9edbc6947b11c88dc.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
index 271fd72..4bcfbd0 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
@@ -771,7 +771,7 @@
<span class="sourceLineNo">763</span> * Add HBase and its dependencies (only) to the job configuration.<a name="line.763"></a>
<span class="sourceLineNo">764</span> * <p><a name="line.764"></a>
<span class="sourceLineNo">765</span> * This is intended as a low-level API, facilitating code reuse between this<a name="line.765"></a>
-<span class="sourceLineNo">766</span> * class and its mapred counterpart. It also of use to extenral tools that<a name="line.766"></a>
+<span class="sourceLineNo">766</span> * class and its mapred counterpart. It also of use to external tools that<a name="line.766"></a>
<span class="sourceLineNo">767</span> * need to build a MapReduce job that interacts with HBase but want<a name="line.767"></a>
<span class="sourceLineNo">768</span> * fine-grained control over the jars shipped to the cluster.<a name="line.768"></a>
<span class="sourceLineNo">769</span> * </p><a name="line.769"></a>
@@ -780,224 +780,240 @@
<span class="sourceLineNo">772</span> * @see <a href="https://issues.apache.org/jira/browse/PIG-3285">PIG-3285</a><a name="line.772"></a>
<span class="sourceLineNo">773</span> */<a name="line.773"></a>
<span class="sourceLineNo">774</span> public static void addHBaseDependencyJars(Configuration conf) throws IOException {<a name="line.774"></a>
-<span class="sourceLineNo">775</span> addDependencyJars(conf,<a name="line.775"></a>
-<span class="sourceLineNo">776</span> // explicitly pull a class from each module<a name="line.776"></a>
-<span class="sourceLineNo">777</span> org.apache.hadoop.hbase.HConstants.class, // hbase-common<a name="line.777"></a>
-<span class="sourceLineNo">778</span> org.apache.hadoop.hbase.protobuf.generated.ClientProtos.class, // hbase-protocol<a name="line.778"></a>
-<span class="sourceLineNo">779</span> org.apache.hadoop.hbase.client.Put.class, // hbase-client<a name="line.779"></a>
-<span class="sourceLineNo">780</span> org.apache.hadoop.hbase.CompatibilityFactory.class, // hbase-hadoop-compat<a name="line.780"></a>
-<span class="sourceLineNo">781</span> org.apache.hadoop.hbase.mapreduce.TableMapper.class, // hbase-server<a name="line.781"></a>
-<span class="sourceLineNo">782</span> // pull necessary dependencies<a name="line.782"></a>
-<span class="sourceLineNo">783</span> org.apache.zookeeper.ZooKeeper.class,<a name="line.783"></a>
-<span class="sourceLineNo">784</span> io.netty.channel.Channel.class,<a name="line.784"></a>
-<span class="sourceLineNo">785</span> com.google.protobuf.Message.class,<a name="line.785"></a>
-<span class="sourceLineNo">786</span> com.google.common.collect.Lists.class,<a name="line.786"></a>
-<span class="sourceLineNo">787</span> org.apache.htrace.Trace.class,<a name="line.787"></a>
-<span class="sourceLineNo">788</span> com.codahale.metrics.MetricRegistry.class);<a name="line.788"></a>
-<span class="sourceLineNo">789</span> }<a name="line.789"></a>
-<span class="sourceLineNo">790</span><a name="line.790"></a>
-<span class="sourceLineNo">791</span> /**<a name="line.791"></a>
-<span class="sourceLineNo">792</span> * Returns a classpath string built from the content of the "tmpjars" value in {@code conf}.<a name="line.792"></a>
-<span class="sourceLineNo">793</span> * Also exposed to shell scripts via `bin/hbase mapredcp`.<a name="line.793"></a>
-<span class="sourceLineNo">794</span> */<a name="line.794"></a>
-<span class="sourceLineNo">795</span> public static String buildDependencyClasspath(Configuration conf) {<a name="line.795"></a>
-<span class="sourceLineNo">796</span> if (conf == null) {<a name="line.796"></a>
-<span class="sourceLineNo">797</span> throw new IllegalArgumentException("Must provide a configuration object.");<a name="line.797"></a>
-<span class="sourceLineNo">798</span> }<a name="line.798"></a>
-<span class="sourceLineNo">799</span> Set<String> paths = new HashSet<String>(conf.getStringCollection("tmpjars"));<a name="line.799"></a>
-<span class="sourceLineNo">800</span> if (paths.size() == 0) {<a name="line.800"></a>
-<span class="sourceLineNo">801</span> throw new IllegalArgumentException("Configuration contains no tmpjars.");<a name="line.801"></a>
-<span class="sourceLineNo">802</span> }<a name="line.802"></a>
-<span class="sourceLineNo">803</span> StringBuilder sb = new StringBuilder();<a name="line.803"></a>
-<span class="sourceLineNo">804</span> for (String s : paths) {<a name="line.804"></a>
-<span class="sourceLineNo">805</span> // entries can take the form 'file:/path/to/file.jar'.<a name="line.805"></a>
-<span class="sourceLineNo">806</span> int idx = s.indexOf(":");<a name="line.806"></a>
-<span class="sourceLineNo">807</span> if (idx != -1) s = s.substring(idx + 1);<a name="line.807"></a>
-<span class="sourceLineNo">808</span> if (sb.length() > 0) sb.append(File.pathSeparator);<a name="line.808"></a>
-<span class="sourceLineNo">809</span> sb.append(s);<a name="line.809"></a>
-<span class="sourceLineNo">810</span> }<a name="line.810"></a>
-<span class="sourceLineNo">811</span> return sb.toString();<a name="line.811"></a>
-<span class="sourceLineNo">812</span> }<a name="line.812"></a>
-<span class="sourceLineNo">813</span><a name="line.813"></a>
-<span class="sourceLineNo">814</span> /**<a name="line.814"></a>
-<span class="sourceLineNo">815</span> * Add the HBase dependency jars as well as jars for any of the configured<a name="line.815"></a>
-<span class="sourceLineNo">816</span> * job classes to the job configuration, so that JobClient will ship them<a name="line.816"></a>
-<span class="sourceLineNo">817</span> * to the cluster and add them to the DistributedCache.<a name="line.817"></a>
-<span class="sourceLineNo">818</span> */<a name="line.818"></a>
-<span class="sourceLineNo">819</span> public static void addDependencyJars(Job job) throws IOException {<a name="line.819"></a>
-<span class="sourceLineNo">820</span> addHBaseDependencyJars(job.getConfiguration());<a name="line.820"></a>
-<span class="sourceLineNo">821</span> try {<a name="line.821"></a>
-<span class="sourceLineNo">822</span> addDependencyJars(job.getConfiguration(),<a name="line.822"></a>
-<span class="sourceLineNo">823</span> // when making changes here, consider also mapred.TableMapReduceUtil<a name="line.823"></a>
-<span class="sourceLineNo">824</span> // pull job classes<a name="line.824"></a>
-<span class="sourceLineNo">825</span> job.getMapOutputKeyClass(),<a name="line.825"></a>
-<span class="sourceLineNo">826</span> job.getMapOutputValueClass(),<a name="line.826"></a>
-<span class="sourceLineNo">827</span> job.getInputFormatClass(),<a name="line.827"></a>
-<span class="sourceLineNo">828</span> job.getOutputKeyClass(),<a name="line.828"></a>
-<span class="sourceLineNo">829</span> job.getOutputValueClass(),<a name="line.829"></a>
-<span class="sourceLineNo">830</span> job.getOutputFormatClass(),<a name="line.830"></a>
-<span class="sourceLineNo">831</span> job.getPartitionerClass(),<a name="line.831"></a>
-<span class="sourceLineNo">832</span> job.getCombinerClass());<a name="line.832"></a>
-<span class="sourceLineNo">833</span> } catch (ClassNotFoundException e) {<a name="line.833"></a>
-<span class="sourceLineNo">834</span> throw new IOException(e);<a name="line.834"></a>
-<span class="sourceLineNo">835</span> }<a name="line.835"></a>
-<span class="sourceLineNo">836</span> }<a name="line.836"></a>
-<span class="sourceLineNo">837</span><a name="line.837"></a>
-<span class="sourceLineNo">838</span> /**<a name="line.838"></a>
-<span class="sourceLineNo">839</span> * Add the jars containing the given classes to the job's configuration<a name="line.839"></a>
-<span class="sourceLineNo">840</span> * such that JobClient will ship them to the cluster and add them to<a name="line.840"></a>
-<span class="sourceLineNo">841</span> * the DistributedCache.<a name="line.841"></a>
-<span class="sourceLineNo">842</span> */<a name="line.842"></a>
-<span class="sourceLineNo">843</span> public static void addDependencyJars(Configuration conf,<a name="line.843"></a>
-<span class="sourceLineNo">844</span> Class<?>... classes) throws IOException {<a name="line.844"></a>
-<span class="sourceLineNo">845</span><a name="line.845"></a>
-<span class="sourceLineNo">846</span> FileSystem localFs = FileSystem.getLocal(conf);<a name="line.846"></a>
-<span class="sourceLineNo">847</span> Set<String> jars = new HashSet<String>();<a name="line.847"></a>
-<span class="sourceLineNo">848</span> // Add jars that are already in the tmpjars variable<a name="line.848"></a>
-<span class="sourceLineNo">849</span> jars.addAll(conf.getStringCollection("tmpjars"));<a name="line.849"></a>
-<span class="sourceLineNo">850</span><a name="line.850"></a>
-<span class="sourceLineNo">851</span> // add jars as we find them to a map of contents jar name so that we can avoid<a name="line.851"></a>
-<span class="sourceLineNo">852</span> // creating new jars for classes that have already been packaged.<a name="line.852"></a>
-<span class="sourceLineNo">853</span> Map<String, String> packagedClasses = new HashMap<String, String>();<a name="line.853"></a>
-<span class="sourceLineNo">854</span><a name="line.854"></a>
-<span class="sourceLineNo">855</span> // Add jars containing the specified classes<a name="line.855"></a>
-<span class="sourceLineNo">856</span> for (Class<?> clazz : classes) {<a name="line.856"></a>
-<span class="sourceLineNo">857</span> if (clazz == null) continue;<a name="line.857"></a>
-<span class="sourceLineNo">858</span><a name="line.858"></a>
-<span class="sourceLineNo">859</span> Path path = findOrCreateJar(clazz, localFs, packagedClasses);<a name="line.859"></a>
-<span class="sourceLineNo">860</span> if (path == null) {<a name="line.860"></a>
-<span class="sourceLineNo">861</span> LOG.warn("Could not find jar for class " + clazz +<a name="line.861"></a>
-<span class="sourceLineNo">862</span> " in order to ship it to the cluster.");<a name="line.862"></a>
-<span class="sourceLineNo">863</span> continue;<a name="line.863"></a>
-<span class="sourceLineNo">864</span> }<a name="line.864"></a>
-<span class="sourceLineNo">865</span> if (!localFs.exists(path)) {<a name="line.865"></a>
-<span class="sourceLineNo">866</span> LOG.warn("Could not validate jar file " + path + " for class "<a name="line.866"></a>
-<span class="sourceLineNo">867</span> + clazz);<a name="line.867"></a>
-<span class="sourceLineNo">868</span> continue;<a name="line.868"></a>
-<span class="sourceLineNo">869</span> }<a name="line.869"></a>
-<span class="sourceLineNo">870</span> jars.add(path.toString());<a name="line.870"></a>
-<span class="sourceLineNo">871</span> }<a name="line.871"></a>
-<span class="sourceLineNo">872</span> if (jars.isEmpty()) return;<a name="line.872"></a>
-<span class="sourceLineNo">873</span><a name="line.873"></a>
-<span class="sourceLineNo">874</span> conf.set("tmpjars", StringUtils.arrayToString(jars.toArray(new String[jars.size()])));<a name="line.874"></a>
-<span class="sourceLineNo">875</span> }<a name="line.875"></a>
-<span class="sourceLineNo">876</span><a name="line.876"></a>
-<span class="sourceLineNo">877</span> /**<a name="line.877"></a>
-<span class="sourceLineNo">878</span> * Finds the Jar for a class or creates it if it doesn't exist. If the class is in<a name="line.878"></a>
-<span class="sourceLineNo">879</span> * a directory in the classpath, it creates a Jar on the fly with the<a name="line.879"></a>
-<span class="sourceLineNo">880</span> * contents of the directory and returns the path to that Jar. If a Jar is<a name="line.880"></a>
-<span class="sourceLineNo">881</span> * created, it is created in the system temporary directory. Otherwise,<a name="line.881"></a>
-<span class="sourceLineNo">882</span> * returns an existing jar that contains a class of the same name. Maintains<a name="line.882"></a>
-<span class="sourceLineNo">883</span> * a mapping from jar contents to the tmp jar created.<a name="line.883"></a>
-<span class="sourceLineNo">884</span> * @param my_class the class to find.<a name="line.884"></a>
-<span class="sourceLineNo">885</span> * @param fs the FileSystem with which to qualify the returned path.<a name="line.885"></a>
-<span class="sourceLineNo">886</span> * @param packagedClasses a map of class name to path.<a name="line.886"></a>
-<span class="sourceLineNo">887</span> * @return a jar file that contains the class.<a name="line.887"></a>
-<span class="sourceLineNo">888</span> * @throws IOException<a name="line.888"></a>
-<span class="sourceLineNo">889</span> */<a name="line.889"></a>
-<span class="sourceLineNo">890</span> private static Path findOrCreateJar(Class<?> my_class, FileSystem fs,<a name="line.890"></a>
-<span class="sourceLineNo">891</span> Map<String, String> packagedClasses)<a name="line.891"></a>
-<span class="sourceLineNo">892</span> throws IOException {<a name="line.892"></a>
-<span class="sourceLineNo">893</span> // attempt to locate an existing jar for the class.<a name="line.893"></a>
-<span class="sourceLineNo">894</span> String jar = findContainingJar(my_class, packagedClasses);<a name="line.894"></a>
-<span class="sourceLineNo">895</span> if (null == jar || jar.isEmpty()) {<a name="line.895"></a>
-<span class="sourceLineNo">896</span> jar = getJar(my_class);<a name="line.896"></a>
-<span class="sourceLineNo">897</span> updateMap(jar, packagedClasses);<a name="line.897"></a>
-<span class="sourceLineNo">898</span> }<a name="line.898"></a>
-<span class="sourceLineNo">899</span><a name="line.899"></a>
-<span class="sourceLineNo">900</span> if (null == jar || jar.isEmpty()) {<a name="line.900"></a>
-<span class="sourceLineNo">901</span> return null;<a name="line.901"></a>
-<span class="sourceLineNo">902</span> }<a name="line.902"></a>
-<span class="sourceLineNo">903</span><a name="line.903"></a>
-<span class="sourceLineNo">904</span> LOG.debug(String.format("For class %s, using jar %s", my_class.getName(), jar));<a name="line.904"></a>
-<span class="sourceLineNo">905</span> return new Path(jar).makeQualified(fs);<a name="line.905"></a>
-<span class="sourceLineNo">906</span> }<a name="line.906"></a>
-<span class="sourceLineNo">907</span><a name="line.907"></a>
-<span class="sourceLineNo">908</span> /**<a name="line.908"></a>
-<span class="sourceLineNo">909</span> * Add entries to <code>packagedClasses</code> corresponding to class files<a name="line.909"></a>
-<span class="sourceLineNo">910</span> * contained in <code>jar</code>.<a name="line.910"></a>
-<span class="sourceLineNo">911</span> * @param jar The jar who's content to list.<a name="line.911"></a>
-<span class="sourceLineNo">912</span> * @param packagedClasses map[class -> jar]<a name="line.912"></a>
-<span class="sourceLineNo">913</span> */<a name="line.913"></a>
-<span class="sourceLineNo">914</span> private static void updateMap(String jar, Map<String, String> packagedClasses) throws IOException {<a name="line.914"></a>
-<span class="sourceLineNo">915</span> if (null == jar || jar.isEmpty()) {<a name="line.915"></a>
-<span class="sourceLineNo">916</span> return;<a name="line.916"></a>
-<span class="sourceLineNo">917</span> }<a name="line.917"></a>
-<span class="sourceLineNo">918</span> ZipFile zip = null;<a name="line.918"></a>
-<span class="sourceLineNo">919</span> try {<a name="line.919"></a>
-<span class="sourceLineNo">920</span> zip = new ZipFile(jar);<a name="line.920"></a>
-<span class="sourceLineNo">921</span> for (Enumeration<? extends ZipEntry> iter = zip.entries(); iter.hasMoreElements();) {<a name="line.921"></a>
-<span class="sourceLineNo">922</span> ZipEntry entry = iter.nextElement();<a name="line.922"></a>
-<span class="sourceLineNo">923</span> if (entry.getName().endsWith("class")) {<a name="line.923"></a>
-<span class="sourceLineNo">924</span> packagedClasses.put(entry.getName(), jar);<a name="line.924"></a>
-<span class="sourceLineNo">925</span> }<a name="line.925"></a>
-<span class="sourceLineNo">926</span> }<a name="line.926"></a>
-<span class="sourceLineNo">927</span> } finally {<a name="line.927"></a>
-<span class="sourceLineNo">928</span> if (null != zip) zip.close();<a name="line.928"></a>
-<span class="sourceLineNo">929</span> }<a name="line.929"></a>
-<span class="sourceLineNo">930</span> }<a name="line.930"></a>
-<span class="sourceLineNo">931</span><a name="line.931"></a>
-<span class="sourceLineNo">932</span> /**<a name="line.932"></a>
-<span class="sourceLineNo">933</span> * Find a jar that contains a class of the same name, if any. It will return<a name="line.933"></a>
-<span class="sourceLineNo">934</span> * a jar file, even if that is not the first thing on the class path that<a name="line.934"></a>
-<span class="sourceLineNo">935</span> * has a class with the same name. Looks first on the classpath and then in<a name="line.935"></a>
-<span class="sourceLineNo">936</span> * the <code>packagedClasses</code> map.<a name="line.936"></a>
-<span class="sourceLineNo">937</span> * @param my_class the class to find.<a name="line.937"></a>
-<span class="sourceLineNo">938</span> * @return a jar file that contains the class, or null.<a name="line.938"></a>
-<span class="sourceLineNo">939</span> * @throws IOException<a name="line.939"></a>
-<span class="sourceLineNo">940</span> */<a name="line.940"></a>
-<span class="sourceLineNo">941</span> private static String findContainingJar(Class<?> my_class, Map<String, String> packagedClasses)<a name="line.941"></a>
-<span class="sourceLineNo">942</span> throws IOException {<a name="line.942"></a>
-<span class="sourceLineNo">943</span> ClassLoader loader = my_class.getClassLoader();<a name="line.943"></a>
-<span class="sourceLineNo">944</span><a name="line.944"></a>
-<span class="sourceLineNo">945</span> String class_file = my_class.getName().replaceAll("\\.", "/") + ".class";<a name="line.945"></a>
-<span class="sourceLineNo">946</span><a name="line.946"></a>
-<span class="sourceLineNo">947</span> if (loader != null) {<a name="line.947"></a>
-<span class="sourceLineNo">948</span> // first search the classpath<a name="line.948"></a>
-<span class="sourceLineNo">949</span> for (Enumeration<URL> itr = loader.getResources(class_file); itr.hasMoreElements();) {<a name="line.949"></a>
-<span class="sourceLineNo">950</span> URL url = itr.nextElement();<a name="line.950"></a>
-<span class="sourceLineNo">951</span> if ("jar".equals(url.getProtocol())) {<a name="line.951"></a>
-<span class="sourceLineNo">952</span> String toReturn = url.getPath();<a name="line.952"></a>
-<span class="sourceLineNo">953</span> if (toReturn.startsWith("file:")) {<a name="line.953"></a>
-<span class="sourceLineNo">954</span> toReturn = toReturn.substring("file:".length());<a name="line.954"></a>
-<span class="sourceLineNo">955</span> }<a name="line.955"></a>
-<span class="sourceLineNo">956</span> // URLDecoder is a misnamed class, since it actually decodes<a name="line.956"></a>
-<span class="sourceLineNo">957</span> // x-www-form-urlencoded MIME type rather than actual<a name="line.957"></a>
-<span class="sourceLineNo">958</span> // URL encoding (which the file path has). Therefore it would<a name="line.958"></a>
-<span class="sourceLineNo">959</span> // decode +s to ' 's which is incorrect (spaces are actually<a name="line.959"></a>
-<span class="sourceLineNo">960</span> // either unencoded or encoded as "%20"). Replace +s first, so<a name="line.960"></a>
-<span class="sourceLineNo">961</span> // that they are kept sacred during the decoding process.<a name="line.961"></a>
-<span class="sourceLineNo">962</span> toReturn = toReturn.replaceAll("\\+", "%2B");<a name="line.962"></a>
-<span class="sourceLineNo">963</span> toReturn = URLDecoder.decode(toReturn, "UTF-8");<a name="line.963"></a>
-<span class="sourceLineNo">964</span> return toReturn.replaceAll("!.*$", "");<a name="line.964"></a>
-<span class="sourceLineNo">965</span> }<a name="line.965"></a>
-<span class="sourceLineNo">966</span> }<a name="line.966"></a>
-<span class="sourceLineNo">967</span> }<a name="line.967"></a>
-<span class="sourceLineNo">968</span><a name="line.968"></a>
-<span class="sourceLineNo">969</span> // now look in any jars we've packaged using JarFinder. Returns null when<a name="line.969"></a>
-<span class="sourceLineNo">970</span> // no jar is found.<a name="line.970"></a>
-<span class="sourceLineNo">971</span> return packagedClasses.get(class_file);<a name="line.971"></a>
-<span class="sourceLineNo">972</span> }<a name="line.972"></a>
-<span class="sourceLineNo">973</span><a name="line.973"></a>
-<span class="sourceLineNo">974</span> /**<a name="line.974"></a>
-<span class="sourceLineNo">975</span> * Invoke 'getJar' on a custom JarFinder implementation. Useful for some job<a name="line.975"></a>
-<span class="sourceLineNo">976</span> * configuration contexts (HBASE-8140) and also for testing on MRv2.<a name="line.976"></a>
-<span class="sourceLineNo">977</span> * check if we have HADOOP-9426.<a name="line.977"></a>
-<span class="sourceLineNo">978</span> * @param my_class the class to find.<a name="line.978"></a>
-<span class="sourceLineNo">979</span> * @return a jar file that contains the class, or null.<a name="line.979"></a>
-<span class="sourceLineNo">980</span> */<a name="line.980"></a>
-<span class="sourceLineNo">981</span> private static String getJar(Class<?> my_class) {<a name="line.981"></a>
-<span class="sourceLineNo">982</span> String ret = null;<a name="line.982"></a>
-<span class="sourceLineNo">983</span> try {<a name="line.983"></a>
-<span class="sourceLineNo">984</span> ret = JarFinder.getJar(my_class);<a name="line.984"></a>
-<span class="sourceLineNo">985</span> } catch (Exception e) {<a name="line.985"></a>
-<span class="sourceLineNo">986</span> // toss all other exceptions, related to reflection failure<a name="line.986"></a>
-<span class="sourceLineNo">987</span> throw new RuntimeException("getJar invocation failed.", e);<a name="line.987"></a>
-<span class="sourceLineNo">988</span> }<a name="line.988"></a>
+<span class="sourceLineNo">775</span><a name="line.775"></a>
+<span class="sourceLineNo">776</span> // PrefixTreeCodec is part of the hbase-prefix-tree module. If not included in MR jobs jar<a name="line.776"></a>
+<span class="sourceLineNo">777</span> // dependencies, MR jobs that write encoded hfiles will fail.<a name="line.777"></a>
+<span class="sourceLineNo">778</span> // We used reflection here so to prevent a circular module dependency.<a name="line.778"></a>
+<span class="sourceLineNo">779</span> // TODO - if we extract the MR into a module, make it depend on hbase-prefix-tree.<a name="line.779"></a>
+<span class="sourceLineNo">780</span> Class prefixTreeCodecClass = null;<a name="line.780"></a>
+<span class="sourceLineNo">781</span> try {<a name="line.781"></a>
+<span class="sourceLineNo">782</span> prefixTreeCodecClass =<a name="line.782"></a>
+<span class="sourceLineNo">783</span> Class.forName("org.apache.hadoop.hbase.code.prefixtree.PrefixTreeCodec");<a name="line.783"></a>
+<span class="sourceLineNo">784</span> } catch (ClassNotFoundException e) {<a name="line.784"></a>
+<span class="sourceLineNo">785</span> // this will show up in unit tests but should not show in real deployments<a name="line.785"></a>
+<span class="sourceLineNo">786</span> LOG.warn("The hbase-prefix-tree module jar containing PrefixTreeCodec is not present." +<a name="line.786"></a>
+<span class="sourceLineNo">787</span> " Continuing without it.");<a name="line.787"></a>
+<span class="sourceLineNo">788</span> }<a name="line.788"></a>
+<span class="sourceLineNo">789</span><a name="line.789"></a>
+<span class="sourceLineNo">790</span> addDependencyJars(conf,<a name="line.790"></a>
+<span class="sourceLineNo">791</span> // explicitly pull a class from each module<a name="line.791"></a>
+<span class="sourceLineNo">792</span> org.apache.hadoop.hbase.HConstants.class, // hbase-common<a name="line.792"></a>
+<span class="sourceLineNo">793</span> org.apache.hadoop.hbase.protobuf.generated.ClientProtos.class, // hbase-protocol<a name="line.793"></a>
+<span class="sourceLineNo">794</span> org.apache.hadoop.hbase.client.Put.class, // hbase-client<a name="line.794"></a>
+<span class="sourceLineNo">795</span> org.apache.hadoop.hbase.CompatibilityFactory.class, // hbase-hadoop-compat<a name="line.795"></a>
+<span class="sourceLineNo">796</span> org.apache.hadoop.hbase.mapreduce.TableMapper.class, // hbase-server<a name="line.796"></a>
+<span class="sourceLineNo">797</span> prefixTreeCodecClass, // hbase-prefix-tree (if null will be skipped)<a name="line.797"></a>
+<span class="sourceLineNo">798</span> // pull necessary dependencies<a name="line.798"></a>
+<span class="sourceLineNo">799</span> org.apache.zookeeper.ZooKeeper.class,<a name="line.799"></a>
+<span class="sourceLineNo">800</span> io.netty.channel.Channel.class,<a name="line.800"></a>
+<span class="sourceLineNo">801</span> com.google.protobuf.Message.class,<a name="line.801"></a>
+<span class="sourceLineNo">802</span> com.google.common.collect.Lists.class,<a name="line.802"></a>
+<span class="sourceLineNo">803</span> org.apache.htrace.Trace.class,<a name="line.803"></a>
+<span class="sourceLineNo">804</span> com.codahale.metrics.MetricRegistry.class);<a name="line.804"></a>
+<span class="sourceLineNo">805</span> }<a name="line.805"></a>
+<span class="sourceLineNo">806</span><a name="line.806"></a>
+<span class="sourceLineNo">807</span> /**<a name="line.807"></a>
+<span class="sourceLineNo">808</span> * Returns a classpath string built from the content of the "tmpjars" value in {@code conf}.<a name="line.808"></a>
+<span class="sourceLineNo">809</span> * Also exposed to shell scripts via `bin/hbase mapredcp`.<a name="line.809"></a>
+<span class="sourceLineNo">810</span> */<a name="line.810"></a>
+<span class="sourceLineNo">811</span> public static String buildDependencyClasspath(Configuration conf) {<a name="line.811"></a>
+<span class="sourceLineNo">812</span> if (conf == null) {<a name="line.812"></a>
+<span class="sourceLineNo">813</span> throw new IllegalArgumentException("Must provide a configuration object.");<a name="line.813"></a>
+<span class="sourceLineNo">814</span> }<a name="line.814"></a>
+<span class="sourceLineNo">815</span> Set<String> paths = new HashSet<String>(conf.getStringCollection("tmpjars"));<a name="line.815"></a>
+<span class="sourceLineNo">816</span> if (paths.size() == 0) {<a name="line.816"></a>
+<span class="sourceLineNo">817</span> throw new IllegalArgumentException("Configuration contains no tmpjars.");<a name="line.817"></a>
+<span class="sourceLineNo">818</span> }<a name="line.818"></a>
+<span class="sourceLineNo">819</span> StringBuilder sb = new StringBuilder();<a name="line.819"></a>
+<span class="sourceLineNo">820</span> for (String s : paths) {<a name="line.820"></a>
+<span class="sourceLineNo">821</span> // entries can take the form 'file:/path/to/file.jar'.<a name="line.821"></a>
+<span class="sourceLineNo">822</span> int idx = s.indexOf(":");<a name="line.822"></a>
+<span class="sourceLineNo">823</span> if (idx != -1) s = s.substring(idx + 1);<a name="line.823"></a>
+<span class="sourceLineNo">824</span> if (sb.length() > 0) sb.append(File.pathSeparator);<a name="line.824"></a>
+<span class="sourceLineNo">825</span> sb.append(s);<a name="line.825"></a>
+<span class="sourceLineNo">826</span> }<a name="line.826"></a>
+<span class="sourceLineNo">827</span> return sb.toString();<a name="line.827"></a>
+<span class="sourceLineNo">828</span> }<a name="line.828"></a>
+<span class="sourceLineNo">829</span><a name="line.829"></a>
+<span class="sourceLineNo">830</span> /**<a name="line.830"></a>
+<span class="sourceLineNo">831</span> * Add the HBase dependency jars as well as jars for any of the configured<a name="line.831"></a>
+<span class="sourceLineNo">832</span> * job classes to the job configuration, so that JobClient will ship them<a name="line.832"></a>
+<span class="sourceLineNo">833</span> * to the cluster and add them to the DistributedCache.<a name="line.833"></a>
+<span class="sourceLineNo">834</span> */<a name="line.834"></a>
+<span class="sourceLineNo">835</span> public static void addDependencyJars(Job job) throws IOException {<a name="line.835"></a>
+<span class="sourceLineNo">836</span> addHBaseDependencyJars(job.getConfiguration());<a name="line.836"></a>
+<span class="sourceLineNo">837</span> try {<a name="line.837"></a>
+<span class="sourceLineNo">838</span> addDependencyJars(job.getConfiguration(),<a name="line.838"></a>
+<span class="sourceLineNo">839</span> // when making changes here, consider also mapred.TableMapReduceUtil<a name="line.839"></a>
+<span class="sourceLineNo">840</span> // pull job classes<a name="line.840"></a>
+<span class="sourceLineNo">841</span> job.getMapOutputKeyClass(),<a name="line.841"></a>
+<span class="sourceLineNo">842</span> job.getMapOutputValueClass(),<a name="line.842"></a>
+<span class="sourceLineNo">843</span> job.getInputFormatClass(),<a name="line.843"></a>
+<span class="sourceLineNo">844</span> job.getOutputKeyClass(),<a name="line.844"></a>
+<span class="sourceLineNo">845</span> job.getOutputValueClass(),<a name="line.845"></a>
+<span class="sourceLineNo">846</span> job.getOutputFormatClass(),<a name="line.846"></a>
+<span class="sourceLineNo">847</span> job.getPartitionerClass(),<a name="line.847"></a>
+<span class="sourceLineNo">848</span> job.getCombinerClass());<a name="line.848"></a>
+<span class="sourceLineNo">849</span> } catch (ClassNotFoundException e) {<a name="line.849"></a>
+<span class="sourceLineNo">850</span> throw new IOException(e);<a name="line.850"></a>
+<span class="sourceLineNo">851</span> }<a name="line.851"></a>
+<span class="sourceLineNo">852</span> }<a name="line.852"></a>
+<span class="sourceLineNo">853</span><a name="line.853"></a>
+<span class="sourceLineNo">854</span> /**<a name="line.854"></a>
+<span class="sourceLineNo">855</span> * Add the jars containing the given classes to the job's configuration<a name="line.855"></a>
+<span class="sourceLineNo">856</span> * such that JobClient will ship them to the cluster and add them to<a name="line.856"></a>
+<span class="sourceLineNo">857</span> * the DistributedCache.<a name="line.857"></a>
+<span class="sourceLineNo">858</span> */<a name="line.858"></a>
+<span class="sourceLineNo">859</span> public static void addDependencyJars(Configuration conf,<a name="line.859"></a>
+<span class="sourceLineNo">860</span> Class<?>... classes) throws IOException {<a name="line.860"></a>
+<span class="sourceLineNo">861</span><a name="line.861"></a>
+<span class="sourceLineNo">862</span> FileSystem localFs = FileSystem.getLocal(conf);<a name="line.862"></a>
+<span class="sourceLineNo">863</span> Set<String> jars = new HashSet<String>();<a name="line.863"></a>
+<span class="sourceLineNo">864</span> // Add jars that are already in the tmpjars variable<a name="line.864"></a>
+<span class="sourceLineNo">865</span> jars.addAll(conf.getStringCollection("tmpjars"));<a name="line.865"></a>
+<span class="sourceLineNo">866</span><a name="line.866"></a>
+<span class="sourceLineNo">867</span> // add jars as we find them to a map of contents jar name so that we can avoid<a name="line.867"></a>
+<span class="sourceLineNo">868</span> // creating new jars for classes that have already been packaged.<a name="line.868"></a>
+<span class="sourceLineNo">869</span> Map<String, String> packagedClasses = new HashMap<String, String>();<a name="line.869"></a>
+<span class="sourceLineNo">870</span><a name="line.870"></a>
+<span class="sourceLineNo">871</span> // Add jars containing the specified classes<a name="line.871"></a>
+<span class="sourceLineNo">872</span> for (Class<?> clazz : classes) {<a name="line.872"></a>
+<span class="sourceLineNo">873</span> if (clazz == null) continue;<a name="line.873"></a>
+<span class="sourceLineNo">874</span><a name="line.874"></a>
+<span class="sourceLineNo">875</span> Path path = findOrCreateJar(clazz, localFs, packagedClasses);<a name="line.875"></a>
+<span class="sourceLineNo">876</span> if (path == null) {<a name="line.876"></a>
+<span class="sourceLineNo">877</span> LOG.warn("Could not find jar for class " + clazz +<a name="line.877"></a>
+<span class="sourceLineNo">878</span> " in order to ship it to the cluster.");<a name="line.878"></a>
+<span class="sourceLineNo">879</span> continue;<a name="line.879"></a>
+<span class="sourceLineNo">880</span> }<a name="line.880"></a>
+<span class="sourceLineNo">881</span> if (!localFs.exists(path)) {<a name="line.881"></a>
+<span class="sourceLineNo">882</span> LOG.warn("Could not validate jar file " + path + " for class "<a name="line.882"></a>
+<span class="sourceLineNo">883</span> + clazz);<a name="line.883"></a>
+<span class="sourceLineNo">884</span> continue;<a name="line.884"></a>
+<span class="sourceLineNo">885</span> }<a name="line.885"></a>
+<span class="sourceLineNo">886</span> jars.add(path.toString());<a name="line.886"></a>
+<span class="sourceLineNo">887</span> }<a name="line.887"></a>
+<span class="sourceLineNo">888</span> if (jars.isEmpty()) return;<a name="line.888"></a>
+<span class="sourceLineNo">889</span><a name="line.889"></a>
+<span class="sourceLineNo">890</span> conf.set("tmpjars", StringUtils.arrayToString(jars.toArray(new String[jars.size()])));<a name="line.890"></a>
+<span class="sourceLineNo">891</span> }<a name="line.891"></a>
+<span class="sourceLineNo">892</span><a name="line.892"></a>
+<span class="sourceLineNo">893</span> /**<a name="line.893"></a>
+<span class="sourceLineNo">894</span> * Finds the Jar for a class or creates it if it doesn't exist. If the class is in<a name="line.894"></a>
+<span class="sourceLineNo">895</span> * a directory in the classpath, it creates a Jar on the fly with the<a name="line.895"></a>
+<span class="sourceLineNo">896</span> * contents of the directory and returns the path to that Jar. If a Jar is<a name="line.896"></a>
+<span class="sourceLineNo">897</span> * created, it is created in the system temporary directory. Otherwise,<a name="line.897"></a>
+<span class="sourceLineNo">898</span> * returns an existing jar that contains a class of the same name. Maintains<a name="line.898"></a>
+<span class="sourceLineNo">899</span> * a mapping from jar contents to the tmp jar created.<a name="line.899"></a>
+<span class="sourceLineNo">900</span> * @param my_class the class to find.<a name="line.900"></a>
+<span class="sourceLineNo">901</span> * @param fs the FileSystem with which to qualify the returned path.<a name="line.901"></a>
+<span class="sourceLineNo">902</span> * @param packagedClasses a map of class name to path.<a name="line.902"></a>
+<span class="sourceLineNo">903</span> * @return a jar file that contains the class.<a name="line.903"></a>
+<span class="sourceLineNo">904</span> * @throws IOException<a name="line.904"></a>
+<span class="sourceLineNo">905</span> */<a name="line.905"></a>
+<span class="sourceLineNo">906</span> private static Path findOrCreateJar(Class<?> my_class, FileSystem fs,<a name="line.906"></a>
+<span class="sourceLineNo">907</span> Map<String, String> packagedClasses)<a name="line.907"></a>
+<span class="sourceLineNo">908</span> throws IOException {<a name="line.908"></a>
+<span class="sourceLineNo">909</span> // attempt to locate an existing jar for the class.<a name="line.909"></a>
+<span class="sourceLineNo">910</span> String jar = findContainingJar(my_class, packagedClasses);<a name="line.910"></a>
+<span class="sourceLineNo">911</span> if (null == jar || jar.isEmpty()) {<a name="line.911"></a>
+<span class="sourceLineNo">912</span> jar = getJar(my_class);<a name="line.912"></a>
+<span class="sourceLineNo">913</span> updateMap(jar, packagedClasses);<a name="line.913"></a>
+<span class="sourceLineNo">914</span> }<a name="line.914"></a>
+<span class="sourceLineNo">915</span><a name="line.915"></a>
+<span class="sourceLineNo">916</span> if (null == jar || jar.isEmpty()) {<a name="line.916"></a>
+<span class="sourceLineNo">917</span> return null;<a name="line.917"></a>
+<span class="sourceLineNo">918</span> }<a name="line.918"></a>
+<span class="sourceLineNo">919</span><a name="line.919"></a>
+<span class="sourceLineNo">920</span> LOG.debug(String.format("For class %s, using jar %s", my_class.getName(), jar));<a name="line.920"></a>
+<span class="sourceLineNo">921</span> return new Path(jar).makeQualified(fs);<a name="line.921"></a>
+<span class="sourceLineNo">922</span> }<a name="line.922"></a>
+<span class="sourceLineNo">923</span><a name="line.923"></a>
+<span class="sourceLineNo">924</span> /**<a name="line.924"></a>
+<span class="sourceLineNo">925</span> * Add entries to <code>packagedClasses</code> corresponding to class files<a name="line.925"></a>
+<span class="sourceLineNo">926</span> * contained in <code>jar</code>.<a name="line.926"></a>
+<span class="sourceLineNo">927</span> * @param jar The jar who's content to list.<a name="line.927"></a>
+<span class="sourceLineNo">928</span> * @param packagedClasses map[class -> jar]<a name="line.928"></a>
+<span class="sourceLineNo">929</span> */<a name="line.929"></a>
+<span class="sourceLineNo">930</span> private static void updateMap(String jar, Map<String, String> packagedClasses) throws IOException {<a name="line.930"></a>
+<span class="sourceLineNo">931</span> if (null == jar || jar.isEmpty()) {<a name="line.931"></a>
+<span class="sourceLineNo">932</span> return;<a name="line.932"></a>
+<span class="sourceLineNo">933</span> }<a name="line.933"></a>
+<span class="sourceLineNo">934</span> ZipFile zip = null;<a name="line.934"></a>
+<span class="sourceLineNo">935</span> try {<a name="line.935"></a>
+<span class="sourceLineNo">936</span> zip = new ZipFile(jar);<a name="line.936"></a>
+<span class="sourceLineNo">937</span> for (Enumeration<? extends ZipEntry> iter = zip.entries(); iter.hasMoreElements();) {<a name="line.937"></a>
+<span class="sourceLineNo">938</span> ZipEntry entry = iter.nextElement();<a name="line.938"></a>
+<span class="sourceLineNo">939</span> if (entry.getName().endsWith("class")) {<a name="line.939"></a>
+<span class="sourceLineNo">940</span> packagedClasses.put(entry.getName(), jar);<a name="line.940"></a>
+<span class="sourceLineNo">941</span> }<a name="line.941"></a>
+<span class="sourceLineNo">942</span> }<a name="line.942"></a>
+<span class="sourceLineNo">943</span> } finally {<a name="line.943"></a>
+<span class="sourceLineNo">944</span> if (null != zip) zip.close();<a name="line.944"></a>
+<span class="sourceLineNo">945</span> }<a name="line.945"></a>
+<span class="sourceLineNo">946</span> }<a name="line.946"></a>
+<span class="sourceLineNo">947</span><a name="line.947"></a>
+<span class="sourceLineNo">948</span> /**<a name="line.948"></a>
+<span class="sourceLineNo">949</span> * Find a jar that contains a class of the same name, if any. It will return<a name="line.949"></a>
+<span class="sourceLineNo">950</span> * a jar file, even if that is not the first thing on the class path that<a name="line.950"></a>
+<span class="sourceLineNo">951</span> * has a class with the same name. Looks first on the classpath and then in<a name="line.951"></a>
+<span class="sourceLineNo">952</span> * the <code>packagedClasses</code> map.<a name="line.952"></a>
+<span class="sourceLineNo">953</span> * @param my_class the class to find.<a name="line.953"></a>
+<span class="sourceLineNo">954</span> * @return a jar file that contains the class, or null.<a name="line.954"></a>
+<span class="sourceLineNo">955</span> * @throws IOException<a name="line.955"></a>
+<span class="sourceLineNo">956</span> */<a name="line.956"></a>
+<span class="sourceLineNo">957</span> private static String findContainingJar(Class<?> my_class, Map<String, String> packagedClasses)<a name="line.957"></a>
+<span class="sourceLineNo">958</span> throws IOException {<a name="line.958"></a>
+<span class="sourceLineNo">959</span> ClassLoader loader = my_class.getClassLoader();<a name="line.959"></a>
+<span class="sourceLineNo">960</span><a name="line.960"></a>
+<span class="sourceLineNo">961</span> String class_file = my_class.getName().replaceAll("\\.", "/") + ".class";<a name="line.961"></a>
+<span class="sourceLineNo">962</span><a name="line.962"></a>
+<span class="sourceLineNo">963</span> if (loader != null) {<a name="line.963"></a>
+<span class="sourceLineNo">964</span> // first search the classpath<a name="line.964"></a>
+<span class="sourceLineNo">965</span> for (Enumeration<URL> itr = loader.getResources(class_file); itr.hasMoreElements();) {<a name="line.965"></a>
+<span class="sourceLineNo">966</span> URL url = itr.nextElement();<a name="line.966"></a>
+<span class="sourceLineNo">967</span> if ("jar".equals(url.getProtocol())) {<a name="line.967"></a>
+<span class="sourceLineNo">968</span> String toReturn = url.getPath();<a name="line.968"></a>
+<span class="sourceLineNo">969</span> if (toReturn.startsWith("file:")) {<a name="line.969"></a>
+<span class="sourceLineNo">970</span> toReturn = toReturn.substring("file:".length());<a name="line.970"></a>
+<span class="sourceLineNo">971</span> }<a name="line.971"></a>
+<span class="sourceLineNo">972</span> // URLDecoder is a misnamed class, since it actually decodes<a name="line.972"></a>
+<span class="sourceLineNo">973</span> // x-www-form-urlencoded MIME type rather than actual<a name="line.973"></a>
+<span class="sourceLineNo">974</span> // URL encoding (which the file path has). Therefore it would<a name="line.974"></a>
+<span class="sourceLineNo">975</span> // decode +s to ' 's which is incorrect (spaces are actually<a name="line.975"></a>
+<span class="sourceLineNo">976</span> // either unencoded or encoded as "%20"). Replace +s first, so<a name="line.976"></a>
+<span class="sourceLineNo">977</span> // that they are kept sacred during the decoding process.<a name="line.977"></a>
+<span class="sourceLineNo">978</span> toReturn = toReturn.replaceAll("\\+", "%2B");<a name="line.978"></a>
+<span class="sourceLineNo">979</span> toReturn = URLDecoder.decode(toReturn, "UTF-8");<a name="line.979"></a>
+<span class="sourceLineNo">980</span> return toReturn.replaceAll("!.*$", "");<a name="line.980"></a>
+<span class="sourceLineNo">981</span> }<a name="line.981"></a>
+<span class="sourceLineNo">982</span> }<a name="line.982"></a>
+<span class="sourceLineNo">983</span> }<a name="line.983"></a>
+<span class="sourceLineNo">984</span><a name="line.984"></a>
+<span class="sourceLineNo">985</span> // now look in any jars we've packaged using JarFinder. Returns null when<a name="line.985"></a>
+<span class="sourceLineNo">986</span> // no jar is found.<a name="line.986"></a>
+<span class="sourceLineNo">987</span> return packagedClasses.get(class_file);<a name="line.987"></a>
+<span class="sourceLineNo">988</span> }<a name="line.988"></a>
<span class="sourceLineNo">989</span><a name="line.989"></a>
-<span class="sourceLineNo">990</span> return ret;<a name="line.990"></a>
-<span class="sourceLineNo">991</span> }<a name="line.991"></a>
-<span class="sourceLineNo">992</span>}<a name="line.992"></a>
+<span class="sourceLineNo">990</span> /**<a name="line.990"></a>
+<span class="sourceLineNo">991</span> * Invoke 'getJar' on a custom JarFinder implementation. Useful for some job<a name="line.991"></a>
+<span class="sourceLineNo">992</span> * configuration contexts (HBASE-8140) and also for testing on MRv2.<a name="line.992"></a>
+<span class="sourceLineNo">993</span> * check if we have HADOOP-9426.<a name="line.993"></a>
+<span class="sourceLineNo">994</span> * @param my_class the class to find.<a name="line.994"></a>
+<span class="sourceLineNo">995</span> * @return a jar file that contains the class, or null.<a name="line.995"></a>
+<span class="sourceLineNo">996</span> */<a name="line.996"></a>
+<span class="sourceLineNo">997</span> private static String getJar(Class<?> my_class) {<a name="line.997"></a>
+<span class="sourceLineNo">998</span> String ret = null;<a name="line.998"></a>
+<span class="sourceLineNo">999</span> try {<a name="line.999"></a>
+<span class="sourceLineNo">1000</span> ret = JarFinder.getJar(my_class);<a name="line.1000"></a>
+<span class="sourceLineNo">1001</span> } catch (Exception e) {<a name="line.1001"></a>
+<span class="sourceLineNo">1002</span> // toss all other exceptions, related to reflection failure<a name="line.1002"></a>
+<span class="sourceLineNo">1003</span> throw new RuntimeException("getJar invocation failed.", e);<a name="line.1003"></a>
+<span class="sourceLineNo">1004</span> }<a name="line.1004"></a>
+<span class="sourceLineNo">1005</span><a name="line.1005"></a>
+<span class="sourceLineNo">1006</span> return ret;<a name="line.1006"></a>
+<span class="sourceLineNo">1007</span> }<a name="line.1007"></a>
+<span class="sourceLineNo">1008</span>}<a name="line.1008"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html
index 53c9784..bb399c2 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html
@@ -72,7 +72,7 @@
<span class="sourceLineNo">064</span> protected KeyValueHeap heap;<a name="line.64"></a>
<span class="sourceLineNo">065</span> protected boolean cacheBlocks;<a name="line.65"></a>
<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span> protected int countPerRow = 0;<a name="line.67"></a>
+<span class="sourceLineNo">067</span> protected long countPerRow = 0;<a name="line.67"></a>
<span class="sourceLineNo">068</span> protected int storeLimit = -1;<a name="line.68"></a>
<span class="sourceLineNo">069</span> protected int storeOffset = 0;<a name="line.69"></a>
<span class="sourceLineNo">070</span><a name="line.70"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html
index 53c9784..bb399c2 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html
@@ -72,7 +72,7 @@
<span class="sourceLineNo">064</span> protected KeyValueHeap heap;<a name="line.64"></a>
<span class="sourceLineNo">065</span> protected boolean cacheBlocks;<a name="line.65"></a>
<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span> protected int countPerRow = 0;<a name="line.67"></a>
+<span class="sourceLineNo">067</span> protected long countPerRow = 0;<a name="line.67"></a>
<span class="sourceLineNo">068</span> protected int storeLimit = -1;<a name="line.68"></a>
<span class="sourceLineNo">069</span> protected int storeOffset = 0;<a name="line.69"></a>
<span class="sourceLineNo">070</span><a name="line.70"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/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 38c4bcd..8979045 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
@@ -293,79 +293,80 @@
<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">288</span> synchronized long getLastKeyUpdate() {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> return lastKeyUpdate;<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">292</span> public static SecretKey createSecretKey(byte[] raw) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span> return SecretManager.createSecretKey(raw);<a name="line.293"></a>
+<span class="sourceLineNo">294</span> }<a name="line.294"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span> private class LeaderElector extends Thread implements Stoppable {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> private boolean stopped = false;<a name="line.297"></a>
+<span class="sourceLineNo">298</span> /** Flag indicating whether we're in charge of rolling/expiring keys */<a name="line.298"></a>
+<span class="sourceLineNo">299</span> private boolean isMaster = false;<a name="line.299"></a>
+<span class="sourceLineNo">300</span> private ZKLeaderManager zkLeader;<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span> public LeaderElector(ZooKeeperWatcher watcher, String serverName) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span> setDaemon(true);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> setName("ZKSecretWatcher-leaderElector");<a name="line.304"></a>
+<span class="sourceLineNo">305</span> zkLeader = new ZKLeaderManager(watcher,<a name="line.305"></a>
+<span class="sourceLineNo">306</span> ZKUtil.joinZNode(zkWatcher.getRootKeyZNode(), "keymaster"),<a name="line.306"></a>
+<span class="sourceLineNo">307</span> Bytes.toBytes(serverName), this);<a name="line.307"></a>
<span class="sourceLineNo">308</span> }<a name="line.308"></a>
<span class="sourceLineNo">309</span><a name="line.309"></a>
-<span class="sourceLineNo">310</span> @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> @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> 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> long localLastKeyUpdate;<a name="line.341"></a>
-<span class="sourceLineNo">342</span> synchronized (this) {<a name="line.342"></a>
-<span class="sourceLineNo">343</span> localLastKeyUpdate = lastKeyUpdate;<a name="line.343"></a>
-<span class="sourceLineNo">344</span> }<a name="line.344"></a>
-<span class="sourceLineNo">345</span> if (localLastKeyUpdate + keyUpdateInterval < now) {<a name="line.345"></a>
-<span class="sourceLineNo">346</span> // roll a new master key<a name="line.346"></a>
-<span class="sourceLineNo">347</span> rollCurrentKey();<a name="line.347"></a>
-<span class="sourceLineNo">348</span> }<a name="line.348"></a>
-<span class="sourceLineNo">349</span><a name="line.349"></a>
-<span class="sourceLineNo">350</span> try {<a name="line.350"></a>
-<span class="sourceLineNo">351</span> Thread.sleep(5000);<a name="line.351"></a>
-<span class="sourceLineNo">352</span> } catch (InterruptedException ie) {<a name="line.352"></a>
-<span class="sourceLineNo">353</span> if (LOG.isDebugEnabled()) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> LOG.debug("Interrupted waiting for next update", ie);<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>
-<span class="sourceLineNo">358</span> }<a name="line.358"></a>
-<span class="sourceLineNo">359</span> }<a name="line.359"></a>
-<span class="sourceLineNo">360</span>}<a name="line.360"></a>
+<span class="sourceLineNo">310</span> public boolean isMaster() {<a name="line.310"></a>
+<span class="sourceLineNo">311</span> return isMaster;<a name="line.311"></a>
+<span class="sourceLineNo">312</span> }<a name="line.312"></a>
+<span class="sourceLineNo">313</span><a name="line.313"></a>
+<span class="sourceLineNo">314</span> @Override<a name="line.314"></a>
+<span class="sourceLineNo">315</span> public boolean isStopped() {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> return stopped;<a name="line.316"></a>
+<span class="sourceLineNo">317</span> }<a name="line.317"></a>
+<span class="sourceLineNo">318</span><a name="line.318"></a>
+<span class="sourceLineNo">319</span> @Override<a name="line.319"></a>
+<span class="sourceLineNo">320</span> public void stop(String reason) {<a name="line.320"></a>
+<span class="sourceLineNo">321</span> if (stopped) {<a name="line.321"></a>
+<span class="sourceLineNo">322</span> return;<a name="line.322"></a>
+<span class="sourceLineNo">323</span> }<a name="line.323"></a>
+<span class="sourceLineNo">324</span><a name="line.324"></a>
+<span class="sourceLineNo">325</span> stopped = true;<a name="line.325"></a>
+<span class="sourceLineNo">326</span> // prevent further key generation when stopping<a name="line.326"></a>
+<span class="sourceLineNo">327</span> if (isMaster) {<a name="line.327"></a>
+<span class="sourceLineNo">328</span> zkLeader.stepDownAsLeader();<a name="line.328"></a>
+<span class="sourceLineNo">329</span> }<a name="line.329"></a>
+<span class="sourceLineNo">330</span> isMaster = false;<a name="line.330"></a>
+<span class="sourceLineNo">331</span> LOG.info("Stopping leader election, because: "+reason);<a name="line.331"></a>
+<span class="sourceLineNo">332</span> interrupt();<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> public void run() {<a name="line.335"></a>
+<span class="sourceLineNo">336</span> zkLeader.start();<a name="line.336"></a>
+<span class="sourceLineNo">337</span> zkLeader.waitToBecomeLeader();<a name="line.337"></a>
+<span class="sourceLineNo">338</span> isMaster = true;<a name="line.338"></a>
+<span class="sourceLineNo">339</span><a name="line.339"></a>
+<span class="sourceLineNo">340</span> while (!stopped) {<a name="line.340"></a>
+<span class="sourceLineNo">341</span> long now = EnvironmentEdgeManager.currentTime();<a name="line.341"></a>
+<span class="sourceLineNo">342</span><a name="line.342"></a>
+<span class="sourceLineNo">343</span> // clear any expired<a name="line.343"></a>
+<span class="sourceLineNo">344</span> removeExpiredKeys();<a name="line.344"></a>
+<span class="sourceLineNo">345</span> long localLastKeyUpdate = getLastKeyUpdate();<a name="line.345"></a>
+<span class="sourceLineNo">346</span> if (localLastKeyUpdate + keyUpdateInterval < now) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span> // roll a new master key<a name="line.347"></a>
+<span class="sourceLineNo">348</span> rollCurrentKey();<a name="line.348"></a>
+<span class="sourceLineNo">349</span> }<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span> try {<a name="line.351"></a>
+<span class="sourceLineNo">352</span> Thread.sleep(5000);<a name="line.352"></a>
+<span class="sourceLineNo">353</span> } catch (InterruptedException ie) {<a name="line.353"></a>
+<span class="sourceLineNo">354</span> if (LOG.isDebugEnabled()) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span> LOG.debug("Interrupted waiting for next update", ie);<a name="line.355"></a>
+<span class="sourceLineNo">356</span> }<a name="line.356"></a>
+<span class="sourceLineNo">357</span> }<a name="line.357"></a>
+<span class="sourceLineNo">358</span> }<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<a name="line.359"></a>
+<span class="sourceLineNo">360</span> }<a name="line.360"></a>
+<span class="sourceLineNo">361</span>}<a name="line.361"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html b/devapidocs/src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html
index 38c4bcd..8979045 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html
@@ -293,79 +293,80 @@
<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">288</span> synchronized long getLastKeyUpdate() {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> return lastKeyUpdate;<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">292</span> public static SecretKey createSecretKey(byte[] raw) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span> return SecretManager.createSecretKey(raw);<a name="line.293"></a>
+<span class="sourceLineNo">294</span> }<a name="line.294"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span> private class LeaderElector extends Thread implements Stoppable {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> private boolean stopped = false;<a name="line.297"></a>
+<span class="sourceLineNo">298</span> /** Flag indicating whether we're in charge of rolling/expiring keys */<a name="line.298"></a>
+<span class="sourceLineNo">299</span> private boolean isMaster = false;<a name="line.299"></a>
+<span class="sourceLineNo">300</span> private ZKLeaderManager zkLeader;<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span> public LeaderElector(ZooKeeperWatcher watcher, String serverName) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span> setDaemon(true);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> setName("ZKSecretWatcher-leaderElector");<a name="line.304"></a>
+<span class="sourceLineNo">305</span> zkLeader = new ZKLeaderManager(watcher,<a name="line.305"></a>
+<span class="sourceLineNo">306</span> ZKUtil.joinZNode(zkWatcher.getRootKeyZNode(), "keymaster"),<a name="line.306"></a>
+<span class="sourceLineNo">307</span> Bytes.toBytes(serverName), this);<a name="line.307"></a>
<span class="sourceLineNo">308</span> }<a name="line.308"></a>
<span class="sourceLineNo">309</span><a name="line.309"></a>
-<span class="sourceLineNo">310</span> @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> @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> 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> long localLastKeyUpdate;<a name="line.341"></a>
-<span class="sourceLineNo">342</span> synchronized (this) {<a name="line.342"></a>
-<span class="sourceLineNo">343</span> localLastKeyUpdate = lastKeyUpdate;<a name="line.343"></a>
-<span class="sourceLineNo">344</span> }<a name="line.344"></a>
-<span class="sourceLineNo">345</span> if (localLastKeyUpdate + keyUpdateInterval < now) {<a name="line.345"></a>
-<span class="sourceLineNo">346</span> // roll a new master key<a name="line.346"></a>
-<span class="sourceLineNo">347</span> rollCurrentKey();<a name="line.347"></a>
-<span class="sourceLineNo">348</span> }<a name="line.348"></a>
-<span class="sourceLineNo">349</span><a name="line.349"></a>
-<span class="sourceLineNo">350</span> try {<a name="line.350"></a>
-<span class="sourceLineNo">351</span> Thread.sleep(5000);<a name="line.351"></a>
-<span class="sourceLineNo">352</span> } catch (InterruptedException ie) {<a name="line.352"></a>
-<span class="sourceLineNo">353</span> if (LOG.isDebugEnabled()) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> LOG.debug("Interrupted waiting for next update", ie);<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>
-<span class="sourceLineNo">358</span> }<a name="line.358"></a>
-<span class="sourceLineNo">359</span> }<a name="line.359"></a>
-<span class="sourceLineNo">360</span>}<a name="line.360"></a>
+<span class="sourceLineNo">310</span> public boolean isMaster() {<a name="line.310"></a>
+<span class="sourceLineNo">311</span> return isMaster;<a name="line.311"></a>
+<span class="sourceLineNo">312</span> }<a name="line.312"></a>
+<span class="sourceLineNo">313</span><a name="line.313"></a>
+<span class="sourceLineNo">314</span> @Override<a name="line.314"></a>
+<span class="sourceLineNo">315</span> public boolean isStopped() {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> return stopped;<a name="line.316"></a>
+<span class="sourceLineNo">317</span> }<a name="line.317"></a>
+<span class="sourceLineNo">318</span><a name="line.318"></a>
+<span class="sourceLineNo">319</span> @Override<a name="line.319"></a>
+<span class="sourceLineNo">320</span> public void stop(String reason) {<a name="line.320"></a>
+<span class="sourceLineNo">321</span> if (stopped) {<a name="line.321"></a>
+<span class="sourceLineNo">322</span> return;<a name="line.322"></a>
+<span class="sourceLineNo">323</span> }<a name="line.323"></a>
+<span class="sourceLineNo">324</span><a name="line.324"></a>
+<span class="sourceLineNo">325</span> stopped = true;<a name="line.325"></a>
+<span class="sourceLineNo">326</span> // prevent further key generation when stopping<a name="line.326"></a>
+<span class="sourceLineNo">327</span> if (isMaster) {<a name="line.327"></a>
+<span class="sourceLineNo">328</span> zkLeader.stepDownAsLeader();<a name="line.328"></a>
+<span class="sourceLineNo">329</span> }<a name="line.329"></a>
+<span class="sourceLineNo">330</span> isMaster = false;<a name="line.330"></a>
+<span class="sourceLineNo">331</span> LOG.info("Stopping leader election, because: "+reason);<a name="line.331"></a>
+<span class="sourceLineNo">332</span> interrupt();<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> public void run() {<a name="line.335"></a>
+<span class="sourceLineNo">336</span> zkLeader.start();<a name="line.336"></a>
+<span class="sourceLineNo">337</span> zkLeader.waitToBecomeLeader();<a name="line.337"></a>
+<span class="sourceLineNo">338</span> isMaster = true;<a name="line.338"></a>
+<span class="sourceLineNo">339</span><a name="line.339"></a>
+<span class="sourceLineNo">340</span> while (!stopped) {<a name="line.340"></a>
+<span class="sourceLineNo">341</span> long now = EnvironmentEdgeManager.currentTime();<a name="line.341"></a>
+<span class="sourceLineNo">342</span><a name="line.342"></a>
+<span class="sourceLineNo">343</span> // clear any expired<a name="line.343"></a>
+<span class="sourceLineNo">344</span> removeExpiredKeys();<a name="line.344"></a>
+<span class="sourceLineNo">345</span> long localLastKeyUpdate = getLastKeyUpdate();<a name="line.345"></a>
+<span class="sourceLineNo">346</span> if (localLastKeyUpdate + keyUpdateInterval < now) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span> // roll a new master key<a name="line.347"></a>
+<span class="sourceLineNo">348</span> rollCurrentKey();<a name="line.348"></a>
+<span class="sourceLineNo">349</span> }<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span> try {<a name="line.351"></a>
+<span class="sourceLineNo">352</span> Thread.sleep(5000);<a name="line.352"></a>
+<span class="sourceLineNo">353</span> } catch (InterruptedException ie) {<a name="line.353"></a>
+<span class="sourceLineNo">354</span> if (LOG.isDebugEnabled()) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span> LOG.debug("Interrupted waiting for next update", ie);<a name="line.355"></a>
+<span class="sourceLineNo">356</span> }<a name="line.356"></a>
+<span class="sourceLineNo">357</span> }<a name="line.357"></a>
+<span class="sourceLineNo">358</span> }<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<a name="line.359"></a>
+<span class="sourceLineNo">360</span> }<a name="line.360"></a>
+<span class="sourceLineNo">361</span>}<a name="line.361"></a>