http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8e4e1542/devapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.html
index bdc667c..7433b34 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.html
@@ -207,976 +207,989 @@
 <span class="sourceLineNo">199</span>   * @throws IOException File system 
exception<a name="line.199"></a>
 <span class="sourceLineNo">200</span>   */<a name="line.200"></a>
 <span class="sourceLineNo">201</span>  public List&lt;SnapshotDescription&gt; 
getCompletedSnapshots() throws IOException {<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    return 
getCompletedSnapshots(SnapshotDescriptionUtils.getSnapshotsDir(rootDir));<a 
name="line.202"></a>
+<span class="sourceLineNo">202</span>    return 
getCompletedSnapshots(SnapshotDescriptionUtils.getSnapshotsDir(rootDir), 
true);<a name="line.202"></a>
 <span class="sourceLineNo">203</span>  }<a name="line.203"></a>
 <span class="sourceLineNo">204</span><a name="line.204"></a>
 <span class="sourceLineNo">205</span>  /**<a name="line.205"></a>
 <span class="sourceLineNo">206</span>   * Gets the list of all completed 
snapshots.<a name="line.206"></a>
 <span class="sourceLineNo">207</span>   * @param snapshotDir snapshot 
directory<a name="line.207"></a>
-<span class="sourceLineNo">208</span>   * @return list of 
SnapshotDescriptions<a name="line.208"></a>
-<span class="sourceLineNo">209</span>   * @throws IOException File system 
exception<a name="line.209"></a>
-<span class="sourceLineNo">210</span>   */<a name="line.210"></a>
-<span class="sourceLineNo">211</span>  private List&lt;SnapshotDescription&gt; 
getCompletedSnapshots(Path snapshotDir) throws IOException {<a 
name="line.211"></a>
-<span class="sourceLineNo">212</span>    List&lt;SnapshotDescription&gt; 
snapshotDescs = new ArrayList&lt;&gt;();<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    // first create the snapshot root 
path and check to see if it exists<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    FileSystem fs = 
master.getMasterFileSystem().getFileSystem();<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    if (snapshotDir == null) snapshotDir 
= SnapshotDescriptionUtils.getSnapshotsDir(rootDir);<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span>    // if there are no snapshots, return 
an empty list<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    if (!fs.exists(snapshotDir)) {<a 
name="line.218"></a>
-<span class="sourceLineNo">219</span>      return snapshotDescs;<a 
name="line.219"></a>
-<span class="sourceLineNo">220</span>    }<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span>    // ignore all the snapshots in 
progress<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    FileStatus[] snapshots = 
fs.listStatus(snapshotDir,<a name="line.223"></a>
-<span class="sourceLineNo">224</span>      new 
SnapshotDescriptionUtils.CompletedSnaphotDirectoriesFilter(fs));<a 
name="line.224"></a>
-<span class="sourceLineNo">225</span>    MasterCoprocessorHost cpHost = 
master.getMasterCoprocessorHost();<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    // loop through all the completed 
snapshots<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    for (FileStatus snapshot : snapshots) 
{<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      Path info = new 
Path(snapshot.getPath(), SnapshotDescriptionUtils.SNAPSHOTINFO_FILE);<a 
name="line.228"></a>
-<span class="sourceLineNo">229</span>      // if the snapshot is bad<a 
name="line.229"></a>
-<span class="sourceLineNo">230</span>      if (!fs.exists(info)) {<a 
name="line.230"></a>
-<span class="sourceLineNo">231</span>        LOG.error("Snapshot information 
for " + snapshot.getPath() + " doesn't exist");<a name="line.231"></a>
-<span class="sourceLineNo">232</span>        continue;<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      }<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      FSDataInputStream in = null;<a 
name="line.234"></a>
-<span class="sourceLineNo">235</span>      try {<a name="line.235"></a>
-<span class="sourceLineNo">236</span>        in = fs.open(info);<a 
name="line.236"></a>
-<span class="sourceLineNo">237</span>        SnapshotDescription desc = 
SnapshotDescription.parseFrom(in);<a name="line.237"></a>
-<span class="sourceLineNo">238</span>        if (cpHost != null) {<a 
name="line.238"></a>
-<span class="sourceLineNo">239</span>          try {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>            
cpHost.preListSnapshot(desc);<a name="line.240"></a>
-<span class="sourceLineNo">241</span>          } catch (AccessDeniedException 
e) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span>            LOG.warn("Current user does 
not have access to " + desc.getName() + " snapshot. "<a name="line.242"></a>
-<span class="sourceLineNo">243</span>                + "Either you should be 
owner of this snapshot or admin user.");<a name="line.243"></a>
-<span class="sourceLineNo">244</span>            // Skip this and try for next 
snapshot<a name="line.244"></a>
-<span class="sourceLineNo">245</span>            continue;<a 
name="line.245"></a>
-<span class="sourceLineNo">246</span>          }<a name="line.246"></a>
-<span class="sourceLineNo">247</span>        }<a name="line.247"></a>
-<span class="sourceLineNo">248</span>        snapshotDescs.add(desc);<a 
name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span>        // call coproc post hook<a 
name="line.250"></a>
-<span class="sourceLineNo">251</span>        if (cpHost != null) {<a 
name="line.251"></a>
-<span class="sourceLineNo">252</span>          
cpHost.postListSnapshot(desc);<a name="line.252"></a>
-<span class="sourceLineNo">253</span>        }<a name="line.253"></a>
-<span class="sourceLineNo">254</span>      } catch (IOException e) {<a 
name="line.254"></a>
-<span class="sourceLineNo">255</span>        LOG.warn("Found a corrupted 
snapshot " + snapshot.getPath(), e);<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      } finally {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>        if (in != null) {<a 
name="line.257"></a>
-<span class="sourceLineNo">258</span>          in.close();<a 
name="line.258"></a>
-<span class="sourceLineNo">259</span>        }<a name="line.259"></a>
-<span class="sourceLineNo">260</span>      }<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    }<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    return snapshotDescs;<a 
name="line.262"></a>
-<span class="sourceLineNo">263</span>  }<a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span>  /**<a name="line.265"></a>
-<span class="sourceLineNo">266</span>   * Cleans up any snapshots in the 
snapshot/.tmp directory that were left from failed<a name="line.266"></a>
-<span class="sourceLineNo">267</span>   * snapshot attempts.<a 
name="line.267"></a>
-<span class="sourceLineNo">268</span>   *<a name="line.268"></a>
-<span class="sourceLineNo">269</span>   * @throws IOException if we can't 
reach the filesystem<a name="line.269"></a>
-<span class="sourceLineNo">270</span>   */<a name="line.270"></a>
-<span class="sourceLineNo">271</span>  void resetTempDir() throws IOException 
{<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    // cleanup any existing snapshots.<a 
name="line.272"></a>
-<span class="sourceLineNo">273</span>    Path tmpdir = 
SnapshotDescriptionUtils.getWorkingSnapshotDir(rootDir);<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    if 
(master.getMasterFileSystem().getFileSystem().exists(tmpdir)) {<a 
name="line.274"></a>
-<span class="sourceLineNo">275</span>      if 
(!master.getMasterFileSystem().getFileSystem().delete(tmpdir, true)) {<a 
name="line.275"></a>
-<span class="sourceLineNo">276</span>        LOG.warn("Couldn't delete working 
snapshot directory: " + tmpdir);<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      }<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    }<a name="line.278"></a>
-<span class="sourceLineNo">279</span>  }<a name="line.279"></a>
-<span class="sourceLineNo">280</span><a name="line.280"></a>
-<span class="sourceLineNo">281</span>  /**<a name="line.281"></a>
-<span class="sourceLineNo">282</span>   * Delete the specified snapshot<a 
name="line.282"></a>
-<span class="sourceLineNo">283</span>   * @param snapshot<a 
name="line.283"></a>
-<span class="sourceLineNo">284</span>   * @throws 
SnapshotDoesNotExistException If the specified snapshot does not exist.<a 
name="line.284"></a>
-<span class="sourceLineNo">285</span>   * @throws IOException For filesystem 
IOExceptions<a name="line.285"></a>
-<span class="sourceLineNo">286</span>   */<a name="line.286"></a>
-<span class="sourceLineNo">287</span>  public void 
deleteSnapshot(SnapshotDescription snapshot) throws 
SnapshotDoesNotExistException, IOException {<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    // check to see if it is completed<a 
name="line.288"></a>
-<span class="sourceLineNo">289</span>    if (!isSnapshotCompleted(snapshot)) 
{<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      throw new 
SnapshotDoesNotExistException(ProtobufUtil.createSnapshotDesc(snapshot));<a 
name="line.290"></a>
-<span class="sourceLineNo">291</span>    }<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span>    String snapshotName = 
snapshot.getName();<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    // first create the snapshot 
description and check to see if it exists<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    FileSystem fs = 
master.getMasterFileSystem().getFileSystem();<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    Path snapshotDir = 
SnapshotDescriptionUtils.getCompletedSnapshotDir(snapshotName, rootDir);<a 
name="line.296"></a>
-<span class="sourceLineNo">297</span>    // Get snapshot info from file 
system. The one passed as parameter is a "fake" snapshotInfo with<a 
name="line.297"></a>
-<span class="sourceLineNo">298</span>    // just the "name" and it does not 
contains the "real" snapshot information<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    snapshot = 
SnapshotDescriptionUtils.readSnapshotInfo(fs, snapshotDir);<a 
name="line.299"></a>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span>    // call coproc pre hook<a 
name="line.301"></a>
-<span class="sourceLineNo">302</span>    MasterCoprocessorHost cpHost = 
master.getMasterCoprocessorHost();<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    if (cpHost != null) {<a 
name="line.303"></a>
-<span class="sourceLineNo">304</span>      
cpHost.preDeleteSnapshot(snapshot);<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    }<a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span>    LOG.debug("Deleting snapshot: " + 
snapshotName);<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    // delete the existing snapshot<a 
name="line.308"></a>
-<span class="sourceLineNo">309</span>    if (!fs.delete(snapshotDir, true)) 
{<a name="line.309"></a>
-<span class="sourceLineNo">310</span>      throw new 
HBaseSnapshotException("Failed to delete snapshot directory: " + 
snapshotDir);<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    }<a name="line.311"></a>
-<span class="sourceLineNo">312</span><a name="line.312"></a>
-<span class="sourceLineNo">313</span>    // call coproc post hook<a 
name="line.313"></a>
-<span class="sourceLineNo">314</span>    if (cpHost != null) {<a 
name="line.314"></a>
-<span class="sourceLineNo">315</span>      
cpHost.postDeleteSnapshot(snapshot);<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    }<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">208</span>   * @param withCpCall Whether to call CP 
hooks<a name="line.208"></a>
+<span class="sourceLineNo">209</span>   * @return list of 
SnapshotDescriptions<a name="line.209"></a>
+<span class="sourceLineNo">210</span>   * @throws IOException File system 
exception<a name="line.210"></a>
+<span class="sourceLineNo">211</span>   */<a name="line.211"></a>
+<span class="sourceLineNo">212</span>  private List&lt;SnapshotDescription&gt; 
getCompletedSnapshots(Path snapshotDir, boolean withCpCall)<a 
name="line.212"></a>
+<span class="sourceLineNo">213</span>      throws IOException {<a 
name="line.213"></a>
+<span class="sourceLineNo">214</span>    List&lt;SnapshotDescription&gt; 
snapshotDescs = new ArrayList&lt;&gt;();<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    // first create the snapshot root 
path and check to see if it exists<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    FileSystem fs = 
master.getMasterFileSystem().getFileSystem();<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    if (snapshotDir == null) snapshotDir 
= SnapshotDescriptionUtils.getSnapshotsDir(rootDir);<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span>    // if there are no snapshots, return 
an empty list<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    if (!fs.exists(snapshotDir)) {<a 
name="line.220"></a>
+<span class="sourceLineNo">221</span>      return snapshotDescs;<a 
name="line.221"></a>
+<span class="sourceLineNo">222</span>    }<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span>    // ignore all the snapshots in 
progress<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    FileStatus[] snapshots = 
fs.listStatus(snapshotDir,<a name="line.225"></a>
+<span class="sourceLineNo">226</span>      new 
SnapshotDescriptionUtils.CompletedSnaphotDirectoriesFilter(fs));<a 
name="line.226"></a>
+<span class="sourceLineNo">227</span>    MasterCoprocessorHost cpHost = 
master.getMasterCoprocessorHost();<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    withCpCall = withCpCall &amp;&amp; 
cpHost != null;<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    // loop through all the completed 
snapshots<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    for (FileStatus snapshot : snapshots) 
{<a name="line.230"></a>
+<span class="sourceLineNo">231</span>      Path info = new 
Path(snapshot.getPath(), SnapshotDescriptionUtils.SNAPSHOTINFO_FILE);<a 
name="line.231"></a>
+<span class="sourceLineNo">232</span>      // if the snapshot is bad<a 
name="line.232"></a>
+<span class="sourceLineNo">233</span>      if (!fs.exists(info)) {<a 
name="line.233"></a>
+<span class="sourceLineNo">234</span>        LOG.error("Snapshot information 
for " + snapshot.getPath() + " doesn't exist");<a name="line.234"></a>
+<span class="sourceLineNo">235</span>        continue;<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      }<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      FSDataInputStream in = null;<a 
name="line.237"></a>
+<span class="sourceLineNo">238</span>      try {<a name="line.238"></a>
+<span class="sourceLineNo">239</span>        in = fs.open(info);<a 
name="line.239"></a>
+<span class="sourceLineNo">240</span>        SnapshotDescription desc = 
SnapshotDescription.parseFrom(in);<a name="line.240"></a>
+<span class="sourceLineNo">241</span>        
org.apache.hadoop.hbase.client.SnapshotDescription descPOJO = (withCpCall)<a 
name="line.241"></a>
+<span class="sourceLineNo">242</span>            ? 
ProtobufUtil.createSnapshotDesc(desc) : null;<a name="line.242"></a>
+<span class="sourceLineNo">243</span>        if (withCpCall) {<a 
name="line.243"></a>
+<span class="sourceLineNo">244</span>          try {<a name="line.244"></a>
+<span class="sourceLineNo">245</span>            
cpHost.preListSnapshot(descPOJO);<a name="line.245"></a>
+<span class="sourceLineNo">246</span>          } catch (AccessDeniedException 
e) {<a name="line.246"></a>
+<span class="sourceLineNo">247</span>            LOG.warn("Current user does 
not have access to " + desc.getName() + " snapshot. "<a name="line.247"></a>
+<span class="sourceLineNo">248</span>                + "Either you should be 
owner of this snapshot or admin user.");<a name="line.248"></a>
+<span class="sourceLineNo">249</span>            // Skip this and try for next 
snapshot<a name="line.249"></a>
+<span class="sourceLineNo">250</span>            continue;<a 
name="line.250"></a>
+<span class="sourceLineNo">251</span>          }<a name="line.251"></a>
+<span class="sourceLineNo">252</span>        }<a name="line.252"></a>
+<span class="sourceLineNo">253</span>        snapshotDescs.add(desc);<a 
name="line.253"></a>
+<span class="sourceLineNo">254</span><a name="line.254"></a>
+<span class="sourceLineNo">255</span>        // call coproc post hook<a 
name="line.255"></a>
+<span class="sourceLineNo">256</span>        if (withCpCall) {<a 
name="line.256"></a>
+<span class="sourceLineNo">257</span>          
cpHost.postListSnapshot(descPOJO);<a name="line.257"></a>
+<span class="sourceLineNo">258</span>        }<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      } catch (IOException e) {<a 
name="line.259"></a>
+<span class="sourceLineNo">260</span>        LOG.warn("Found a corrupted 
snapshot " + snapshot.getPath(), e);<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      } finally {<a name="line.261"></a>
+<span class="sourceLineNo">262</span>        if (in != null) {<a 
name="line.262"></a>
+<span class="sourceLineNo">263</span>          in.close();<a 
name="line.263"></a>
+<span class="sourceLineNo">264</span>        }<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      }<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    }<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    return snapshotDescs;<a 
name="line.267"></a>
+<span class="sourceLineNo">268</span>  }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span>  /**<a name="line.270"></a>
+<span class="sourceLineNo">271</span>   * Cleans up any snapshots in the 
snapshot/.tmp directory that were left from failed<a name="line.271"></a>
+<span class="sourceLineNo">272</span>   * snapshot attempts.<a 
name="line.272"></a>
+<span class="sourceLineNo">273</span>   *<a name="line.273"></a>
+<span class="sourceLineNo">274</span>   * @throws IOException if we can't 
reach the filesystem<a name="line.274"></a>
+<span class="sourceLineNo">275</span>   */<a name="line.275"></a>
+<span class="sourceLineNo">276</span>  void resetTempDir() throws IOException 
{<a name="line.276"></a>
+<span class="sourceLineNo">277</span>    // cleanup any existing snapshots.<a 
name="line.277"></a>
+<span class="sourceLineNo">278</span>    Path tmpdir = 
SnapshotDescriptionUtils.getWorkingSnapshotDir(rootDir);<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    if 
(master.getMasterFileSystem().getFileSystem().exists(tmpdir)) {<a 
name="line.279"></a>
+<span class="sourceLineNo">280</span>      if 
(!master.getMasterFileSystem().getFileSystem().delete(tmpdir, true)) {<a 
name="line.280"></a>
+<span class="sourceLineNo">281</span>        LOG.warn("Couldn't delete working 
snapshot directory: " + tmpdir);<a name="line.281"></a>
+<span class="sourceLineNo">282</span>      }<a name="line.282"></a>
+<span class="sourceLineNo">283</span>    }<a name="line.283"></a>
+<span class="sourceLineNo">284</span>  }<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span>  /**<a name="line.286"></a>
+<span class="sourceLineNo">287</span>   * Delete the specified snapshot<a 
name="line.287"></a>
+<span class="sourceLineNo">288</span>   * @param snapshot<a 
name="line.288"></a>
+<span class="sourceLineNo">289</span>   * @throws 
SnapshotDoesNotExistException If the specified snapshot does not exist.<a 
name="line.289"></a>
+<span class="sourceLineNo">290</span>   * @throws IOException For filesystem 
IOExceptions<a name="line.290"></a>
+<span class="sourceLineNo">291</span>   */<a name="line.291"></a>
+<span class="sourceLineNo">292</span>  public void 
deleteSnapshot(SnapshotDescription snapshot) throws 
SnapshotDoesNotExistException, IOException {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    // check to see if it is completed<a 
name="line.293"></a>
+<span class="sourceLineNo">294</span>    if (!isSnapshotCompleted(snapshot)) 
{<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      throw new 
SnapshotDoesNotExistException(ProtobufUtil.createSnapshotDesc(snapshot));<a 
name="line.295"></a>
+<span class="sourceLineNo">296</span>    }<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span>    String snapshotName = 
snapshot.getName();<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    // first create the snapshot 
description and check to see if it exists<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    FileSystem fs = 
master.getMasterFileSystem().getFileSystem();<a name="line.300"></a>
+<span class="sourceLineNo">301</span>    Path snapshotDir = 
SnapshotDescriptionUtils.getCompletedSnapshotDir(snapshotName, rootDir);<a 
name="line.301"></a>
+<span class="sourceLineNo">302</span>    // Get snapshot info from file 
system. The one passed as parameter is a "fake" snapshotInfo with<a 
name="line.302"></a>
+<span class="sourceLineNo">303</span>    // just the "name" and it does not 
contains the "real" snapshot information<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    snapshot = 
SnapshotDescriptionUtils.readSnapshotInfo(fs, snapshotDir);<a 
name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span>    // call coproc pre hook<a 
name="line.306"></a>
+<span class="sourceLineNo">307</span>    MasterCoprocessorHost cpHost = 
master.getMasterCoprocessorHost();<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    
org.apache.hadoop.hbase.client.SnapshotDescription snapshotPOJO = null;<a 
name="line.308"></a>
+<span class="sourceLineNo">309</span>    if (cpHost != null) {<a 
name="line.309"></a>
+<span class="sourceLineNo">310</span>      snapshotPOJO = 
ProtobufUtil.createSnapshotDesc(snapshot);<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      
cpHost.preDeleteSnapshot(snapshotPOJO);<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>    LOG.debug("Deleting snapshot: " + 
snapshotName);<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    // delete the existing snapshot<a 
name="line.315"></a>
+<span class="sourceLineNo">316</span>    if (!fs.delete(snapshotDir, true)) 
{<a name="line.316"></a>
+<span class="sourceLineNo">317</span>      throw new 
HBaseSnapshotException("Failed to delete snapshot directory: " + 
snapshotDir);<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    }<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>   * Check if the specified snapshot is 
done<a name="line.321"></a>
-<span class="sourceLineNo">322</span>   *<a name="line.322"></a>
-<span class="sourceLineNo">323</span>   * @param expected<a 
name="line.323"></a>
-<span class="sourceLineNo">324</span>   * @return true if snapshot is ready to 
be restored, false if it is still being taken.<a name="line.324"></a>
-<span class="sourceLineNo">325</span>   * @throws IOException IOException if 
error from HDFS or RPC<a name="line.325"></a>
-<span class="sourceLineNo">326</span>   * @throws UnknownSnapshotException if 
snapshot is invalid or does not exist.<a name="line.326"></a>
-<span class="sourceLineNo">327</span>   */<a name="line.327"></a>
-<span class="sourceLineNo">328</span>  public boolean 
isSnapshotDone(SnapshotDescription expected) throws IOException {<a 
name="line.328"></a>
-<span class="sourceLineNo">329</span>    // check the request to make sure it 
has a snapshot<a name="line.329"></a>
-<span class="sourceLineNo">330</span>    if (expected == null) {<a 
name="line.330"></a>
-<span class="sourceLineNo">331</span>      throw new 
UnknownSnapshotException(<a name="line.331"></a>
-<span class="sourceLineNo">332</span>         "No snapshot name passed in 
request, can't figure out which snapshot you want to check.");<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>    String ssString = 
ClientSnapshotDescriptionUtils.toString(expected);<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span>    // check to see if the sentinel 
exists,<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    // and if the task is complete 
removes it from the in-progress snapshots map.<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    SnapshotSentinel handler = 
removeSentinelIfFinished(this.snapshotHandlers, expected);<a 
name="line.339"></a>
-<span class="sourceLineNo">340</span><a name="line.340"></a>
-<span class="sourceLineNo">341</span>    // stop tracking "abandoned" 
handlers<a name="line.341"></a>
-<span class="sourceLineNo">342</span>    cleanupSentinels();<a 
name="line.342"></a>
+<span class="sourceLineNo">320</span>    // call coproc post hook<a 
name="line.320"></a>
+<span class="sourceLineNo">321</span>    if (cpHost != null) {<a 
name="line.321"></a>
+<span class="sourceLineNo">322</span>      
cpHost.postDeleteSnapshot(snapshotPOJO);<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>  }<a name="line.325"></a>
+<span class="sourceLineNo">326</span><a name="line.326"></a>
+<span class="sourceLineNo">327</span>  /**<a name="line.327"></a>
+<span class="sourceLineNo">328</span>   * Check if the specified snapshot is 
done<a name="line.328"></a>
+<span class="sourceLineNo">329</span>   *<a name="line.329"></a>
+<span class="sourceLineNo">330</span>   * @param expected<a 
name="line.330"></a>
+<span class="sourceLineNo">331</span>   * @return true if snapshot is ready to 
be restored, false if it is still being taken.<a name="line.331"></a>
+<span class="sourceLineNo">332</span>   * @throws IOException IOException if 
error from HDFS or RPC<a name="line.332"></a>
+<span class="sourceLineNo">333</span>   * @throws UnknownSnapshotException if 
snapshot is invalid or does not exist.<a name="line.333"></a>
+<span class="sourceLineNo">334</span>   */<a name="line.334"></a>
+<span class="sourceLineNo">335</span>  public boolean 
isSnapshotDone(SnapshotDescription expected) throws IOException {<a 
name="line.335"></a>
+<span class="sourceLineNo">336</span>    // check the request to make sure it 
has a snapshot<a name="line.336"></a>
+<span class="sourceLineNo">337</span>    if (expected == null) {<a 
name="line.337"></a>
+<span class="sourceLineNo">338</span>      throw new 
UnknownSnapshotException(<a name="line.338"></a>
+<span class="sourceLineNo">339</span>         "No snapshot name passed in 
request, can't figure out which snapshot you want to check.");<a 
name="line.339"></a>
+<span class="sourceLineNo">340</span>    }<a name="line.340"></a>
+<span class="sourceLineNo">341</span><a name="line.341"></a>
+<span class="sourceLineNo">342</span>    String ssString = 
ClientSnapshotDescriptionUtils.toString(expected);<a name="line.342"></a>
 <span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span>    if (handler == null) {<a 
name="line.344"></a>
-<span class="sourceLineNo">345</span>      // If there's no handler in the 
in-progress map, it means one of the following:<a name="line.345"></a>
-<span class="sourceLineNo">346</span>      //   - someone has already 
requested the snapshot state<a name="line.346"></a>
-<span class="sourceLineNo">347</span>      //   - the requested snapshot was 
completed long time ago (cleanupSentinels() timeout)<a name="line.347"></a>
-<span class="sourceLineNo">348</span>      //   - the snapshot was never 
requested<a name="line.348"></a>
-<span class="sourceLineNo">349</span>      // In those cases returns to the 
user the "done state" if the snapshots exists on disk,<a name="line.349"></a>
-<span class="sourceLineNo">350</span>      // otherwise raise an exception 
saying that the snapshot is not running and doesn't exist.<a 
name="line.350"></a>
-<span class="sourceLineNo">351</span>      if (!isSnapshotCompleted(expected)) 
{<a name="line.351"></a>
-<span class="sourceLineNo">352</span>        throw new 
UnknownSnapshotException("Snapshot " + ssString<a name="line.352"></a>
-<span class="sourceLineNo">353</span>            + " is not currently running 
or one of the known completed snapshots.");<a name="line.353"></a>
-<span class="sourceLineNo">354</span>      }<a name="line.354"></a>
-<span class="sourceLineNo">355</span>      // was done, return true;<a 
name="line.355"></a>
-<span class="sourceLineNo">356</span>      return true;<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>    // pass on any failure we find in the 
sentinel<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    try {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>      
handler.rethrowExceptionIfFailed();<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    } catch (ForeignException e) {<a 
name="line.362"></a>
-<span class="sourceLineNo">363</span>      // Give some procedure info on an 
exception.<a name="line.363"></a>
-<span class="sourceLineNo">364</span>      String status;<a 
name="line.364"></a>
-<span class="sourceLineNo">365</span>      Procedure p = 
coordinator.getProcedure(expected.getName());<a name="line.365"></a>
-<span class="sourceLineNo">366</span>      if (p != null) {<a 
name="line.366"></a>
-<span class="sourceLineNo">367</span>        status = p.getStatus();<a 
name="line.367"></a>
-<span class="sourceLineNo">368</span>      } else {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>        status = expected.getName() + " 
not found in proclist " + coordinator.getProcedureNames();<a 
name="line.369"></a>
-<span class="sourceLineNo">370</span>      }<a name="line.370"></a>
-<span class="sourceLineNo">371</span>      throw new 
HBaseSnapshotException("Snapshot " + ssString +  " had an error.  " + status, 
e,<a name="line.371"></a>
-<span class="sourceLineNo">372</span>        
ProtobufUtil.createSnapshotDesc(expected));<a name="line.372"></a>
-<span class="sourceLineNo">373</span>    }<a name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span>    // check to see if we are done<a 
name="line.375"></a>
-<span class="sourceLineNo">376</span>    if (handler.isFinished()) {<a 
name="line.376"></a>
-<span class="sourceLineNo">377</span>      LOG.debug("Snapshot '" + ssString + 
"' has completed, notifying client.");<a name="line.377"></a>
-<span class="sourceLineNo">378</span>      return true;<a name="line.378"></a>
-<span class="sourceLineNo">379</span>    } else if (LOG.isDebugEnabled()) {<a 
name="line.379"></a>
-<span class="sourceLineNo">380</span>      LOG.debug("Snapshoting '" + 
ssString + "' is still in progress!");<a name="line.380"></a>
-<span class="sourceLineNo">381</span>    }<a name="line.381"></a>
-<span class="sourceLineNo">382</span>    return false;<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>  /**<a name="line.385"></a>
-<span class="sourceLineNo">386</span>   * Check to see if there is a snapshot 
in progress with the same name or on the same table.<a name="line.386"></a>
-<span class="sourceLineNo">387</span>   * Currently we have a limitation only 
allowing a single snapshot per table at a time. Also we<a name="line.387"></a>
-<span class="sourceLineNo">388</span>   * don't allow snapshot with the same 
name.<a name="line.388"></a>
-<span class="sourceLineNo">389</span>   * @param snapshot description of the 
snapshot being checked.<a name="line.389"></a>
-<span class="sourceLineNo">390</span>   * @return &lt;tt&gt;true&lt;/tt&gt; if 
there is a snapshot in progress with the same name or on the same<a 
name="line.390"></a>
-<span class="sourceLineNo">391</span>   *         table.<a name="line.391"></a>
-<span class="sourceLineNo">392</span>   */<a name="line.392"></a>
-<span class="sourceLineNo">393</span>  synchronized boolean 
isTakingSnapshot(final SnapshotDescription snapshot) {<a name="line.393"></a>
-<span class="sourceLineNo">394</span>    TableName snapshotTable = 
TableName.valueOf(snapshot.getTable());<a name="line.394"></a>
-<span class="sourceLineNo">395</span>    if (isTakingSnapshot(snapshotTable)) 
{<a name="line.395"></a>
-<span class="sourceLineNo">396</span>      return true;<a name="line.396"></a>
-<span class="sourceLineNo">397</span>    }<a name="line.397"></a>
-<span class="sourceLineNo">398</span>    Iterator&lt;Map.Entry&lt;TableName, 
SnapshotSentinel&gt;&gt; it = this.snapshotHandlers.entrySet().iterator();<a 
name="line.398"></a>
-<span class="sourceLineNo">399</span>    while (it.hasNext()) {<a 
name="line.399"></a>
-<span class="sourceLineNo">400</span>      Map.Entry&lt;TableName, 
SnapshotSentinel&gt; entry = it.next();<a name="line.400"></a>
-<span class="sourceLineNo">401</span>      SnapshotSentinel sentinel = 
entry.getValue();<a name="line.401"></a>
-<span class="sourceLineNo">402</span>      if 
(snapshot.getName().equals(sentinel.getSnapshot().getName()) &amp;&amp; 
!sentinel.isFinished()) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span>        return true;<a 
name="line.403"></a>
-<span class="sourceLineNo">404</span>      }<a name="line.404"></a>
-<span class="sourceLineNo">405</span>    }<a name="line.405"></a>
-<span class="sourceLineNo">406</span>    return false;<a name="line.406"></a>
-<span class="sourceLineNo">407</span>  }<a name="line.407"></a>
-<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span>  /**<a name="line.409"></a>
-<span class="sourceLineNo">410</span>   * Check to see if the specified table 
has a snapshot in progress.  Currently we have a<a name="line.410"></a>
-<span class="sourceLineNo">411</span>   * limitation only allowing a single 
snapshot per table at a time.<a name="line.411"></a>
-<span class="sourceLineNo">412</span>   * @param tableName name of the table 
being snapshotted.<a name="line.412"></a>
-<span class="sourceLineNo">413</span>   * @return &lt;tt&gt;true&lt;/tt&gt; if 
there is a snapshot in progress on the specified table.<a name="line.413"></a>
-<span class="sourceLineNo">414</span>   */<a name="line.414"></a>
-<span class="sourceLineNo">415</span>  synchronized boolean 
isTakingSnapshot(final TableName tableName) {<a name="line.415"></a>
-<span class="sourceLineNo">416</span>    SnapshotSentinel handler = 
this.snapshotHandlers.get(tableName);<a name="line.416"></a>
-<span class="sourceLineNo">417</span>    return handler != null &amp;&amp; 
!handler.isFinished();<a name="line.417"></a>
-<span class="sourceLineNo">418</span>  }<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>   * Check to make sure that we are OK to 
run the passed snapshot. Checks to make sure that we<a name="line.421"></a>
-<span class="sourceLineNo">422</span>   * aren't already running a snapshot or 
restore on the requested table.<a name="line.422"></a>
-<span class="sourceLineNo">423</span>   * @param snapshot description of the 
snapshot we want to start<a name="line.423"></a>
-<span class="sourceLineNo">424</span>   * @throws HBaseSnapshotException if 
the filesystem could not be prepared to start the snapshot<a 
name="line.424"></a>
-<span class="sourceLineNo">425</span>   */<a name="line.425"></a>
-<span class="sourceLineNo">426</span>  private synchronized void 
prepareToTakeSnapshot(SnapshotDescription snapshot)<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      throws HBaseSnapshotException {<a 
name="line.427"></a>
-<span class="sourceLineNo">428</span>    FileSystem fs = 
master.getMasterFileSystem().getFileSystem();<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    Path workingDir = 
SnapshotDescriptionUtils.getWorkingSnapshotDir(snapshot, rootDir);<a 
name="line.429"></a>
-<span class="sourceLineNo">430</span>    TableName snapshotTable =<a 
name="line.430"></a>
-<span class="sourceLineNo">431</span>        
TableName.valueOf(snapshot.getTable());<a name="line.431"></a>
-<span class="sourceLineNo">432</span><a name="line.432"></a>
-<span class="sourceLineNo">433</span>    // make sure we aren't already 
running a snapshot<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    if (isTakingSnapshot(snapshot)) {<a 
name="line.434"></a>
-<span class="sourceLineNo">435</span>      SnapshotSentinel handler = 
this.snapshotHandlers.get(snapshotTable);<a name="line.435"></a>
-<span class="sourceLineNo">436</span>      throw new 
SnapshotCreationException("Rejected taking "<a name="line.436"></a>
-<span class="sourceLineNo">437</span>          + 
ClientSnapshotDescriptionUtils.toString(snapshot)<a name="line.437"></a>
-<span class="sourceLineNo">438</span>          + " because we are already 
running another snapshot "<a name="line.438"></a>
-<span class="sourceLineNo">439</span>          + (handler != null ? ("on the 
same table " +<a name="line.439"></a>
-<span class="sourceLineNo">440</span>              
ClientSnapshotDescriptionUtils.toString(handler.getSnapshot()))<a 
name="line.440"></a>
-<span class="sourceLineNo">441</span>              : "with the same name"), 
ProtobufUtil.createSnapshotDesc(snapshot));<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>    // make sure we aren't running a 
restore on the same table<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    if (isRestoringTable(snapshotTable)) 
{<a name="line.445"></a>
-<span class="sourceLineNo">446</span>      throw new 
SnapshotCreationException("Rejected taking "<a name="line.446"></a>
-<span class="sourceLineNo">447</span>          + 
ClientSnapshotDescriptionUtils.toString(snapshot)<a name="line.447"></a>
-<span class="sourceLineNo">448</span>          + " because we are already have 
a restore in progress on the same snapshot.");<a name="line.448"></a>
+<span class="sourceLineNo">344</span>    // check to see if the sentinel 
exists,<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    // and if the task is complete 
removes it from the in-progress snapshots map.<a name="line.345"></a>
+<span class="sourceLineNo">346</span>    SnapshotSentinel handler = 
removeSentinelIfFinished(this.snapshotHandlers, expected);<a 
name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span>    // stop tracking "abandoned" 
handlers<a name="line.348"></a>
+<span class="sourceLineNo">349</span>    cleanupSentinels();<a 
name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span>    if (handler == null) {<a 
name="line.351"></a>
+<span class="sourceLineNo">352</span>      // If there's no handler in the 
in-progress map, it means one of the following:<a name="line.352"></a>
+<span class="sourceLineNo">353</span>      //   - someone has already 
requested the snapshot state<a name="line.353"></a>
+<span class="sourceLineNo">354</span>      //   - the requested snapshot was 
completed long time ago (cleanupSentinels() timeout)<a name="line.354"></a>
+<span class="sourceLineNo">355</span>      //   - the snapshot was never 
requested<a name="line.355"></a>
+<span class="sourceLineNo">356</span>      // In those cases returns to the 
user the "done state" if the snapshots exists on disk,<a name="line.356"></a>
+<span class="sourceLineNo">357</span>      // otherwise raise an exception 
saying that the snapshot is not running and doesn't exist.<a 
name="line.357"></a>
+<span class="sourceLineNo">358</span>      if (!isSnapshotCompleted(expected)) 
{<a name="line.358"></a>
+<span class="sourceLineNo">359</span>        throw new 
UnknownSnapshotException("Snapshot " + ssString<a name="line.359"></a>
+<span class="sourceLineNo">360</span>            + " is not currently running 
or one of the known completed snapshots.");<a name="line.360"></a>
+<span class="sourceLineNo">361</span>      }<a name="line.361"></a>
+<span class="sourceLineNo">362</span>      // was done, return true;<a 
name="line.362"></a>
+<span class="sourceLineNo">363</span>      return true;<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    }<a name="line.364"></a>
+<span class="sourceLineNo">365</span><a name="line.365"></a>
+<span class="sourceLineNo">366</span>    // pass on any failure we find in the 
sentinel<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    try {<a name="line.367"></a>
+<span class="sourceLineNo">368</span>      
handler.rethrowExceptionIfFailed();<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    } catch (ForeignException e) {<a 
name="line.369"></a>
+<span class="sourceLineNo">370</span>      // Give some procedure info on an 
exception.<a name="line.370"></a>
+<span class="sourceLineNo">371</span>      String status;<a 
name="line.371"></a>
+<span class="sourceLineNo">372</span>      Procedure p = 
coordinator.getProcedure(expected.getName());<a name="line.372"></a>
+<span class="sourceLineNo">373</span>      if (p != null) {<a 
name="line.373"></a>
+<span class="sourceLineNo">374</span>        status = p.getStatus();<a 
name="line.374"></a>
+<span class="sourceLineNo">375</span>      } else {<a name="line.375"></a>
+<span class="sourceLineNo">376</span>        status = expected.getName() + " 
not found in proclist " + coordinator.getProcedureNames();<a 
name="line.376"></a>
+<span class="sourceLineNo">377</span>      }<a name="line.377"></a>
+<span class="sourceLineNo">378</span>      throw new 
HBaseSnapshotException("Snapshot " + ssString +  " had an error.  " + status, 
e,<a name="line.378"></a>
+<span class="sourceLineNo">379</span>        
ProtobufUtil.createSnapshotDesc(expected));<a name="line.379"></a>
+<span class="sourceLineNo">380</span>    }<a name="line.380"></a>
+<span class="sourceLineNo">381</span><a name="line.381"></a>
+<span class="sourceLineNo">382</span>    // check to see if we are done<a 
name="line.382"></a>
+<span class="sourceLineNo">383</span>    if (handler.isFinished()) {<a 
name="line.383"></a>
+<span class="sourceLineNo">384</span>      LOG.debug("Snapshot '" + ssString + 
"' has completed, notifying client.");<a name="line.384"></a>
+<span class="sourceLineNo">385</span>      return true;<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    } else if (LOG.isDebugEnabled()) {<a 
name="line.386"></a>
+<span class="sourceLineNo">387</span>      LOG.debug("Snapshoting '" + 
ssString + "' is still in progress!");<a name="line.387"></a>
+<span class="sourceLineNo">388</span>    }<a name="line.388"></a>
+<span class="sourceLineNo">389</span>    return false;<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>   * Check to see if there is a snapshot 
in progress with the same name or on the same table.<a name="line.393"></a>
+<span class="sourceLineNo">394</span>   * Currently we have a limitation only 
allowing a single snapshot per table at a time. Also we<a name="line.394"></a>
+<span class="sourceLineNo">395</span>   * don't allow snapshot with the same 
name.<a name="line.395"></a>
+<span class="sourceLineNo">396</span>   * @param snapshot description of the 
snapshot being checked.<a name="line.396"></a>
+<span class="sourceLineNo">397</span>   * @return &lt;tt&gt;true&lt;/tt&gt; if 
there is a snapshot in progress with the same name or on the same<a 
name="line.397"></a>
+<span class="sourceLineNo">398</span>   *         table.<a name="line.398"></a>
+<span class="sourceLineNo">399</span>   */<a name="line.399"></a>
+<span class="sourceLineNo">400</span>  synchronized boolean 
isTakingSnapshot(final SnapshotDescription snapshot) {<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    TableName snapshotTable = 
TableName.valueOf(snapshot.getTable());<a name="line.401"></a>
+<span class="sourceLineNo">402</span>    if (isTakingSnapshot(snapshotTable)) 
{<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      return true;<a name="line.403"></a>
+<span class="sourceLineNo">404</span>    }<a name="line.404"></a>
+<span class="sourceLineNo">405</span>    Iterator&lt;Map.Entry&lt;TableName, 
SnapshotSentinel&gt;&gt; it = this.snapshotHandlers.entrySet().iterator();<a 
name="line.405"></a>
+<span class="sourceLineNo">406</span>    while (it.hasNext()) {<a 
name="line.406"></a>
+<span class="sourceLineNo">407</span>      Map.Entry&lt;TableName, 
SnapshotSentinel&gt; entry = it.next();<a name="line.407"></a>
+<span class="sourceLineNo">408</span>      SnapshotSentinel sentinel = 
entry.getValue();<a name="line.408"></a>
+<span class="sourceLineNo">409</span>      if 
(snapshot.getName().equals(sentinel.getSnapshot().getName()) &amp;&amp; 
!sentinel.isFinished()) {<a name="line.409"></a>
+<span class="sourceLineNo">410</span>        return true;<a 
name="line.410"></a>
+<span class="sourceLineNo">411</span>      }<a name="line.411"></a>
+<span class="sourceLineNo">412</span>    }<a name="line.412"></a>
+<span class="sourceLineNo">413</span>    return false;<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>  /**<a name="line.416"></a>
+<span class="sourceLineNo">417</span>   * Check to see if the specified table 
has a snapshot in progress.  Currently we have a<a name="line.417"></a>
+<span class="sourceLineNo">418</span>   * limitation only allowing a single 
snapshot per table at a time.<a name="line.418"></a>
+<span class="sourceLineNo">419</span>   * @param tableName name of the table 
being snapshotted.<a name="line.419"></a>
+<span class="sourceLineNo">420</span>   * @return &lt;tt&gt;true&lt;/tt&gt; if 
there is a snapshot in progress on the specified table.<a name="line.420"></a>
+<span class="sourceLineNo">421</span>   */<a name="line.421"></a>
+<span class="sourceLineNo">422</span>  synchronized boolean 
isTakingSnapshot(final TableName tableName) {<a name="line.422"></a>
+<span class="sourceLineNo">423</span>    SnapshotSentinel handler = 
this.snapshotHandlers.get(tableName);<a name="line.423"></a>
+<span class="sourceLineNo">424</span>    return handler != null &amp;&amp; 
!handler.isFinished();<a name="line.424"></a>
+<span class="sourceLineNo">425</span>  }<a name="line.425"></a>
+<span class="sourceLineNo">426</span><a name="line.426"></a>
+<span class="sourceLineNo">427</span>  /**<a name="line.427"></a>
+<span class="sourceLineNo">428</span>   * Check to make sure that we are OK to 
run the passed snapshot. Checks to make sure that we<a name="line.428"></a>
+<span class="sourceLineNo">429</span>   * aren't already running a snapshot or 
restore on the requested table.<a name="line.429"></a>
+<span class="sourceLineNo">430</span>   * @param snapshot description of the 
snapshot we want to start<a name="line.430"></a>
+<span class="sourceLineNo">431</span>   * @throws HBaseSnapshotException if 
the filesystem could not be prepared to start the snapshot<a 
name="line.431"></a>
+<span class="sourceLineNo">432</span>   */<a name="line.432"></a>
+<span class="sourceLineNo">433</span>  private synchronized void 
prepareToTakeSnapshot(SnapshotDescription snapshot)<a name="line.433"></a>
+<span class="sourceLineNo">434</span>      throws HBaseSnapshotException {<a 
name="line.434"></a>
+<span class="sourceLineNo">435</span>    FileSystem fs = 
master.getMasterFileSystem().getFileSystem();<a name="line.435"></a>
+<span class="sourceLineNo">436</span>    Path workingDir = 
SnapshotDescriptionUtils.getWorkingSnapshotDir(snapshot, rootDir);<a 
name="line.436"></a>
+<span class="sourceLineNo">437</span>    TableName snapshotTable =<a 
name="line.437"></a>
+<span class="sourceLineNo">438</span>        
TableName.valueOf(snapshot.getTable());<a name="line.438"></a>
+<span class="sourceLineNo">439</span><a name="line.439"></a>
+<span class="sourceLineNo">440</span>    // make sure we aren't already 
running a snapshot<a name="line.440"></a>
+<span class="sourceLineNo">441</span>    if (isTakingSnapshot(snapshot)) {<a 
name="line.441"></a>
+<span class="sourceLineNo">442</span>      SnapshotSentinel handler = 
this.snapshotHandlers.get(snapshotTable);<a name="line.442"></a>
+<span class="sourceLineNo">443</span>      throw new 
SnapshotCreationException("Rejected taking "<a name="line.443"></a>
+<span class="sourceLineNo">444</span>          + 
ClientSnapshotDescriptionUtils.toString(snapshot)<a name="line.444"></a>
+<span class="sourceLineNo">445</span>          + " because we are already 
running another snapshot "<a name="line.445"></a>
+<span class="sourceLineNo">446</span>          + (handler != null ? ("on the 
same table " +<a name="line.446"></a>
+<span class="sourceLineNo">447</span>              
ClientSnapshotDescriptionUtils.toString(handler.getSnapshot()))<a 
name="line.447"></a>
+<span class="sourceLineNo">448</span>              : "with the same name"), 
ProtobufUtil.createSnapshotDesc(snapshot));<a name="line.448"></a>
 <span class="sourceLineNo">449</span>    }<a name="line.449"></a>
 <span class="sourceLineNo">450</span><a name="line.450"></a>
-<span class="sourceLineNo">451</span>    try {<a name="line.451"></a>
-<span class="sourceLineNo">452</span>      // delete the working directory, 
since we aren't running the snapshot. Likely leftovers<a name="line.452"></a>
-<span class="sourceLineNo">453</span>      // from a failed attempt.<a 
name="line.453"></a>
-<span class="sourceLineNo">454</span>      fs.delete(workingDir, true);<a 
name="line.454"></a>
-<span class="sourceLineNo">455</span><a name="line.455"></a>
-<span class="sourceLineNo">456</span>      // recreate the working directory 
for the snapshot<a name="line.456"></a>
-<span class="sourceLineNo">457</span>      if (!fs.mkdirs(workingDir)) {<a 
name="line.457"></a>
-<span class="sourceLineNo">458</span>        throw new 
SnapshotCreationException(<a name="line.458"></a>
-<span class="sourceLineNo">459</span>            "Couldn't create working 
directory (" + workingDir + ") for snapshot",<a name="line.459"></a>
-<span class="sourceLineNo">460</span>            
ProtobufUtil.createSnapshotDesc(snapshot));<a name="line.460"></a>
-<span class="sourceLineNo">461</span>      }<a name="line.461"></a>
-<span class="sourceLineNo">462</span>    } catch (HBaseSnapshotException e) 
{<a name="line.462"></a>
-<span class="sourceLineNo">463</span>      throw e;<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    } catch (IOException e) {<a 
name="line.464"></a>
-<span class="sourceLineNo">465</span>      throw new 
SnapshotCreationException(<a name="line.465"></a>
-<span class="sourceLineNo">466</span>          "Exception while checking to 
see if snapshot could be started.", e,<a name="line.466"></a>
-<span class="sourceLineNo">467</span>          
ProtobufUtil.createSnapshotDesc(snapshot));<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>   * Take a snapshot of a disabled 
table.<a name="line.472"></a>
-<span class="sourceLineNo">473</span>   * @param snapshot description of the 
snapshot to take. Modified to be {@link Type#DISABLED}.<a name="line.473"></a>
-<span class="sourceLineNo">474</span>   * @throws HBaseSnapshotException if 
the snapshot could not be started<a name="line.474"></a>
-<span class="sourceLineNo">475</span>   */<a name="line.475"></a>
-<span class="sourceLineNo">476</span>  private synchronized void 
snapshotDisabledTable(SnapshotDescription snapshot)<a name="line.476"></a>
-<span class="sourceLineNo">477</span>      throws HBaseSnapshotException {<a 
name="line.477"></a>
-<span class="sourceLineNo">478</span>    // setup the snapshot<a 
name="line.478"></a>
-<span class="sourceLineNo">479</span>    prepareToTakeSnapshot(snapshot);<a 
name="line.479"></a>
-<span class="sourceLineNo">480</span><a name="line.480"></a>
-<span class="sourceLineNo">481</span>    // set the snapshot to be a disabled 
snapshot, since the client doesn't know about that<a name="line.481"></a>
-<span class="sourceLineNo">482</span>    snapshot = 
snapshot.toBuilder().setType(Type.DISABLED).build();<a name="line.482"></a>
-<span class="sourceLineNo">483</span><a name="line.483"></a>
-<span class="sourceLineNo">484</span>    // Take the snapshot of the disabled 
table<a name="line.484"></a>
-<span class="sourceLineNo">485</span>    DisabledTableSnapshotHandler handler 
=<a name="line.485"></a>
-<span class="sourceLineNo">486</span>        new 
DisabledTableSnapshotHandler(snapshot, master, this);<a name="line.486"></a>
-<span class="sourceLineNo">487</span>    snapshotTable(snapshot, handler);<a 
name="line.487"></a>
-<span class="sourceLineNo">488</span>  }<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span>  /**<a name="line.490"></a>
-<span class="sourceLineNo">491</span>   * Take a snapshot of an enabled 
table.<a name="line.491"></a>
-<span class="sourceLineNo">492</span>   * @param snapshot description of the 
snapshot to take.<a name="line.492"></a>
-<span class="sourceLineNo">493</span>   * @throws HBaseSnapshotException if 
the snapshot could not be started<a name="line.493"></a>
-<span class="sourceLineNo">494</span>   */<a name="line.494"></a>
-<span class="sourceLineNo">495</span>  private synchronized void 
snapshotEnabledTable(SnapshotDescription snapshot)<a name="line.495"></a>
-<span class="sourceLineNo">496</span>      throws HBaseSnapshotException {<a 
name="line.496"></a>
-<span class="sourceLineNo">497</span>    // setup the snapshot<a 
name="line.497"></a>
-<span class="sourceLineNo">498</span>    prepareToTakeSnapshot(snapshot);<a 
name="line.498"></a>
-<span class="sourceLineNo">499</span><a name="line.499"></a>
-<span class="sourceLineNo">500</span>    // Take the snapshot of the enabled 
table<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    EnabledTableSnapshotHandler handler 
=<a name="line.501"></a>
-<span class="sourceLineNo">502</span>        new 
EnabledTableSnapshotHandler(snapshot, master, this);<a name="line.502"></a>
-<span class="sourceLineNo">503</span>    snapshotTable(snapshot, handler);<a 
name="line.503"></a>
-<span class="sourceLineNo">504</span>  }<a name="line.504"></a>
-<span class="sourceLineNo">505</span><a name="line.505"></a>
-<span class="sourceLineNo">506</span>  /**<a name="line.506"></a>
-<span class="sourceLineNo">507</span>   * Take a snapshot using the specified 
handler.<a name="line.507"></a>
-<span class="sourceLineNo">508</span>   * On failure the snapshot temporary 
working directory is removed.<a name="line.508"></a>
-<span class="sourceLineNo">509</span>   * NOTE: prepareToTakeSnapshot() called 
before this one takes care of the rejecting the<a name="line.509"></a>
-<span class="sourceLineNo">510</span>   *       snapshot request if the table 
is busy with another snapshot/restore operation.<a name="line.510"></a>
-<span class="sourceLineNo">511</span>   * @param snapshot the snapshot 
description<a name="line.511"></a>
-<span class="sourceLineNo">512</span>   * @param handler the snapshot 
handler<a name="line.512"></a>
-<span class="sourceLineNo">513</span>   */<a name="line.513"></a>
-<span class="sourceLineNo">514</span>  private synchronized void 
snapshotTable(SnapshotDescription snapshot,<a name="line.514"></a>
-<span class="sourceLineNo">515</span>      final TakeSnapshotHandler handler) 
throws HBaseSnapshotException {<a name="line.515"></a>
-<span class="sourceLineNo">516</span>    try {<a name="line.516"></a>
-<span class="sourceLineNo">517</span>      handler.prepare();<a 
name="line.517"></a>
-<span class="sourceLineNo">518</span>      
this.executorService.submit(handler);<a name="line.518"></a>
-<span class="sourceLineNo">519</span>      
this.snapshotHandlers.put(TableName.valueOf(snapshot.getTable()), handler);<a 
name="line.519"></a>
-<span class="sourceLineNo">520</span>    } catch (Exception e) {<a 
name="line.520"></a>
-<span class="sourceLineNo">521</span>      // cleanup the working directory by 
trying to delete it from the fs.<a name="line.521"></a>
-<span class="sourceLineNo">522</span>      Path workingDir = 
SnapshotDescriptionUtils.getWorkingSnapshotDir(snapshot, rootDir);<a 
name="line.522"></a>
-<span class="sourceLineNo">523</span>      try {<a name="line.523"></a>
-<span class="sourceLineNo">524</span>        if 
(!this.master.getMasterFileSystem().getFileSystem().delete(workingDir, true)) 
{<a name="line.524"></a>
-<span class="sourceLineNo">525</span>          LOG.error("Couldn't delete 
working directory (" + workingDir + " for snapshot:" +<a name="line.525"></a>
-<span class="sourceLineNo">526</span>              
ClientSnapshotDescriptionUtils.toString(snapshot));<a name="line.526"></a>
-<span class="sourceLineNo">527</span>        }<a name="line.527"></a>
-<span class="sourceLineNo">528</span>      } catch (IOException e1) {<a 
name="line.528"></a>
-<span class="sourceLineNo">529</span>        LOG.error("Couldn't delete 
working directory (" + workingDir + " for snapshot:" +<a name="line.529"></a>
-<span class="sourceLineNo">530</span>            
ClientSnapshotDescriptionUtils.toString(snapshot));<a name="line.530"></a>
-<span class="sourceLineNo">531</span>      }<a name="line.531"></a>
-<span class="sourceLineNo">532</span>      // fail the snapshot<a 
name="line.532"></a>
-<span class="sourceLineNo">533</span>      throw new 
SnapshotCreationException("Could not build snapshot handler", e,<a 
name="line.533"></a>
-<span class="sourceLineNo">534</span>        
ProtobufUtil.createSnapshotDesc(snapshot));<a name="line.534"></a>
-<span class="sourceLineNo">535</span>    }<a name="line.535"></a>
-<span class="sourceLineNo">536</span>  }<a name="line.536"></a>
-<span class="sourceLineNo">537</span><a name="line.537"></a>
-<span class="sourceLineNo">538</span>  /**<a name="line.538"></a>
-<span class="sourceLineNo">539</span>   * Take a snapshot based on the 
enabled/disabled state of the table.<a name="line.539"></a>
-<span class="sourceLineNo">540</span>   *<a name="line.540"></a>
-<span class="sourceLineNo">541</span>   * @param snapshot<a 
name="line.541"></a>
-<span class="sourceLineNo">542</span>   * @throws HBaseSnapshotException when 
a snapshot specific exception occurs.<a name="line.542"></a>
-<span class="sourceLineNo">543</span>   * @throws IOException when some sort 
of generic IO exception occurs.<a name="line.543"></a>
-<span class="sourceLineNo">544</span>   */<a name="line.544"></a>
-<span class="sourceLineNo">545</span>  public void 
takeSnapshot(SnapshotDescription snapshot) throws IOException {<a 
name="line.545"></a>
-<span class="sourceLineNo">546</span>    // check to see if we already 
completed the snapshot<a name="line.546"></a>
-<span class="sourceLineNo">547</span>    if (isSnapshotCompleted(snapshot)) 
{<a name="line.547"></a>
-<span class="sourceLineNo">548</span>      throw new 
SnapshotExistsException(<a name="line.548"></a>
-<span class="sourceLineNo">549</span>          "Snapshot '" + 
snapshot.getName() + "' already stored on the filesystem.",<a 
name="line.549"></a>
-<span class="sourceLineNo">550</span>          
ProtobufUtil.createSnapshotDesc(snapshot));<a name="line.550"></a>
-<span class="sourceLineNo">551</span>    }<a name="line.551"></a>
-<span class="sourceLineNo">552</span><a name="line.552"></a>
-<span class="sourceLineNo">553</span>    LOG.debug("No existing snapshot, 
attempting snapshot...");<a name="line.553"></a>
-<span class="sourceLineNo">554</span><a name="line.554"></a>
-<span class="sourceLineNo">555</span>    // stop tracking "abandoned" 
handlers<a name="line.555"></a>
-<span class="sourceLineNo">556</span>    cleanupSentinels();<a 
name="line.556"></a>
-<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span>    // check to see if the table exists<a 
name="line.558"></a>
-<span class="sourceLineNo">559</span>    TableDescriptor desc = null;<a 
name="line.559"></a>
-<span class="sourceLineNo">560</span>    try {<a name="line.560"></a>
-<span class="sourceLineNo">561</span>      desc = 
master.getTableDescriptors().get(<a name="line.561"></a>
-<span class="sourceLineNo">562</span>          
TableName.valueOf(snapshot.getTable()));<a name="line.562"></a>
-<span class="sourceLineNo">563</span>    } catch (FileNotFoundException e) {<a 
name="line.563"></a>
-<span class="sourceLineNo">564</span>      String msg = "Table:" + 
snapshot.getTable() + " info doesn't exist!";<a name="line.564"></a>
-<span class="sourceLineNo">565</span>      LOG.error(msg);<a 
name="line.565"></a>
-<span class="sourceLineNo">566</span>      throw new 
SnapshotCreationException(msg, e, ProtobufUtil.createSnapshotDesc(snapshot));<a 
name="line.566"></a>
-<span class="sourceLineNo">567</span>    } catch (IOException e) {<a 
name="line.567"></a>
-<span class="sourceLineNo">568</span>      throw new 
SnapshotCreationException(<a name="line.568"></a>
-<span class="sourceLineNo">569</span>          "Error while geting table 
description for table " + snapshot.getTable(), e,<a name="line.569"></a>
-<span class="sourceLineNo">570</span>          
ProtobufUtil.createSnapshotDesc(snapshot));<a name="line.570"></a>
-<span class="sourceLineNo">571</span>    }<a name="line.571"></a>
-<span class="sourceLineNo">572</span>    if (desc == null) {<a 
name="line.572"></a>
-<span class="sourceLineNo">573</span>      throw new 
SnapshotCreationException(<a name="line.573"></a>
-<span class="sourceLineNo">574</span>          "Table '" + snapshot.getTable() 
+ "' doesn't exist, can't take snapshot.",<a name="line.574"></a>
-<span class="sourceLineNo">575</span>          
ProtobufUtil.createSnapshotDesc(snapshot));<a name="line.575"></a>
-<span class="sourceLineNo">576</span>    }<a name="line.576"></a>
-<span class="sourceLineNo">577</span>    SnapshotDescription.Builder builder = 
snapshot.toBuilder();<a name="line.577"></a>
-<span class="sourceLineNo">578</span>    // if not specified, set the snapshot 
format<a name="line.578"></a>
-<span class="sourceLineNo">579</span>    if (!snapshot.hasVersion()) {<a 
name="line.579"></a>
-<span class="sourceLineNo">580</span>      
builder.setVersion(SnapshotDescriptionUtils.SNAPSHOT_LAYOUT_VERSION);<a 
name="line.580"></a>
-<span class="sourceLineNo">581</span>    }<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    User user = 
RpcServer.getRequestUser();<a name="line.582"></a>
-<span class="sourceLineNo">583</span>    if 
(User.isHBaseSecurityEnabled(master.getConfiguration()) &amp;&amp; user != 
null) {<a name="line.583"></a>
-<span class="sourceLineNo">584</span>      
builder.setOwner(user.getShortName());<a name="line.584"></a>
-<span class="sourceLineNo">585</span>    }<a name="line.585"></a>
-<span class="sourceLineNo">586</span>    snapshot = builder.build();<a 
name="line.586"></a>
-<span class="sourceLineNo">587</span><a name="line.587"></a>
-<span class="sourceLineNo">588</span>    // call pre coproc hook<a 
name="line.588"></a>
-<span class="sourceLineNo">589</span>    MasterCoprocessorHost cpHost = 
master.getMasterCoprocessorHost();<a name="line.589"></a>
-<span class="sourceLineNo">590</span>    if (cpHost != null) {<a 
name="line.590"></a>
-<span class="sourceLineNo">591</span>      cpHost.preSnapshot(snapshot, 
desc);<a name="line.591"></a>
+<span class="sourceLineNo">451</span>    // make sure we aren't running a 
restore on the same table<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    if (isRestoringTable(snapshotTable)) 
{<a name="line.452"></a>
+<span class="sourceLineNo">453</span>      throw new 
SnapshotCreationException("Rejected taking "<a name="line.453"></a>
+<span class="sourceLineNo">454</span>          + 
ClientSnapshotDescriptionUtils.toString(snapshot)<a name="line.454"></a>
+<span class="sourceLineNo">455</span>          + " because we are already have 
a restore in progress on the same snapshot.");<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>    try {<a name="line.458"></a>
+<span class="sourceLineNo">459</span>      // delete the working directory, 
since we aren't running the snapshot. Likely leftovers<a name="line.459"></a>
+<span class="sourceLineNo">460</span>      // from a failed attempt.<a 
name="line.460"></a>
+<span class="sourceLineNo">461</span>      fs.delete(workingDir, true);<a 
name="line.461"></a>
+<span class="sourceLineNo">462</span><a name="line.462"></a>
+<span class="sourceLineNo">463</span>      // recreate the working directory 
for the snapshot<a name="line.463"></a>
+<span class="sourceLineNo">464</span>      if (!fs.mkdirs(workingDir)) {<a 
name="line.464"></a>
+<span class="sourceLineNo">465</span>        throw new 
SnapshotCreationException(<a name="line.465"></a>
+<span class="sourceLineNo">466</span>            "Couldn't create working 
directory (" + workingDir + ") for snapshot",<a name="line.466"></a>
+<span class="sourceLineNo">467</span>            
ProtobufUtil.createSnapshotDesc(snapshot));<a name="line.467"></a>
+<span class="sourceLineNo">468</span>      }<a name="line.468"></a>
+<span class="sourceLineNo">469</span>    } catch (HBaseSnapshotException e) 
{<a name="line.469"></a>
+<span class="sourceLineNo">470</span>      throw e;<a name="line.470"></a>
+<span class="sourceLineNo">471</span>    } catch (IOException e) {<a 
name="line.471"></a>
+<span class="sourceLineNo">472</span>      throw new 
SnapshotCreationException(<a name="line.472"></a>
+<span class="sourceLineNo">473</span>          "Exception while checking to 
see if snapshot could be started.", e,<a name="line.473"></a>
+<span class="sourceLineNo">474</span>          
ProtobufUtil.createSnapshotDesc(snapshot));<a name="line.474"></a>
+<span class="sourceLineNo">475</span>    }<a name="line.475"></a>
+<span class="sourceLineNo">476</span>  }<a name="line.476"></a>
+<span class="sourceLineNo">477</span><a name="line.477"></a>
+<span class="sourceLineNo">478</span>  /**<a name="line.478"></a>
+<span class="sourceLineNo">479</span>   * Take a snapshot of a disabled 
table.<a name="line.479"></a>
+<span class="sourceLineNo">480</span>   * @param snapshot description of the 
snapshot to take. Modified to be {@link Type#DISABLED}.<a name="line.480"></a>
+<span class="sourceLineNo">481</span>   * @throws HBaseSnapshotException if 
the snapshot could not be started<a name="line.481"></a>
+<span class="sourceLineNo">482</span>   */<a name="line.482"></a>
+<span class="sourceLineNo">483</span>  private synchronized void 
snapshotDisabledTable(SnapshotDescription snapshot)<a name="line.483"></a>
+<span class="sourceLineNo">484</span>      throws HBaseSnapshotException {<a 
name="line.484"></a>
+<span class="sourceLineNo">485</span>    // setup the snapshot<a 
name="line.485"></a>
+<span class="sourceLineNo">486</span>    prepareToTakeSnapshot(snapshot);<a 
name="line.486"></a>
+<span class="sourceLineNo">487</span><a name="line.487"></a>
+<span class="sourceLineNo">488</span>    // set the snapshot to be a disabled 
snapshot, since the client doesn't know about that<a name="line.488"></a>
+<span class="sourceLineNo">489</span>    snapshot = 
snapshot.toBuilder().setType(Type.DISABLED).build();<a name="line.489"></a>
+<span class="sourceLineNo">490</span><a name="line.490"></a>
+<span class="sourceLineNo">491</span>    // Take the snapshot of the disabled 
table<a name="line.491"></a>
+<span class="sourceLineNo">492</span>    DisabledTableSnapshotHandler handler 
=<a name="line.492"></a>
+<span class="sourceLineNo">493</span>        new 
DisabledTableSnapshotHandler(snapshot, master, this);<a name="line.493"></a>
+<span class="sourceLineNo">494</span>    snapshotTable(snapshot, handler);<a 
name="line.494"></a>
+<span class="sourceLineNo">495</span>  }<a name="line.495"></a>
+<span class="sourceLineNo">496</span><a name="line.496"></a>
+<span class="sourceLineNo">497</span>  /**<a name="line.497"></a>
+<span class="sourceLineNo">498</span>   * Take a snapshot of an enabled 
table.<a name="line.498"></a>
+<span class="sourceLineNo">499</span>   * @param snapshot description of the 
snapshot to take.<a name="line.499"></a>
+<span class="sourceLineNo">500</span>   * @throws HBaseSnapshotException if 
the snapshot could not be started<a name="line.500"></a>
+<span class="sourceLineNo">501</span>   */<a name="line.501"></a>
+<span class="sourceLineNo">502</span>  private synchronized void 
snapshotEnabledTable(SnapshotDescription snapshot)<a name="line.502"></a>
+<span class="sourceLineNo">503</span>      throws HBaseSnapshotException {<a 
name="line.503"></a>
+<span class="sourceLineNo">504</span>    // setup the snapshot<a 
name="line.504"></a>
+<span class="sourceLineNo">505</span>    prepareToTakeSnapshot(snapshot);<a 
name="line.505"></a>
+<span class="sourceLineNo">506</span><a name="line.506"></a>
+<span class="sourceLineNo">507</span>    // Take the snapshot of the enabled 
table<a name="line.507"></a>
+<span class="sourceLineNo">508</span>    EnabledTableSnapshotHandler handler 
=<a name="line.508"></a>
+<span class="sourceLineNo">509</span>        new 
EnabledTableSnapshotHandler(snapshot, master, this);<a name="line.509"></a>
+<span class="sourceLineNo">510</span>    snapshotTable(snapshot, handler);<a 
name="line.510"></a>
+<span class="sourceLineNo">511</span>  }<a name="line.511"></a>
+<span class="sourceLineNo">512</span><a name="line.512"></a>
+<span class="sourceLineNo">513</span>  /**<a name="line.513"></a>
+<span class="sourceLineNo">514</span>   * Take a snapshot using the specified 
handler.<a name="line.514"></a>
+<span class="sourceLineNo">515</span>   * On failure the snapshot temporary 
working directory is removed.<a name="line.515"></a>
+<span class="sourceLineNo">516</span>   * NOTE: prepareToTakeSnapshot() called 
before this one takes care of the rejecting the<a name="line.516"></a>
+<span class="sourceLineNo">517</span>   *       snapshot request if the table 
is busy with another snapshot/restore operation.<a name="line.517"></a>
+<span class="sourceLineNo">518</span>   * @param snapshot the snapshot 
description<a name="line.518"></a>
+<span class="sourceLineNo">519</span>   * @param handler the snapshot 
handler<a name="line.519"></a>
+<span class="sourceLineNo">520</span>   */<a name="line.520"></a>
+<span class="sourceLineNo">521</span>  private synchronized void 
snapshotTable(SnapshotDescription snapshot,<a name="line.521"></a>
+<span class="sourceLineNo">522</span>      final TakeSnapshotHandler handler) 
throws HBaseSnapshotException {<a name="line.522"></a>
+<span class="sourceLineNo">523</span>    try {<a name="line.523"></a>
+<span class="sourceLineNo">524</span>      handler.prepare();<a 
name="line.524"></a>
+<span class="sourceLineNo">525</span>      
this.executorService.submit(handler);<a name="line.525"></a>
+<span class="sourceLineNo">526</span>      
this.snapshotHandlers.put(TableName.valueOf(snapshot.getTable()), handler);<a 
name="line.526"></a>
+<span class="sourceLineNo">527</span>    } catch (Exception e) {<a 
name="line.527"></a>
+<span class="sourceLineNo">528</span>      // cleanup the working directory by 
trying to delete it from the fs.<a name="line.528"></a>
+<span class="sourceLineNo">529</span>      Path workingDir = 
SnapshotDescriptionUtils.getWorkingSnapshotDir(snapshot, rootDir);<a 
name="line.529"></a>
+<span class="sourceLineNo">530</span>      try {<a name="line.530"></a>
+<span class="sourceLineNo">531</span>        if 
(!this.master.getMasterFileSystem().getFileSystem().delete(workingDir, true)) 
{<a name="line.531"></a>
+<span class="sourceLineNo">532</span>          LOG.error("Couldn't delete 
working directory (" + workingDir + " for snapshot:" +<a name="line.532"></a>
+<span class="sourceLineNo">533</span>              
ClientSnapshotDescriptionUtils.toString(snapshot));<a name="line.533"></a>
+<span class="sourceLineNo">534</span>        }<a name="line.534"></a>
+<span class="sourceLineNo">535</span>      } catch (IOException e1) {<a 
name="line.535"></a>
+<span class="sourceLineNo">536</span>        LOG.error("Couldn't delete 
working directory (" + workingDir + " for snapshot:" +<a name="line.536"></a>
+<span class="sourceLineNo">537</span>            
ClientSnapshotDescriptionUtils.toString(snapshot));<a name="line.537"></a>
+<span class="sourceLineNo">538</span>      }<a name="line.538"></a>
+<span class="sourceLineNo">539</span>      // fail the snapshot<a 
name="line.539"></a>
+<span class="sourceLineNo">540</span>      throw new 
SnapshotCreationException("Could not build snapshot handler", e,<a 
name="line.540"></a>
+<span class="sourceLineNo">541</span>        
ProtobufUtil.createSnapshotDesc(snapshot));<a name="line.541"></a>
+<span class="sourceLineNo">542</span>    }<a name="line.542"></a>
+<span class="sourceLineNo">543</span>  }<a name="line.543"></a>
+<span class="sourceLineNo">544</span><a name="line.544"></a>
+<span class="sourceLineNo">545</span>  /**<a name="line.545"></a>
+<span class="sourceLineNo">546</span>   * Take a snapshot based on the 
enabled/disabled state of the table.<a name="line.546"></a>
+<span class="sourceLineNo">547</span>   *<a name="line.547"></a>
+<span class="sourceLineNo">548</span>   * @param snapshot<a 
name="line.548"></a>
+<span class="sourceLineNo">549</span>   * @throws HBaseSnapshotException when 
a snapshot specific exception occurs.<a name="line.549"></a>
+<span class="sourceLineNo">550</span>   * @throws IOException when some sort 
of generic IO exception occurs.<a name="line.550"></a>
+<span class="sourceLineNo">551</span>   */<a name="line.551"></a>
+<span class="sourceLineNo">552</span>  public void 
takeSnapshot(SnapshotDescription snapshot) throws IOException {<a 
name="line.552"></a>
+<span class="sourceLineNo">553</span>    // check to see if we already 
completed the snapshot<a name="line.553"></a>
+<span class="sourceLineNo">554</span>    if (isSnapshotCompleted(snapshot)) 
{<a name="line.554"></a>
+<span class="sourceLineNo">555</span>      throw new 
SnapshotExistsException(<a name="line.555"></a>
+<span class="sourceLineNo">556</span>          "Snapshot '" + 
snapshot.getName() + "' already stored on the filesystem.",<a 
name="line.556"></a>
+<span class="sourceLineNo">557</span>          
ProtobufUtil.createSnapshotDesc(snapshot));<a name="line.557"></a>
+<span class="sourceLineNo">558</span>    }<a name="line.558"></a>
+<span class="sourceLineNo">559</span><a name="line.559"></a>
+<span class="sourceLineNo">560</span>    LOG.debug("No existing snapshot, 
attempting snapshot...");<a name="line.560"></a>
+<span class="sourceLineNo">561</span><a name="line.561"></a>
+<span class="sourceLineNo">562</span>    // stop tracking "abandoned" 
handlers<a name="line.562"></a>
+<span class="sourceLineNo">563</span>    cleanupSentinels();<a 
name="line.563"></a>
+<span class="sourceLineNo">564</span><a name="line.564"></a>
+<span class="sourceLineNo">565</span>    // check to see if the table exists<a 
name="line.565"></a>
+<span class="sourceLineNo">566</span>    TableDescriptor desc = null;<a 
name="line.566"></a>
+<span class="sourceLineNo">567</span>    try {<a name="line.567"></a>
+<span class="sourceLineNo">568</span>      desc = 
master.getTableDescriptors().get(<a name="line.568"></a>
+<span class="sourceLineNo">569</span>          
TableName.valueOf(snapshot.getTable()));<a name="line.569"></a>
+<span class="sourceLineNo">570</span>    } catch (FileNotFoundException e) {<a 
name="line.570"></a>
+<span class="sourceLineNo">571</span>      String msg = "Table:" + 
snapshot.getTable() + " info doesn't exist!";<a name="line.571"></a>
+<span class="sourceLineNo">572</span>      LOG.error(msg);<a 
name="line.572"></a>
+<span class="sourceLineNo">573</span>      throw new 
SnapshotCreationException(msg, e, ProtobufUtil.createSnapshotDesc(snapshot));<a 
name="line.573"></a>
+<span class="sourceLineNo">574</span>    } catch (IOException e) {<a 
name="line.574"></a>
+<span class="sourceLineNo">575</span>      throw new 
SnapshotCreationException(<a name="line.575"></a>
+<span class="sourceLineNo">576</span>          "Error while geting table 
description for table " + snapshot.getTable(), e,<a name="line.576"></a>
+<span class="sourceLineNo">577</span>          
ProtobufUtil.createSnapshotDesc(snapshot));<a name="line.577"></a>
+<span class="sourceLineNo">578</span>    }<a name="line.578"></a>
+<span class="sourceLineNo">579</span>    if (desc == null) {<a 
name="line.579"></a>
+<span class="sourceLineNo">580</span>      throw new 
SnapshotCreationException(<a name="line.580"></a>
+<span class="sourceLineNo">581</span>          "Table '" + snapshot.getTable() 
+ "' doesn't exist, can't take snapshot.",<a name="line.581"></a>
+<span class="sourceLineNo">582</span>          
ProtobufUtil.createSnapshotDesc(snapshot));<a name="line.582"></a>
+<span class="sourceLineNo">583</span>    }<a name="line.583"></a>
+<span class="sourceLineNo">584</span>    SnapshotDescription.Builder builder = 
snapshot.toBuilder();<a name="line.584"></a>
+<span class="sourceLineNo">585</span>    // if not specified, set the snapshot 
format<a name="line.585"></a>
+<span class="sourceLineNo">586</span>    if (!snapshot.hasVersion()) {<a 
name="line.586"></a>
+<span class="sourceLineNo">587</span>      
builder.setVersion(SnapshotDescriptionUtils.SNAPSHOT_LAYOUT_VERSION);<a 
name="line.587"></a>
+<span class="sourceLineNo">588</span>    }<a name="line.588"></a>
+<span class="sourceLineNo">589</span>    User user = 
RpcServer.getRequestUser();<a name="line.589"></a>
+<span class="sourceLineNo">590</span>    if 
(User.isHBaseSecurityEnabled(master.getConfiguration()) &amp;&amp; user != 
null) {<a name="line.590"></a>
+<span class="sourceLineNo">591</span>      
builder.setOwner(user.getShortName());<a name="line.591"></a>
 <span class="sourceLineNo">592</span>    }<a name="line.592"></a>
-<span class="sourceLineNo">593</span><a name="line.593"></a>
-<span class="sourceLineNo">594</span>    // if the table is enabled, then have 
the RS run actually the snapshot work<a name="line.594"></a>
-<span class="sourceLineNo">595</span>    TableName snapshotTable = 
TableName.valueOf(snapshot.getTable());<a name="line.595"></a>
-<span class="sourceLineNo">596</span>    if 
(master.getTableStateManager().isTableState(snapshotTable,<a 
name="line.596"></a>
-<span class="sourceLineNo">597</span>        TableState.State.ENABLED)) {<a 
name="line.597"></a>
-<span class="sourceLineNo">598</span>      LOG.debug("Table enabled, starting 
distributed snapshot.");<a name="line.598"></a>
-<span class="sourceLineNo">599</span>      snapshotEnabledTable(snapshot);<a 
name="line.599"></a>
-<span class="sourceLineNo">600</span>      LOG.debug("Started snapshot: " + 
ClientSnapshotDescriptionUtils.toString(snapshot));<a name="line.600"></a>
+<span class="sourceLineNo">593</span>    snapshot = builder.build();<a 
name="line.593"></a>
+<span class="sourceLineNo">594</span><a name="line.594"></a>
+<span class="sourceLineNo">595</span>    // call pre coproc hook<a 
name="line.595"></a>
+<span class="sourceLineNo">596</span>    MasterCoprocessorHost cpHost = 
master.getMasterCoprocessorHost();<a name="line.596"></a>
+<span class="sourceLineNo">597</span>    
org.apache.hadoop.hbase.client.SnapshotDescription snapshotPOJO = null;<a 
name="line.597"></a>
+<span class="sourceLineNo">598</span>    if (cpHost != null) {<a 
name="line.598"></a>
+<span class="sourceLineNo">599</span>      snapshotPOJO = 
ProtobufUtil.createSnapshotDesc(snapshot);<a name="line.599"></a>
+<span class="sourceLineNo">600</span>      cpHost.preSnapshot(snapshotPOJO, 
desc);<a name="line.600"></a>
 <span class="sourceLineNo">601</span>    }<a name="line.601"></a>
-<span class="sourceLineNo">602</span>    // For disabled table, snapshot is 
created by the master<a name="line.602"></a>
-<span class="sourceLineNo">603</span>    else if 
(master.getTableStateManager().isTableState(snapshotTable,<a 
name="line.603"></a>
-<span class="sourceLineNo">604</span>        TableState.State.DISABLED)) {<a 
name="line.604"></a>
-<span class="sourceLineNo">605</span>      LOG.debug("Table is disabled, 
running snapshot entirely on master.");<a name="line.605"></a>
-<span class="sourceLineNo">606</span>      snapshotDisabledTable(snapshot);<a 
name="line.606"></a>
-<span class="sourceLineNo">607</span>      LOG.debug("Started snapshot: " + 
ClientSnapshotDescriptionUtils.toString(snapshot));<a name="line.607"></a>
-<span class="sourceLineNo">608</span>    } else {<a name="line.608"></a>
-<span class="sourceLineNo">609</span>      LOG.error("Can't snapshot table '" 
+ snapshot.getTable()<a name="line.609"></a>
-<span class="sourceLineNo">610</span>          + "', isn't open or closed, we 
don't know what to do!");<a name="line.610"></a>
-<span class="sourceLineNo">611</span>      TablePartiallyOpenException tpoe = 
new TablePartiallyOpenException(snapshot.getTable()<a name="line.611"></a>
-<span class="sourceLineNo">612</span>          + " isn't fully open.");<a 
name="line.612"></a>
-<span class="sourceLineNo">613</span>      throw new 
SnapshotCreationException("Table is not entirely open or closed", tpoe,<a 
name="line.613"></a>
-<span class="sourceLineNo">614</span>        
ProtobufUtil.createSnapshotDesc(snapshot));<a name="line.614"></a>
-<span class="sourceLineNo">615</span>    }<a name="line.615"></a>
-<span class="sourceLineNo">616</span><a name="line.616"></a>
-<span class="sourceLineNo">617</span>    // call post coproc hook<a 
name="line.617"></a>
-<span class="sourceLineNo">618</span>    if (cpHost != null) {<a 
name="line.618"></a>
-<span class="sourceLineNo">619</span>      cpHost.postSnapshot(snapshot, 
desc);<a name="line.619"></a>
-<span class="sourceLineNo">620</span>    }<a name="line.620"></a>
-<span class="sourceLineNo">621</span>  }<a name="line.621"></a>
-<span class="sourceLineNo">622</span><a name="line.622"></a>
-<span class="sourceLineNo">623</span>  /**<a name="line.623"></a>
-<span class="sourceLineNo">624</span>   * Set the handler for the current 
snapshot<a name="line.624"></a>
-<span class="sourceLineNo">625</span>   * &lt;p&gt;<a name="line.625"></a>
-<span class="sourceLineNo">626</span>   * Exposed for TESTING<a 
name="line.626"></a>
-<span class="sourceLineNo">627</span>   * @param tableName<a 
name="line.627"></a>
-<span class="sourceLineNo">628</span>   * @param handler handler the master 
should use<a name="line.628"></a>
-<span class="sourceLineNo">629</span>   *<a name="line.629"></a>
-<span class="sourceLineNo">630</span>   * TODO get rid of this if possible, 
repackaging, modify tests.<a name="line.630"></a>
-<span class="sourceLineNo">631</span>   */<a name="line.631"></a>
-<span class="sourceLineNo">632</span>  public synchronized void 
setSnapshotHandlerForTesting(<a name="line.632"></a>
-<span class="sourceLineNo">633</span>      final TableName tableName,<a 
name="line.633"></a>
-<span class="sourceLineNo">634</span>      final SnapshotSentinel handler) {<a 
name="line.634"></a>
-<span class="sourceLineNo">635</span>    if (handler != null) {<a 
name="line.635"></a>
-<span class="sourceLineNo">636</span>      
this.snapshotHandlers.put(tableName, handler);<a name="line.636"></a>
-<span class="sourceLineNo">637</span>    } else {<a name="line.637"></a>
-<span class="sourceLineNo">638</span>      
this.snapshotHandlers.remove(tableName);<a name="line.638"></a>
-<span class="sourceLineNo">639</span>    }<a name="line.639"></a>
-<span class="sourceLineNo">640</span>  }<a name="line.640"></a>
-<span class="sourceLineNo">641</span><a name="line.641"></a>
-<span class="sourceLineNo">642</span>  /**<a name="line.642"></a>
-<span class="sourceLineNo">643</span>   * @return distributed commit 
coordinator for all running snapshots<a name="line.643"></a>
-<span class="sourceLineNo">644</span>   */<a name="line.644"></a>
-<span class="sourceLineNo">645</span>  ProcedureCoordinator getCoordinator() 
{<a name="line.645"></a>
-<span class="sourceLineNo">646</span>    return coordinator;<a 
name="line.646"></a>
-<span class="sourceLineNo">647</span>  }<a name="line.647"></a>
-<span class="sourceLineNo">648</span><a name="line.648"></a>
-<span class="sourceLineNo">649</span>  /**<a name="line.649"></a>
-<span class="sourceLineNo">650</span>   * Check to see if the snapshot is one 
of the currently completed snapshots<a name="line.650"></a>
-<span class="sourceLineNo">651</span>   * Returns true if the snapshot exists 
in the "completed snapshots folder".<a name="line.651"></a>
-<span class="sourceLineNo">652</span>   *<a name="line.652"></a>
-<span class="sourceLineNo">653</span>   * @param snapshot expected snapshot to 
check<a name="line.653"></a>
-<span class="sourceLineNo">654</span>   * @return &lt;tt&gt;true&lt;/tt&gt; if 
the snapshot is stored on the {@link FileSystem}, &lt;tt&gt;false&lt;/tt&gt; if 
is<a name="line.654"></a>
-<span class="sourceLineNo">655</span>   *         not stored<a 
name="line.655"></a>
-<span class="sourceLineNo">656</span>   * @throws IOException if the 
filesystem throws an unexpected exception,<a name="line.656"></a>
-<span class="sourceLineNo">657</span>   * @throws IllegalArgumentException if 
snapshot name is invalid.<a name="line.657"></a>
-<span class="sourceLineNo">658</span>   */<a name="line.658"></a>
-<span class="sourceLineNo">659</span>  private boolean 
isSnapshotCompleted(SnapshotDescription snapshot) throws IOException {<a 
name="line.659"></a>
-<span class="sourceLineNo">660</span>    try {<a name="line.660"></a>
-<span class="sourceLineNo">661</span>      final Path snapshotDir = 
SnapshotDescriptionUtils.getCompletedSnapshotDir(snapshot, rootDir);<a 
name="line.661"></a>
-<span class="sourceLineNo">662</span>      FileSystem fs = 
master.getMasterFileSystem().getFileSystem();<a name="line.662"></a>
-<span class="sourceLineNo">663</span>      // check to see if the snapshot 
already exists<a name="line.663"></a>
-<span class="sourceLineNo">664</span>      return fs.exists(snapshotDir);<a 
name="line.664"></a>
-<span class="sourceLineNo">665</span>    } catch (IllegalArgumentException 
iae) {<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      throw new 
UnknownSnapshotException("Unexpected exception thrown", iae);<a 
name="line.666"></a>
-<span class="sourceLineNo">667</span>    }<a name="line.667"></a>
-<span class="sourceLineNo">668</span>  }<a name="line.668"></a>
-<span class="sourceLineNo">669</span><a name="line.669"></a>
-<span class="sourceLineNo">670</span>  /**<a name="line.670"></a>
-<span class="sourceLineNo">671</span>   * Clone the specified snapshot.<a 
name="line.671"></a>
-<span class="sourceLineNo">672</span>   * The clone will fail if the 
destination table has a snapshot or restore in progress.<a name="line.672"></a>
-<span class="sourceLineNo">673</span>   *<a name="line.673"></a>
-<span class="sourceLineNo">674</span> 

<TRUNCATED>

Reply via email to