You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/07/22 09:30:43 UTC
[05/51] [partial] hbase-site git commit: Published site at
b4759ce6e72f50ccd9d410bd5917dc5a515414f1.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/df8fd1d3/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RestoreSnapshotProcedure.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RestoreSnapshotProcedure.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RestoreSnapshotProcedure.html
index b341b0d..10ab3d1 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RestoreSnapshotProcedure.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RestoreSnapshotProcedure.html
@@ -42,473 +42,534 @@
<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.TableNotFoundException;<a name="line.34"></a>
<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.35"></a>
<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.client.TableDescriptor;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.errorhandling.ForeignException;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.errorhandling.ForeignExceptionDispatcher;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.master.MasterFileSystem;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.master.MetricsSnapshot;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.monitoring.MonitoredTask;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.monitoring.TaskMonitor;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.snapshot.ClientSnapshotDescriptionUtils;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.snapshot.RestoreSnapshotHelper;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.snapshot.SnapshotDescriptionUtils;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.snapshot.SnapshotManifest;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.slf4j.Logger;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.slf4j.LoggerFactory;<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.HBaseProtos;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.RestoreSnapshotState;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDescription;<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span>@InterfaceAudience.Private<a name="line.59"></a>
-<span class="sourceLineNo">060</span>public class RestoreSnapshotProcedure<a name="line.60"></a>
-<span class="sourceLineNo">061</span> extends AbstractStateMachineTableProcedure<RestoreSnapshotState> {<a name="line.61"></a>
-<span class="sourceLineNo">062</span> private static final Logger LOG = LoggerFactory.getLogger(RestoreSnapshotProcedure.class);<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span> private TableDescriptor modifiedTableDescriptor;<a name="line.64"></a>
-<span class="sourceLineNo">065</span> private List<RegionInfo> regionsToRestore = null;<a name="line.65"></a>
-<span class="sourceLineNo">066</span> private List<RegionInfo> regionsToRemove = null;<a name="line.66"></a>
-<span class="sourceLineNo">067</span> private List<RegionInfo> regionsToAdd = null;<a name="line.67"></a>
-<span class="sourceLineNo">068</span> private Map<String, Pair<String, String>> parentsToChildrenPairMap = new HashMap<>();<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span> private SnapshotDescription snapshot;<a name="line.70"></a>
-<span class="sourceLineNo">071</span> private boolean restoreAcl;<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span> // Monitor<a name="line.73"></a>
-<span class="sourceLineNo">074</span> private MonitoredTask monitorStatus = null;<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span> private Boolean traceEnabled = null;<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span> /**<a name="line.78"></a>
-<span class="sourceLineNo">079</span> * Constructor (for failover)<a name="line.79"></a>
-<span class="sourceLineNo">080</span> */<a name="line.80"></a>
-<span class="sourceLineNo">081</span> public RestoreSnapshotProcedure() {<a name="line.81"></a>
-<span class="sourceLineNo">082</span> }<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span> public RestoreSnapshotProcedure(final MasterProcedureEnv env,<a name="line.84"></a>
-<span class="sourceLineNo">085</span> final TableDescriptor tableDescriptor, final SnapshotDescription snapshot)<a name="line.85"></a>
-<span class="sourceLineNo">086</span> throws HBaseIOException {<a name="line.86"></a>
-<span class="sourceLineNo">087</span> this(env, tableDescriptor, snapshot, false);<a name="line.87"></a>
-<span class="sourceLineNo">088</span> }<a name="line.88"></a>
-<span class="sourceLineNo">089</span> /**<a name="line.89"></a>
-<span class="sourceLineNo">090</span> * Constructor<a name="line.90"></a>
-<span class="sourceLineNo">091</span> * @param env MasterProcedureEnv<a name="line.91"></a>
-<span class="sourceLineNo">092</span> * @param tableDescriptor the table to operate on<a name="line.92"></a>
-<span class="sourceLineNo">093</span> * @param snapshot snapshot to restore from<a name="line.93"></a>
-<span class="sourceLineNo">094</span> * @throws IOException<a name="line.94"></a>
-<span class="sourceLineNo">095</span> */<a name="line.95"></a>
-<span class="sourceLineNo">096</span> public RestoreSnapshotProcedure(<a name="line.96"></a>
-<span class="sourceLineNo">097</span> final MasterProcedureEnv env,<a name="line.97"></a>
-<span class="sourceLineNo">098</span> final TableDescriptor tableDescriptor,<a name="line.98"></a>
-<span class="sourceLineNo">099</span> final SnapshotDescription snapshot,<a name="line.99"></a>
-<span class="sourceLineNo">100</span> final boolean restoreAcl)<a name="line.100"></a>
-<span class="sourceLineNo">101</span> throws HBaseIOException {<a name="line.101"></a>
-<span class="sourceLineNo">102</span> super(env);<a name="line.102"></a>
-<span class="sourceLineNo">103</span> // This is the new schema we are going to write out as this modification.<a name="line.103"></a>
-<span class="sourceLineNo">104</span> this.modifiedTableDescriptor = tableDescriptor;<a name="line.104"></a>
-<span class="sourceLineNo">105</span> preflightChecks(env, null/*Table can be online when restore is called?*/);<a name="line.105"></a>
-<span class="sourceLineNo">106</span> // Snapshot information<a name="line.106"></a>
-<span class="sourceLineNo">107</span> this.snapshot = snapshot;<a name="line.107"></a>
-<span class="sourceLineNo">108</span> this.restoreAcl = restoreAcl;<a name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span> // Monitor<a name="line.110"></a>
-<span class="sourceLineNo">111</span> getMonitorStatus();<a name="line.111"></a>
-<span class="sourceLineNo">112</span> }<a name="line.112"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.client.RegionReplicaUtil;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.client.TableDescriptor;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.errorhandling.ForeignException;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.errorhandling.ForeignExceptionDispatcher;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.favored.FavoredNodesManager;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.master.MasterFileSystem;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.master.MetricsSnapshot;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.master.RegionState;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.master.assignment.AssignmentManager;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.monitoring.MonitoredTask;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.monitoring.TaskMonitor;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.snapshot.ClientSnapshotDescriptionUtils;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.snapshot.RestoreSnapshotHelper;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.snapshot.SnapshotDescriptionUtils;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.snapshot.SnapshotManifest;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.slf4j.Logger;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.slf4j.LoggerFactory;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.RestoreSnapshotState;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDescription;<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span>@InterfaceAudience.Private<a name="line.63"></a>
+<span class="sourceLineNo">064</span>public class RestoreSnapshotProcedure<a name="line.64"></a>
+<span class="sourceLineNo">065</span> extends AbstractStateMachineTableProcedure<RestoreSnapshotState> {<a name="line.65"></a>
+<span class="sourceLineNo">066</span> private static final Logger LOG = LoggerFactory.getLogger(RestoreSnapshotProcedure.class);<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span> private TableDescriptor modifiedTableDescriptor;<a name="line.68"></a>
+<span class="sourceLineNo">069</span> private List<RegionInfo> regionsToRestore = null;<a name="line.69"></a>
+<span class="sourceLineNo">070</span> private List<RegionInfo> regionsToRemove = null;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> private List<RegionInfo> regionsToAdd = null;<a name="line.71"></a>
+<span class="sourceLineNo">072</span> private Map<String, Pair<String, String>> parentsToChildrenPairMap = new HashMap<>();<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span> private SnapshotDescription snapshot;<a name="line.74"></a>
+<span class="sourceLineNo">075</span> private boolean restoreAcl;<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span> // Monitor<a name="line.77"></a>
+<span class="sourceLineNo">078</span> private MonitoredTask monitorStatus = null;<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span> private Boolean traceEnabled = null;<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span> /**<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * Constructor (for failover)<a name="line.83"></a>
+<span class="sourceLineNo">084</span> */<a name="line.84"></a>
+<span class="sourceLineNo">085</span> public RestoreSnapshotProcedure() {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> }<a name="line.86"></a>
+<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">088</span> public RestoreSnapshotProcedure(final MasterProcedureEnv env,<a name="line.88"></a>
+<span class="sourceLineNo">089</span> final TableDescriptor tableDescriptor, final SnapshotDescription snapshot)<a name="line.89"></a>
+<span class="sourceLineNo">090</span> throws HBaseIOException {<a name="line.90"></a>
+<span class="sourceLineNo">091</span> this(env, tableDescriptor, snapshot, false);<a name="line.91"></a>
+<span class="sourceLineNo">092</span> }<a name="line.92"></a>
+<span class="sourceLineNo">093</span> /**<a name="line.93"></a>
+<span class="sourceLineNo">094</span> * Constructor<a name="line.94"></a>
+<span class="sourceLineNo">095</span> * @param env MasterProcedureEnv<a name="line.95"></a>
+<span class="sourceLineNo">096</span> * @param tableDescriptor the table to operate on<a name="line.96"></a>
+<span class="sourceLineNo">097</span> * @param snapshot snapshot to restore from<a name="line.97"></a>
+<span class="sourceLineNo">098</span> * @throws IOException<a name="line.98"></a>
+<span class="sourceLineNo">099</span> */<a name="line.99"></a>
+<span class="sourceLineNo">100</span> public RestoreSnapshotProcedure(<a name="line.100"></a>
+<span class="sourceLineNo">101</span> final MasterProcedureEnv env,<a name="line.101"></a>
+<span class="sourceLineNo">102</span> final TableDescriptor tableDescriptor,<a name="line.102"></a>
+<span class="sourceLineNo">103</span> final SnapshotDescription snapshot,<a name="line.103"></a>
+<span class="sourceLineNo">104</span> final boolean restoreAcl)<a name="line.104"></a>
+<span class="sourceLineNo">105</span> throws HBaseIOException {<a name="line.105"></a>
+<span class="sourceLineNo">106</span> super(env);<a name="line.106"></a>
+<span class="sourceLineNo">107</span> // This is the new schema we are going to write out as this modification.<a name="line.107"></a>
+<span class="sourceLineNo">108</span> this.modifiedTableDescriptor = tableDescriptor;<a name="line.108"></a>
+<span class="sourceLineNo">109</span> preflightChecks(env, null/*Table can be online when restore is called?*/);<a name="line.109"></a>
+<span class="sourceLineNo">110</span> // Snapshot information<a name="line.110"></a>
+<span class="sourceLineNo">111</span> this.snapshot = snapshot;<a name="line.111"></a>
+<span class="sourceLineNo">112</span> this.restoreAcl = restoreAcl;<a name="line.112"></a>
<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span> /**<a name="line.114"></a>
-<span class="sourceLineNo">115</span> * Set up monitor status if it is not created.<a name="line.115"></a>
-<span class="sourceLineNo">116</span> */<a name="line.116"></a>
-<span class="sourceLineNo">117</span> private MonitoredTask getMonitorStatus() {<a name="line.117"></a>
-<span class="sourceLineNo">118</span> if (monitorStatus == null) {<a name="line.118"></a>
-<span class="sourceLineNo">119</span> monitorStatus = TaskMonitor.get().createStatus("Restoring snapshot '" + snapshot.getName()<a name="line.119"></a>
-<span class="sourceLineNo">120</span> + "' to table " + getTableName());<a name="line.120"></a>
-<span class="sourceLineNo">121</span> }<a name="line.121"></a>
-<span class="sourceLineNo">122</span> return monitorStatus;<a name="line.122"></a>
-<span class="sourceLineNo">123</span> }<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span> @Override<a name="line.125"></a>
-<span class="sourceLineNo">126</span> protected Flow executeFromState(final MasterProcedureEnv env, final RestoreSnapshotState state)<a name="line.126"></a>
-<span class="sourceLineNo">127</span> throws InterruptedException {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> if (isTraceEnabled()) {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> LOG.trace(this + " execute state=" + state);<a name="line.129"></a>
-<span class="sourceLineNo">130</span> }<a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span> // Make sure that the monitor status is set up<a name="line.132"></a>
-<span class="sourceLineNo">133</span> getMonitorStatus();<a name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span> try {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> switch (state) {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> case RESTORE_SNAPSHOT_PRE_OPERATION:<a name="line.137"></a>
-<span class="sourceLineNo">138</span> // Verify if we can restore the table<a name="line.138"></a>
-<span class="sourceLineNo">139</span> prepareRestore(env);<a name="line.139"></a>
-<span class="sourceLineNo">140</span> setNextState(RestoreSnapshotState.RESTORE_SNAPSHOT_UPDATE_TABLE_DESCRIPTOR);<a name="line.140"></a>
-<span class="sourceLineNo">141</span> break;<a name="line.141"></a>
-<span class="sourceLineNo">142</span> case RESTORE_SNAPSHOT_UPDATE_TABLE_DESCRIPTOR:<a name="line.142"></a>
-<span class="sourceLineNo">143</span> updateTableDescriptor(env);<a name="line.143"></a>
-<span class="sourceLineNo">144</span> setNextState(RestoreSnapshotState.RESTORE_SNAPSHOT_WRITE_FS_LAYOUT);<a name="line.144"></a>
+<span class="sourceLineNo">114</span> // Monitor<a name="line.114"></a>
+<span class="sourceLineNo">115</span> getMonitorStatus();<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> /**<a name="line.118"></a>
+<span class="sourceLineNo">119</span> * Set up monitor status if it is not created.<a name="line.119"></a>
+<span class="sourceLineNo">120</span> */<a name="line.120"></a>
+<span class="sourceLineNo">121</span> private MonitoredTask getMonitorStatus() {<a name="line.121"></a>
+<span class="sourceLineNo">122</span> if (monitorStatus == null) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span> monitorStatus = TaskMonitor.get().createStatus("Restoring snapshot '" + snapshot.getName()<a name="line.123"></a>
+<span class="sourceLineNo">124</span> + "' to table " + getTableName());<a name="line.124"></a>
+<span class="sourceLineNo">125</span> }<a name="line.125"></a>
+<span class="sourceLineNo">126</span> return monitorStatus;<a name="line.126"></a>
+<span class="sourceLineNo">127</span> }<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span> @Override<a name="line.129"></a>
+<span class="sourceLineNo">130</span> protected Flow executeFromState(final MasterProcedureEnv env, final RestoreSnapshotState state)<a name="line.130"></a>
+<span class="sourceLineNo">131</span> throws InterruptedException {<a name="line.131"></a>
+<span class="sourceLineNo">132</span> if (isTraceEnabled()) {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> LOG.trace(this + " execute state=" + state);<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> // Make sure that the monitor status is set up<a name="line.136"></a>
+<span class="sourceLineNo">137</span> getMonitorStatus();<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span> try {<a name="line.139"></a>
+<span class="sourceLineNo">140</span> switch (state) {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> case RESTORE_SNAPSHOT_PRE_OPERATION:<a name="line.141"></a>
+<span class="sourceLineNo">142</span> // Verify if we can restore the table<a name="line.142"></a>
+<span class="sourceLineNo">143</span> prepareRestore(env);<a name="line.143"></a>
+<span class="sourceLineNo">144</span> setNextState(RestoreSnapshotState.RESTORE_SNAPSHOT_UPDATE_TABLE_DESCRIPTOR);<a name="line.144"></a>
<span class="sourceLineNo">145</span> break;<a name="line.145"></a>
-<span class="sourceLineNo">146</span> case RESTORE_SNAPSHOT_WRITE_FS_LAYOUT:<a name="line.146"></a>
-<span class="sourceLineNo">147</span> restoreSnapshot(env);<a name="line.147"></a>
-<span class="sourceLineNo">148</span> setNextState(RestoreSnapshotState.RESTORE_SNAPSHOT_UPDATE_META);<a name="line.148"></a>
+<span class="sourceLineNo">146</span> case RESTORE_SNAPSHOT_UPDATE_TABLE_DESCRIPTOR:<a name="line.146"></a>
+<span class="sourceLineNo">147</span> updateTableDescriptor(env);<a name="line.147"></a>
+<span class="sourceLineNo">148</span> setNextState(RestoreSnapshotState.RESTORE_SNAPSHOT_WRITE_FS_LAYOUT);<a name="line.148"></a>
<span class="sourceLineNo">149</span> break;<a name="line.149"></a>
-<span class="sourceLineNo">150</span> case RESTORE_SNAPSHOT_UPDATE_META:<a name="line.150"></a>
-<span class="sourceLineNo">151</span> updateMETA(env);<a name="line.151"></a>
-<span class="sourceLineNo">152</span> setNextState(RestoreSnapshotState.RESTORE_SNAPSHOT_RESTORE_ACL);<a name="line.152"></a>
+<span class="sourceLineNo">150</span> case RESTORE_SNAPSHOT_WRITE_FS_LAYOUT:<a name="line.150"></a>
+<span class="sourceLineNo">151</span> restoreSnapshot(env);<a name="line.151"></a>
+<span class="sourceLineNo">152</span> setNextState(RestoreSnapshotState.RESTORE_SNAPSHOT_UPDATE_META);<a name="line.152"></a>
<span class="sourceLineNo">153</span> break;<a name="line.153"></a>
-<span class="sourceLineNo">154</span> case RESTORE_SNAPSHOT_RESTORE_ACL:<a name="line.154"></a>
-<span class="sourceLineNo">155</span> restoreSnapshotAcl(env);<a name="line.155"></a>
-<span class="sourceLineNo">156</span> return Flow.NO_MORE_STATE;<a name="line.156"></a>
-<span class="sourceLineNo">157</span> default:<a name="line.157"></a>
-<span class="sourceLineNo">158</span> throw new UnsupportedOperationException("unhandled state=" + state);<a name="line.158"></a>
-<span class="sourceLineNo">159</span> }<a name="line.159"></a>
-<span class="sourceLineNo">160</span> } catch (IOException e) {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> if (isRollbackSupported(state)) {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> setFailure("master-restore-snapshot", e);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> } else {<a name="line.163"></a>
-<span class="sourceLineNo">164</span> LOG.warn("Retriable error trying to restore snapshot=" + snapshot.getName() +<a name="line.164"></a>
-<span class="sourceLineNo">165</span> " to table=" + getTableName() + " (in state=" + state + ")", e);<a name="line.165"></a>
-<span class="sourceLineNo">166</span> }<a name="line.166"></a>
-<span class="sourceLineNo">167</span> }<a name="line.167"></a>
-<span class="sourceLineNo">168</span> return Flow.HAS_MORE_STATE;<a name="line.168"></a>
-<span class="sourceLineNo">169</span> }<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span> @Override<a name="line.171"></a>
-<span class="sourceLineNo">172</span> protected void rollbackState(final MasterProcedureEnv env, final RestoreSnapshotState state)<a name="line.172"></a>
-<span class="sourceLineNo">173</span> throws IOException {<a name="line.173"></a>
-<span class="sourceLineNo">174</span> if (state == RestoreSnapshotState.RESTORE_SNAPSHOT_PRE_OPERATION) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span> // nothing to rollback<a name="line.175"></a>
-<span class="sourceLineNo">176</span> return;<a name="line.176"></a>
-<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> // The restore snapshot doesn't have a rollback. The execution will succeed, at some point.<a name="line.179"></a>
-<span class="sourceLineNo">180</span> throw new UnsupportedOperationException("unhandled state=" + state);<a name="line.180"></a>
-<span class="sourceLineNo">181</span> }<a name="line.181"></a>
+<span class="sourceLineNo">154</span> case RESTORE_SNAPSHOT_UPDATE_META:<a name="line.154"></a>
+<span class="sourceLineNo">155</span> updateMETA(env);<a name="line.155"></a>
+<span class="sourceLineNo">156</span> setNextState(RestoreSnapshotState.RESTORE_SNAPSHOT_RESTORE_ACL);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> break;<a name="line.157"></a>
+<span class="sourceLineNo">158</span> case RESTORE_SNAPSHOT_RESTORE_ACL:<a name="line.158"></a>
+<span class="sourceLineNo">159</span> restoreSnapshotAcl(env);<a name="line.159"></a>
+<span class="sourceLineNo">160</span> return Flow.NO_MORE_STATE;<a name="line.160"></a>
+<span class="sourceLineNo">161</span> default:<a name="line.161"></a>
+<span class="sourceLineNo">162</span> throw new UnsupportedOperationException("unhandled state=" + state);<a name="line.162"></a>
+<span class="sourceLineNo">163</span> }<a name="line.163"></a>
+<span class="sourceLineNo">164</span> } catch (IOException e) {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> if (isRollbackSupported(state)) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span> setFailure("master-restore-snapshot", e);<a name="line.166"></a>
+<span class="sourceLineNo">167</span> } else {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> LOG.warn("Retriable error trying to restore snapshot=" + snapshot.getName() +<a name="line.168"></a>
+<span class="sourceLineNo">169</span> " to table=" + getTableName() + " (in state=" + state + ")", e);<a name="line.169"></a>
+<span class="sourceLineNo">170</span> }<a name="line.170"></a>
+<span class="sourceLineNo">171</span> }<a name="line.171"></a>
+<span class="sourceLineNo">172</span> return Flow.HAS_MORE_STATE;<a name="line.172"></a>
+<span class="sourceLineNo">173</span> }<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span> @Override<a name="line.175"></a>
+<span class="sourceLineNo">176</span> protected void rollbackState(final MasterProcedureEnv env, final RestoreSnapshotState state)<a name="line.176"></a>
+<span class="sourceLineNo">177</span> throws IOException {<a name="line.177"></a>
+<span class="sourceLineNo">178</span> if (state == RestoreSnapshotState.RESTORE_SNAPSHOT_PRE_OPERATION) {<a name="line.178"></a>
+<span class="sourceLineNo">179</span> // nothing to rollback<a name="line.179"></a>
+<span class="sourceLineNo">180</span> return;<a name="line.180"></a>
+<span class="sourceLineNo">181</span> }<a name="line.181"></a>
<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span> @Override<a name="line.183"></a>
-<span class="sourceLineNo">184</span> protected boolean isRollbackSupported(final RestoreSnapshotState state) {<a name="line.184"></a>
-<span class="sourceLineNo">185</span> switch (state) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> case RESTORE_SNAPSHOT_PRE_OPERATION:<a name="line.186"></a>
-<span class="sourceLineNo">187</span> return true;<a name="line.187"></a>
-<span class="sourceLineNo">188</span> default:<a name="line.188"></a>
-<span class="sourceLineNo">189</span> return false;<a name="line.189"></a>
-<span class="sourceLineNo">190</span> }<a name="line.190"></a>
-<span class="sourceLineNo">191</span> }<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span> @Override<a name="line.193"></a>
-<span class="sourceLineNo">194</span> protected RestoreSnapshotState getState(final int stateId) {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> return RestoreSnapshotState.valueOf(stateId);<a name="line.195"></a>
-<span class="sourceLineNo">196</span> }<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span> @Override<a name="line.198"></a>
-<span class="sourceLineNo">199</span> protected int getStateId(final RestoreSnapshotState state) {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> return state.getNumber();<a name="line.200"></a>
-<span class="sourceLineNo">201</span> }<a name="line.201"></a>
-<span class="sourceLineNo">202</span><a name="line.202"></a>
-<span class="sourceLineNo">203</span> @Override<a name="line.203"></a>
-<span class="sourceLineNo">204</span> protected RestoreSnapshotState getInitialState() {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> return RestoreSnapshotState.RESTORE_SNAPSHOT_PRE_OPERATION;<a name="line.205"></a>
-<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span><a name="line.207"></a>
-<span class="sourceLineNo">208</span> @Override<a name="line.208"></a>
-<span class="sourceLineNo">209</span> public TableName getTableName() {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> return modifiedTableDescriptor.getTableName();<a name="line.210"></a>
-<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span> @Override<a name="line.213"></a>
-<span class="sourceLineNo">214</span> public TableOperationType getTableOperationType() {<a name="line.214"></a>
-<span class="sourceLineNo">215</span> return TableOperationType.EDIT; // Restore is modifying a table<a name="line.215"></a>
-<span class="sourceLineNo">216</span> }<a name="line.216"></a>
-<span class="sourceLineNo">217</span><a name="line.217"></a>
-<span class="sourceLineNo">218</span> @Override<a name="line.218"></a>
-<span class="sourceLineNo">219</span> public boolean abort(final MasterProcedureEnv env) {<a name="line.219"></a>
-<span class="sourceLineNo">220</span> // TODO: We may be able to abort if the procedure is not started yet.<a name="line.220"></a>
-<span class="sourceLineNo">221</span> return false;<a name="line.221"></a>
-<span class="sourceLineNo">222</span> }<a name="line.222"></a>
-<span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span> @Override<a name="line.224"></a>
-<span class="sourceLineNo">225</span> public void toStringClassDetails(StringBuilder sb) {<a name="line.225"></a>
-<span class="sourceLineNo">226</span> sb.append(getClass().getSimpleName());<a name="line.226"></a>
-<span class="sourceLineNo">227</span> sb.append(" (table=");<a name="line.227"></a>
-<span class="sourceLineNo">228</span> sb.append(getTableName());<a name="line.228"></a>
-<span class="sourceLineNo">229</span> sb.append(" snapshot=");<a name="line.229"></a>
-<span class="sourceLineNo">230</span> sb.append(snapshot);<a name="line.230"></a>
-<span class="sourceLineNo">231</span> sb.append(")");<a name="line.231"></a>
-<span class="sourceLineNo">232</span> }<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span> @Override<a name="line.234"></a>
-<span class="sourceLineNo">235</span> protected void serializeStateData(ProcedureStateSerializer serializer)<a name="line.235"></a>
-<span class="sourceLineNo">236</span> throws IOException {<a name="line.236"></a>
-<span class="sourceLineNo">237</span> super.serializeStateData(serializer);<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span> MasterProcedureProtos.RestoreSnapshotStateData.Builder restoreSnapshotMsg =<a name="line.239"></a>
-<span class="sourceLineNo">240</span> MasterProcedureProtos.RestoreSnapshotStateData.newBuilder()<a name="line.240"></a>
-<span class="sourceLineNo">241</span> .setUserInfo(MasterProcedureUtil.toProtoUserInfo(getUser()))<a name="line.241"></a>
-<span class="sourceLineNo">242</span> .setSnapshot(this.snapshot)<a name="line.242"></a>
-<span class="sourceLineNo">243</span> .setModifiedTableSchema(ProtobufUtil.toTableSchema(modifiedTableDescriptor));<a name="line.243"></a>
-<span class="sourceLineNo">244</span><a name="line.244"></a>
-<span class="sourceLineNo">245</span> if (regionsToRestore != null) {<a name="line.245"></a>
-<span class="sourceLineNo">246</span> for (RegionInfo hri: regionsToRestore) {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> restoreSnapshotMsg.addRegionInfoForRestore(ProtobufUtil.toRegionInfo(hri));<a name="line.247"></a>
-<span class="sourceLineNo">248</span> }<a name="line.248"></a>
-<span class="sourceLineNo">249</span> }<a name="line.249"></a>
-<span class="sourceLineNo">250</span> if (regionsToRemove != null) {<a name="line.250"></a>
-<span class="sourceLineNo">251</span> for (RegionInfo hri: regionsToRemove) {<a name="line.251"></a>
-<span class="sourceLineNo">252</span> restoreSnapshotMsg.addRegionInfoForRemove(ProtobufUtil.toRegionInfo(hri));<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span> }<a name="line.254"></a>
-<span class="sourceLineNo">255</span> if (regionsToAdd != null) {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> for (RegionInfo hri: regionsToAdd) {<a name="line.256"></a>
-<span class="sourceLineNo">257</span> restoreSnapshotMsg.addRegionInfoForAdd(ProtobufUtil.toRegionInfo(hri));<a name="line.257"></a>
-<span class="sourceLineNo">258</span> }<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
-<span class="sourceLineNo">260</span> if (!parentsToChildrenPairMap.isEmpty()) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> final Iterator<Map.Entry<String, Pair<String, String>>> it =<a name="line.261"></a>
-<span class="sourceLineNo">262</span> parentsToChildrenPairMap.entrySet().iterator();<a name="line.262"></a>
-<span class="sourceLineNo">263</span> while (it.hasNext()) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> final Map.Entry<String, Pair<String, String>> entry = it.next();<a name="line.264"></a>
-<span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span> MasterProcedureProtos.RestoreParentToChildRegionsPair.Builder parentToChildrenPair =<a name="line.266"></a>
-<span class="sourceLineNo">267</span> MasterProcedureProtos.RestoreParentToChildRegionsPair.newBuilder()<a name="line.267"></a>
-<span class="sourceLineNo">268</span> .setParentRegionName(entry.getKey())<a name="line.268"></a>
-<span class="sourceLineNo">269</span> .setChild1RegionName(entry.getValue().getFirst())<a name="line.269"></a>
-<span class="sourceLineNo">270</span> .setChild2RegionName(entry.getValue().getSecond());<a name="line.270"></a>
-<span class="sourceLineNo">271</span> restoreSnapshotMsg.addParentToChildRegionsPairList (parentToChildrenPair);<a name="line.271"></a>
-<span class="sourceLineNo">272</span> }<a name="line.272"></a>
-<span class="sourceLineNo">273</span> }<a name="line.273"></a>
-<span class="sourceLineNo">274</span> serializer.serialize(restoreSnapshotMsg.build());<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span><a name="line.276"></a>
-<span class="sourceLineNo">277</span> @Override<a name="line.277"></a>
-<span class="sourceLineNo">278</span> protected void deserializeStateData(ProcedureStateSerializer serializer)<a name="line.278"></a>
-<span class="sourceLineNo">279</span> throws IOException {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> super.deserializeStateData(serializer);<a name="line.280"></a>
-<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span> MasterProcedureProtos.RestoreSnapshotStateData restoreSnapshotMsg =<a name="line.282"></a>
-<span class="sourceLineNo">283</span> serializer.deserialize(MasterProcedureProtos.RestoreSnapshotStateData.class);<a name="line.283"></a>
-<span class="sourceLineNo">284</span> setUser(MasterProcedureUtil.toUserInfo(restoreSnapshotMsg.getUserInfo()));<a name="line.284"></a>
-<span class="sourceLineNo">285</span> snapshot = restoreSnapshotMsg.getSnapshot();<a name="line.285"></a>
-<span class="sourceLineNo">286</span> modifiedTableDescriptor =<a name="line.286"></a>
-<span class="sourceLineNo">287</span> ProtobufUtil.toTableDescriptor(restoreSnapshotMsg.getModifiedTableSchema());<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> if (restoreSnapshotMsg.getRegionInfoForRestoreCount() == 0) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> regionsToRestore = null;<a name="line.290"></a>
-<span class="sourceLineNo">291</span> } else {<a name="line.291"></a>
-<span class="sourceLineNo">292</span> regionsToRestore = new ArrayList<>(restoreSnapshotMsg.getRegionInfoForRestoreCount());<a name="line.292"></a>
-<span class="sourceLineNo">293</span> for (HBaseProtos.RegionInfo hri: restoreSnapshotMsg.getRegionInfoForRestoreList()) {<a name="line.293"></a>
-<span class="sourceLineNo">294</span> regionsToRestore.add(ProtobufUtil.toRegionInfo(hri));<a name="line.294"></a>
-<span class="sourceLineNo">295</span> }<a name="line.295"></a>
-<span class="sourceLineNo">296</span> }<a name="line.296"></a>
-<span class="sourceLineNo">297</span> if (restoreSnapshotMsg.getRegionInfoForRemoveCount() == 0) {<a name="line.297"></a>
-<span class="sourceLineNo">298</span> regionsToRemove = null;<a name="line.298"></a>
-<span class="sourceLineNo">299</span> } else {<a name="line.299"></a>
-<span class="sourceLineNo">300</span> regionsToRemove = new ArrayList<>(restoreSnapshotMsg.getRegionInfoForRemoveCount());<a name="line.300"></a>
-<span class="sourceLineNo">301</span> for (HBaseProtos.RegionInfo hri: restoreSnapshotMsg.getRegionInfoForRemoveList()) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span> regionsToRemove.add(ProtobufUtil.toRegionInfo(hri));<a name="line.302"></a>
-<span class="sourceLineNo">303</span> }<a name="line.303"></a>
-<span class="sourceLineNo">304</span> }<a name="line.304"></a>
-<span class="sourceLineNo">305</span> if (restoreSnapshotMsg.getRegionInfoForAddCount() == 0) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> regionsToAdd = null;<a name="line.306"></a>
-<span class="sourceLineNo">307</span> } else {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> regionsToAdd = new ArrayList<>(restoreSnapshotMsg.getRegionInfoForAddCount());<a name="line.308"></a>
-<span class="sourceLineNo">309</span> for (HBaseProtos.RegionInfo hri: restoreSnapshotMsg.getRegionInfoForAddList()) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span> regionsToAdd.add(ProtobufUtil.toRegionInfo(hri));<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> if (restoreSnapshotMsg.getParentToChildRegionsPairListCount() > 0) {<a name="line.313"></a>
-<span class="sourceLineNo">314</span> for (MasterProcedureProtos.RestoreParentToChildRegionsPair parentToChildrenPair:<a name="line.314"></a>
-<span class="sourceLineNo">315</span> restoreSnapshotMsg.getParentToChildRegionsPairListList()) {<a name="line.315"></a>
-<span class="sourceLineNo">316</span> parentsToChildrenPairMap.put(<a name="line.316"></a>
-<span class="sourceLineNo">317</span> parentToChildrenPair.getParentRegionName(),<a name="line.317"></a>
-<span class="sourceLineNo">318</span> new Pair<>(<a name="line.318"></a>
-<span class="sourceLineNo">319</span> parentToChildrenPair.getChild1RegionName(),<a name="line.319"></a>
-<span class="sourceLineNo">320</span> parentToChildrenPair.getChild2RegionName()));<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> /**<a name="line.325"></a>
-<span class="sourceLineNo">326</span> * Action before any real action of restoring from snapshot.<a name="line.326"></a>
-<span class="sourceLineNo">327</span> * @param env MasterProcedureEnv<a name="line.327"></a>
-<span class="sourceLineNo">328</span> * @throws IOException<a name="line.328"></a>
-<span class="sourceLineNo">329</span> */<a name="line.329"></a>
-<span class="sourceLineNo">330</span> private void prepareRestore(final MasterProcedureEnv env) throws IOException {<a name="line.330"></a>
-<span class="sourceLineNo">331</span> final TableName tableName = getTableName();<a name="line.331"></a>
-<span class="sourceLineNo">332</span> // Checks whether the table exists<a name="line.332"></a>
-<span class="sourceLineNo">333</span> if (!MetaTableAccessor.tableExists(env.getMasterServices().getConnection(), tableName)) {<a name="line.333"></a>
-<span class="sourceLineNo">334</span> throw new TableNotFoundException(tableName);<a name="line.334"></a>
-<span class="sourceLineNo">335</span> }<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span> // Check whether table is disabled.<a name="line.337"></a>
-<span class="sourceLineNo">338</span> env.getMasterServices().checkTableModifiable(tableName);<a name="line.338"></a>
-<span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span> // Check that we have at least 1 CF<a name="line.340"></a>
-<span class="sourceLineNo">341</span> if (modifiedTableDescriptor.getColumnFamilyCount() == 0) {<a name="line.341"></a>
-<span class="sourceLineNo">342</span> throw new DoNotRetryIOException("Table " + getTableName().toString() +<a name="line.342"></a>
-<span class="sourceLineNo">343</span> " should have at least one column family.");<a name="line.343"></a>
-<span class="sourceLineNo">344</span> }<a name="line.344"></a>
-<span class="sourceLineNo">345</span><a name="line.345"></a>
-<span class="sourceLineNo">346</span> if (!getTableName().isSystemTable()) {<a name="line.346"></a>
-<span class="sourceLineNo">347</span> // Table already exist. Check and update the region quota for this table namespace.<a name="line.347"></a>
-<span class="sourceLineNo">348</span> final MasterFileSystem mfs = env.getMasterServices().getMasterFileSystem();<a name="line.348"></a>
-<span class="sourceLineNo">349</span> SnapshotManifest manifest = SnapshotManifest.open(<a name="line.349"></a>
-<span class="sourceLineNo">350</span> env.getMasterConfiguration(),<a name="line.350"></a>
-<span class="sourceLineNo">351</span> mfs.getFileSystem(),<a name="line.351"></a>
-<span class="sourceLineNo">352</span> SnapshotDescriptionUtils.getCompletedSnapshotDir(snapshot, mfs.getRootDir()),<a name="line.352"></a>
-<span class="sourceLineNo">353</span> snapshot);<a name="line.353"></a>
-<span class="sourceLineNo">354</span> int snapshotRegionCount = manifest.getRegionManifestsMap().size();<a name="line.354"></a>
-<span class="sourceLineNo">355</span> int tableRegionCount =<a name="line.355"></a>
-<span class="sourceLineNo">356</span> ProcedureSyncWait.getMasterQuotaManager(env).getRegionCountOfTable(tableName);<a name="line.356"></a>
-<span class="sourceLineNo">357</span><a name="line.357"></a>
-<span class="sourceLineNo">358</span> if (snapshotRegionCount > 0 && tableRegionCount != snapshotRegionCount) {<a name="line.358"></a>
-<span class="sourceLineNo">359</span> ProcedureSyncWait.getMasterQuotaManager(env).checkAndUpdateNamespaceRegionQuota(<a name="line.359"></a>
-<span class="sourceLineNo">360</span> tableName, snapshotRegionCount);<a name="line.360"></a>
-<span class="sourceLineNo">361</span> }<a name="line.361"></a>
-<span class="sourceLineNo">362</span> }<a name="line.362"></a>
-<span class="sourceLineNo">363</span> }<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> * Update descriptor<a name="line.366"></a>
-<span class="sourceLineNo">367</span> * @param env MasterProcedureEnv<a name="line.367"></a>
-<span class="sourceLineNo">368</span> * @throws IOException<a name="line.368"></a>
-<span class="sourceLineNo">369</span> **/<a name="line.369"></a>
-<span class="sourceLineNo">370</span> private void updateTableDescriptor(final MasterProcedureEnv env) throws IOException {<a name="line.370"></a>
-<span class="sourceLineNo">371</span> env.getMasterServices().getTableDescriptors().add(modifiedTableDescriptor);<a name="line.371"></a>
-<span class="sourceLineNo">372</span> }<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> * Execute the on-disk Restore<a name="line.375"></a>
-<span class="sourceLineNo">376</span> * @param env MasterProcedureEnv<a name="line.376"></a>
-<span class="sourceLineNo">377</span> * @throws IOException<a name="line.377"></a>
-<span class="sourceLineNo">378</span> **/<a name="line.378"></a>
-<span class="sourceLineNo">379</span> private void restoreSnapshot(final MasterProcedureEnv env) throws IOException {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> MasterFileSystem fileSystemManager = env.getMasterServices().getMasterFileSystem();<a name="line.380"></a>
-<span class="sourceLineNo">381</span> FileSystem fs = fileSystemManager.getFileSystem();<a name="line.381"></a>
-<span class="sourceLineNo">382</span> Path rootDir = fileSystemManager.getRootDir();<a name="line.382"></a>
-<span class="sourceLineNo">383</span> final ForeignExceptionDispatcher monitorException = new ForeignExceptionDispatcher();<a name="line.383"></a>
-<span class="sourceLineNo">384</span><a name="line.384"></a>
-<span class="sourceLineNo">385</span> LOG.info("Starting restore snapshot=" + ClientSnapshotDescriptionUtils.toString(snapshot));<a name="line.385"></a>
-<span class="sourceLineNo">386</span> try {<a name="line.386"></a>
-<span class="sourceLineNo">387</span> Path snapshotDir = SnapshotDescriptionUtils.getCompletedSnapshotDir(snapshot, rootDir);<a name="line.387"></a>
-<span class="sourceLineNo">388</span> SnapshotManifest manifest = SnapshotManifest.open(<a name="line.388"></a>
-<span class="sourceLineNo">389</span> env.getMasterServices().getConfiguration(), fs, snapshotDir, snapshot);<a name="line.389"></a>
-<span class="sourceLineNo">390</span> RestoreSnapshotHelper restoreHelper = new RestoreSnapshotHelper(<a name="line.390"></a>
-<span class="sourceLineNo">391</span> env.getMasterServices().getConfiguration(),<a name="line.391"></a>
-<span class="sourceLineNo">392</span> fs,<a name="line.392"></a>
-<span class="sourceLineNo">393</span> manifest,<a name="line.393"></a>
-<span class="sourceLineNo">394</span> modifiedTableDescriptor,<a name="line.394"></a>
-<span class="sourceLineNo">395</span> rootDir,<a name="line.395"></a>
-<span class="sourceLineNo">396</span> monitorException,<a name="line.396"></a>
-<span class="sourceLineNo">397</span> getMonitorStatus());<a name="line.397"></a>
-<span class="sourceLineNo">398</span><a name="line.398"></a>
-<span class="sourceLineNo">399</span> RestoreSnapshotHelper.RestoreMetaChanges metaChanges = restoreHelper.restoreHdfsRegions();<a name="line.399"></a>
-<span class="sourceLineNo">400</span> regionsToRestore = metaChanges.getRegionsToRestore();<a name="line.400"></a>
-<span class="sourceLineNo">401</span> regionsToRemove = metaChanges.getRegionsToRemove();<a name="line.401"></a>
-<span class="sourceLineNo">402</span> regionsToAdd = metaChanges.getRegionsToAdd();<a name="line.402"></a>
-<span class="sourceLineNo">403</span> parentsToChildrenPairMap = metaChanges.getParentToChildrenPairMap();<a name="line.403"></a>
-<span class="sourceLineNo">404</span> } catch (IOException e) {<a name="line.404"></a>
-<span class="sourceLineNo">405</span> String msg = "restore snapshot=" + ClientSnapshotDescriptionUtils.toString(snapshot)<a name="line.405"></a>
-<span class="sourceLineNo">406</span> + " failed in on-disk restore. Try re-running the restore command.";<a name="line.406"></a>
-<span class="sourceLineNo">407</span> LOG.error(msg, e);<a name="line.407"></a>
-<span class="sourceLineNo">408</span> monitorException.receive(<a name="line.408"></a>
-<span class="sourceLineNo">409</span> new ForeignException(env.getMasterServices().getServerName().toString(), e));<a name="line.409"></a>
-<span class="sourceLineNo">410</span> throw new IOException(msg, e);<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><a name="line.413"></a>
-<span class="sourceLineNo">414</span> /**<a name="line.414"></a>
-<span class="sourceLineNo">415</span> * Apply changes to hbase:meta<a name="line.415"></a>
-<span class="sourceLineNo">416</span> * @param env MasterProcedureEnv<a name="line.416"></a>
-<span class="sourceLineNo">417</span> * @throws IOException<a name="line.417"></a>
-<span class="sourceLineNo">418</span> **/<a name="line.418"></a>
-<span class="sourceLineNo">419</span> private void updateMETA(final MasterProcedureEnv env) throws IOException {<a name="line.419"></a>
-<span class="sourceLineNo">420</span> try {<a name="line.420"></a>
-<span class="sourceLineNo">421</span> Connection conn = env.getMasterServices().getConnection();<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span> // 1. Prepare to restore<a name="line.423"></a>
-<span class="sourceLineNo">424</span> getMonitorStatus().setStatus("Preparing to restore each region");<a name="line.424"></a>
-<span class="sourceLineNo">425</span><a name="line.425"></a>
-<span class="sourceLineNo">426</span> // 2. Applies changes to hbase:meta<a name="line.426"></a>
-<span class="sourceLineNo">427</span> // (2.1). Removes the current set of regions from META<a name="line.427"></a>
-<span class="sourceLineNo">428</span> //<a name="line.428"></a>
-<span class="sourceLineNo">429</span> // By removing also the regions to restore (the ones present both in the snapshot<a name="line.429"></a>
-<span class="sourceLineNo">430</span> // and in the current state) we ensure that no extra fields are present in META<a name="line.430"></a>
-<span class="sourceLineNo">431</span> // e.g. with a simple add addRegionToMeta() the splitA and splitB attributes<a name="line.431"></a>
-<span class="sourceLineNo">432</span> // not overwritten/removed, so you end up with old informations<a name="line.432"></a>
-<span class="sourceLineNo">433</span> // that are not correct after the restore.<a name="line.433"></a>
-<span class="sourceLineNo">434</span> if (regionsToRemove != null) {<a name="line.434"></a>
-<span class="sourceLineNo">435</span> MetaTableAccessor.deleteRegions(conn, regionsToRemove);<a name="line.435"></a>
-<span class="sourceLineNo">436</span> }<a name="line.436"></a>
-<span class="sourceLineNo">437</span><a name="line.437"></a>
-<span class="sourceLineNo">438</span> // (2.2). Add the new set of regions to META<a name="line.438"></a>
-<span class="sourceLineNo">439</span> //<a name="line.439"></a>
-<span class="sourceLineNo">440</span> // At this point the old regions are no longer present in META.<a name="line.440"></a>
-<span class="sourceLineNo">441</span> // and the set of regions present in the snapshot will be written to META.<a name="line.441"></a>
-<span class="sourceLineNo">442</span> // All the information in hbase:meta are coming from the .regioninfo of each region present<a name="line.442"></a>
-<span class="sourceLineNo">443</span> // in the snapshot folder.<a name="line.443"></a>
-<span class="sourceLineNo">444</span> if (regionsToAdd != null) {<a name="line.444"></a>
-<span class="sourceLineNo">445</span> MetaTableAccessor.addRegionsToMeta(<a name="line.445"></a>
-<span class="sourceLineNo">446</span> conn,<a name="line.446"></a>
-<span class="sourceLineNo">447</span> regionsToAdd,<a name="line.447"></a>
-<span class="sourceLineNo">448</span> modifiedTableDescriptor.getRegionReplication());<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> if (regionsToRestore != null) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span> MetaTableAccessor.overwriteRegions(<a name="line.452"></a>
-<span class="sourceLineNo">453</span> conn,<a name="line.453"></a>
-<span class="sourceLineNo">454</span> regionsToRestore,<a name="line.454"></a>
-<span class="sourceLineNo">455</span> modifiedTableDescriptor.getRegionReplication());<a name="line.455"></a>
-<span class="sourceLineNo">456</span> }<a name="line.456"></a>
+<span class="sourceLineNo">183</span> // The restore snapshot doesn't have a rollback. The execution will succeed, at some point.<a name="line.183"></a>
+<span class="sourceLineNo">184</span> throw new UnsupportedOperationException("unhandled state=" + state);<a name="line.184"></a>
+<span class="sourceLineNo">185</span> }<a name="line.185"></a>
+<span class="sourceLineNo">186</span><a name="line.186"></a>
+<span class="sourceLineNo">187</span> @Override<a name="line.187"></a>
+<span class="sourceLineNo">188</span> protected boolean isRollbackSupported(final RestoreSnapshotState state) {<a name="line.188"></a>
+<span class="sourceLineNo">189</span> switch (state) {<a name="line.189"></a>
+<span class="sourceLineNo">190</span> case RESTORE_SNAPSHOT_PRE_OPERATION:<a name="line.190"></a>
+<span class="sourceLineNo">191</span> return true;<a name="line.191"></a>
+<span class="sourceLineNo">192</span> default:<a name="line.192"></a>
+<span class="sourceLineNo">193</span> return false;<a name="line.193"></a>
+<span class="sourceLineNo">194</span> }<a name="line.194"></a>
+<span class="sourceLineNo">195</span> }<a name="line.195"></a>
+<span class="sourceLineNo">196</span><a name="line.196"></a>
+<span class="sourceLineNo">197</span> @Override<a name="line.197"></a>
+<span class="sourceLineNo">198</span> protected RestoreSnapshotState getState(final int stateId) {<a name="line.198"></a>
+<span class="sourceLineNo">199</span> return RestoreSnapshotState.valueOf(stateId);<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> @Override<a name="line.202"></a>
+<span class="sourceLineNo">203</span> protected int getStateId(final RestoreSnapshotState state) {<a name="line.203"></a>
+<span class="sourceLineNo">204</span> return state.getNumber();<a name="line.204"></a>
+<span class="sourceLineNo">205</span> }<a name="line.205"></a>
+<span class="sourceLineNo">206</span><a name="line.206"></a>
+<span class="sourceLineNo">207</span> @Override<a name="line.207"></a>
+<span class="sourceLineNo">208</span> protected RestoreSnapshotState getInitialState() {<a name="line.208"></a>
+<span class="sourceLineNo">209</span> return RestoreSnapshotState.RESTORE_SNAPSHOT_PRE_OPERATION;<a name="line.209"></a>
+<span class="sourceLineNo">210</span> }<a name="line.210"></a>
+<span class="sourceLineNo">211</span><a name="line.211"></a>
+<span class="sourceLineNo">212</span> @Override<a name="line.212"></a>
+<span class="sourceLineNo">213</span> public TableName getTableName() {<a name="line.213"></a>
+<span class="sourceLineNo">214</span> return modifiedTableDescriptor.getTableName();<a name="line.214"></a>
+<span class="sourceLineNo">215</span> }<a name="line.215"></a>
+<span class="sourceLineNo">216</span><a name="line.216"></a>
+<span class="sourceLineNo">217</span> @Override<a name="line.217"></a>
+<span class="sourceLineNo">218</span> public TableOperationType getTableOperationType() {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> return TableOperationType.EDIT; // Restore is modifying a table<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> @Override<a name="line.222"></a>
+<span class="sourceLineNo">223</span> public boolean abort(final MasterProcedureEnv env) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> // TODO: We may be able to abort if the procedure is not started yet.<a name="line.224"></a>
+<span class="sourceLineNo">225</span> return false;<a name="line.225"></a>
+<span class="sourceLineNo">226</span> }<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span> @Override<a name="line.228"></a>
+<span class="sourceLineNo">229</span> public void toStringClassDetails(StringBuilder sb) {<a name="line.229"></a>
+<span class="sourceLineNo">230</span> sb.append(getClass().getSimpleName());<a name="line.230"></a>
+<span class="sourceLineNo">231</span> sb.append(" (table=");<a name="line.231"></a>
+<span class="sourceLineNo">232</span> sb.append(getTableName());<a name="line.232"></a>
+<span class="sourceLineNo">233</span> sb.append(" snapshot=");<a name="line.233"></a>
+<span class="sourceLineNo">234</span> sb.append(snapshot);<a name="line.234"></a>
+<span class="sourceLineNo">235</span> sb.append(")");<a name="line.235"></a>
+<span class="sourceLineNo">236</span> }<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span> @Override<a name="line.238"></a>
+<span class="sourceLineNo">239</span> protected void serializeStateData(ProcedureStateSerializer serializer)<a name="line.239"></a>
+<span class="sourceLineNo">240</span> throws IOException {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> super.serializeStateData(serializer);<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span> MasterProcedureProtos.RestoreSnapshotStateData.Builder restoreSnapshotMsg =<a name="line.243"></a>
+<span class="sourceLineNo">244</span> MasterProcedureProtos.RestoreSnapshotStateData.newBuilder()<a name="line.244"></a>
+<span class="sourceLineNo">245</span> .setUserInfo(MasterProcedureUtil.toProtoUserInfo(getUser()))<a name="line.245"></a>
+<span class="sourceLineNo">246</span> .setSnapshot(this.snapshot)<a name="line.246"></a>
+<span class="sourceLineNo">247</span> .setModifiedTableSchema(ProtobufUtil.toTableSchema(modifiedTableDescriptor));<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span> if (regionsToRestore != null) {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> for (RegionInfo hri: regionsToRestore) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span> restoreSnapshotMsg.addRegionInfoForRestore(ProtobufUtil.toRegionInfo(hri));<a name="line.251"></a>
+<span class="sourceLineNo">252</span> }<a name="line.252"></a>
+<span class="sourceLineNo">253</span> }<a name="line.253"></a>
+<span class="sourceLineNo">254</span> if (regionsToRemove != null) {<a name="line.254"></a>
+<span class="sourceLineNo">255</span> for (RegionInfo hri: regionsToRemove) {<a name="line.255"></a>
+<span class="sourceLineNo">256</span> restoreSnapshotMsg.addRegionInfoForRemove(ProtobufUtil.toRegionInfo(hri));<a name="line.256"></a>
+<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">258</span> }<a name="line.258"></a>
+<span class="sourceLineNo">259</span> if (regionsToAdd != null) {<a name="line.259"></a>
+<span class="sourceLineNo">260</span> for (RegionInfo hri: regionsToAdd) {<a name="line.260"></a>
+<span class="sourceLineNo">261</span> restoreSnapshotMsg.addRegionInfoForAdd(ProtobufUtil.toRegionInfo(hri));<a name="line.261"></a>
+<span class="sourceLineNo">262</span> }<a name="line.262"></a>
+<span class="sourceLineNo">263</span> }<a name="line.263"></a>
+<span class="sourceLineNo">264</span> if (!parentsToChildrenPairMap.isEmpty()) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> final Iterator<Map.Entry<String, Pair<String, String>>> it =<a name="line.265"></a>
+<span class="sourceLineNo">266</span> parentsToChildrenPairMap.entrySet().iterator();<a name="line.266"></a>
+<span class="sourceLineNo">267</span> while (it.hasNext()) {<a name="line.267"></a>
+<span class="sourceLineNo">268</span> final Map.Entry<String, Pair<String, String>> entry = it.next();<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> MasterProcedureProtos.RestoreParentToChildRegionsPair.Builder parentToChildrenPair =<a name="line.270"></a>
+<span class="sourceLineNo">271</span> MasterProcedureProtos.RestoreParentToChildRegionsPair.newBuilder()<a name="line.271"></a>
+<span class="sourceLineNo">272</span> .setParentRegionName(entry.getKey())<a name="line.272"></a>
+<span class="sourceLineNo">273</span> .setChild1RegionName(entry.getValue().getFirst())<a name="line.273"></a>
+<span class="sourceLineNo">274</span> .setChild2RegionName(entry.getValue().getSecond());<a name="line.274"></a>
+<span class="sourceLineNo">275</span> restoreSnapshotMsg.addParentToChildRegionsPairList (parentToChildrenPair);<a name="line.275"></a>
+<span class="sourceLineNo">276</span> }<a name="line.276"></a>
+<span class="sourceLineNo">277</span> }<a name="line.277"></a>
+<span class="sourceLineNo">278</span> serializer.serialize(restoreSnapshotMsg.build());<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> @Override<a name="line.281"></a>
+<span class="sourceLineNo">282</span> protected void deserializeStateData(ProcedureStateSerializer serializer)<a name="line.282"></a>
+<span class="sourceLineNo">283</span> throws IOException {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> super.deserializeStateData(serializer);<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span> MasterProcedureProtos.RestoreSnapshotStateData restoreSnapshotMsg =<a name="line.286"></a>
+<span class="sourceLineNo">287</span> serializer.deserialize(MasterProcedureProtos.RestoreSnapshotStateData.class);<a name="line.287"></a>
+<span class="sourceLineNo">288</span> setUser(MasterProcedureUtil.toUserInfo(restoreSnapshotMsg.getUserInfo()));<a name="line.288"></a>
+<span class="sourceLineNo">289</span> snapshot = restoreSnapshotMsg.getSnapshot();<a name="line.289"></a>
+<span class="sourceLineNo">290</span> modifiedTableDescriptor =<a name="line.290"></a>
+<span class="sourceLineNo">291</span> ProtobufUtil.toTableDescriptor(restoreSnapshotMsg.getModifiedTableSchema());<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span> if (restoreSnapshotMsg.getRegionInfoForRestoreCount() == 0) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> regionsToRestore = null;<a name="line.294"></a>
+<span class="sourceLineNo">295</span> } else {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> regionsToRestore = new ArrayList<>(restoreSnapshotMsg.getRegionInfoForRestoreCount());<a name="line.296"></a>
+<span class="sourceLineNo">297</span> for (HBaseProtos.RegionInfo hri: restoreSnapshotMsg.getRegionInfoForRestoreList()) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> regionsToRestore.add(ProtobufUtil.toRegionInfo(hri));<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> if (restoreSnapshotMsg.getRegionInfoForRemoveCount() == 0) {<a name="line.301"></a>
+<span class="sourceLineNo">302</span> regionsToRemove = null;<a name="line.302"></a>
+<span class="sourceLineNo">303</span> } else {<a name="line.303"></a>
+<span class="sourceLineNo">304</span> regionsToRemove = new ArrayList<>(restoreSnapshotMsg.getRegionInfoForRemoveCount());<a name="line.304"></a>
+<span class="sourceLineNo">305</span> for (HBaseProtos.RegionInfo hri: restoreSnapshotMsg.getRegionInfoForRemoveList()) {<a name="line.305"></a>
+<span class="sourceLineNo">306</span> regionsToRemove.add(ProtobufUtil.toRegionInfo(hri));<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> if (restoreSnapshotMsg.getRegionInfoForAddCount() == 0) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> regionsToAdd = null;<a name="line.310"></a>
+<span class="sourceLineNo">311</span> } else {<a name="line.311"></a>
+<span class="sourceLineNo">312</span> regionsToAdd = new ArrayList<>(restoreSnapshotMsg.getRegionInfoForAddCount());<a name="line.312"></a>
+<span class="sourceLineNo">313</span> for (HBaseProtos.RegionInfo hri: restoreSnapshotMsg.getRegionInfoForAddList()) {<a name="line.313"></a>
+<span class="sourceLineNo">314</span> regionsToAdd.add(ProtobufUtil.toRegionInfo(hri));<a name="line.314"></a>
+<span class="sourceLineNo">315</span> }<a name="line.315"></a>
+<span class="sourceLineNo">316</span> }<a name="line.316"></a>
+<span class="sourceLineNo">317</span> if (restoreSnapshotMsg.getParentToChildRegionsPairListCount() > 0) {<a name="line.317"></a>
+<span class="sourceLineNo">318</span> for (MasterProcedureProtos.RestoreParentToChildRegionsPair parentToChildrenPair:<a name="line.318"></a>
+<span class="sourceLineNo">319</span> restoreSnapshotMsg.getParentToChildRegionsPairListList()) {<a name="line.319"></a>
+<span class="sourceLineNo">320</span> parentsToChildrenPairMap.put(<a name="line.320"></a>
+<span class="sourceLineNo">321</span> parentToChildrenPair.getParentRegionName(),<a name="line.321"></a>
+<span class="sourceLineNo">322</span> new Pair<>(<a name="line.322"></a>
+<span class="sourceLineNo">323</span> parentToChildrenPair.getChild1RegionName(),<a name="line.323"></a>
+<span class="sourceLineNo">324</span> parentToChildrenPair.getChild2RegionName()));<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><a name="line.328"></a>
+<span class="sourceLineNo">329</span> /**<a name="line.329"></a>
+<span class="sourceLineNo">330</span> * Action before any real action of restoring from snapshot.<a name="line.330"></a>
+<span class="sourceLineNo">331</span> * @param env MasterProcedureEnv<a name="line.331"></a>
+<span class="sourceLineNo">332</span> * @throws IOException<a name="line.332"></a>
+<span class="sourceLineNo">333</span> */<a name="line.333"></a>
+<span class="sourceLineNo">334</span> private void prepareRestore(final MasterProcedureEnv env) throws IOException {<a name="line.334"></a>
+<span class="sourceLineNo">335</span> final TableName tableName = getTableName();<a name="line.335"></a>
+<span class="sourceLineNo">336</span> // Checks whether the table exists<a name="line.336"></a>
+<span class="sourceLineNo">337</span> if (!MetaTableAccessor.tableExists(env.getMasterServices().getConnection(), tableName)) {<a name="line.337"></a>
+<span class="sourceLineNo">338</span> throw new TableNotFoundException(tableName);<a name="line.338"></a>
+<span class="sourceLineNo">339</span> }<a name="line.339"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span> // Check whether table is disabled.<a name="line.341"></a>
+<span class="sourceLineNo">342</span> env.getMasterServices().checkTableModifiable(tableName);<a name="line.342"></a>
+<span class="sourceLineNo">343</span><a name="line.343"></a>
+<span class="sourceLineNo">344</span> // Check that we have at least 1 CF<a name="line.344"></a>
+<span class="sourceLineNo">345</span> if (modifiedTableDescriptor.getColumnFamilyCount() == 0) {<a name="line.345"></a>
+<span class="sourceLineNo">346</span> throw new DoNotRetryIOException("Table " + getTableName().toString() +<a name="line.346"></a>
+<span class="sourceLineNo">347</span> " should have at least one column family.");<a name="line.347"></a>
+<span class="sourceLineNo">348</span> }<a name="line.348"></a>
+<span class="sourceLineNo">349</span><a name="line.349"></a>
+<span class="sourceLineNo">350</span> if (!getTableName().isSystemTable()) {<a name="line.350"></a>
+<span class="sourceLineNo">351</span> // Table already exist. Check and update the region quota for this table namespace.<a name="line.351"></a>
+<span class="sourceLineNo">352</span> final MasterFileSystem mfs = env.getMasterServices().getMasterFileSystem();<a name="line.352"></a>
+<span class="sourceLineNo">353</span> SnapshotManifest manifest = SnapshotManifest.open(<a name="line.353"></a>
+<span class="sourceLineNo">354</span> env.getMasterConfiguration(),<a name="line.354"></a>
+<span class="sourceLineNo">355</span> mfs.getFileSystem(),<a name="line.355"></a>
+<span class="sourceLineNo">356</span> SnapshotDescriptionUtils.getCompletedSnapshotDir(snapshot, mfs.getRootDir()),<a name="line.356"></a>
+<span class="sourceLineNo">357</span> snapshot);<a name="line.357"></a>
+<span class="sourceLineNo">358</span> int snapshotRegionCount = manifest.getRegionManifestsMap().size();<a name="line.358"></a>
+<span class="sourceLineNo">359</span> int tableRegionCount =<a name="line.359"></a>
+<span class="sourceLineNo">360</span> ProcedureSyncWait.getMasterQuotaManager(env).getRegionCountOfTable(tableName);<a name="line.360"></a>
+<span class="sourceLineNo">361</span><a name="line.361"></a>
+<span class="sourceLineNo">362</span> if (snapshotRegionCount > 0 && tableRegionCount != snapshotRegionCount) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span> ProcedureSyncWait.getMasterQuotaManager(env).checkAndUpdateNamespaceRegionQuota(<a name="line.363"></a>
+<span class="sourceLineNo">364</span> tableName, snapshotRegionCount);<a name="line.364"></a>
+<span class="sourceLineNo">365</span> }<a name="line.365"></a>
+<span class="sourceLineNo">366</span> }<a name="line.366"></a>
+<span class="sourceLineNo">367</span> }<a name="line.367"></a>
+<span class="sourceLineNo">368</span><a name="line.368"></a>
+<span class="sourceLineNo">369</span> /**<a name="line.369"></a>
+<span class="sourceLineNo">370</span> * Update descriptor<a name="line.370"></a>
+<span class="sourceLineNo">371</span> * @param env MasterProcedureEnv<a name="line.371"></a>
+<span class="sourceLineNo">372</span> * @throws IOException<a name="line.372"></a>
+<span class="sourceLineNo">373</span> **/<a name="line.373"></a>
+<span class="sourceLineNo">374</span> private void updateTableDescriptor(final MasterProcedureEnv env) throws IOException {<a name="line.374"></a>
+<span class="sourceLineNo">375</span> env.getMasterServices().getTableDescriptors().add(modifiedTableDescriptor);<a name="line.375"></a>
+<span class="sourceLineNo">376</span> }<a name="line.376"></a>
+<span class="sourceLineNo">377</span><a name="line.377"></a>
+<span class="sourceLineNo">378</span> /**<a name="line.378"></a>
+<span class="sourceLineNo">379</span> * Execute the on-disk Restore<a name="line.379"></a>
+<span class="sourceLineNo">380</span> * @param env MasterProcedureEnv<a name="line.380"></a>
+<span class="sourceLineNo">381</span> * @throws IOException<a name="line.381"></a>
+<span class="sourceLineNo">382</span> **/<a name="line.382"></a>
+<span class="sourceLineNo">383</span> private void restoreSnapshot(final MasterProcedureEnv env) throws IOException {<a name="line.383"></a>
+<span class="sourceLineNo">384</span> MasterFileSystem fileSystemManager = env.getMasterServices().getMasterFileSystem();<a name="line.384"></a>
+<span class="sourceLineNo">385</span> FileSystem fs = fileSystemManager.getFileSystem();<a name="line.385"></a>
+<span class="sourceLineNo">386</span> Path rootDir = fileSystemManager.getRootDir();<a name="line.386"></a>
+<span class="sourceLineNo">387</span> final ForeignExceptionDispatcher monitorException = new ForeignExceptionDispatcher();<a name="line.387"></a>
+<span class="sourceLineNo">388</span><a name="line.388"></a>
+<span class="sourceLineNo">389</span> LOG.info("Starting restore snapshot=" + ClientSnapshotDescriptionUtils.toString(snapshot));<a name="line.389"></a>
+<span class="sourceLineNo">390</span> try {<a name="line.390"></a>
+<span class="sourceLineNo">391</span> Path snapshotDir = SnapshotDescriptionUtils.getCompletedSnapshotDir(snapshot, rootDir);<a name="line.391"></a>
+<span class="sourceLineNo">392</span> SnapshotManifest manifest = SnapshotManifest.open(<a name="line.392"></a>
+<span class="sourceLineNo">393</span> env.getMasterServices().getConfiguration(), fs, snapshotDir, snapshot);<a name="line.393"></a>
+<span class="sourceLineNo">394</span> RestoreSnapshotHelper restoreHelper = new RestoreSnapshotHelper(<a name="line.394"></a>
+<span class="sourceLineNo">395</span> env.getMasterServices().getConfiguration(),<a name="line.395"></a>
+<span class="sourceLineNo">396</span> fs,<a name="line.396"></a>
+<span class="sourceLineNo">397</span> manifest,<a name="line.397"></a>
+<span class="sourceLineNo">398</span> modifiedTableDescriptor,<a name="line.398"></a>
+<span class="sourceLineNo">399</span> rootDir,<a name="line.399"></a>
+<span class="sourceLineNo">400</span> monitorException,<a name="line.400"></a>
+<span class="sourceLineNo">401</span> getMonitorStatus());<a name="line.401"></a>
+<span class="sourceLineNo">402</span><a name="line.402"></a>
+<span class="sourceLineNo">403</span> RestoreSnapshotHelper.RestoreMetaChanges metaChanges = restoreHelper.restoreHdfsRegions();<a name="line.403"></a>
+<span class="sourceLineNo">404</span> regionsToRestore = metaChanges.getRegionsToRestore();<a name="line.404"></a>
+<span class="sourceLineNo">405</span> regionsToRemove = metaChanges.getRegionsToRemove();<a name="line.405"></a>
+<span class="sourceLineNo">406</span> regionsToAdd = metaChanges.getRegionsToAdd();<a name="line.406"></a>
+<span class="sourceLineNo">407</span> parentsToChildrenPairMap = metaChanges.getParentToChildrenPairMap();<a name="line.407"></a>
+<span class="sourceLineNo">408</span> } catch (IOException e) {<a name="line.408"></a>
+<span class="sourceLineNo">409</span> String msg = "restore snapshot=" + ClientSnapshotDescriptionUtils.toString(snapshot)<a name="line.409"></a>
+<span class="sourceLineNo">410</span> + " failed in on-disk restore. Try re-running the restore command.";<a name="line.410"></a>
+<span class="sourceLineNo">411</span> LOG.error(msg, e);<a name="line.411"></a>
+<span class="sourceLineNo">412</span> monitorException.receive(<a name="line.412"></a>
+<span class="sourceLineNo">413</span> new ForeignException(env.getMasterServices().getServerName().toString(), e));<a name="line.413"></a>
+<span class="sourceLineNo">414</span> throw new IOException(msg, e);<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><a name="line.417"></a>
+<span class="sourceLineNo">418</span> /**<a name="line.418"></a>
+<span class="sourceLineNo">419</span> * Apply changes to hbase:meta<a name="line.419"></a>
+<span class="sourceLineNo">420</span> * @param env MasterProcedureEnv<a name="line.420"></a>
+<span class="sourceLineNo">421</span> * @throws IOException<a name="line.421"></a>
+<span class="sourceLineNo">422</span> **/<a name="line.422"></a>
+<span class="sourceLineNo">423</span> private void updateMETA(final MasterProcedureEnv env) throws IOException {<a name="line.423"></a>
+<span class="sourceLineNo">424</span> try {<a name="line.424"></a>
+<span class="sourceLineNo">425</span> Connection conn = env.getMasterServices().getConnection();<a name="line.425"></a>
+<span class="sourceLineNo">426</span> int regionReplication = modifiedTableDescriptor.getRegionReplication();<a name="line.426"></a>
+<span class="sourceLineNo">427</span><a name="line.427"></a>
+<span class="sourceLineNo">428</span> // 1. Prepare to restore<a name="line.428"></a>
+<span class="sourceLineNo">429</span> getMonitorStatus().setStatus("Preparing to restore each region");<a name="line.429"></a>
+<span class="sourceLineNo">430</span><a name="line.430"></a>
+<span class="sourceLineNo">431</span> // 2. Applies changes to hbase:meta and in-memory states<a name="line.431"></a>
+<span class="sourceLineNo">432</span> // (2.1). Removes the current set of regions from META and in-memory states<a name="line.432"></a>
+<span class="sourceLineNo">433</span> //<a name="line.433"></a>
+<span class="sourceLineNo">434</span> // By removing also the regions to restore (the ones present both in the snapshot<a name="line.434"></a>
+<span class="sourceLineNo">435</span> // and in the current state) we ensure that no extra fields are present in META<a name="line.435"></a>
+<span class="sourceLineNo">436</span> // e.g. with a simple add addRegionToMeta() the splitA and splitB attributes<a name="line.436"></a>
+<span class="sourceLineNo">437</span> // not overwritten/removed, so you end up with old informations<a name="line.437"></a>
+<span class="sourceLineNo">438</span> // that are not correct after the restore.<a name="line.438"></a>
+<span class="sourceLineNo">439</span> if (regionsToRemove != null) {<a name="line.439"></a>
+<span class="sourceLineNo">440</span> MetaTableAccessor.deleteRegions(conn, regionsToRemove);<a name="line.440"></a>
+<span class="sourceLineNo">441</span> deleteRegionsFromInMemoryStates(regionsToRemove, env, regionReplication);<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> // (2.2). Add the new set of regions to META and in-memory states<a name="line.444"></a>
+<span class="sourceLineNo">445</span> //<a name="line.445"></a>
+<span class="sourceLineNo">446</span> // At this point the old regions are no longer present in META.<a name="line.446"></a>
+<span class="sourceLineNo">447</span> // and the set of regions present in the snapshot will be written to META.<a name="line.447"></a>
+<span class="sourceLineNo">448</span> // All the information in hbase:meta are coming from the .regioninfo of each region present<a name="line.448"></a>
+<span class="sourceLineNo">449</span> // in the snapshot folder.<a name="line.449"></a>
+<span class="sourceLineNo">450</span> if (regionsToAdd != null) {<a name="line.450"></a>
+<span class="sourceLineNo">451</span> MetaTableAccessor.addRegionsToMeta(conn, regionsToAdd, regionReplication);<a name="line.451"></a>
+<span class="sourceLineNo">452</span> addRegionsToInMemoryStates(regionsToAdd, env, regionReplication);<a name="line.452"></a>
+<span class="sourceLineNo">453</span> }<a name="line.453"></a>
+<span class="sourceLineNo">454</span><a name="line.454"></a>
+<span class="sourceLineNo">455</span> if (regionsToRestore != null) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span> MetaTableAccessor.overwriteRegions(conn, regionsToRestore, regionReplication);<a name="line.456"></a>
<span class="sourceLineNo">457</span><a name="line.457"></a>
-<span class="sourceLineNo">458</span> RestoreSnapshotHelper.RestoreMetaChanges metaChanges =<a name="line.458"></a>
-<span class="sourceLineNo">459</span> new RestoreSnapshotHelper.RestoreMetaChanges(<a name="line.459"></a>
-<span class="sourceLineNo">460</span> modifiedTableDescriptor, parentsToChildrenPairMap);<a name="line.460"></a>
-<span class="sourceLineNo">461</span> metaChanges.updateMetaParentRegions(conn, regionsToAdd);<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span> // At this point the restore is complete.<a name="line.463"></a>
-<span class="sourceLineNo">464</span> LOG.info("Restore snapshot=" + ClientSnapshotDescriptionUtils.toString(snapshot) +<a name="line.464"></a>
-<span class="sourceLineNo">465</span> " on table=" + getTableName() + " completed!");<a name="line.465"></a>
-<span class="sourceLineNo">466</span> } catch (IOException e) {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> final ForeignExceptionDispatcher monitorException = new ForeignExceptionDispatcher();<a name="line.467"></a>
-<span class="sourceLineNo">468</span> String msg = "restore snapshot=" + ClientSnapshotDescriptionUtils.toString(snapshot)<a name="line.468"></a>
-<span class="sourceLineNo">469</span> + " failed in meta update. Try re-running the restore command.";<a name="line.469"></a>
-<span class="sourceLineNo">470</span> LOG.error(msg, e);<a name="line.470"></a>
-<span class="sourceLineNo">471</span> monitorException.receive(<a name="line.471"></a>
-<span class="sourceLineNo">472</span> new ForeignException(env.getMasterServices().getServerName().toString(), e));<a name="line.472"></a>
-<span class="sourceLineNo">473</span> throw new IOException(msg, e);<a name="line.473"></a>
-<span class="sourceLineNo">474</span> }<a name="line.474"></a>
-<span class="sourceLineNo">475</span><a name="line.475"></a>
-<span class="sourceLineNo">476</span> monitorStatus.markComplete("Restore snapshot '"+ snapshot.getName() +"'!");<a name="line.476"></a>
-<span class="sourceLineNo">477</span> MetricsSnapshot metricsSnapshot = new MetricsSnapshot();<a name="line.477"></a>
-<span class="sourceLineNo">478</span> metricsSnapshot.addSnapshotRestore(<a name="line.478"></a>
-<span class="sourceLineNo">479</span> monitorStatus.getCompletionTimestamp() - monitorStatus.getStartTime());<a name="line.479"></a>
-<span class="sourceLineNo">480</span> }<a name="line.480"></a>
-<span class="sourceLineNo">481</span><a name="line.481"></a>
-<span class="sourceLineNo">482</span> private void restoreSnapshotAcl(final MasterProcedureEnv env) throws IOException {<a name="line.482"></a>
-<span class="sourceLineNo">483</span> if (restoreAcl && snapshot.hasUsersAndPermissions() && snapshot.getUsersAndPermissions() != null<a name="line.483"></a>
-<span class="sourceLineNo">484</span> && SnapshotDescriptionUtils<a name="line.484"></a>
-<span class="sourceLineNo">485</span> .isSecurityAvailable(env.getMasterServices().getConfiguration())) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span> // restore acl of snapshot to table.<a name="line.486"></a>
-<span class="sourceLineNo">487</span> RestoreSnapshotHelper.restoreSnapshotAcl(snapshot, TableName.valueOf(snapshot.getTable()),<a name="line.487"></a>
-<span class="sourceLineNo">488</span> env.getMasterServices().getConfiguration());<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><a name="line.491"></a>
-<span class="sourceLineNo">492</span> /**<a name="line.492"></a>
-<span class="sourceLineNo">493</span> * The procedure could be restarted from a different machine. If the variable is null, we need to<a name="line.493"></a>
-<span class="sourceLineNo">494</span> * retrieve it.<a name="line.494"></a>
-<span class="sourceLineNo">495</span> * @return traceEnabled<a name="line.495"></a>
-<span class="sourceLineNo">496</span> */<a name="line.496"></a>
-<span class="sourceLineNo">497</span> private Boolean isTraceEnabled() {<a name="line.497"></a>
-<span class="sourceLineNo">498</span> if (traceEnabled == null) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span> traceEnabled = LOG.isTraceEnabled();<a name="line.499"></a>
+<span class="sourceLineNo">458</span> deleteRegionsFromInMemoryStates(regionsToRestore, env, regionReplication);<a name="line.458"></a>
+<span class="sourceLineNo">459</span> addRegionsToInMemoryStates(regionsToRestore, env, regionReplication);<a name="line.459"></a>
+<span class="sourceLineNo">460</span> }<a name="line.460"></a>
+<span class="sourceLineNo">461</span><a name="line.461"></a>
<TRUNCATED>