http://git-wip-us.apache.org/repos/asf/hbase-site/blob/99c53df1/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotManifest.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotManifest.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotManifest.html
index 3255174..bfaacbc 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotManifest.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotManifest.html
@@ -55,516 +55,538 @@
 <span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.regionserver.Store;<a name="line.47"></a>
 <span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.regionserver.StoreFile;<a name="line.48"></a>
 <span class="sourceLineNo">049</span>import 
org.apache.hadoop.hbase.regionserver.StoreFileInfo;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import 
org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream;<a 
name="line.50"></a>
-<span class="sourceLineNo">051</span>import 
org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;<a
 name="line.51"></a>
-<span class="sourceLineNo">052</span>import 
org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDataManifest;<a
 name="line.53"></a>
-<span class="sourceLineNo">054</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDescription;<a
 name="line.54"></a>
-<span class="sourceLineNo">055</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotRegionManifest;<a
 name="line.55"></a>
-<span class="sourceLineNo">056</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import 
org.apache.hadoop.hbase.util.FSTableDescriptors;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import 
org.apache.hadoop.hbase.util.FSUtils;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import 
org.apache.hadoop.hbase.util.Threads;<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span>/**<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * Utility class to help read/write the 
Snapshot Manifest.<a name="line.62"></a>
-<span class="sourceLineNo">063</span> *<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * The snapshot format is transparent for 
the users of this class,<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * once the snapshot is written, it will 
never be modified.<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * On open() the snapshot will be loaded 
to the current in-memory format.<a name="line.66"></a>
-<span class="sourceLineNo">067</span> */<a name="line.67"></a>
-<span class="sourceLineNo">068</span>@InterfaceAudience.Private<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span>public final class SnapshotManifest {<a 
name="line.69"></a>
-<span class="sourceLineNo">070</span>  private static final Log LOG = 
LogFactory.getLog(SnapshotManifest.class);<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span>  public static final String 
SNAPSHOT_MANIFEST_SIZE_LIMIT_CONF_KEY = "snapshot.manifest.size.limit";<a 
name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span>  public static final String 
DATA_MANIFEST_NAME = "data.manifest";<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span>  private 
List&lt;SnapshotRegionManifest&gt; regionManifests;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>  private SnapshotDescription desc;<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>  private HTableDescriptor htd;<a 
name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span>  private final ForeignExceptionSnare 
monitor;<a name="line.80"></a>
-<span class="sourceLineNo">081</span>  private final Configuration conf;<a 
name="line.81"></a>
-<span class="sourceLineNo">082</span>  private final Path workingDir;<a 
name="line.82"></a>
-<span class="sourceLineNo">083</span>  private final FileSystem fs;<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>  private int manifestSizeLimit;<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span>  private SnapshotManifest(final 
Configuration conf, final FileSystem fs,<a name="line.86"></a>
-<span class="sourceLineNo">087</span>      final Path workingDir, final 
SnapshotDescription desc,<a name="line.87"></a>
-<span class="sourceLineNo">088</span>      final ForeignExceptionSnare 
monitor) {<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    this.monitor = monitor;<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>    this.desc = desc;<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>    this.workingDir = workingDir;<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span>    this.conf = conf;<a 
name="line.92"></a>
-<span class="sourceLineNo">093</span>    this.fs = fs;<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span>    this.manifestSizeLimit = 
conf.getInt(SNAPSHOT_MANIFEST_SIZE_LIMIT_CONF_KEY, 64 * 1024 * 1024);<a 
name="line.95"></a>
-<span class="sourceLineNo">096</span>  }<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>  /**<a name="line.98"></a>
-<span class="sourceLineNo">099</span>   * Return a SnapshotManifest instance, 
used for writing a snapshot.<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   *<a name="line.100"></a>
-<span class="sourceLineNo">101</span>   * There are two usage pattern:<a 
name="line.101"></a>
-<span class="sourceLineNo">102</span>   *  - The Master will create a 
manifest, add the descriptor, offline regions<a name="line.102"></a>
-<span class="sourceLineNo">103</span>   *    and consolidate the snapshot by 
writing all the pending stuff on-disk.<a name="line.103"></a>
-<span class="sourceLineNo">104</span>   *      manifest = 
SnapshotManifest.create(...)<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   *      manifest.addRegion(tableDir, 
hri)<a name="line.105"></a>
-<span class="sourceLineNo">106</span>   *      manifest.consolidate()<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>   *  - The RegionServer will create a 
single region manifest<a name="line.107"></a>
-<span class="sourceLineNo">108</span>   *      manifest = 
SnapshotManifest.create(...)<a name="line.108"></a>
-<span class="sourceLineNo">109</span>   *      manifest.addRegion(region)<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>   */<a name="line.110"></a>
-<span class="sourceLineNo">111</span>  public static SnapshotManifest 
create(final Configuration conf, final FileSystem fs,<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      final Path workingDir, final 
SnapshotDescription desc,<a name="line.112"></a>
-<span class="sourceLineNo">113</span>      final ForeignExceptionSnare 
monitor) {<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    return new SnapshotManifest(conf, fs, 
workingDir, desc, monitor);<a name="line.114"></a>
-<span class="sourceLineNo">115</span>  }<a name="line.115"></a>
+<span class="sourceLineNo">050</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.50"></a>
+<span class="sourceLineNo">051</span>import 
org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream;<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>import 
org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;<a
 name="line.52"></a>
+<span class="sourceLineNo">053</span>import 
org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDataManifest;<a
 name="line.54"></a>
+<span class="sourceLineNo">055</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDescription;<a
 name="line.55"></a>
+<span class="sourceLineNo">056</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotRegionManifest;<a
 name="line.56"></a>
+<span class="sourceLineNo">057</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import 
org.apache.hadoop.hbase.util.FSTableDescriptors;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import 
org.apache.hadoop.hbase.util.FSUtils;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import 
org.apache.hadoop.hbase.util.Threads;<a name="line.60"></a>
+<span class="sourceLineNo">061</span><a name="line.61"></a>
+<span class="sourceLineNo">062</span>/**<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * Utility class to help read/write the 
Snapshot Manifest.<a name="line.63"></a>
+<span class="sourceLineNo">064</span> *<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * The snapshot format is transparent for 
the users of this class,<a name="line.65"></a>
+<span class="sourceLineNo">066</span> * once the snapshot is written, it will 
never be modified.<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * On open() the snapshot will be loaded 
to the current in-memory format.<a name="line.67"></a>
+<span class="sourceLineNo">068</span> */<a name="line.68"></a>
+<span class="sourceLineNo">069</span>@InterfaceAudience.Private<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span>public final class SnapshotManifest {<a 
name="line.70"></a>
+<span class="sourceLineNo">071</span>  private static final Log LOG = 
LogFactory.getLog(SnapshotManifest.class);<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span>  public static final String 
SNAPSHOT_MANIFEST_SIZE_LIMIT_CONF_KEY = "snapshot.manifest.size.limit";<a 
name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>  public static final String 
DATA_MANIFEST_NAME = "data.manifest";<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span>  private 
List&lt;SnapshotRegionManifest&gt; regionManifests;<a name="line.77"></a>
+<span class="sourceLineNo">078</span>  private SnapshotDescription desc;<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>  private HTableDescriptor htd;<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span>  private final ForeignExceptionSnare 
monitor;<a name="line.81"></a>
+<span class="sourceLineNo">082</span>  private final Configuration conf;<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>  private final Path workingDir;<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>  private final FileSystem fs;<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>  private int manifestSizeLimit;<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span>  private SnapshotManifest(final 
Configuration conf, final FileSystem fs,<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      final Path workingDir, final 
SnapshotDescription desc,<a name="line.88"></a>
+<span class="sourceLineNo">089</span>      final ForeignExceptionSnare 
monitor) {<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    this.monitor = monitor;<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span>    this.desc = desc;<a 
name="line.91"></a>
+<span class="sourceLineNo">092</span>    this.workingDir = workingDir;<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>    this.conf = conf;<a 
name="line.93"></a>
+<span class="sourceLineNo">094</span>    this.fs = fs;<a name="line.94"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span>    this.manifestSizeLimit = 
conf.getInt(SNAPSHOT_MANIFEST_SIZE_LIMIT_CONF_KEY, 64 * 1024 * 1024);<a 
name="line.96"></a>
+<span class="sourceLineNo">097</span>  }<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>  /**<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   * Return a SnapshotManifest instance, 
used for writing a snapshot.<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   *<a name="line.101"></a>
+<span class="sourceLineNo">102</span>   * There are two usage pattern:<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>   *  - The Master will create a 
manifest, add the descriptor, offline regions<a name="line.103"></a>
+<span class="sourceLineNo">104</span>   *    and consolidate the snapshot by 
writing all the pending stuff on-disk.<a name="line.104"></a>
+<span class="sourceLineNo">105</span>   *      manifest = 
SnapshotManifest.create(...)<a name="line.105"></a>
+<span class="sourceLineNo">106</span>   *      manifest.addRegion(tableDir, 
hri)<a name="line.106"></a>
+<span class="sourceLineNo">107</span>   *      manifest.consolidate()<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>   *  - The RegionServer will create a 
single region manifest<a name="line.108"></a>
+<span class="sourceLineNo">109</span>   *      manifest = 
SnapshotManifest.create(...)<a name="line.109"></a>
+<span class="sourceLineNo">110</span>   *      manifest.addRegion(region)<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>   */<a name="line.111"></a>
+<span class="sourceLineNo">112</span>  public static SnapshotManifest 
create(final Configuration conf, final FileSystem fs,<a name="line.112"></a>
+<span class="sourceLineNo">113</span>      final Path workingDir, final 
SnapshotDescription desc,<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      final ForeignExceptionSnare 
monitor) {<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    return new SnapshotManifest(conf, fs, 
workingDir, desc, monitor);<a name="line.115"></a>
 <span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>  /**<a name="line.117"></a>
-<span class="sourceLineNo">118</span>   * Return a SnapshotManifest instance 
with the information already loaded in-memory.<a name="line.118"></a>
-<span class="sourceLineNo">119</span>   *    SnapshotManifest manifest = 
SnapshotManifest.open(...)<a name="line.119"></a>
-<span class="sourceLineNo">120</span>   *    HTableDescriptor htd = 
manifest.getTableDescriptor()<a name="line.120"></a>
-<span class="sourceLineNo">121</span>   *    for (SnapshotRegionManifest 
regionManifest: manifest.getRegionManifests())<a name="line.121"></a>
-<span class="sourceLineNo">122</span>   *      hri = 
regionManifest.getRegionInfo()<a name="line.122"></a>
-<span class="sourceLineNo">123</span>   *      for 
(regionManifest.getFamilyFiles())<a name="line.123"></a>
-<span class="sourceLineNo">124</span>   *        ...<a name="line.124"></a>
-<span class="sourceLineNo">125</span>   */<a name="line.125"></a>
-<span class="sourceLineNo">126</span>  public static SnapshotManifest 
open(final Configuration conf, final FileSystem fs,<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      final Path workingDir, final 
SnapshotDescription desc) throws IOException {<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    SnapshotManifest manifest = new 
SnapshotManifest(conf, fs, workingDir, desc, null);<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    manifest.load();<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>    return manifest;<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>  }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span>  /**<a name="line.134"></a>
-<span class="sourceLineNo">135</span>   * Add the table descriptor to the 
snapshot manifest<a name="line.135"></a>
-<span class="sourceLineNo">136</span>   */<a name="line.136"></a>
-<span class="sourceLineNo">137</span>  public void addTableDescriptor(final 
HTableDescriptor htd) throws IOException {<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    this.htd = htd;<a name="line.138"></a>
-<span class="sourceLineNo">139</span>  }<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>  interface RegionVisitor&lt;TRegion, 
TFamily&gt; {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    TRegion regionOpen(final HRegionInfo 
regionInfo) throws IOException;<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    void regionClose(final TRegion 
region) throws IOException;<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span>    TFamily familyOpen(final TRegion 
region, final byte[] familyName) throws IOException;<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    void familyClose(final TRegion 
region, final TFamily family) throws IOException;<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span>    void storeFile(final TRegion region, 
final TFamily family, final StoreFileInfo storeFile)<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      throws IOException;<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>  }<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span>  private RegionVisitor 
createRegionVisitor(final SnapshotDescription desc) throws IOException {<a 
name="line.152"></a>
-<span class="sourceLineNo">153</span>    switch (getSnapshotFormat(desc)) {<a 
name="line.153"></a>
-<span class="sourceLineNo">154</span>      case 
SnapshotManifestV1.DESCRIPTOR_VERSION:<a name="line.154"></a>
-<span class="sourceLineNo">155</span>        return new 
SnapshotManifestV1.ManifestBuilder(conf, fs, workingDir);<a name="line.155"></a>
-<span class="sourceLineNo">156</span>      case 
SnapshotManifestV2.DESCRIPTOR_VERSION:<a name="line.156"></a>
-<span class="sourceLineNo">157</span>        return new 
SnapshotManifestV2.ManifestBuilder(conf, fs, workingDir);<a name="line.157"></a>
-<span class="sourceLineNo">158</span>      default:<a name="line.158"></a>
-<span class="sourceLineNo">159</span>      throw new 
CorruptedSnapshotException("Invalid Snapshot version: " + desc.getVersion(),<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>        
ProtobufUtil.createSnapshotDesc(desc));<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    }<a name="line.161"></a>
-<span class="sourceLineNo">162</span>  }<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>  public void addMobRegion(HRegionInfo 
regionInfo) throws IOException {<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    // 0. Get the 
ManifestBuilder/RegionVisitor<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    RegionVisitor visitor = 
createRegionVisitor(desc);<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>    // 1. dump region meta info into the 
snapshot directory<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    LOG.debug("Storing mob region '" + 
regionInfo + "' region-info for snapshot.");<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    Object regionData = 
visitor.regionOpen(regionInfo);<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    monitor.rethrowException();<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span>    // 2. iterate through all the stores 
in the region<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    LOG.debug("Creating references for 
mob files");<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span>    Path mobRegionPath = 
MobUtils.getMobRegionPath(conf, regionInfo.getTable());<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    for (HColumnDescriptor hcd : 
htd.getColumnFamilies()) {<a name="line.177"></a>
-<span class="sourceLineNo">178</span>      // 2.1. build the snapshot 
reference for the store if it's a mob store<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      if (!hcd.isMobEnabled()) {<a 
name="line.179"></a>
-<span class="sourceLineNo">180</span>        continue;<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      }<a name="line.181"></a>
-<span class="sourceLineNo">182</span>      Object familyData = 
visitor.familyOpen(regionData, hcd.getName());<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      monitor.rethrowException();<a 
name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span>      Path storePath = 
MobUtils.getMobFamilyPath(mobRegionPath, hcd.getNameAsString());<a 
name="line.185"></a>
-<span class="sourceLineNo">186</span>      List&lt;StoreFileInfo&gt; 
storeFiles = getStoreFiles(storePath);<a name="line.186"></a>
-<span class="sourceLineNo">187</span>      if (storeFiles == null) {<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>        if (LOG.isDebugEnabled()) {<a 
name="line.188"></a>
-<span class="sourceLineNo">189</span>          LOG.debug("No mob files under 
family: " + hcd.getNameAsString());<a name="line.189"></a>
-<span class="sourceLineNo">190</span>        }<a name="line.190"></a>
-<span class="sourceLineNo">191</span>        continue;<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      }<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>      addReferenceFiles(visitor, 
regionData, familyData, storeFiles, true);<a name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span>      visitor.familyClose(regionData, 
familyData);<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    }<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    visitor.regionClose(regionData);<a 
name="line.198"></a>
-<span class="sourceLineNo">199</span>  }<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span>  /**<a name="line.201"></a>
-<span class="sourceLineNo">202</span>   * Creates a 'manifest' for the 
specified region, by reading directly from the HRegion object.<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>   * This is used by the "online 
snapshot" when the table is enabled.<a name="line.203"></a>
-<span class="sourceLineNo">204</span>   */<a name="line.204"></a>
-<span class="sourceLineNo">205</span>  public void addRegion(final HRegion 
region) throws IOException {<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    // 0. Get the 
ManifestBuilder/RegionVisitor<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    RegionVisitor visitor = 
createRegionVisitor(desc);<a name="line.207"></a>
+<span class="sourceLineNo">117</span>  }<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span>  /**<a name="line.119"></a>
+<span class="sourceLineNo">120</span>   * Return a SnapshotManifest instance 
with the information already loaded in-memory.<a name="line.120"></a>
+<span class="sourceLineNo">121</span>   *    SnapshotManifest manifest = 
SnapshotManifest.open(...)<a name="line.121"></a>
+<span class="sourceLineNo">122</span>   *    HTableDescriptor htd = 
manifest.getTableDescriptor()<a name="line.122"></a>
+<span class="sourceLineNo">123</span>   *    for (SnapshotRegionManifest 
regionManifest: manifest.getRegionManifests())<a name="line.123"></a>
+<span class="sourceLineNo">124</span>   *      hri = 
regionManifest.getRegionInfo()<a name="line.124"></a>
+<span class="sourceLineNo">125</span>   *      for 
(regionManifest.getFamilyFiles())<a name="line.125"></a>
+<span class="sourceLineNo">126</span>   *        ...<a name="line.126"></a>
+<span class="sourceLineNo">127</span>   */<a name="line.127"></a>
+<span class="sourceLineNo">128</span>  public static SnapshotManifest 
open(final Configuration conf, final FileSystem fs,<a name="line.128"></a>
+<span class="sourceLineNo">129</span>      final Path workingDir, final 
SnapshotDescription desc) throws IOException {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    SnapshotManifest manifest = new 
SnapshotManifest(conf, fs, workingDir, desc, null);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    manifest.load();<a 
name="line.131"></a>
+<span class="sourceLineNo">132</span>    return manifest;<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>  }<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span>  /**<a name="line.136"></a>
+<span class="sourceLineNo">137</span>   * Add the table descriptor to the 
snapshot manifest<a name="line.137"></a>
+<span class="sourceLineNo">138</span>   */<a name="line.138"></a>
+<span class="sourceLineNo">139</span>  public void addTableDescriptor(final 
HTableDescriptor htd) throws IOException {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    this.htd = htd;<a name="line.140"></a>
+<span class="sourceLineNo">141</span>  }<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span>  interface RegionVisitor&lt;TRegion, 
TFamily&gt; {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    TRegion regionOpen(final HRegionInfo 
regionInfo) throws IOException;<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    void regionClose(final TRegion 
region) throws IOException;<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span>    TFamily familyOpen(final TRegion 
region, final byte[] familyName) throws IOException;<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    void familyClose(final TRegion 
region, final TFamily family) throws IOException;<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span>    void storeFile(final TRegion region, 
final TFamily family, final StoreFileInfo storeFile)<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      throws IOException;<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>  }<a name="line.152"></a>
+<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">154</span>  private RegionVisitor 
createRegionVisitor(final SnapshotDescription desc) throws IOException {<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>    switch (getSnapshotFormat(desc)) {<a 
name="line.155"></a>
+<span class="sourceLineNo">156</span>      case 
SnapshotManifestV1.DESCRIPTOR_VERSION:<a name="line.156"></a>
+<span class="sourceLineNo">157</span>        return new 
SnapshotManifestV1.ManifestBuilder(conf, fs, workingDir);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      case 
SnapshotManifestV2.DESCRIPTOR_VERSION:<a name="line.158"></a>
+<span class="sourceLineNo">159</span>        return new 
SnapshotManifestV2.ManifestBuilder(conf, fs, workingDir);<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      default:<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      throw new 
CorruptedSnapshotException("Invalid Snapshot version: " + desc.getVersion(),<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>        
ProtobufUtil.createSnapshotDesc(desc));<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    }<a name="line.163"></a>
+<span class="sourceLineNo">164</span>  }<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span>  public void addMobRegion(HRegionInfo 
regionInfo) throws IOException {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    // Get the 
ManifestBuilder/RegionVisitor<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    RegionVisitor visitor = 
createRegionVisitor(desc);<a name="line.168"></a>
+<span class="sourceLineNo">169</span><a name="line.169"></a>
+<span class="sourceLineNo">170</span>    // Visit the region and add it to the 
manifest<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    addMobRegion(regionInfo, visitor);<a 
name="line.171"></a>
+<span class="sourceLineNo">172</span>  }<a name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span>  @VisibleForTesting<a 
name="line.174"></a>
+<span class="sourceLineNo">175</span>  protected void addMobRegion(HRegionInfo 
regionInfo, RegionVisitor visitor) throws IOException {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    // 1. dump region meta info into the 
snapshot directory<a name="line.176"></a>
+<span class="sourceLineNo">177</span>    LOG.debug("Storing mob region '" + 
regionInfo + "' region-info for snapshot.");<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    Object regionData = 
visitor.regionOpen(regionInfo);<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    monitor.rethrowException();<a 
name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span>    // 2. iterate through all the stores 
in the region<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    LOG.debug("Creating references for 
mob files");<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span>    Path mobRegionPath = 
MobUtils.getMobRegionPath(conf, regionInfo.getTable());<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    for (HColumnDescriptor hcd : 
htd.getColumnFamilies()) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      // 2.1. build the snapshot 
reference for the store if it's a mob store<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      if (!hcd.isMobEnabled()) {<a 
name="line.187"></a>
+<span class="sourceLineNo">188</span>        continue;<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      }<a name="line.189"></a>
+<span class="sourceLineNo">190</span>      Object familyData = 
visitor.familyOpen(regionData, hcd.getName());<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      monitor.rethrowException();<a 
name="line.191"></a>
+<span class="sourceLineNo">192</span><a name="line.192"></a>
+<span class="sourceLineNo">193</span>      Path storePath = 
MobUtils.getMobFamilyPath(mobRegionPath, hcd.getNameAsString());<a 
name="line.193"></a>
+<span class="sourceLineNo">194</span>      List&lt;StoreFileInfo&gt; 
storeFiles = getStoreFiles(storePath);<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      if (storeFiles == null) {<a 
name="line.195"></a>
+<span class="sourceLineNo">196</span>        if (LOG.isDebugEnabled()) {<a 
name="line.196"></a>
+<span class="sourceLineNo">197</span>          LOG.debug("No mob files under 
family: " + hcd.getNameAsString());<a name="line.197"></a>
+<span class="sourceLineNo">198</span>        }<a name="line.198"></a>
+<span class="sourceLineNo">199</span>        continue;<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      }<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span>      addReferenceFiles(visitor, 
regionData, familyData, storeFiles, true);<a name="line.202"></a>
+<span class="sourceLineNo">203</span><a name="line.203"></a>
+<span class="sourceLineNo">204</span>      visitor.familyClose(regionData, 
familyData);<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    }<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    visitor.regionClose(regionData);<a 
name="line.206"></a>
+<span class="sourceLineNo">207</span>  }<a name="line.207"></a>
 <span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span>    // 1. dump region meta info into the 
snapshot directory<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    LOG.debug("Storing '" + region + "' 
region-info for snapshot.");<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    Object regionData = 
visitor.regionOpen(region.getRegionInfo());<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    monitor.rethrowException();<a 
name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span>    // 2. iterate through all the stores 
in the region<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    LOG.debug("Creating references for 
hfiles");<a name="line.215"></a>
+<span class="sourceLineNo">209</span>  /**<a name="line.209"></a>
+<span class="sourceLineNo">210</span>   * Creates a 'manifest' for the 
specified region, by reading directly from the HRegion object.<a 
name="line.210"></a>
+<span class="sourceLineNo">211</span>   * This is used by the "online 
snapshot" when the table is enabled.<a name="line.211"></a>
+<span class="sourceLineNo">212</span>   */<a name="line.212"></a>
+<span class="sourceLineNo">213</span>  public void addRegion(final HRegion 
region) throws IOException {<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    // Get the 
ManifestBuilder/RegionVisitor<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    RegionVisitor visitor = 
createRegionVisitor(desc);<a name="line.215"></a>
 <span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span>    for (Store store : 
region.getStores()) {<a name="line.217"></a>
-<span class="sourceLineNo">218</span>      // 2.1. build the snapshot 
reference for the store<a name="line.218"></a>
-<span class="sourceLineNo">219</span>      Object familyData = 
visitor.familyOpen(regionData, store.getColumnFamilyDescriptor().getName());<a 
name="line.219"></a>
-<span class="sourceLineNo">220</span>      monitor.rethrowException();<a 
name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span>      List&lt;StoreFile&gt; storeFiles = 
new ArrayList&lt;&gt;(store.getStorefiles());<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      if (LOG.isDebugEnabled()) {<a 
name="line.223"></a>
-<span class="sourceLineNo">224</span>        LOG.debug("Adding snapshot 
references for " + storeFiles  + " hfiles");<a name="line.224"></a>
-<span class="sourceLineNo">225</span>      }<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span>      // 2.2. iterate through all the 
store's files and create "references".<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      for (int i = 0, sz = 
storeFiles.size(); i &lt; sz; i++) {<a name="line.228"></a>
-<span class="sourceLineNo">229</span>        StoreFile storeFile = 
storeFiles.get(i);<a name="line.229"></a>
-<span class="sourceLineNo">230</span>        monitor.rethrowException();<a 
name="line.230"></a>
-<span class="sourceLineNo">231</span><a name="line.231"></a>
-<span class="sourceLineNo">232</span>        // create "reference" to this 
store file.<a name="line.232"></a>
-<span class="sourceLineNo">233</span>        LOG.debug("Adding reference for 
file (" + (i+1) + "/" + sz + "): " + storeFile.getPath());<a 
name="line.233"></a>
-<span class="sourceLineNo">234</span>        visitor.storeFile(regionData, 
familyData, storeFile.getFileInfo());<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      }<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      visitor.familyClose(regionData, 
familyData);<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    }<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    visitor.regionClose(regionData);<a 
name="line.238"></a>
-<span class="sourceLineNo">239</span>  }<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>
-<span class="sourceLineNo">242</span>   * Creates a 'manifest' for the 
specified region, by reading directly from the disk.<a name="line.242"></a>
-<span class="sourceLineNo">243</span>   * This is used by the "offline 
snapshot" when the table is disabled.<a name="line.243"></a>
-<span class="sourceLineNo">244</span>   */<a name="line.244"></a>
-<span class="sourceLineNo">245</span>  public void addRegion(final Path 
tableDir, final HRegionInfo regionInfo) throws IOException {<a 
name="line.245"></a>
-<span class="sourceLineNo">246</span>    // 0. Get the 
ManifestBuilder/RegionVisitor<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    RegionVisitor visitor = 
createRegionVisitor(desc);<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span>    boolean isMobRegion = 
MobUtils.isMobRegionInfo(regionInfo);<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    try {<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      Path baseDir = tableDir;<a 
name="line.251"></a>
-<span class="sourceLineNo">252</span>      // Open the RegionFS<a 
name="line.252"></a>
-<span class="sourceLineNo">253</span>      if (isMobRegion) {<a 
name="line.253"></a>
-<span class="sourceLineNo">254</span>        baseDir = 
FSUtils.getTableDir(MobUtils.getMobHome(conf), regionInfo.getTable());<a 
name="line.254"></a>
-<span class="sourceLineNo">255</span>      }<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      HRegionFileSystem regionFs = 
HRegionFileSystem.openRegionFromFileSystem(conf, fs,<a name="line.256"></a>
-<span class="sourceLineNo">257</span>        baseDir, regionInfo, true);<a 
name="line.257"></a>
-<span class="sourceLineNo">258</span>      monitor.rethrowException();<a 
name="line.258"></a>
-<span class="sourceLineNo">259</span><a name="line.259"></a>
-<span class="sourceLineNo">260</span>      // 1. dump region meta info into 
the snapshot directory<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      LOG.debug("Storing region-info for 
snapshot.");<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      Object regionData = 
visitor.regionOpen(regionInfo);<a name="line.262"></a>
-<span class="sourceLineNo">263</span>      monitor.rethrowException();<a 
name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span>      // 2. iterate through all the 
stores in the region<a name="line.265"></a>
-<span class="sourceLineNo">266</span>      LOG.debug("Creating references for 
hfiles");<a name="line.266"></a>
+<span class="sourceLineNo">217</span>    // Visit the region and add it to the 
manifest<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    addRegion(region, visitor);<a 
name="line.218"></a>
+<span class="sourceLineNo">219</span>  }<a name="line.219"></a>
+<span class="sourceLineNo">220</span><a name="line.220"></a>
+<span class="sourceLineNo">221</span>  @VisibleForTesting<a 
name="line.221"></a>
+<span class="sourceLineNo">222</span>  protected void addRegion(final HRegion 
region, RegionVisitor visitor) throws IOException {<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    // 1. dump region meta info into the 
snapshot directory<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    LOG.debug("Storing '" + region + "' 
region-info for snapshot.");<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    Object regionData = 
visitor.regionOpen(region.getRegionInfo());<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    monitor.rethrowException();<a 
name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span>    // 2. iterate through all the stores 
in the region<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    LOG.debug("Creating references for 
hfiles");<a name="line.229"></a>
+<span class="sourceLineNo">230</span><a name="line.230"></a>
+<span class="sourceLineNo">231</span>    for (Store store : 
region.getStores()) {<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      // 2.1. build the snapshot 
reference for the store<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      Object familyData = 
visitor.familyOpen(regionData,<a name="line.233"></a>
+<span class="sourceLineNo">234</span>          
store.getColumnFamilyDescriptor().getName());<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      monitor.rethrowException();<a 
name="line.235"></a>
+<span class="sourceLineNo">236</span><a name="line.236"></a>
+<span class="sourceLineNo">237</span>      List&lt;StoreFile&gt; storeFiles = 
new ArrayList&lt;&gt;(store.getStorefiles());<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      if (LOG.isDebugEnabled()) {<a 
name="line.238"></a>
+<span class="sourceLineNo">239</span>        LOG.debug("Adding snapshot 
references for " + storeFiles  + " hfiles");<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>
+<span class="sourceLineNo">242</span>      // 2.2. iterate through all the 
store's files and create "references".<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      for (int i = 0, sz = 
storeFiles.size(); i &lt; sz; i++) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>        StoreFile storeFile = 
storeFiles.get(i);<a name="line.244"></a>
+<span class="sourceLineNo">245</span>        monitor.rethrowException();<a 
name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span>        // create "reference" to this 
store file.<a name="line.247"></a>
+<span class="sourceLineNo">248</span>        LOG.debug("Adding reference for 
file (" + (i+1) + "/" + sz + "): " + storeFile.getPath());<a 
name="line.248"></a>
+<span class="sourceLineNo">249</span>        visitor.storeFile(regionData, 
familyData, storeFile.getFileInfo());<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      }<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      visitor.familyClose(regionData, 
familyData);<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    }<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    visitor.regionClose(regionData);<a 
name="line.253"></a>
+<span class="sourceLineNo">254</span>  }<a name="line.254"></a>
+<span class="sourceLineNo">255</span><a name="line.255"></a>
+<span class="sourceLineNo">256</span>  /**<a name="line.256"></a>
+<span class="sourceLineNo">257</span>   * Creates a 'manifest' for the 
specified region, by reading directly from the disk.<a name="line.257"></a>
+<span class="sourceLineNo">258</span>   * This is used by the "offline 
snapshot" when the table is disabled.<a name="line.258"></a>
+<span class="sourceLineNo">259</span>   */<a name="line.259"></a>
+<span class="sourceLineNo">260</span>  public void addRegion(final Path 
tableDir, final HRegionInfo regionInfo) throws IOException {<a 
name="line.260"></a>
+<span class="sourceLineNo">261</span>    // Get the 
ManifestBuilder/RegionVisitor<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    RegionVisitor visitor = 
createRegionVisitor(desc);<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span>    // Visit the region and add it to the 
manifest<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    addRegion(tableDir, regionInfo, 
visitor);<a name="line.265"></a>
+<span class="sourceLineNo">266</span>  }<a name="line.266"></a>
 <span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span>      // This ensures that we have an 
atomic view of the directory as long as we have &lt; ls limit<a 
name="line.268"></a>
-<span class="sourceLineNo">269</span>      // (batch size of the files in a 
directory) on the namenode. Otherwise, we get back the files<a 
name="line.269"></a>
-<span class="sourceLineNo">270</span>      // in batches and may miss files 
being added/deleted. This could be more robust (iteratively<a 
name="line.270"></a>
-<span class="sourceLineNo">271</span>      // checking to see if we have all 
the files until we are sure), but the limit is currently<a name="line.271"></a>
-<span class="sourceLineNo">272</span>      // 1000 files/batch, far more than 
the number of store files under a single column family.<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      Collection&lt;String&gt; 
familyNames = regionFs.getFamilies();<a name="line.273"></a>
-<span class="sourceLineNo">274</span>      if (familyNames != null) {<a 
name="line.274"></a>
-<span class="sourceLineNo">275</span>        for (String familyName: 
familyNames) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span>          Object familyData = 
visitor.familyOpen(regionData, Bytes.toBytes(familyName));<a 
name="line.276"></a>
-<span class="sourceLineNo">277</span>          monitor.rethrowException();<a 
name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span>          Collection&lt;StoreFileInfo&gt; 
storeFiles = regionFs.getStoreFiles(familyName);<a name="line.279"></a>
-<span class="sourceLineNo">280</span>          if (storeFiles == null) {<a 
name="line.280"></a>
-<span class="sourceLineNo">281</span>            if (LOG.isDebugEnabled()) {<a 
name="line.281"></a>
-<span class="sourceLineNo">282</span>              LOG.debug("No files under 
family: " + familyName);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>            }<a name="line.283"></a>
-<span class="sourceLineNo">284</span>            continue;<a 
name="line.284"></a>
-<span class="sourceLineNo">285</span>          }<a name="line.285"></a>
+<span class="sourceLineNo">268</span>  @VisibleForTesting<a 
name="line.268"></a>
+<span class="sourceLineNo">269</span>  protected void addRegion(final Path 
tableDir, final HRegionInfo regionInfo, RegionVisitor visitor)<a 
name="line.269"></a>
+<span class="sourceLineNo">270</span>      throws IOException {<a 
name="line.270"></a>
+<span class="sourceLineNo">271</span>    boolean isMobRegion = 
MobUtils.isMobRegionInfo(regionInfo);<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    try {<a name="line.272"></a>
+<span class="sourceLineNo">273</span>      Path baseDir = tableDir;<a 
name="line.273"></a>
+<span class="sourceLineNo">274</span>      // Open the RegionFS<a 
name="line.274"></a>
+<span class="sourceLineNo">275</span>      if (isMobRegion) {<a 
name="line.275"></a>
+<span class="sourceLineNo">276</span>        baseDir = 
FSUtils.getTableDir(MobUtils.getMobHome(conf), regionInfo.getTable());<a 
name="line.276"></a>
+<span class="sourceLineNo">277</span>      }<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      HRegionFileSystem regionFs = 
HRegionFileSystem.openRegionFromFileSystem(conf, fs,<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        baseDir, regionInfo, true);<a 
name="line.279"></a>
+<span class="sourceLineNo">280</span>      monitor.rethrowException();<a 
name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span>      // 1. dump region meta info into 
the snapshot directory<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      LOG.debug("Storing region-info for 
snapshot.");<a name="line.283"></a>
+<span class="sourceLineNo">284</span>      Object regionData = 
visitor.regionOpen(regionInfo);<a name="line.284"></a>
+<span class="sourceLineNo">285</span>      monitor.rethrowException();<a 
name="line.285"></a>
 <span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span>          // 2.1. build the snapshot 
reference for the store<a name="line.287"></a>
-<span class="sourceLineNo">288</span>          // iterate through all the 
store's files and create "references".<a name="line.288"></a>
-<span class="sourceLineNo">289</span>          addReferenceFiles(visitor, 
regionData, familyData, storeFiles, false);<a name="line.289"></a>
-<span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span>          visitor.familyClose(regionData, 
familyData);<a name="line.291"></a>
-<span class="sourceLineNo">292</span>        }<a name="line.292"></a>
-<span class="sourceLineNo">293</span>      }<a name="line.293"></a>
-<span class="sourceLineNo">294</span>      visitor.regionClose(regionData);<a 
name="line.294"></a>
-<span class="sourceLineNo">295</span>    } catch (IOException e) {<a 
name="line.295"></a>
-<span class="sourceLineNo">296</span>      // the mob directory might not be 
created yet, so do nothing when it is a mob region<a name="line.296"></a>
-<span class="sourceLineNo">297</span>      if (!isMobRegion) {<a 
name="line.297"></a>
-<span class="sourceLineNo">298</span>        throw e;<a name="line.298"></a>
-<span class="sourceLineNo">299</span>      }<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    }<a name="line.300"></a>
-<span class="sourceLineNo">301</span>  }<a name="line.301"></a>
-<span class="sourceLineNo">302</span><a name="line.302"></a>
-<span class="sourceLineNo">303</span>  private List&lt;StoreFileInfo&gt; 
getStoreFiles(Path storeDir) throws IOException {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    FileStatus[] stats = 
FSUtils.listStatus(fs, storeDir);<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    if (stats == null) return null;<a 
name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span>    ArrayList&lt;StoreFileInfo&gt; 
storeFiles = new ArrayList&lt;&gt;(stats.length);<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    for (int i = 0; i &lt; stats.length; 
++i) {<a name="line.308"></a>
-<span class="sourceLineNo">309</span>      storeFiles.add(new 
StoreFileInfo(conf, fs, stats[i]));<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    }<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    return storeFiles;<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>  private void 
addReferenceFiles(RegionVisitor visitor, Object regionData, Object 
familyData,<a name="line.314"></a>
-<span class="sourceLineNo">315</span>      Collection&lt;StoreFileInfo&gt; 
storeFiles, boolean isMob) throws IOException {<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    final String fileType = isMob ? "mob 
file" : "hfile";<a name="line.316"></a>
-<span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span>    if (LOG.isDebugEnabled()) {<a 
name="line.318"></a>
-<span class="sourceLineNo">319</span>      LOG.debug(String.format("Adding 
snapshot references for %s %ss", storeFiles, fileType));<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    }<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span>    int i = 0;<a name="line.322"></a>
-<span class="sourceLineNo">323</span>    int sz = storeFiles.size();<a 
name="line.323"></a>
-<span class="sourceLineNo">324</span>    for (StoreFileInfo storeFile: 
storeFiles) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span>      monitor.rethrowException();<a 
name="line.325"></a>
-<span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span>      LOG.debug(String.format("Adding 
reference for %s (%d/%d): %s",<a name="line.327"></a>
-<span class="sourceLineNo">328</span>          fileType, ++i, sz, 
storeFile.getPath()));<a name="line.328"></a>
-<span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span>      // create "reference" to this store 
file.<a name="line.330"></a>
-<span class="sourceLineNo">331</span>      visitor.storeFile(regionData, 
familyData, storeFile);<a name="line.331"></a>
+<span class="sourceLineNo">287</span>      // 2. iterate through all the 
stores in the region<a name="line.287"></a>
+<span class="sourceLineNo">288</span>      LOG.debug("Creating references for 
hfiles");<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span>      // This ensures that we have an 
atomic view of the directory as long as we have &lt; ls limit<a 
name="line.290"></a>
+<span class="sourceLineNo">291</span>      // (batch size of the files in a 
directory) on the namenode. Otherwise, we get back the files<a 
name="line.291"></a>
+<span class="sourceLineNo">292</span>      // in batches and may miss files 
being added/deleted. This could be more robust (iteratively<a 
name="line.292"></a>
+<span class="sourceLineNo">293</span>      // checking to see if we have all 
the files until we are sure), but the limit is currently<a name="line.293"></a>
+<span class="sourceLineNo">294</span>      // 1000 files/batch, far more than 
the number of store files under a single column family.<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      Collection&lt;String&gt; 
familyNames = regionFs.getFamilies();<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      if (familyNames != null) {<a 
name="line.296"></a>
+<span class="sourceLineNo">297</span>        for (String familyName: 
familyNames) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span>          Object familyData = 
visitor.familyOpen(regionData, Bytes.toBytes(familyName));<a 
name="line.298"></a>
+<span class="sourceLineNo">299</span>          monitor.rethrowException();<a 
name="line.299"></a>
+<span class="sourceLineNo">300</span><a name="line.300"></a>
+<span class="sourceLineNo">301</span>          Collection&lt;StoreFileInfo&gt; 
storeFiles = regionFs.getStoreFiles(familyName);<a name="line.301"></a>
+<span class="sourceLineNo">302</span>          if (storeFiles == null) {<a 
name="line.302"></a>
+<span class="sourceLineNo">303</span>            if (LOG.isDebugEnabled()) {<a 
name="line.303"></a>
+<span class="sourceLineNo">304</span>              LOG.debug("No files under 
family: " + familyName);<a name="line.304"></a>
+<span class="sourceLineNo">305</span>            }<a name="line.305"></a>
+<span class="sourceLineNo">306</span>            continue;<a 
name="line.306"></a>
+<span class="sourceLineNo">307</span>          }<a name="line.307"></a>
+<span class="sourceLineNo">308</span><a name="line.308"></a>
+<span class="sourceLineNo">309</span>          // 2.1. build the snapshot 
reference for the store<a name="line.309"></a>
+<span class="sourceLineNo">310</span>          // iterate through all the 
store's files and create "references".<a name="line.310"></a>
+<span class="sourceLineNo">311</span>          addReferenceFiles(visitor, 
regionData, familyData, storeFiles, false);<a name="line.311"></a>
+<span class="sourceLineNo">312</span><a name="line.312"></a>
+<span class="sourceLineNo">313</span>          visitor.familyClose(regionData, 
familyData);<a name="line.313"></a>
+<span class="sourceLineNo">314</span>        }<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      }<a name="line.315"></a>
+<span class="sourceLineNo">316</span>      visitor.regionClose(regionData);<a 
name="line.316"></a>
+<span class="sourceLineNo">317</span>    } catch (IOException e) {<a 
name="line.317"></a>
+<span class="sourceLineNo">318</span>      // the mob directory might not be 
created yet, so do nothing when it is a mob region<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      if (!isMobRegion) {<a 
name="line.319"></a>
+<span class="sourceLineNo">320</span>        throw e;<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      }<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    }<a name="line.322"></a>
+<span class="sourceLineNo">323</span>  }<a name="line.323"></a>
+<span class="sourceLineNo">324</span><a name="line.324"></a>
+<span class="sourceLineNo">325</span>  private List&lt;StoreFileInfo&gt; 
getStoreFiles(Path storeDir) throws IOException {<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    FileStatus[] stats = 
FSUtils.listStatus(fs, storeDir);<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    if (stats == null) return null;<a 
name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span>    ArrayList&lt;StoreFileInfo&gt; 
storeFiles = new ArrayList&lt;&gt;(stats.length);<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    for (int i = 0; i &lt; stats.length; 
++i) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      storeFiles.add(new 
StoreFileInfo(conf, fs, stats[i]));<a name="line.331"></a>
 <span class="sourceLineNo">332</span>    }<a name="line.332"></a>
-<span class="sourceLineNo">333</span>  }<a name="line.333"></a>
-<span class="sourceLineNo">334</span><a name="line.334"></a>
-<span class="sourceLineNo">335</span>  /**<a name="line.335"></a>
-<span class="sourceLineNo">336</span>   * Load the information in the 
SnapshotManifest. Called by SnapshotManifest.open()<a name="line.336"></a>
-<span class="sourceLineNo">337</span>   *<a name="line.337"></a>
-<span class="sourceLineNo">338</span>   * If the format is v2 and there is no 
data-manifest, means that we are loading an<a name="line.338"></a>
-<span class="sourceLineNo">339</span>   * in-progress snapshot. Since we 
support rolling-upgrades, we loook for v1 and v2<a name="line.339"></a>
-<span class="sourceLineNo">340</span>   * regions format.<a 
name="line.340"></a>
-<span class="sourceLineNo">341</span>   */<a name="line.341"></a>
-<span class="sourceLineNo">342</span>  private void load() throws IOException 
{<a name="line.342"></a>
-<span class="sourceLineNo">343</span>    switch (getSnapshotFormat(desc)) {<a 
name="line.343"></a>
-<span class="sourceLineNo">344</span>      case 
SnapshotManifestV1.DESCRIPTOR_VERSION: {<a name="line.344"></a>
-<span class="sourceLineNo">345</span>        this.htd = 
FSTableDescriptors.getTableDescriptorFromFs(fs, workingDir);<a 
name="line.345"></a>
-<span class="sourceLineNo">346</span>        ThreadPoolExecutor tpool = 
createExecutor("SnapshotManifestLoader");<a name="line.346"></a>
-<span class="sourceLineNo">347</span>        try {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>          this.regionManifests =<a 
name="line.348"></a>
-<span class="sourceLineNo">349</span>            
SnapshotManifestV1.loadRegionManifests(conf, tpool, fs, workingDir, desc);<a 
name="line.349"></a>
-<span class="sourceLineNo">350</span>        } finally {<a name="line.350"></a>
-<span class="sourceLineNo">351</span>          tpool.shutdown();<a 
name="line.351"></a>
-<span class="sourceLineNo">352</span>        }<a name="line.352"></a>
-<span class="sourceLineNo">353</span>        break;<a name="line.353"></a>
-<span class="sourceLineNo">354</span>      }<a name="line.354"></a>
-<span class="sourceLineNo">355</span>      case 
SnapshotManifestV2.DESCRIPTOR_VERSION: {<a name="line.355"></a>
-<span class="sourceLineNo">356</span>        SnapshotDataManifest dataManifest 
= readDataManifest();<a name="line.356"></a>
-<span class="sourceLineNo">357</span>        if (dataManifest != null) {<a 
name="line.357"></a>
-<span class="sourceLineNo">358</span>          htd = 
ProtobufUtil.convertToHTableDesc(dataManifest.getTableSchema());<a 
name="line.358"></a>
-<span class="sourceLineNo">359</span>          regionManifests = 
dataManifest.getRegionManifestsList();<a name="line.359"></a>
-<span class="sourceLineNo">360</span>        } else {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>          // Compatibility, load the v1 
regions<a name="line.361"></a>
-<span class="sourceLineNo">362</span>          // This happens only when the 
snapshot is in-progress and the cache wants to refresh.<a name="line.362"></a>
-<span class="sourceLineNo">363</span>          
List&lt;SnapshotRegionManifest&gt; v1Regions, v2Regions;<a name="line.363"></a>
-<span class="sourceLineNo">364</span>          ThreadPoolExecutor tpool = 
createExecutor("SnapshotManifestLoader");<a name="line.364"></a>
-<span class="sourceLineNo">365</span>          try {<a name="line.365"></a>
-<span class="sourceLineNo">366</span>            v1Regions = 
SnapshotManifestV1.loadRegionManifests(conf, tpool, fs, workingDir, desc);<a 
name="line.366"></a>
-<span class="sourceLineNo">367</span>            v2Regions = 
SnapshotManifestV2.loadRegionManifests(conf, tpool, fs, workingDir, desc,<a 
name="line.367"></a>
-<span class="sourceLineNo">368</span>                manifestSizeLimit);<a 
name="line.368"></a>
-<span class="sourceLineNo">369</span>          } catch 
(InvalidProtocolBufferException e) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span>            throw new 
CorruptedSnapshotException("unable to parse region manifest " +<a 
name="line.370"></a>
-<span class="sourceLineNo">371</span>                e.getMessage(), e);<a 
name="line.371"></a>
-<span class="sourceLineNo">372</span>          } finally {<a 
name="line.372"></a>
-<span class="sourceLineNo">373</span>            tpool.shutdown();<a 
name="line.373"></a>
-<span class="sourceLineNo">374</span>          }<a name="line.374"></a>
-<span class="sourceLineNo">375</span>          if (v1Regions != null 
&amp;&amp; v2Regions != null) {<a name="line.375"></a>
-<span class="sourceLineNo">376</span>            regionManifests = new 
ArrayList&lt;&gt;(v1Regions.size() + v2Regions.size());<a name="line.376"></a>
-<span class="sourceLineNo">377</span>            
regionManifests.addAll(v1Regions);<a name="line.377"></a>
-<span class="sourceLineNo">378</span>            
regionManifests.addAll(v2Regions);<a name="line.378"></a>
-<span class="sourceLineNo">379</span>          } else if (v1Regions != null) 
{<a name="line.379"></a>
-<span class="sourceLineNo">380</span>            regionManifests = 
v1Regions;<a name="line.380"></a>
-<span class="sourceLineNo">381</span>          } else /* if (v2Regions != 
null) */ {<a name="line.381"></a>
-<span class="sourceLineNo">382</span>            regionManifests = 
v2Regions;<a name="line.382"></a>
-<span class="sourceLineNo">383</span>          }<a name="line.383"></a>
-<span class="sourceLineNo">384</span>        }<a name="line.384"></a>
-<span class="sourceLineNo">385</span>        break;<a name="line.385"></a>
-<span class="sourceLineNo">386</span>      }<a name="line.386"></a>
-<span class="sourceLineNo">387</span>      default:<a name="line.387"></a>
-<span class="sourceLineNo">388</span>      throw new 
CorruptedSnapshotException("Invalid Snapshot version: " + desc.getVersion(),<a 
name="line.388"></a>
-<span class="sourceLineNo">389</span>        
ProtobufUtil.createSnapshotDesc(desc));<a name="line.389"></a>
-<span class="sourceLineNo">390</span>    }<a name="line.390"></a>
-<span class="sourceLineNo">391</span>  }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span>  /**<a name="line.393"></a>
-<span class="sourceLineNo">394</span>   * Get the current snapshot working 
dir<a name="line.394"></a>
-<span class="sourceLineNo">395</span>   */<a name="line.395"></a>
-<span class="sourceLineNo">396</span>  public Path getSnapshotDir() {<a 
name="line.396"></a>
-<span class="sourceLineNo">397</span>    return this.workingDir;<a 
name="line.397"></a>
-<span class="sourceLineNo">398</span>  }<a name="line.398"></a>
-<span class="sourceLineNo">399</span><a name="line.399"></a>
-<span class="sourceLineNo">400</span>  /**<a name="line.400"></a>
-<span class="sourceLineNo">401</span>   * Get the SnapshotDescription<a 
name="line.401"></a>
-<span class="sourceLineNo">402</span>   */<a name="line.402"></a>
-<span class="sourceLineNo">403</span>  public SnapshotDescription 
getSnapshotDescription() {<a name="line.403"></a>
-<span class="sourceLineNo">404</span>    return this.desc;<a 
name="line.404"></a>
-<span class="sourceLineNo">405</span>  }<a name="line.405"></a>
-<span class="sourceLineNo">406</span><a name="line.406"></a>
-<span class="sourceLineNo">407</span>  /**<a name="line.407"></a>
-<span class="sourceLineNo">408</span>   * Get the table descriptor from the 
Snapshot<a name="line.408"></a>
-<span class="sourceLineNo">409</span>   */<a name="line.409"></a>
-<span class="sourceLineNo">410</span>  public HTableDescriptor 
getTableDescriptor() {<a name="line.410"></a>
-<span class="sourceLineNo">411</span>    return this.htd;<a 
name="line.411"></a>
-<span class="sourceLineNo">412</span>  }<a name="line.412"></a>
-<span class="sourceLineNo">413</span><a name="line.413"></a>
-<span class="sourceLineNo">414</span>  /**<a name="line.414"></a>
-<span class="sourceLineNo">415</span>   * Get all the Region Manifest from the 
snapshot<a name="line.415"></a>
-<span class="sourceLineNo">416</span>   */<a name="line.416"></a>
-<span class="sourceLineNo">417</span>  public 
List&lt;SnapshotRegionManifest&gt; getRegionManifests() {<a name="line.417"></a>
-<span class="sourceLineNo">418</span>    return this.regionManifests;<a 
name="line.418"></a>
-<span class="sourceLineNo">419</span>  }<a name="line.419"></a>
-<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span>  /**<a name="line.421"></a>
-<span class="sourceLineNo">422</span>   * Get all the Region Manifest from the 
snapshot.<a name="line.422"></a>
-<span class="sourceLineNo">423</span>   * This is an helper to get a map with 
the region encoded name<a name="line.423"></a>
+<span class="sourceLineNo">333</span>    return storeFiles;<a 
name="line.333"></a>
+<span class="sourceLineNo">334</span>  }<a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span>  private void 
addReferenceFiles(RegionVisitor visitor, Object regionData, Object 
familyData,<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      Collection&lt;StoreFileInfo&gt; 
storeFiles, boolean isMob) throws IOException {<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    final String fileType = isMob ? "mob 
file" : "hfile";<a name="line.338"></a>
+<span class="sourceLineNo">339</span><a name="line.339"></a>
+<span class="sourceLineNo">340</span>    if (LOG.isDebugEnabled()) {<a 
name="line.340"></a>
+<span class="sourceLineNo">341</span>      LOG.debug(String.format("Adding 
snapshot references for %s %ss", storeFiles, fileType));<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    }<a name="line.342"></a>
+<span class="sourceLineNo">343</span><a name="line.343"></a>
+<span class="sourceLineNo">344</span>    int i = 0;<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    int sz = storeFiles.size();<a 
name="line.345"></a>
+<span class="sourceLineNo">346</span>    for (StoreFileInfo storeFile: 
storeFiles) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>      monitor.rethrowException();<a 
name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
+<span class="sourceLineNo">349</span>      LOG.debug(String.format("Adding 
reference for %s (%d/%d): %s",<a name="line.349"></a>
+<span class="sourceLineNo">350</span>          fileType, ++i, sz, 
storeFile.getPath()));<a name="line.350"></a>
+<span class="sourceLineNo">351</span><a name="line.351"></a>
+<span class="sourceLineNo">352</span>      // create "reference" to this store 
file.<a name="line.352"></a>
+<span class="sourceLineNo">353</span>      visitor.storeFile(regionData, 
familyData, storeFile);<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    }<a name="line.354"></a>
+<span class="sourceLineNo">355</span>  }<a name="line.355"></a>
+<span class="sourceLineNo">356</span><a name="line.356"></a>
+<span class="sourceLineNo">357</span>  /**<a name="line.357"></a>
+<span class="sourceLineNo">358</span>   * Load the information in the 
SnapshotManifest. Called by SnapshotManifest.open()<a name="line.358"></a>
+<span class="sourceLineNo">359</span>   *<a name="line.359"></a>
+<span class="sourceLineNo">360</span>   * If the format is v2 and there is no 
data-manifest, means that we are loading an<a name="line.360"></a>
+<span class="sourceLineNo">361</span>   * in-progress snapshot. Since we 
support rolling-upgrades, we loook for v1 and v2<a name="line.361"></a>
+<span class="sourceLineNo">362</span>   * regions format.<a 
name="line.362"></a>
+<span class="sourceLineNo">363</span>   */<a name="line.363"></a>
+<span class="sourceLineNo">364</span>  private void load() throws IOException 
{<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    switch (getSnapshotFormat(desc)) {<a 
name="line.365"></a>
+<span class="sourceLineNo">366</span>      case 
SnapshotManifestV1.DESCRIPTOR_VERSION: {<a name="line.366"></a>
+<span class="sourceLineNo">367</span>        this.htd = 
FSTableDescriptors.getTableDescriptorFromFs(fs, workingDir);<a 
name="line.367"></a>
+<span class="sourceLineNo">368</span>        ThreadPoolExecutor tpool = 
createExecutor("SnapshotManifestLoader");<a name="line.368"></a>
+<span class="sourceLineNo">369</span>        try {<a name="line.369"></a>
+<span class="sourceLineNo">370</span>          this.regionManifests =<a 
name="line.370"></a>
+<span class="sourceLineNo">371</span>            
SnapshotManifestV1.loadRegionManifests(conf, tpool, fs, workingDir, desc);<a 
name="line.371"></a>
+<span class="sourceLineNo">372</span>        } finally {<a name="line.372"></a>
+<span class="sourceLineNo">373</span>          tpool.shutdown();<a 
name="line.373"></a>
+<span class="sourceLineNo">374</span>        }<a name="line.374"></a>
+<span class="sourceLineNo">375</span>        break;<a name="line.375"></a>
+<span class="sourceLineNo">376</span>      }<a name="line.376"></a>
+<span class="sourceLineNo">377</span>      case 
SnapshotManifestV2.DESCRIPTOR_VERSION: {<a name="line.377"></a>
+<span class="sourceLineNo">378</span>        SnapshotDataManifest dataManifest 
= readDataManifest();<a name="line.378"></a>
+<span class="sourceLineNo">379</span>        if (dataManifest != null) {<a 
name="line.379"></a>
+<span class="sourceLineNo">380</span>          htd = 
ProtobufUtil.convertToHTableDesc(dataManifest.getTableSchema());<a 
name="line.380"></a>
+<span class="sourceLineNo">381</span>          regionManifests = 
dataManifest.getRegionManifestsList();<a name="line.381"></a>
+<span class="sourceLineNo">382</span>        } else {<a name="line.382"></a>
+<span class="sourceLineNo">383</span>          // Compatibility, load the v1 
regions<a name="line.383"></a>
+<span class="sourceLineNo">384</span>          // This happens only when the 
snapshot is in-progress and the cache wants to refresh.<a name="line.384"></a>
+<span class="sourceLineNo">385</span>          
List&lt;SnapshotRegionManifest&gt; v1Regions, v2Regions;<a name="line.385"></a>
+<span class="sourceLineNo">386</span>          ThreadPoolExecutor tpool = 
createExecutor("SnapshotManifestLoader");<a name="line.386"></a>
+<span class="sourceLineNo">387</span>          try {<a name="line.387"></a>
+<span class="sourceLineNo">388</span>            v1Regions = 
SnapshotManifestV1.loadRegionManifests(conf, tpool, fs, workingDir, desc);<a 
name="line.388"></a>
+<span class="sourceLineNo">389</span>            v2Regions = 
SnapshotManifestV2.loadRegionManifests(conf, tpool, fs, workingDir, desc,<a 
name="line.389"></a>
+<span class="sourceLineNo">390</span>                manifestSizeLimit);<a 
name="line.390"></a>
+<span class="sourceLineNo">391</span>          } catch 
(InvalidProtocolBufferException e) {<a name="line.391"></a>
+<span class="sourceLineNo">392</span>            throw new 
CorruptedSnapshotException("unable to parse region manifest " +<a 
name="line.392"></a>
+<span class="sourceLineNo">393</span>                e.getMessage(), e);<a 
name="line.393"></a>
+<span class="sourceLineNo">394</span>          } finally {<a 
name="line.394"></a>
+<span class="sourceLineNo">395</span>            tpool.shutdown();<a 
name="line.395"></a>
+<span class="sourceLineNo">396</span>          }<a name="line.396"></a>
+<span class="sourceLineNo">397</span>          if (v1Regions != null 
&amp;&amp; v2Regions != null) {<a name="line.397"></a>
+<span class="sourceLineNo">398</span>            regionManifests = new 
ArrayList&lt;&gt;(v1Regions.size() + v2Regions.size());<a name="line.398"></a>
+<span class="sourceLineNo">399</span>            
regionManifests.addAll(v1Regions);<a name="line.399"></a>
+<span class="sourceLineNo">400</span>            
regionManifests.addAll(v2Regions);<a name="line.400"></a>
+<span class="sourceLineNo">401</span>          } else if (v1Regions != null) 
{<a name="line.401"></a>
+<span class="sourceLineNo">402</span>            regionManifests = 
v1Regions;<a name="line.402"></a>
+<span class="sourceLineNo">403</span>          } else /* if (v2Regions != 
null) */ {<a name="line.403"></a>
+<span class="sourceLineNo">404</span>            regionManifests = 
v2Regions;<a name="line.404"></a>
+<span class="sourceLineNo">405</span>          }<a name="line.405"></a>
+<span class="sourceLineNo">406</span>        }<a name="line.406"></a>
+<span class="sourceLineNo">407</span>        break;<a name="line.407"></a>
+<span class="sourceLineNo">408</span>      }<a name="line.408"></a>
+<span class="sourceLineNo">409</span>      default:<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      throw new 
CorruptedSnapshotException("Invalid Snapshot version: " + desc.getVersion(),<a 
name="line.410"></a>
+<span class="sourceLineNo">411</span>        
ProtobufUtil.createSnapshotDesc(desc));<a name="line.411"></a>
+<span class="sourceLineNo">412</span>    }<a name="line.412"></a>
+<span class="sourceLineNo">413</span>  }<a name="line.413"></a>
+<span class="sourceLineNo">414</span><a name="line.414"></a>
+<span class="sourceLineNo">415</span>  /**<a name="line.415"></a>
+<span class="sourceLineNo">416</span>   * Get the current snapshot working 
dir<a name="line.416"></a>
+<span class="sourceLineNo">417</span>   */<a name="line.417"></a>
+<span class="sourceLineNo">418</span>  public Path getSnapshotDir() {<a 
name="line.418"></a>
+<span class="sourceLineNo">419</span>    return this.workingDir;<a 
name="line.419"></a>
+<span class="sourceLineNo">420</span>  }<a name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span>  /**<a name="line.422"></a>
+<span class="sourceLineNo">423</span>   * Get the SnapshotDescription<a 
name="line.423"></a>
 <span class="sourceLineNo">424</span>   */<a name="line.424"></a>
-<span class="sourceLineNo">425</span>  public Map&lt;String, 
SnapshotRegionManifest&gt; getRegionManifestsMap() {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>    if (regionManifests == null || 
regionManifests.isEmpty()) return null;<a name="line.426"></a>
-<span class="sourceLineNo">427</span><a name="line.427"></a>
-<span class="sourceLineNo">428</span>    HashMap&lt;String, 
SnapshotRegionManifest&gt; regionsMap = new 
HashMap&lt;&gt;(regionManifests.size());<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    for (SnapshotRegionManifest manifest: 
regionManifests) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>      String regionName = 
getRegionNameFromManifest(manifest);<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      regionsMap.put(regionName, 
manifest);<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    }<a name="line.432"></a>
-<span class="sourceLineNo">433</span>    return regionsMap;<a 
name="line.433"></a>
+<span class="sourceLineNo">425</span>  public SnapshotDescription 
getSnapshotDescription() {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>    return this.desc;<a 
name="line.426"></a>
+<span class="sourceLineNo">427</span>  }<a name="line.427"></a>
+<span class="sourceLineNo">428</span><a name="line.428"></a>
+<span class="sourceLineNo">429</span>  /**<a name="line.429"></a>
+<span class="sourceLineNo">430</span>   * Get the table descriptor from the 
Snapshot<a name="line.430"></a>
+<span class="sourceLineNo">431</span>   */<a name="line.431"></a>
+<span class="sourceLineNo">432</span>  public HTableDescriptor 
getTableDescriptor() {<a name="line.432"></a>
+<span class="sourceLineNo">433</span>    return this.htd;<a 
name="line.433"></a>
 <span class="sourceLineNo">434</span>  }<a name="line.434"></a>
 <span class="sourceLineNo">435</span><a name="line.435"></a>
-<span class="sourceLineNo">436</span>  public void consolidate() throws 
IOException {<a name="line.436"></a>
-<span class="sourceLineNo">437</span>    if (getSnapshotFormat(desc) == 
SnapshotManifestV1.DESCRIPTOR_VERSION) {<a name="line.437"></a>
-<span class="sourceLineNo">438</span>      Path rootDir = 
FSUtils.getRootDir(conf);<a name="line.438"></a>
-<span class="sourceLineNo">439</span>      LOG.info("Using old Snapshot 
Format");<a name="line.439"></a>
-<span class="sourceLineNo">440</span>      // write a copy of descriptor to 
the snapshot directory<a name="line.440"></a>
-<span class="sourceLineNo">441</span>      new FSTableDescriptors(conf, fs, 
rootDir)<a name="line.441"></a>
-<span class="sourceLineNo">442</span>        
.createTableDescriptorForTableDirectory(workingDir, htd, false);<a 
name="line.442"></a>
-<span class="sourceLineNo">443</span>    } else {<a name="line.443"></a>
-<span class="sourceLineNo">444</span>      LOG.debug("Convert to Single 
Snapshot Manifest");<a name="line.444"></a>
-<span class="sourceLineNo">445</span>      convertToV2SingleManifest();<a 
name="line.445"></a>
-<span class="sourceLineNo">446</span>    }<a name="line.446"></a>
-<span class="sourceLineNo">447</span>  }<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span>  /*<a name="line.449"></a>
-<span class="sourceLineNo">450</span>   * In case of rolling-upgrade, we try 
to read all the formats and build<a name="line.450"></a>
-<span class="sourceLineNo">451</span>   * the snapshot with the latest 
format.<a name="line.451"></a>
-<span class="sourceLineNo">452</span>   */<a name="line.452"></a>
-<span class="sourceLineNo">453</span>  private void 
convertToV2SingleManifest() throws IOException {<a name="line.453"></a>
-<span class="sourceLineNo">454</span>    // Try to load v1 and v2 regions<a 
name="line.454"></a>
-<span class="sourceLineNo">455</span>    List&lt;SnapshotRegionManifest&gt; 
v1Regions, v2Regions;<a name="line.455"></a>
-<span class="sourceLineNo">456</span>    ThreadPoolExecutor tpool = 
createExecutor("SnapshotManifestLoader");<a name="line.456"></a>
-<span class="sourceLineNo">457</span>    try {<a name="line.457"></a>
-<span class="sourceLineNo">458</span>      v1Regions = 
SnapshotManifestV1.loadRegionManifests(conf, tpool, fs, workingDir, desc);<a 
name="line.458"></a>
-<span class="sourceLineNo">459</span>      v2Regions = 
SnapshotManifestV2.loadRegionManifests(conf, tpool, fs, workingDir, desc,<a 
name="line.459"></a>
-<span class="sourceLineNo">460</span>          manifestSizeLimit);<a 
name="line.460"></a>
-<span class="sourceLineNo">461</span>    } finally {<a name="line.461"></a>
-<span class="sourceLineNo">462</span>      tpool.shutdown();<a 
name="line.462"></a>
-<span class="sourceLineNo">463</span>    }<a name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span>    SnapshotDataManifest.Builder 
dataManifestBuilder = SnapshotDataManifest.newBuilder();<a name="line.465"></a>
-<span class="sourceLineNo">466</span>    
dataManifestBuilder.setTableSchema(ProtobufUtil.convertToTableSchema(htd));<a 
name="line.466"></a>
-<span class="sourceLineNo">467</span><a name="line.467"></a>
-<span class="sourceLineNo">468</span>    if (v1Regions != null &amp;&amp; 
v1Regions.size() &gt; 0) {<a name="line.468"></a>
-<span class="sourceLineNo">469</span>      
dataManifestBuilder.addAllRegionManifests(v1Regions);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    }<a name="line.470"></a>
-<span class="sourceLineNo">471</span>    if (v2Regions != null &amp;&amp; 
v2Regions.size() &gt; 0) {<a name="line.471"></a>
-<span class="sourceLineNo">472</span>      
dataManifestBuilder.addAllRegionManifests(v2Regions);<a name="line.472"></a>
-<span class="sourceLineNo">473</span>    }<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span>    // Write the v2 Data Manifest.<a 
name="line.475"></a>
-<span class="sourceLineNo">476</span>    // Once the data-manifest is written, 
the snapshot can be considered complete.<a name="line.476"></a>
-<span class="sourceLineNo">477</span>    // Currently snapshots are written in 
a "temporary" directory and later<a name="line.477"></a>
-<span class="sourceLineNo">478</span>    // moved to the "complated" snapshot 
directory.<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    SnapshotDataManifest dataManifest = 
dataManifestBuilder.build();<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    writeDataManifest(dataManifest);<a 
name="line.480"></a>
-<span class="sourceLineNo">481</span>    this.regionManifests = 
dataManifest.getRegionManifestsList();<a name="line.481"></a>
-<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span>    // Remove the region manifests. 
Everything is now in the data-manifest.<a name="line.483"></a>
-<span class="sourceLineNo">484</span>    // The delete operation is "relaxed", 
unless we get an exception we keep going.<a name="line.484"></a>
-<span class="sourceLineNo">485</span>    // The extra files in the snapshot 
directory will not give any problem,<a name="line.485"></a>
-<span class="sourceLineNo">486</span>    // since they have the same content 
as the data manifest, and even by re-reading<a name="line.486"></a>
-<span class="sourceLineNo">487</span>    // them we will get the same 
information.<a name="line.487"></a>
-<span class="sourceLineNo">488</span>    if (v1Regions != null &amp;&amp; 
v1Regions.size() &gt; 0) {<a name="line.488"></a>
-<span class="sourceLineNo">489</span>      for (SnapshotRegionManifest 
regionManifest: v1Regions) {<a name="line.489"></a>
-<span class="sourceLineNo">490</span>        
SnapshotManifestV1.deleteRegionManifest(fs, workingDir, regionManifest);<a 
name="line.490"></a>
-<span class="sourceLineNo">491</span>      }<a name="line.491"></a>
+<span class="sourceLineNo">436</span>  /**<a name="line.436"></a>
+<span class="sourceLineNo">437</span>   * Get all the Region Manifest from the 
snapshot<a name="line.437"></a>
+<span class="sourceLineNo">438</span>   */<a name="line.438"></a>
+<span class="sourceLineNo">439</span>  public 
List&lt;SnapshotRegionManifest&gt; getRegionManifests() {<a name="line.439"></a>
+<span class="sourceLineNo">440</span>    return this.regionManifests;<a 
name="line.440"></a>
+<span class="sourceLineNo">441</span>  }<a name="line.441"></a>
+<span class="sourceLineNo">442</span><a name="line.442"></a>
+<span class="sourceLineNo">443</span>  /**<a name="line.443"></a>
+<span class="sourceLineNo">444</span>   * Get all the Region Manifest from the 
snapshot.<a name="line.444"></a>
+<span class="sourceLineNo">445</span>   * This is an helper to get a map with 
the region encoded name<a name="line.445"></a>
+<span class="sourceLineNo">446</span>   */<a name="line.446"></a>
+<span class="sourceLineNo">447</span>  public Map&lt;String, 
SnapshotRegionManifest&gt; getRegionManifestsMap() {<a name="line.447"></a>
+<span class="sourceLineNo">448</span>    if (regionManifests == null || 
regionManifests.isEmpty()) return null;<a name="line.448"></a>
+<span class="sourceLineNo">449</span><a name="line.449"></a>
+<span class="sourceLineNo">450</span>    HashMap&lt;String, 
SnapshotRegionManifest&gt; regionsMap = new 
HashMap&lt;&gt;(regionManifests.size());<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    for (SnapshotRegionManifest manifest: 
regionManifests) {<a name="line.451"></a>
+<span class="sourceLineNo">452</span>      String regionName = 
getRegionNameFromManifest(manifest);<a name="line.452"></a>
+<span class="sourceLineNo">453</span>      regionsMap.put(regionName, 
manifest);<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    }<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    return regionsMap;<a 
name="line.455"></a>
+<span class="sourceLineNo">456</span>  }<a name="line.456"></a>
+<span class="sourceLineNo">457</span><a name="line.457"></a>
+<span class="sourceLineNo">458</span>  public void consolidate() throws 
IOException {<a name="line.458"></a>
+<span class="sourceLineNo">459</span>    if (getSnapshotFormat(desc) == 
SnapshotManifestV1.DESCRIPTOR_VERSION) {<a name="line.459"></a>
+<span class="sourceLineNo">460</span>      Path rootDir = 
FSUtils.getRootDir(conf);<a name="line.460"></a>
+<span class="sourceLineNo">461</span>      LOG.info("Using old Snapshot 
Format");<a name="line.461"></a>
+<span class="sourceLineNo">462</span>      // write a copy of descriptor to 
the snapshot directory<a name="line.462"></a>
+<span class="sourceLineNo">463</span>      new FSTableDescriptors(conf, fs, 
rootDir)<a name="line.463"></a>
+<span class="sourceLineNo">464</span>        
.createTableDescriptorForTableDirectory(workingDir, htd, false);<a 
name="line.464"></a>
+<span class="sourceLineNo">465</span>    } else {<a name="line.465"></a>
+<span class="sourceLineNo">466</span>      LOG.debug("Convert to Single 
Snapshot Manifest");<a name="line.466"></a>
+<span class="sourceLineNo">467</span>      convertToV2SingleManifest();<a 
name="line.467"></a>
+<span class="sourceLineNo">468</span>    }<a name="line.468"></a>
+<span class="sourceLineNo">469</span>  }<a name="line.469"></a>
+<span class="sourceLineNo">470</span><a name="line.470"></a>
+<span class="sourceLineNo">471</span>  /*<a name="line.471"></a>
+<span class="sourceLineNo">472</span>   * In case of rolling-upgrade, we try 
to read all the formats and build<a name="line.472"></a>
+<span class="sourceLineNo">473</span>   * the snapshot with the latest 
format.<a name="line.473"></a>
+<span class="sourceLineNo">474</span>   */<a name="line.474"></a>
+<span class="sourceLineNo">475</span>  private void 
convertToV2SingleManifest() throws IOException {<a name="line.475"></a>
+<span class="sourceLineNo">476</span>    // Try to load v1 and v2 regions<a 
name="line.476"></a>
+<span class="sourceLineNo">477</span>    List&lt;SnapshotRegionManifest&gt; 
v1Regions, v2Regions;<a name="line.477"></a>
+<span class="sourceLineNo">478</span>    ThreadPoolExecutor tpool = 
createExecutor("SnapshotManifestLoader");<a name="line.478"></a>
+<span class="sourceLineNo">479</span>    try {<a name="line.479"></a>
+<span class="sourceLineNo">480</span>      v1Regions = 
SnapshotManifestV1.loadRegionManifests(conf, tpool, fs, workingDir, desc);<a 
name="line.480"></a>
+<span class="sourceLineNo">481</span>      v2Regions = 
SnapshotManifestV2.loadRegionManifests(conf, tpool, fs, workingDir, desc,<a 
name="line.481"></a>
+<span class="sourceLineNo">482</span>          manifestSizeLimit);<a 
name="line.482"></a>
+<span class="sourceLineNo">483</span>    } finally {<a name="line.483"></a>
+<span class="sourceLineNo">484</span>      tpool.shutdown();<a 
name="line.484"></a>
+<span class="sourceLineNo">485</span>    }<a name="line.485"></a>
+<span class="sourceLineNo">486</span><a name="line.486"></a>
+<span class="sourceLineNo">487</span>    SnapshotDataManifest.Builder 
dataManifestBuilder = SnapshotDataManifest.newBuilder();<a name="line.487"></a>
+<span class="sourceLineNo">488</span>    
dataManifestBuilder.setTableSchema(ProtobufUtil.convertToTableSchema(htd));<a 
name="line.488"></a>
+<span class="sourceLineNo">489</span><a name="line.489"></a>
+<span class="source

<TRUNCATED>

Reply via email to