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 2019/01/09 14:51:10 UTC
[25/51] [partial] hbase-site git commit: Published site at
620d70d6186fb800299bcc62ad7179fccfd1be41.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/aa3fb87f/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html
index 68302bf..a5a8905 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html
@@ -2197,1768 +2197,1775 @@
<span class="sourceLineNo">2189</span> warnOrThrowExceptionForFailure(logWarn, CONF_KEY, message, null);<a name="line.2189"></a>
<span class="sourceLineNo">2190</span> }<a name="line.2190"></a>
<span class="sourceLineNo">2191</span><a name="line.2191"></a>
-<span class="sourceLineNo">2192</span> for (ColumnFamilyDescriptor hcd : htd.getColumnFamilies()) {<a name="line.2192"></a>
-<span class="sourceLineNo">2193</span> if (hcd.getTimeToLive() <= 0) {<a name="line.2193"></a>
-<span class="sourceLineNo">2194</span> String message = "TTL for column family " + hcd.getNameAsString() + " must be positive.";<a name="line.2194"></a>
-<span class="sourceLineNo">2195</span> warnOrThrowExceptionForFailure(logWarn, CONF_KEY, message, null);<a name="line.2195"></a>
-<span class="sourceLineNo">2196</span> }<a name="line.2196"></a>
-<span class="sourceLineNo">2197</span><a name="line.2197"></a>
-<span class="sourceLineNo">2198</span> // check blockSize<a name="line.2198"></a>
-<span class="sourceLineNo">2199</span> if (hcd.getBlocksize() < 1024 || hcd.getBlocksize() > 16 * 1024 * 1024) {<a name="line.2199"></a>
-<span class="sourceLineNo">2200</span> String message = "Block size for column family " + hcd.getNameAsString()<a name="line.2200"></a>
-<span class="sourceLineNo">2201</span> + " must be between 1K and 16MB.";<a name="line.2201"></a>
+<span class="sourceLineNo">2192</span> // check that we have minimum 1 region replicas<a name="line.2192"></a>
+<span class="sourceLineNo">2193</span> int regionReplicas = htd.getRegionReplication();<a name="line.2193"></a>
+<span class="sourceLineNo">2194</span> if (regionReplicas < 1) {<a name="line.2194"></a>
+<span class="sourceLineNo">2195</span> String message = "Table region replication should be at least one.";<a name="line.2195"></a>
+<span class="sourceLineNo">2196</span> warnOrThrowExceptionForFailure(logWarn, CONF_KEY, message, null);<a name="line.2196"></a>
+<span class="sourceLineNo">2197</span> }<a name="line.2197"></a>
+<span class="sourceLineNo">2198</span><a name="line.2198"></a>
+<span class="sourceLineNo">2199</span> for (ColumnFamilyDescriptor hcd : htd.getColumnFamilies()) {<a name="line.2199"></a>
+<span class="sourceLineNo">2200</span> if (hcd.getTimeToLive() <= 0) {<a name="line.2200"></a>
+<span class="sourceLineNo">2201</span> String message = "TTL for column family " + hcd.getNameAsString() + " must be positive.";<a name="line.2201"></a>
<span class="sourceLineNo">2202</span> warnOrThrowExceptionForFailure(logWarn, CONF_KEY, message, null);<a name="line.2202"></a>
<span class="sourceLineNo">2203</span> }<a name="line.2203"></a>
<span class="sourceLineNo">2204</span><a name="line.2204"></a>
-<span class="sourceLineNo">2205</span> // check versions<a name="line.2205"></a>
-<span class="sourceLineNo">2206</span> if (hcd.getMinVersions() < 0) {<a name="line.2206"></a>
-<span class="sourceLineNo">2207</span> String message = "Min versions for column family " + hcd.getNameAsString()<a name="line.2207"></a>
-<span class="sourceLineNo">2208</span> + " must be positive.";<a name="line.2208"></a>
+<span class="sourceLineNo">2205</span> // check blockSize<a name="line.2205"></a>
+<span class="sourceLineNo">2206</span> if (hcd.getBlocksize() < 1024 || hcd.getBlocksize() > 16 * 1024 * 1024) {<a name="line.2206"></a>
+<span class="sourceLineNo">2207</span> String message = "Block size for column family " + hcd.getNameAsString()<a name="line.2207"></a>
+<span class="sourceLineNo">2208</span> + " must be between 1K and 16MB.";<a name="line.2208"></a>
<span class="sourceLineNo">2209</span> warnOrThrowExceptionForFailure(logWarn, CONF_KEY, message, null);<a name="line.2209"></a>
<span class="sourceLineNo">2210</span> }<a name="line.2210"></a>
-<span class="sourceLineNo">2211</span> // max versions already being checked<a name="line.2211"></a>
-<span class="sourceLineNo">2212</span><a name="line.2212"></a>
-<span class="sourceLineNo">2213</span> // HBASE-13776 Setting illegal versions for ColumnFamilyDescriptor<a name="line.2213"></a>
-<span class="sourceLineNo">2214</span> // does not throw IllegalArgumentException<a name="line.2214"></a>
-<span class="sourceLineNo">2215</span> // check minVersions <= maxVerions<a name="line.2215"></a>
-<span class="sourceLineNo">2216</span> if (hcd.getMinVersions() > hcd.getMaxVersions()) {<a name="line.2216"></a>
-<span class="sourceLineNo">2217</span> String message = "Min versions for column family " + hcd.getNameAsString()<a name="line.2217"></a>
-<span class="sourceLineNo">2218</span> + " must be less than the Max versions.";<a name="line.2218"></a>
-<span class="sourceLineNo">2219</span> warnOrThrowExceptionForFailure(logWarn, CONF_KEY, message, null);<a name="line.2219"></a>
-<span class="sourceLineNo">2220</span> }<a name="line.2220"></a>
-<span class="sourceLineNo">2221</span><a name="line.2221"></a>
-<span class="sourceLineNo">2222</span> // check replication scope<a name="line.2222"></a>
-<span class="sourceLineNo">2223</span> checkReplicationScope(hcd);<a name="line.2223"></a>
-<span class="sourceLineNo">2224</span> // check bloom filter type<a name="line.2224"></a>
-<span class="sourceLineNo">2225</span> checkBloomFilterType(hcd);<a name="line.2225"></a>
-<span class="sourceLineNo">2226</span><a name="line.2226"></a>
-<span class="sourceLineNo">2227</span> // check data replication factor, it can be 0(default value) when user has not explicitly<a name="line.2227"></a>
-<span class="sourceLineNo">2228</span> // set the value, in this case we use default replication factor set in the file system.<a name="line.2228"></a>
-<span class="sourceLineNo">2229</span> if (hcd.getDFSReplication() < 0) {<a name="line.2229"></a>
-<span class="sourceLineNo">2230</span> String message = "HFile Replication for column family " + hcd.getNameAsString()<a name="line.2230"></a>
-<span class="sourceLineNo">2231</span> + " must be greater than zero.";<a name="line.2231"></a>
-<span class="sourceLineNo">2232</span> warnOrThrowExceptionForFailure(logWarn, CONF_KEY, message, null);<a name="line.2232"></a>
-<span class="sourceLineNo">2233</span> }<a name="line.2233"></a>
-<span class="sourceLineNo">2234</span><a name="line.2234"></a>
-<span class="sourceLineNo">2235</span> // TODO: should we check coprocessors and encryption ?<a name="line.2235"></a>
-<span class="sourceLineNo">2236</span> }<a name="line.2236"></a>
-<span class="sourceLineNo">2237</span> }<a name="line.2237"></a>
-<span class="sourceLineNo">2238</span><a name="line.2238"></a>
-<span class="sourceLineNo">2239</span> private void checkReplicationScope(ColumnFamilyDescriptor hcd) throws IOException{<a name="line.2239"></a>
-<span class="sourceLineNo">2240</span> // check replication scope<a name="line.2240"></a>
-<span class="sourceLineNo">2241</span> WALProtos.ScopeType scop = WALProtos.ScopeType.valueOf(hcd.getScope());<a name="line.2241"></a>
-<span class="sourceLineNo">2242</span> if (scop == null) {<a name="line.2242"></a>
-<span class="sourceLineNo">2243</span> String message = "Replication scope for column family "<a name="line.2243"></a>
-<span class="sourceLineNo">2244</span> + hcd.getNameAsString() + " is " + hcd.getScope() + " which is invalid.";<a name="line.2244"></a>
+<span class="sourceLineNo">2211</span><a name="line.2211"></a>
+<span class="sourceLineNo">2212</span> // check versions<a name="line.2212"></a>
+<span class="sourceLineNo">2213</span> if (hcd.getMinVersions() < 0) {<a name="line.2213"></a>
+<span class="sourceLineNo">2214</span> String message = "Min versions for column family " + hcd.getNameAsString()<a name="line.2214"></a>
+<span class="sourceLineNo">2215</span> + " must be positive.";<a name="line.2215"></a>
+<span class="sourceLineNo">2216</span> warnOrThrowExceptionForFailure(logWarn, CONF_KEY, message, null);<a name="line.2216"></a>
+<span class="sourceLineNo">2217</span> }<a name="line.2217"></a>
+<span class="sourceLineNo">2218</span> // max versions already being checked<a name="line.2218"></a>
+<span class="sourceLineNo">2219</span><a name="line.2219"></a>
+<span class="sourceLineNo">2220</span> // HBASE-13776 Setting illegal versions for ColumnFamilyDescriptor<a name="line.2220"></a>
+<span class="sourceLineNo">2221</span> // does not throw IllegalArgumentException<a name="line.2221"></a>
+<span class="sourceLineNo">2222</span> // check minVersions <= maxVerions<a name="line.2222"></a>
+<span class="sourceLineNo">2223</span> if (hcd.getMinVersions() > hcd.getMaxVersions()) {<a name="line.2223"></a>
+<span class="sourceLineNo">2224</span> String message = "Min versions for column family " + hcd.getNameAsString()<a name="line.2224"></a>
+<span class="sourceLineNo">2225</span> + " must be less than the Max versions.";<a name="line.2225"></a>
+<span class="sourceLineNo">2226</span> warnOrThrowExceptionForFailure(logWarn, CONF_KEY, message, null);<a name="line.2226"></a>
+<span class="sourceLineNo">2227</span> }<a name="line.2227"></a>
+<span class="sourceLineNo">2228</span><a name="line.2228"></a>
+<span class="sourceLineNo">2229</span> // check replication scope<a name="line.2229"></a>
+<span class="sourceLineNo">2230</span> checkReplicationScope(hcd);<a name="line.2230"></a>
+<span class="sourceLineNo">2231</span> // check bloom filter type<a name="line.2231"></a>
+<span class="sourceLineNo">2232</span> checkBloomFilterType(hcd);<a name="line.2232"></a>
+<span class="sourceLineNo">2233</span><a name="line.2233"></a>
+<span class="sourceLineNo">2234</span> // check data replication factor, it can be 0(default value) when user has not explicitly<a name="line.2234"></a>
+<span class="sourceLineNo">2235</span> // set the value, in this case we use default replication factor set in the file system.<a name="line.2235"></a>
+<span class="sourceLineNo">2236</span> if (hcd.getDFSReplication() < 0) {<a name="line.2236"></a>
+<span class="sourceLineNo">2237</span> String message = "HFile Replication for column family " + hcd.getNameAsString()<a name="line.2237"></a>
+<span class="sourceLineNo">2238</span> + " must be greater than zero.";<a name="line.2238"></a>
+<span class="sourceLineNo">2239</span> warnOrThrowExceptionForFailure(logWarn, CONF_KEY, message, null);<a name="line.2239"></a>
+<span class="sourceLineNo">2240</span> }<a name="line.2240"></a>
+<span class="sourceLineNo">2241</span><a name="line.2241"></a>
+<span class="sourceLineNo">2242</span> // TODO: should we check coprocessors and encryption ?<a name="line.2242"></a>
+<span class="sourceLineNo">2243</span> }<a name="line.2243"></a>
+<span class="sourceLineNo">2244</span> }<a name="line.2244"></a>
<span class="sourceLineNo">2245</span><a name="line.2245"></a>
-<span class="sourceLineNo">2246</span> LOG.error(message);<a name="line.2246"></a>
-<span class="sourceLineNo">2247</span> throw new DoNotRetryIOException(message);<a name="line.2247"></a>
-<span class="sourceLineNo">2248</span> }<a name="line.2248"></a>
-<span class="sourceLineNo">2249</span> }<a name="line.2249"></a>
-<span class="sourceLineNo">2250</span><a name="line.2250"></a>
-<span class="sourceLineNo">2251</span> private void checkCompactionPolicy(Configuration conf, TableDescriptor htd)<a name="line.2251"></a>
-<span class="sourceLineNo">2252</span> throws IOException {<a name="line.2252"></a>
-<span class="sourceLineNo">2253</span> // FIFO compaction has some requirements<a name="line.2253"></a>
-<span class="sourceLineNo">2254</span> // Actually FCP ignores periodic major compactions<a name="line.2254"></a>
-<span class="sourceLineNo">2255</span> String className = htd.getValue(DefaultStoreEngine.DEFAULT_COMPACTION_POLICY_CLASS_KEY);<a name="line.2255"></a>
-<span class="sourceLineNo">2256</span> if (className == null) {<a name="line.2256"></a>
-<span class="sourceLineNo">2257</span> className =<a name="line.2257"></a>
-<span class="sourceLineNo">2258</span> conf.get(DefaultStoreEngine.DEFAULT_COMPACTION_POLICY_CLASS_KEY,<a name="line.2258"></a>
-<span class="sourceLineNo">2259</span> ExploringCompactionPolicy.class.getName());<a name="line.2259"></a>
-<span class="sourceLineNo">2260</span> }<a name="line.2260"></a>
-<span class="sourceLineNo">2261</span><a name="line.2261"></a>
-<span class="sourceLineNo">2262</span> int blockingFileCount = HStore.DEFAULT_BLOCKING_STOREFILE_COUNT;<a name="line.2262"></a>
-<span class="sourceLineNo">2263</span> String sv = htd.getValue(HStore.BLOCKING_STOREFILES_KEY);<a name="line.2263"></a>
-<span class="sourceLineNo">2264</span> if (sv != null) {<a name="line.2264"></a>
-<span class="sourceLineNo">2265</span> blockingFileCount = Integer.parseInt(sv);<a name="line.2265"></a>
-<span class="sourceLineNo">2266</span> } else {<a name="line.2266"></a>
-<span class="sourceLineNo">2267</span> blockingFileCount = conf.getInt(HStore.BLOCKING_STOREFILES_KEY, blockingFileCount);<a name="line.2267"></a>
-<span class="sourceLineNo">2268</span> }<a name="line.2268"></a>
-<span class="sourceLineNo">2269</span><a name="line.2269"></a>
-<span class="sourceLineNo">2270</span> for (ColumnFamilyDescriptor hcd : htd.getColumnFamilies()) {<a name="line.2270"></a>
-<span class="sourceLineNo">2271</span> String compactionPolicy =<a name="line.2271"></a>
-<span class="sourceLineNo">2272</span> hcd.getConfigurationValue(DefaultStoreEngine.DEFAULT_COMPACTION_POLICY_CLASS_KEY);<a name="line.2272"></a>
-<span class="sourceLineNo">2273</span> if (compactionPolicy == null) {<a name="line.2273"></a>
-<span class="sourceLineNo">2274</span> compactionPolicy = className;<a name="line.2274"></a>
-<span class="sourceLineNo">2275</span> }<a name="line.2275"></a>
-<span class="sourceLineNo">2276</span> if (!compactionPolicy.equals(FIFOCompactionPolicy.class.getName())) {<a name="line.2276"></a>
-<span class="sourceLineNo">2277</span> continue;<a name="line.2277"></a>
-<span class="sourceLineNo">2278</span> }<a name="line.2278"></a>
-<span class="sourceLineNo">2279</span> // FIFOCompaction<a name="line.2279"></a>
-<span class="sourceLineNo">2280</span> String message = null;<a name="line.2280"></a>
-<span class="sourceLineNo">2281</span><a name="line.2281"></a>
-<span class="sourceLineNo">2282</span> // 1. Check TTL<a name="line.2282"></a>
-<span class="sourceLineNo">2283</span> if (hcd.getTimeToLive() == ColumnFamilyDescriptorBuilder.DEFAULT_TTL) {<a name="line.2283"></a>
-<span class="sourceLineNo">2284</span> message = "Default TTL is not supported for FIFO compaction";<a name="line.2284"></a>
-<span class="sourceLineNo">2285</span> throw new IOException(message);<a name="line.2285"></a>
-<span class="sourceLineNo">2286</span> }<a name="line.2286"></a>
-<span class="sourceLineNo">2287</span><a name="line.2287"></a>
-<span class="sourceLineNo">2288</span> // 2. Check min versions<a name="line.2288"></a>
-<span class="sourceLineNo">2289</span> if (hcd.getMinVersions() > 0) {<a name="line.2289"></a>
-<span class="sourceLineNo">2290</span> message = "MIN_VERSION > 0 is not supported for FIFO compaction";<a name="line.2290"></a>
-<span class="sourceLineNo">2291</span> throw new IOException(message);<a name="line.2291"></a>
-<span class="sourceLineNo">2292</span> }<a name="line.2292"></a>
-<span class="sourceLineNo">2293</span><a name="line.2293"></a>
-<span class="sourceLineNo">2294</span> // 3. blocking file count<a name="line.2294"></a>
-<span class="sourceLineNo">2295</span> sv = hcd.getConfigurationValue(HStore.BLOCKING_STOREFILES_KEY);<a name="line.2295"></a>
-<span class="sourceLineNo">2296</span> if (sv != null) {<a name="line.2296"></a>
-<span class="sourceLineNo">2297</span> blockingFileCount = Integer.parseInt(sv);<a name="line.2297"></a>
-<span class="sourceLineNo">2298</span> }<a name="line.2298"></a>
-<span class="sourceLineNo">2299</span> if (blockingFileCount < 1000) {<a name="line.2299"></a>
-<span class="sourceLineNo">2300</span> message =<a name="line.2300"></a>
-<span class="sourceLineNo">2301</span> "Blocking file count '" + HStore.BLOCKING_STOREFILES_KEY + "' " + blockingFileCount<a name="line.2301"></a>
-<span class="sourceLineNo">2302</span> + " is below recommended minimum of 1000 for column family "+ hcd.getNameAsString();<a name="line.2302"></a>
-<span class="sourceLineNo">2303</span> throw new IOException(message);<a name="line.2303"></a>
-<span class="sourceLineNo">2304</span> }<a name="line.2304"></a>
-<span class="sourceLineNo">2305</span> }<a name="line.2305"></a>
-<span class="sourceLineNo">2306</span> }<a name="line.2306"></a>
-<span class="sourceLineNo">2307</span><a name="line.2307"></a>
-<span class="sourceLineNo">2308</span> private static void checkBloomFilterType(ColumnFamilyDescriptor cfd)<a name="line.2308"></a>
-<span class="sourceLineNo">2309</span> throws IOException {<a name="line.2309"></a>
-<span class="sourceLineNo">2310</span> Configuration conf = new CompoundConfiguration().addStringMap(cfd.getConfiguration());<a name="line.2310"></a>
-<span class="sourceLineNo">2311</span> try {<a name="line.2311"></a>
-<span class="sourceLineNo">2312</span> BloomFilterUtil.getBloomFilterParam(cfd.getBloomFilterType(), conf);<a name="line.2312"></a>
-<span class="sourceLineNo">2313</span> } catch (IllegalArgumentException e) {<a name="line.2313"></a>
-<span class="sourceLineNo">2314</span> throw new DoNotRetryIOException("Failed to get bloom filter param", e);<a name="line.2314"></a>
-<span class="sourceLineNo">2315</span> }<a name="line.2315"></a>
-<span class="sourceLineNo">2316</span> }<a name="line.2316"></a>
-<span class="sourceLineNo">2317</span><a name="line.2317"></a>
-<span class="sourceLineNo">2318</span> // HBASE-13350 - Helper method to log warning on sanity check failures if checks disabled.<a name="line.2318"></a>
-<span class="sourceLineNo">2319</span> private static void warnOrThrowExceptionForFailure(boolean logWarn, String confKey,<a name="line.2319"></a>
-<span class="sourceLineNo">2320</span> String message, Exception cause) throws IOException {<a name="line.2320"></a>
-<span class="sourceLineNo">2321</span> if (!logWarn) {<a name="line.2321"></a>
-<span class="sourceLineNo">2322</span> throw new DoNotRetryIOException(message + " Set " + confKey +<a name="line.2322"></a>
-<span class="sourceLineNo">2323</span> " to false at conf or table descriptor if you want to bypass sanity checks", cause);<a name="line.2323"></a>
-<span class="sourceLineNo">2324</span> }<a name="line.2324"></a>
-<span class="sourceLineNo">2325</span> LOG.warn(message);<a name="line.2325"></a>
-<span class="sourceLineNo">2326</span> }<a name="line.2326"></a>
-<span class="sourceLineNo">2327</span><a name="line.2327"></a>
-<span class="sourceLineNo">2328</span> private void startActiveMasterManager(int infoPort) throws KeeperException {<a name="line.2328"></a>
-<span class="sourceLineNo">2329</span> String backupZNode = ZNodePaths.joinZNode(<a name="line.2329"></a>
-<span class="sourceLineNo">2330</span> zooKeeper.getZNodePaths().backupMasterAddressesZNode, serverName.toString());<a name="line.2330"></a>
-<span class="sourceLineNo">2331</span> /*<a name="line.2331"></a>
-<span class="sourceLineNo">2332</span> * Add a ZNode for ourselves in the backup master directory since we<a name="line.2332"></a>
-<span class="sourceLineNo">2333</span> * may not become the active master. If so, we want the actual active<a name="line.2333"></a>
-<span class="sourceLineNo">2334</span> * master to know we are backup masters, so that it won't assign<a name="line.2334"></a>
-<span class="sourceLineNo">2335</span> * regions to us if so configured.<a name="line.2335"></a>
-<span class="sourceLineNo">2336</span> *<a name="line.2336"></a>
-<span class="sourceLineNo">2337</span> * If we become the active master later, ActiveMasterManager will delete<a name="line.2337"></a>
-<span class="sourceLineNo">2338</span> * this node explicitly. If we crash before then, ZooKeeper will delete<a name="line.2338"></a>
-<span class="sourceLineNo">2339</span> * this node for us since it is ephemeral.<a name="line.2339"></a>
-<span class="sourceLineNo">2340</span> */<a name="line.2340"></a>
-<span class="sourceLineNo">2341</span> LOG.info("Adding backup master ZNode " + backupZNode);<a name="line.2341"></a>
-<span class="sourceLineNo">2342</span> if (!MasterAddressTracker.setMasterAddress(zooKeeper, backupZNode, serverName, infoPort)) {<a name="line.2342"></a>
-<span class="sourceLineNo">2343</span> LOG.warn("Failed create of " + backupZNode + " by " + serverName);<a name="line.2343"></a>
-<span class="sourceLineNo">2344</span> }<a name="line.2344"></a>
-<span class="sourceLineNo">2345</span> this.activeMasterManager.setInfoPort(infoPort);<a name="line.2345"></a>
-<span class="sourceLineNo">2346</span> int timeout = conf.getInt(HConstants.ZK_SESSION_TIMEOUT, HConstants.DEFAULT_ZK_SESSION_TIMEOUT);<a name="line.2346"></a>
-<span class="sourceLineNo">2347</span> // If we're a backup master, stall until a primary to write this address<a name="line.2347"></a>
-<span class="sourceLineNo">2348</span> if (conf.getBoolean(HConstants.MASTER_TYPE_BACKUP, HConstants.DEFAULT_MASTER_TYPE_BACKUP)) {<a name="line.2348"></a>
-<span class="sourceLineNo">2349</span> LOG.debug("HMaster started in backup mode. Stalling until master znode is written.");<a name="line.2349"></a>
-<span class="sourceLineNo">2350</span> // This will only be a minute or so while the cluster starts up,<a name="line.2350"></a>
-<span class="sourceLineNo">2351</span> // so don't worry about setting watches on the parent znode<a name="line.2351"></a>
-<span class="sourceLineNo">2352</span> while (!activeMasterManager.hasActiveMaster()) {<a name="line.2352"></a>
-<span class="sourceLineNo">2353</span> LOG.debug("Waiting for master address and cluster state znode to be written.");<a name="line.2353"></a>
-<span class="sourceLineNo">2354</span> Threads.sleep(timeout);<a name="line.2354"></a>
-<span class="sourceLineNo">2355</span> }<a name="line.2355"></a>
-<span class="sourceLineNo">2356</span> }<a name="line.2356"></a>
-<span class="sourceLineNo">2357</span> MonitoredTask status = TaskMonitor.get().createStatus("Master startup");<a name="line.2357"></a>
-<span class="sourceLineNo">2358</span> status.setDescription("Master startup");<a name="line.2358"></a>
-<span class="sourceLineNo">2359</span> try {<a name="line.2359"></a>
-<span class="sourceLineNo">2360</span> if (activeMasterManager.blockUntilBecomingActiveMaster(timeout, status)) {<a name="line.2360"></a>
-<span class="sourceLineNo">2361</span> finishActiveMasterInitialization(status);<a name="line.2361"></a>
+<span class="sourceLineNo">2246</span> private void checkReplicationScope(ColumnFamilyDescriptor hcd) throws IOException{<a name="line.2246"></a>
+<span class="sourceLineNo">2247</span> // check replication scope<a name="line.2247"></a>
+<span class="sourceLineNo">2248</span> WALProtos.ScopeType scop = WALProtos.ScopeType.valueOf(hcd.getScope());<a name="line.2248"></a>
+<span class="sourceLineNo">2249</span> if (scop == null) {<a name="line.2249"></a>
+<span class="sourceLineNo">2250</span> String message = "Replication scope for column family "<a name="line.2250"></a>
+<span class="sourceLineNo">2251</span> + hcd.getNameAsString() + " is " + hcd.getScope() + " which is invalid.";<a name="line.2251"></a>
+<span class="sourceLineNo">2252</span><a name="line.2252"></a>
+<span class="sourceLineNo">2253</span> LOG.error(message);<a name="line.2253"></a>
+<span class="sourceLineNo">2254</span> throw new DoNotRetryIOException(message);<a name="line.2254"></a>
+<span class="sourceLineNo">2255</span> }<a name="line.2255"></a>
+<span class="sourceLineNo">2256</span> }<a name="line.2256"></a>
+<span class="sourceLineNo">2257</span><a name="line.2257"></a>
+<span class="sourceLineNo">2258</span> private void checkCompactionPolicy(Configuration conf, TableDescriptor htd)<a name="line.2258"></a>
+<span class="sourceLineNo">2259</span> throws IOException {<a name="line.2259"></a>
+<span class="sourceLineNo">2260</span> // FIFO compaction has some requirements<a name="line.2260"></a>
+<span class="sourceLineNo">2261</span> // Actually FCP ignores periodic major compactions<a name="line.2261"></a>
+<span class="sourceLineNo">2262</span> String className = htd.getValue(DefaultStoreEngine.DEFAULT_COMPACTION_POLICY_CLASS_KEY);<a name="line.2262"></a>
+<span class="sourceLineNo">2263</span> if (className == null) {<a name="line.2263"></a>
+<span class="sourceLineNo">2264</span> className =<a name="line.2264"></a>
+<span class="sourceLineNo">2265</span> conf.get(DefaultStoreEngine.DEFAULT_COMPACTION_POLICY_CLASS_KEY,<a name="line.2265"></a>
+<span class="sourceLineNo">2266</span> ExploringCompactionPolicy.class.getName());<a name="line.2266"></a>
+<span class="sourceLineNo">2267</span> }<a name="line.2267"></a>
+<span class="sourceLineNo">2268</span><a name="line.2268"></a>
+<span class="sourceLineNo">2269</span> int blockingFileCount = HStore.DEFAULT_BLOCKING_STOREFILE_COUNT;<a name="line.2269"></a>
+<span class="sourceLineNo">2270</span> String sv = htd.getValue(HStore.BLOCKING_STOREFILES_KEY);<a name="line.2270"></a>
+<span class="sourceLineNo">2271</span> if (sv != null) {<a name="line.2271"></a>
+<span class="sourceLineNo">2272</span> blockingFileCount = Integer.parseInt(sv);<a name="line.2272"></a>
+<span class="sourceLineNo">2273</span> } else {<a name="line.2273"></a>
+<span class="sourceLineNo">2274</span> blockingFileCount = conf.getInt(HStore.BLOCKING_STOREFILES_KEY, blockingFileCount);<a name="line.2274"></a>
+<span class="sourceLineNo">2275</span> }<a name="line.2275"></a>
+<span class="sourceLineNo">2276</span><a name="line.2276"></a>
+<span class="sourceLineNo">2277</span> for (ColumnFamilyDescriptor hcd : htd.getColumnFamilies()) {<a name="line.2277"></a>
+<span class="sourceLineNo">2278</span> String compactionPolicy =<a name="line.2278"></a>
+<span class="sourceLineNo">2279</span> hcd.getConfigurationValue(DefaultStoreEngine.DEFAULT_COMPACTION_POLICY_CLASS_KEY);<a name="line.2279"></a>
+<span class="sourceLineNo">2280</span> if (compactionPolicy == null) {<a name="line.2280"></a>
+<span class="sourceLineNo">2281</span> compactionPolicy = className;<a name="line.2281"></a>
+<span class="sourceLineNo">2282</span> }<a name="line.2282"></a>
+<span class="sourceLineNo">2283</span> if (!compactionPolicy.equals(FIFOCompactionPolicy.class.getName())) {<a name="line.2283"></a>
+<span class="sourceLineNo">2284</span> continue;<a name="line.2284"></a>
+<span class="sourceLineNo">2285</span> }<a name="line.2285"></a>
+<span class="sourceLineNo">2286</span> // FIFOCompaction<a name="line.2286"></a>
+<span class="sourceLineNo">2287</span> String message = null;<a name="line.2287"></a>
+<span class="sourceLineNo">2288</span><a name="line.2288"></a>
+<span class="sourceLineNo">2289</span> // 1. Check TTL<a name="line.2289"></a>
+<span class="sourceLineNo">2290</span> if (hcd.getTimeToLive() == ColumnFamilyDescriptorBuilder.DEFAULT_TTL) {<a name="line.2290"></a>
+<span class="sourceLineNo">2291</span> message = "Default TTL is not supported for FIFO compaction";<a name="line.2291"></a>
+<span class="sourceLineNo">2292</span> throw new IOException(message);<a name="line.2292"></a>
+<span class="sourceLineNo">2293</span> }<a name="line.2293"></a>
+<span class="sourceLineNo">2294</span><a name="line.2294"></a>
+<span class="sourceLineNo">2295</span> // 2. Check min versions<a name="line.2295"></a>
+<span class="sourceLineNo">2296</span> if (hcd.getMinVersions() > 0) {<a name="line.2296"></a>
+<span class="sourceLineNo">2297</span> message = "MIN_VERSION > 0 is not supported for FIFO compaction";<a name="line.2297"></a>
+<span class="sourceLineNo">2298</span> throw new IOException(message);<a name="line.2298"></a>
+<span class="sourceLineNo">2299</span> }<a name="line.2299"></a>
+<span class="sourceLineNo">2300</span><a name="line.2300"></a>
+<span class="sourceLineNo">2301</span> // 3. blocking file count<a name="line.2301"></a>
+<span class="sourceLineNo">2302</span> sv = hcd.getConfigurationValue(HStore.BLOCKING_STOREFILES_KEY);<a name="line.2302"></a>
+<span class="sourceLineNo">2303</span> if (sv != null) {<a name="line.2303"></a>
+<span class="sourceLineNo">2304</span> blockingFileCount = Integer.parseInt(sv);<a name="line.2304"></a>
+<span class="sourceLineNo">2305</span> }<a name="line.2305"></a>
+<span class="sourceLineNo">2306</span> if (blockingFileCount < 1000) {<a name="line.2306"></a>
+<span class="sourceLineNo">2307</span> message =<a name="line.2307"></a>
+<span class="sourceLineNo">2308</span> "Blocking file count '" + HStore.BLOCKING_STOREFILES_KEY + "' " + blockingFileCount<a name="line.2308"></a>
+<span class="sourceLineNo">2309</span> + " is below recommended minimum of 1000 for column family "+ hcd.getNameAsString();<a name="line.2309"></a>
+<span class="sourceLineNo">2310</span> throw new IOException(message);<a name="line.2310"></a>
+<span class="sourceLineNo">2311</span> }<a name="line.2311"></a>
+<span class="sourceLineNo">2312</span> }<a name="line.2312"></a>
+<span class="sourceLineNo">2313</span> }<a name="line.2313"></a>
+<span class="sourceLineNo">2314</span><a name="line.2314"></a>
+<span class="sourceLineNo">2315</span> private static void checkBloomFilterType(ColumnFamilyDescriptor cfd)<a name="line.2315"></a>
+<span class="sourceLineNo">2316</span> throws IOException {<a name="line.2316"></a>
+<span class="sourceLineNo">2317</span> Configuration conf = new CompoundConfiguration().addStringMap(cfd.getConfiguration());<a name="line.2317"></a>
+<span class="sourceLineNo">2318</span> try {<a name="line.2318"></a>
+<span class="sourceLineNo">2319</span> BloomFilterUtil.getBloomFilterParam(cfd.getBloomFilterType(), conf);<a name="line.2319"></a>
+<span class="sourceLineNo">2320</span> } catch (IllegalArgumentException e) {<a name="line.2320"></a>
+<span class="sourceLineNo">2321</span> throw new DoNotRetryIOException("Failed to get bloom filter param", e);<a name="line.2321"></a>
+<span class="sourceLineNo">2322</span> }<a name="line.2322"></a>
+<span class="sourceLineNo">2323</span> }<a name="line.2323"></a>
+<span class="sourceLineNo">2324</span><a name="line.2324"></a>
+<span class="sourceLineNo">2325</span> // HBASE-13350 - Helper method to log warning on sanity check failures if checks disabled.<a name="line.2325"></a>
+<span class="sourceLineNo">2326</span> private static void warnOrThrowExceptionForFailure(boolean logWarn, String confKey,<a name="line.2326"></a>
+<span class="sourceLineNo">2327</span> String message, Exception cause) throws IOException {<a name="line.2327"></a>
+<span class="sourceLineNo">2328</span> if (!logWarn) {<a name="line.2328"></a>
+<span class="sourceLineNo">2329</span> throw new DoNotRetryIOException(message + " Set " + confKey +<a name="line.2329"></a>
+<span class="sourceLineNo">2330</span> " to false at conf or table descriptor if you want to bypass sanity checks", cause);<a name="line.2330"></a>
+<span class="sourceLineNo">2331</span> }<a name="line.2331"></a>
+<span class="sourceLineNo">2332</span> LOG.warn(message);<a name="line.2332"></a>
+<span class="sourceLineNo">2333</span> }<a name="line.2333"></a>
+<span class="sourceLineNo">2334</span><a name="line.2334"></a>
+<span class="sourceLineNo">2335</span> private void startActiveMasterManager(int infoPort) throws KeeperException {<a name="line.2335"></a>
+<span class="sourceLineNo">2336</span> String backupZNode = ZNodePaths.joinZNode(<a name="line.2336"></a>
+<span class="sourceLineNo">2337</span> zooKeeper.getZNodePaths().backupMasterAddressesZNode, serverName.toString());<a name="line.2337"></a>
+<span class="sourceLineNo">2338</span> /*<a name="line.2338"></a>
+<span class="sourceLineNo">2339</span> * Add a ZNode for ourselves in the backup master directory since we<a name="line.2339"></a>
+<span class="sourceLineNo">2340</span> * may not become the active master. If so, we want the actual active<a name="line.2340"></a>
+<span class="sourceLineNo">2341</span> * master to know we are backup masters, so that it won't assign<a name="line.2341"></a>
+<span class="sourceLineNo">2342</span> * regions to us if so configured.<a name="line.2342"></a>
+<span class="sourceLineNo">2343</span> *<a name="line.2343"></a>
+<span class="sourceLineNo">2344</span> * If we become the active master later, ActiveMasterManager will delete<a name="line.2344"></a>
+<span class="sourceLineNo">2345</span> * this node explicitly. If we crash before then, ZooKeeper will delete<a name="line.2345"></a>
+<span class="sourceLineNo">2346</span> * this node for us since it is ephemeral.<a name="line.2346"></a>
+<span class="sourceLineNo">2347</span> */<a name="line.2347"></a>
+<span class="sourceLineNo">2348</span> LOG.info("Adding backup master ZNode " + backupZNode);<a name="line.2348"></a>
+<span class="sourceLineNo">2349</span> if (!MasterAddressTracker.setMasterAddress(zooKeeper, backupZNode, serverName, infoPort)) {<a name="line.2349"></a>
+<span class="sourceLineNo">2350</span> LOG.warn("Failed create of " + backupZNode + " by " + serverName);<a name="line.2350"></a>
+<span class="sourceLineNo">2351</span> }<a name="line.2351"></a>
+<span class="sourceLineNo">2352</span> this.activeMasterManager.setInfoPort(infoPort);<a name="line.2352"></a>
+<span class="sourceLineNo">2353</span> int timeout = conf.getInt(HConstants.ZK_SESSION_TIMEOUT, HConstants.DEFAULT_ZK_SESSION_TIMEOUT);<a name="line.2353"></a>
+<span class="sourceLineNo">2354</span> // If we're a backup master, stall until a primary to write this address<a name="line.2354"></a>
+<span class="sourceLineNo">2355</span> if (conf.getBoolean(HConstants.MASTER_TYPE_BACKUP, HConstants.DEFAULT_MASTER_TYPE_BACKUP)) {<a name="line.2355"></a>
+<span class="sourceLineNo">2356</span> LOG.debug("HMaster started in backup mode. Stalling until master znode is written.");<a name="line.2356"></a>
+<span class="sourceLineNo">2357</span> // This will only be a minute or so while the cluster starts up,<a name="line.2357"></a>
+<span class="sourceLineNo">2358</span> // so don't worry about setting watches on the parent znode<a name="line.2358"></a>
+<span class="sourceLineNo">2359</span> while (!activeMasterManager.hasActiveMaster()) {<a name="line.2359"></a>
+<span class="sourceLineNo">2360</span> LOG.debug("Waiting for master address and cluster state znode to be written.");<a name="line.2360"></a>
+<span class="sourceLineNo">2361</span> Threads.sleep(timeout);<a name="line.2361"></a>
<span class="sourceLineNo">2362</span> }<a name="line.2362"></a>
-<span class="sourceLineNo">2363</span> } catch (Throwable t) {<a name="line.2363"></a>
-<span class="sourceLineNo">2364</span> status.setStatus("Failed to become active: " + t.getMessage());<a name="line.2364"></a>
-<span class="sourceLineNo">2365</span> LOG.error(HBaseMarkers.FATAL, "Failed to become active master", t);<a name="line.2365"></a>
-<span class="sourceLineNo">2366</span> // HBASE-5680: Likely hadoop23 vs hadoop 20.x/1.x incompatibility<a name="line.2366"></a>
-<span class="sourceLineNo">2367</span> if (t instanceof NoClassDefFoundError && t.getMessage().<a name="line.2367"></a>
-<span class="sourceLineNo">2368</span> contains("org/apache/hadoop/hdfs/protocol/HdfsConstants$SafeModeAction")) {<a name="line.2368"></a>
-<span class="sourceLineNo">2369</span> // improved error message for this special case<a name="line.2369"></a>
-<span class="sourceLineNo">2370</span> abort("HBase is having a problem with its Hadoop jars. You may need to recompile " +<a name="line.2370"></a>
-<span class="sourceLineNo">2371</span> "HBase against Hadoop version " + org.apache.hadoop.util.VersionInfo.getVersion() +<a name="line.2371"></a>
-<span class="sourceLineNo">2372</span> " or change your hadoop jars to start properly", t);<a name="line.2372"></a>
-<span class="sourceLineNo">2373</span> } else {<a name="line.2373"></a>
-<span class="sourceLineNo">2374</span> abort("Unhandled exception. Starting shutdown.", t);<a name="line.2374"></a>
-<span class="sourceLineNo">2375</span> }<a name="line.2375"></a>
-<span class="sourceLineNo">2376</span> } finally {<a name="line.2376"></a>
-<span class="sourceLineNo">2377</span> status.cleanup();<a name="line.2377"></a>
-<span class="sourceLineNo">2378</span> }<a name="line.2378"></a>
-<span class="sourceLineNo">2379</span> }<a name="line.2379"></a>
-<span class="sourceLineNo">2380</span><a name="line.2380"></a>
-<span class="sourceLineNo">2381</span> private void checkCompression(final TableDescriptor htd)<a name="line.2381"></a>
-<span class="sourceLineNo">2382</span> throws IOException {<a name="line.2382"></a>
-<span class="sourceLineNo">2383</span> if (!this.masterCheckCompression) return;<a name="line.2383"></a>
-<span class="sourceLineNo">2384</span> for (ColumnFamilyDescriptor hcd : htd.getColumnFamilies()) {<a name="line.2384"></a>
-<span class="sourceLineNo">2385</span> checkCompression(hcd);<a name="line.2385"></a>
-<span class="sourceLineNo">2386</span> }<a name="line.2386"></a>
-<span class="sourceLineNo">2387</span> }<a name="line.2387"></a>
-<span class="sourceLineNo">2388</span><a name="line.2388"></a>
-<span class="sourceLineNo">2389</span> private void checkCompression(final ColumnFamilyDescriptor hcd)<a name="line.2389"></a>
-<span class="sourceLineNo">2390</span> throws IOException {<a name="line.2390"></a>
-<span class="sourceLineNo">2391</span> if (!this.masterCheckCompression) return;<a name="line.2391"></a>
-<span class="sourceLineNo">2392</span> CompressionTest.testCompression(hcd.getCompressionType());<a name="line.2392"></a>
-<span class="sourceLineNo">2393</span> CompressionTest.testCompression(hcd.getCompactionCompressionType());<a name="line.2393"></a>
+<span class="sourceLineNo">2363</span> }<a name="line.2363"></a>
+<span class="sourceLineNo">2364</span> MonitoredTask status = TaskMonitor.get().createStatus("Master startup");<a name="line.2364"></a>
+<span class="sourceLineNo">2365</span> status.setDescription("Master startup");<a name="line.2365"></a>
+<span class="sourceLineNo">2366</span> try {<a name="line.2366"></a>
+<span class="sourceLineNo">2367</span> if (activeMasterManager.blockUntilBecomingActiveMaster(timeout, status)) {<a name="line.2367"></a>
+<span class="sourceLineNo">2368</span> finishActiveMasterInitialization(status);<a name="line.2368"></a>
+<span class="sourceLineNo">2369</span> }<a name="line.2369"></a>
+<span class="sourceLineNo">2370</span> } catch (Throwable t) {<a name="line.2370"></a>
+<span class="sourceLineNo">2371</span> status.setStatus("Failed to become active: " + t.getMessage());<a name="line.2371"></a>
+<span class="sourceLineNo">2372</span> LOG.error(HBaseMarkers.FATAL, "Failed to become active master", t);<a name="line.2372"></a>
+<span class="sourceLineNo">2373</span> // HBASE-5680: Likely hadoop23 vs hadoop 20.x/1.x incompatibility<a name="line.2373"></a>
+<span class="sourceLineNo">2374</span> if (t instanceof NoClassDefFoundError && t.getMessage().<a name="line.2374"></a>
+<span class="sourceLineNo">2375</span> contains("org/apache/hadoop/hdfs/protocol/HdfsConstants$SafeModeAction")) {<a name="line.2375"></a>
+<span class="sourceLineNo">2376</span> // improved error message for this special case<a name="line.2376"></a>
+<span class="sourceLineNo">2377</span> abort("HBase is having a problem with its Hadoop jars. You may need to recompile " +<a name="line.2377"></a>
+<span class="sourceLineNo">2378</span> "HBase against Hadoop version " + org.apache.hadoop.util.VersionInfo.getVersion() +<a name="line.2378"></a>
+<span class="sourceLineNo">2379</span> " or change your hadoop jars to start properly", t);<a name="line.2379"></a>
+<span class="sourceLineNo">2380</span> } else {<a name="line.2380"></a>
+<span class="sourceLineNo">2381</span> abort("Unhandled exception. Starting shutdown.", t);<a name="line.2381"></a>
+<span class="sourceLineNo">2382</span> }<a name="line.2382"></a>
+<span class="sourceLineNo">2383</span> } finally {<a name="line.2383"></a>
+<span class="sourceLineNo">2384</span> status.cleanup();<a name="line.2384"></a>
+<span class="sourceLineNo">2385</span> }<a name="line.2385"></a>
+<span class="sourceLineNo">2386</span> }<a name="line.2386"></a>
+<span class="sourceLineNo">2387</span><a name="line.2387"></a>
+<span class="sourceLineNo">2388</span> private void checkCompression(final TableDescriptor htd)<a name="line.2388"></a>
+<span class="sourceLineNo">2389</span> throws IOException {<a name="line.2389"></a>
+<span class="sourceLineNo">2390</span> if (!this.masterCheckCompression) return;<a name="line.2390"></a>
+<span class="sourceLineNo">2391</span> for (ColumnFamilyDescriptor hcd : htd.getColumnFamilies()) {<a name="line.2391"></a>
+<span class="sourceLineNo">2392</span> checkCompression(hcd);<a name="line.2392"></a>
+<span class="sourceLineNo">2393</span> }<a name="line.2393"></a>
<span class="sourceLineNo">2394</span> }<a name="line.2394"></a>
<span class="sourceLineNo">2395</span><a name="line.2395"></a>
-<span class="sourceLineNo">2396</span> private void checkEncryption(final Configuration conf, final TableDescriptor htd)<a name="line.2396"></a>
+<span class="sourceLineNo">2396</span> private void checkCompression(final ColumnFamilyDescriptor hcd)<a name="line.2396"></a>
<span class="sourceLineNo">2397</span> throws IOException {<a name="line.2397"></a>
-<span class="sourceLineNo">2398</span> if (!this.masterCheckEncryption) return;<a name="line.2398"></a>
-<span class="sourceLineNo">2399</span> for (ColumnFamilyDescriptor hcd : htd.getColumnFamilies()) {<a name="line.2399"></a>
-<span class="sourceLineNo">2400</span> checkEncryption(conf, hcd);<a name="line.2400"></a>
-<span class="sourceLineNo">2401</span> }<a name="line.2401"></a>
-<span class="sourceLineNo">2402</span> }<a name="line.2402"></a>
-<span class="sourceLineNo">2403</span><a name="line.2403"></a>
-<span class="sourceLineNo">2404</span> private void checkEncryption(final Configuration conf, final ColumnFamilyDescriptor hcd)<a name="line.2404"></a>
-<span class="sourceLineNo">2405</span> throws IOException {<a name="line.2405"></a>
-<span class="sourceLineNo">2406</span> if (!this.masterCheckEncryption) return;<a name="line.2406"></a>
-<span class="sourceLineNo">2407</span> EncryptionTest.testEncryption(conf, hcd.getEncryptionType(), hcd.getEncryptionKey());<a name="line.2407"></a>
-<span class="sourceLineNo">2408</span> }<a name="line.2408"></a>
-<span class="sourceLineNo">2409</span><a name="line.2409"></a>
-<span class="sourceLineNo">2410</span> private void checkClassLoading(final Configuration conf, final TableDescriptor htd)<a name="line.2410"></a>
-<span class="sourceLineNo">2411</span> throws IOException {<a name="line.2411"></a>
-<span class="sourceLineNo">2412</span> RegionSplitPolicy.getSplitPolicyClass(htd, conf);<a name="line.2412"></a>
-<span class="sourceLineNo">2413</span> RegionCoprocessorHost.testTableCoprocessorAttrs(conf, htd);<a name="line.2413"></a>
-<span class="sourceLineNo">2414</span> }<a name="line.2414"></a>
-<span class="sourceLineNo">2415</span><a name="line.2415"></a>
-<span class="sourceLineNo">2416</span> private static boolean isCatalogTable(final TableName tableName) {<a name="line.2416"></a>
-<span class="sourceLineNo">2417</span> return tableName.equals(TableName.META_TABLE_NAME);<a name="line.2417"></a>
-<span class="sourceLineNo">2418</span> }<a name="line.2418"></a>
-<span class="sourceLineNo">2419</span><a name="line.2419"></a>
-<span class="sourceLineNo">2420</span> @Override<a name="line.2420"></a>
-<span class="sourceLineNo">2421</span> public long deleteTable(<a name="line.2421"></a>
-<span class="sourceLineNo">2422</span> final TableName tableName,<a name="line.2422"></a>
-<span class="sourceLineNo">2423</span> final long nonceGroup,<a name="line.2423"></a>
-<span class="sourceLineNo">2424</span> final long nonce) throws IOException {<a name="line.2424"></a>
-<span class="sourceLineNo">2425</span> checkInitialized();<a name="line.2425"></a>
+<span class="sourceLineNo">2398</span> if (!this.masterCheckCompression) return;<a name="line.2398"></a>
+<span class="sourceLineNo">2399</span> CompressionTest.testCompression(hcd.getCompressionType());<a name="line.2399"></a>
+<span class="sourceLineNo">2400</span> CompressionTest.testCompression(hcd.getCompactionCompressionType());<a name="line.2400"></a>
+<span class="sourceLineNo">2401</span> }<a name="line.2401"></a>
+<span class="sourceLineNo">2402</span><a name="line.2402"></a>
+<span class="sourceLineNo">2403</span> private void checkEncryption(final Configuration conf, final TableDescriptor htd)<a name="line.2403"></a>
+<span class="sourceLineNo">2404</span> throws IOException {<a name="line.2404"></a>
+<span class="sourceLineNo">2405</span> if (!this.masterCheckEncryption) return;<a name="line.2405"></a>
+<span class="sourceLineNo">2406</span> for (ColumnFamilyDescriptor hcd : htd.getColumnFamilies()) {<a name="line.2406"></a>
+<span class="sourceLineNo">2407</span> checkEncryption(conf, hcd);<a name="line.2407"></a>
+<span class="sourceLineNo">2408</span> }<a name="line.2408"></a>
+<span class="sourceLineNo">2409</span> }<a name="line.2409"></a>
+<span class="sourceLineNo">2410</span><a name="line.2410"></a>
+<span class="sourceLineNo">2411</span> private void checkEncryption(final Configuration conf, final ColumnFamilyDescriptor hcd)<a name="line.2411"></a>
+<span class="sourceLineNo">2412</span> throws IOException {<a name="line.2412"></a>
+<span class="sourceLineNo">2413</span> if (!this.masterCheckEncryption) return;<a name="line.2413"></a>
+<span class="sourceLineNo">2414</span> EncryptionTest.testEncryption(conf, hcd.getEncryptionType(), hcd.getEncryptionKey());<a name="line.2414"></a>
+<span class="sourceLineNo">2415</span> }<a name="line.2415"></a>
+<span class="sourceLineNo">2416</span><a name="line.2416"></a>
+<span class="sourceLineNo">2417</span> private void checkClassLoading(final Configuration conf, final TableDescriptor htd)<a name="line.2417"></a>
+<span class="sourceLineNo">2418</span> throws IOException {<a name="line.2418"></a>
+<span class="sourceLineNo">2419</span> RegionSplitPolicy.getSplitPolicyClass(htd, conf);<a name="line.2419"></a>
+<span class="sourceLineNo">2420</span> RegionCoprocessorHost.testTableCoprocessorAttrs(conf, htd);<a name="line.2420"></a>
+<span class="sourceLineNo">2421</span> }<a name="line.2421"></a>
+<span class="sourceLineNo">2422</span><a name="line.2422"></a>
+<span class="sourceLineNo">2423</span> private static boolean isCatalogTable(final TableName tableName) {<a name="line.2423"></a>
+<span class="sourceLineNo">2424</span> return tableName.equals(TableName.META_TABLE_NAME);<a name="line.2424"></a>
+<span class="sourceLineNo">2425</span> }<a name="line.2425"></a>
<span class="sourceLineNo">2426</span><a name="line.2426"></a>
-<span class="sourceLineNo">2427</span> return MasterProcedureUtil.submitProcedure(<a name="line.2427"></a>
-<span class="sourceLineNo">2428</span> new MasterProcedureUtil.NonceProcedureRunnable(this, nonceGroup, nonce) {<a name="line.2428"></a>
-<span class="sourceLineNo">2429</span> @Override<a name="line.2429"></a>
-<span class="sourceLineNo">2430</span> protected void run() throws IOException {<a name="line.2430"></a>
-<span class="sourceLineNo">2431</span> getMaster().getMasterCoprocessorHost().preDeleteTable(tableName);<a name="line.2431"></a>
-<span class="sourceLineNo">2432</span><a name="line.2432"></a>
-<span class="sourceLineNo">2433</span> LOG.info(getClientIdAuditPrefix() + " delete " + tableName);<a name="line.2433"></a>
-<span class="sourceLineNo">2434</span><a name="line.2434"></a>
-<span class="sourceLineNo">2435</span> // TODO: We can handle/merge duplicate request<a name="line.2435"></a>
-<span class="sourceLineNo">2436</span> //<a name="line.2436"></a>
-<span class="sourceLineNo">2437</span> // We need to wait for the procedure to potentially fail due to "prepare" sanity<a name="line.2437"></a>
-<span class="sourceLineNo">2438</span> // checks. This will block only the beginning of the procedure. See HBASE-19953.<a name="line.2438"></a>
-<span class="sourceLineNo">2439</span> ProcedurePrepareLatch latch = ProcedurePrepareLatch.createBlockingLatch();<a name="line.2439"></a>
-<span class="sourceLineNo">2440</span> submitProcedure(new DeleteTableProcedure(procedureExecutor.getEnvironment(),<a name="line.2440"></a>
-<span class="sourceLineNo">2441</span> tableName, latch));<a name="line.2441"></a>
-<span class="sourceLineNo">2442</span> latch.await();<a name="line.2442"></a>
-<span class="sourceLineNo">2443</span><a name="line.2443"></a>
-<span class="sourceLineNo">2444</span> getMaster().getMasterCoprocessorHost().postDeleteTable(tableName);<a name="line.2444"></a>
-<span class="sourceLineNo">2445</span> }<a name="line.2445"></a>
-<span class="sourceLineNo">2446</span><a name="line.2446"></a>
-<span class="sourceLineNo">2447</span> @Override<a name="line.2447"></a>
-<span class="sourceLineNo">2448</span> protected String getDescription() {<a name="line.2448"></a>
-<span class="sourceLineNo">2449</span> return "DeleteTableProcedure";<a name="line.2449"></a>
-<span class="sourceLineNo">2450</span> }<a name="line.2450"></a>
-<span class="sourceLineNo">2451</span> });<a name="line.2451"></a>
-<span class="sourceLineNo">2452</span> }<a name="line.2452"></a>
+<span class="sourceLineNo">2427</span> @Override<a name="line.2427"></a>
+<span class="sourceLineNo">2428</span> public long deleteTable(<a name="line.2428"></a>
+<span class="sourceLineNo">2429</span> final TableName tableName,<a name="line.2429"></a>
+<span class="sourceLineNo">2430</span> final long nonceGroup,<a name="line.2430"></a>
+<span class="sourceLineNo">2431</span> final long nonce) throws IOException {<a name="line.2431"></a>
+<span class="sourceLineNo">2432</span> checkInitialized();<a name="line.2432"></a>
+<span class="sourceLineNo">2433</span><a name="line.2433"></a>
+<span class="sourceLineNo">2434</span> return MasterProcedureUtil.submitProcedure(<a name="line.2434"></a>
+<span class="sourceLineNo">2435</span> new MasterProcedureUtil.NonceProcedureRunnable(this, nonceGroup, nonce) {<a name="line.2435"></a>
+<span class="sourceLineNo">2436</span> @Override<a name="line.2436"></a>
+<span class="sourceLineNo">2437</span> protected void run() throws IOException {<a name="line.2437"></a>
+<span class="sourceLineNo">2438</span> getMaster().getMasterCoprocessorHost().preDeleteTable(tableName);<a name="line.2438"></a>
+<span class="sourceLineNo">2439</span><a name="line.2439"></a>
+<span class="sourceLineNo">2440</span> LOG.info(getClientIdAuditPrefix() + " delete " + tableName);<a name="line.2440"></a>
+<span class="sourceLineNo">2441</span><a name="line.2441"></a>
+<span class="sourceLineNo">2442</span> // TODO: We can handle/merge duplicate request<a name="line.2442"></a>
+<span class="sourceLineNo">2443</span> //<a name="line.2443"></a>
+<span class="sourceLineNo">2444</span> // We need to wait for the procedure to potentially fail due to "prepare" sanity<a name="line.2444"></a>
+<span class="sourceLineNo">2445</span> // checks. This will block only the beginning of the procedure. See HBASE-19953.<a name="line.2445"></a>
+<span class="sourceLineNo">2446</span> ProcedurePrepareLatch latch = ProcedurePrepareLatch.createBlockingLatch();<a name="line.2446"></a>
+<span class="sourceLineNo">2447</span> submitProcedure(new DeleteTableProcedure(procedureExecutor.getEnvironment(),<a name="line.2447"></a>
+<span class="sourceLineNo">2448</span> tableName, latch));<a name="line.2448"></a>
+<span class="sourceLineNo">2449</span> latch.await();<a name="line.2449"></a>
+<span class="sourceLineNo">2450</span><a name="line.2450"></a>
+<span class="sourceLineNo">2451</span> getMaster().getMasterCoprocessorHost().postDeleteTable(tableName);<a name="line.2451"></a>
+<span class="sourceLineNo">2452</span> }<a name="line.2452"></a>
<span class="sourceLineNo">2453</span><a name="line.2453"></a>
-<span class="sourceLineNo">2454</span> @Override<a name="line.2454"></a>
-<span class="sourceLineNo">2455</span> public long truncateTable(<a name="line.2455"></a>
-<span class="sourceLineNo">2456</span> final TableName tableName,<a name="line.2456"></a>
-<span class="sourceLineNo">2457</span> final boolean preserveSplits,<a name="line.2457"></a>
-<span class="sourceLineNo">2458</span> final long nonceGroup,<a name="line.2458"></a>
-<span class="sourceLineNo">2459</span> final long nonce) throws IOException {<a name="line.2459"></a>
-<span class="sourceLineNo">2460</span> checkInitialized();<a name="line.2460"></a>
-<span class="sourceLineNo">2461</span><a name="line.2461"></a>
-<span class="sourceLineNo">2462</span> return MasterProcedureUtil.submitProcedure(<a name="line.2462"></a>
-<span class="sourceLineNo">2463</span> new MasterProcedureUtil.NonceProcedureRunnable(this, nonceGroup, nonce) {<a name="line.2463"></a>
-<span class="sourceLineNo">2464</span> @Override<a name="line.2464"></a>
-<span class="sourceLineNo">2465</span> protected void run() throws IOException {<a name="line.2465"></a>
-<span class="sourceLineNo">2466</span> getMaster().getMasterCoprocessorHost().preTruncateTable(tableName);<a name="line.2466"></a>
-<span class="sourceLineNo">2467</span><a name="line.2467"></a>
-<span class="sourceLineNo">2468</span> LOG.info(getClientIdAuditPrefix() + " truncate " + tableName);<a name="line.2468"></a>
-<span class="sourceLineNo">2469</span> ProcedurePrepareLatch latch = ProcedurePrepareLatch.createLatch(2, 0);<a name="line.2469"></a>
-<span class="sourceLineNo">2470</span> submitProcedure(new TruncateTableProcedure(procedureExecutor.getEnvironment(),<a name="line.2470"></a>
-<span class="sourceLineNo">2471</span> tableName, preserveSplits, latch));<a name="line.2471"></a>
-<span class="sourceLineNo">2472</span> latch.await();<a name="line.2472"></a>
-<span class="sourceLineNo">2473</span><a name="line.2473"></a>
-<span class="sourceLineNo">2474</span> getMaster().getMasterCoprocessorHost().postTruncateTable(tableName);<a name="line.2474"></a>
-<span class="sourceLineNo">2475</span> }<a name="line.2475"></a>
-<span class="sourceLineNo">2476</span><a name="line.2476"></a>
-<span class="sourceLineNo">2477</span> @Override<a name="line.2477"></a>
-<span class="sourceLineNo">2478</span> protected String getDescription() {<a name="line.2478"></a>
-<span class="sourceLineNo">2479</span> return "TruncateTableProcedure";<a name="line.2479"></a>
-<span class="sourceLineNo">2480</span> }<a name="line.2480"></a>
-<span class="sourceLineNo">2481</span> });<a name="line.2481"></a>
-<span class="sourceLineNo">2482</span> }<a name="line.2482"></a>
+<span class="sourceLineNo">2454</span> @Override<a name="line.2454"></a>
+<span class="sourceLineNo">2455</span> protected String getDescription() {<a name="line.2455"></a>
+<span class="sourceLineNo">2456</span> return "DeleteTableProcedure";<a name="line.2456"></a>
+<span class="sourceLineNo">2457</span> }<a name="line.2457"></a>
+<span class="sourceLineNo">2458</span> });<a name="line.2458"></a>
+<span class="sourceLineNo">2459</span> }<a name="line.2459"></a>
+<span class="sourceLineNo">2460</span><a name="line.2460"></a>
+<span class="sourceLineNo">2461</span> @Override<a name="line.2461"></a>
+<span class="sourceLineNo">2462</span> public long truncateTable(<a name="line.2462"></a>
+<span class="sourceLineNo">2463</span> final TableName tableName,<a name="line.2463"></a>
+<span class="sourceLineNo">2464</span> final boolean preserveSplits,<a name="line.2464"></a>
+<span class="sourceLineNo">2465</span> final long nonceGroup,<a name="line.2465"></a>
+<span class="sourceLineNo">2466</span> final long nonce) throws IOException {<a name="line.2466"></a>
+<span class="sourceLineNo">2467</span> checkInitialized();<a name="line.2467"></a>
+<span class="sourceLineNo">2468</span><a name="line.2468"></a>
+<span class="sourceLineNo">2469</span> return MasterProcedureUtil.submitProcedure(<a name="line.2469"></a>
+<span class="sourceLineNo">2470</span> new MasterProcedureUtil.NonceProcedureRunnable(this, nonceGroup, nonce) {<a name="line.2470"></a>
+<span class="sourceLineNo">2471</span> @Override<a name="line.2471"></a>
+<span class="sourceLineNo">2472</span> protected void run() throws IOException {<a name="line.2472"></a>
+<span class="sourceLineNo">2473</span> getMaster().getMasterCoprocessorHost().preTruncateTable(tableName);<a name="line.2473"></a>
+<span class="sourceLineNo">2474</span><a name="line.2474"></a>
+<span class="sourceLineNo">2475</span> LOG.info(getClientIdAuditPrefix() + " truncate " + tableName);<a name="line.2475"></a>
+<span class="sourceLineNo">2476</span> ProcedurePrepareLatch latch = ProcedurePrepareLatch.createLatch(2, 0);<a name="line.2476"></a>
+<span class="sourceLineNo">2477</span> submitProcedure(new TruncateTableProcedure(procedureExecutor.getEnvironment(),<a name="line.2477"></a>
+<span class="sourceLineNo">2478</span> tableName, preserveSplits, latch));<a name="line.2478"></a>
+<span class="sourceLineNo">2479</span> latch.await();<a name="line.2479"></a>
+<span class="sourceLineNo">2480</span><a name="line.2480"></a>
+<span class="sourceLineNo">2481</span> getMaster().getMasterCoprocessorHost().postTruncateTable(tableName);<a name="line.2481"></a>
+<span class="sourceLineNo">2482</span> }<a name="line.2482"></a>
<span class="sourceLineNo">2483</span><a name="line.2483"></a>
-<span class="sourceLineNo">2484</span> @Override<a name="line.2484"></a>
-<span class="sourceLineNo">2485</span> public long addColumn(final TableName tableName, final ColumnFamilyDescriptor column,<a name="line.2485"></a>
-<span class="sourceLineNo">2486</span> final long nonceGroup, final long nonce) throws IOException {<a name="line.2486"></a>
-<span class="sourceLineNo">2487</span> checkInitialized();<a name="line.2487"></a>
-<span class="sourceLineNo">2488</span> checkTableExists(tableName);<a name="line.2488"></a>
-<span class="sourceLineNo">2489</span><a name="line.2489"></a>
-<span class="sourceLineNo">2490</span> return modifyTable(tableName, new TableDescriptorGetter() {<a name="line.2490"></a>
-<span class="sourceLineNo">2491</span><a name="line.2491"></a>
-<span class="sourceLineNo">2492</span> @Override<a name="line.2492"></a>
-<span class="sourceLineNo">2493</span> public TableDescriptor get() throws IOException {<a name="line.2493"></a>
-<span class="sourceLineNo">2494</span> TableDescriptor old = getTableDescriptors().get(tableName);<a name="line.2494"></a>
-<span class="sourceLineNo">2495</span> if (old.hasColumnFamily(column.getName())) {<a name="line.2495"></a>
-<span class="sourceLineNo">2496</span> throw new InvalidFamilyOperationException("Column family '" + column.getNameAsString()<a name="line.2496"></a>
-<span class="sourceLineNo">2497</span> + "' in table '" + tableName + "' already exists so cannot be added");<a name="line.2497"></a>
-<span class="sourceLineNo">2498</span> }<a name="line.2498"></a>
-<span class="sourceLineNo">2499</span><a name="line.2499"></a>
-<span class="sourceLineNo">2500</span> return TableDescriptorBuilder.newBuilder(old).setColumnFamily(column).build();<a name="line.2500"></a>
-<span class="sourceLineNo">2501</span> }<a name="line.2501"></a>
-<span class="sourceLineNo">2502</span> }, nonceGroup, nonce);<a name="line.2502"></a>
-<span class="sourceLineNo">2503</span> }<a name="line.2503"></a>
-<span class="sourceLineNo">2504</span><a name="line.2504"></a>
-<span class="sourceLineNo">2505</span> /**<a name="line.2505"></a>
-<span class="sourceLineNo">2506</span> * Implement to return TableDescriptor after pre-checks<a name="line.2506"></a>
-<span class="sourceLineNo">2507</span> */<a name="line.2507"></a>
-<span class="sourceLineNo">2508</span> protected interface TableDescriptorGetter {<a name="line.2508"></a>
-<span class="sourceLineNo">2509</span> TableDescriptor get() throws IOException;<a name="line.2509"></a>
+<span class="sourceLineNo">2484</span> @Override<a name="line.2484"></a>
+<span class="sourceLineNo">2485</span> protected String getDescription() {<a name="line.2485"></a>
+<span class="sourceLineNo">2486</span> return "TruncateTableProcedure";<a name="line.2486"></a>
+<span class="sourceLineNo">2487</span> }<a name="line.2487"></a>
+<span class="sourceLineNo">2488</span> });<a name="line.2488"></a>
+<span class="sourceLineNo">2489</span> }<a name="line.2489"></a>
+<span class="sourceLineNo">2490</span><a name="line.2490"></a>
+<span class="sourceLineNo">2491</span> @Override<a name="line.2491"></a>
+<span class="sourceLineNo">2492</span> public long addColumn(final TableName tableName, final ColumnFamilyDescriptor column,<a name="line.2492"></a>
+<span class="sourceLineNo">2493</span> final long nonceGroup, final long nonce) throws IOException {<a name="line.2493"></a>
+<span class="sourceLineNo">2494</span> checkInitialized();<a name="line.2494"></a>
+<span class="sourceLineNo">2495</span> checkTableExists(tableName);<a name="line.2495"></a>
+<span class="sourceLineNo">2496</span><a name="line.2496"></a>
+<span class="sourceLineNo">2497</span> return modifyTable(tableName, new TableDescriptorGetter() {<a name="line.2497"></a>
+<span class="sourceLineNo">2498</span><a name="line.2498"></a>
+<span class="sourceLineNo">2499</span> @Override<a name="line.2499"></a>
+<span class="sourceLineNo">2500</span> public TableDescriptor get() throws IOException {<a name="line.2500"></a>
+<span class="sourceLineNo">2501</span> TableDescriptor old = getTableDescriptors().get(tableName);<a name="line.2501"></a>
+<span class="sourceLineNo">2502</span> if (old.hasColumnFamily(column.getName())) {<a name="line.2502"></a>
+<span class="sourceLineNo">2503</span> throw new InvalidFamilyOperationException("Column family '" + column.getNameAsString()<a name="line.2503"></a>
+<span class="sourceLineNo">2504</span> + "' in table '" + tableName + "' already exists so cannot be added");<a name="line.2504"></a>
+<span class="sourceLineNo">2505</span> }<a name="line.2505"></a>
+<span class="sourceLineNo">2506</span><a name="line.2506"></a>
+<span class="sourceLineNo">2507</span> return TableDescriptorBuilder.newBuilder(old).setColumnFamily(column).build();<a name="line.2507"></a>
+<span class="sourceLineNo">2508</span> }<a name="line.2508"></a>
+<span class="sourceLineNo">2509</span> }, nonceGroup, nonce);<a name="line.2509"></a>
<span class="sourceLineNo">2510</span> }<a name="line.2510"></a>
<span class="sourceLineNo">2511</span><a name="line.2511"></a>
-<span class="sourceLineNo">2512</span> @Override<a name="line.2512"></a>
-<span class="sourceLineNo">2513</span> public long modifyColumn(final TableName tableName, final ColumnFamilyDescriptor descriptor,<a name="line.2513"></a>
-<span class="sourceLineNo">2514</span> final long nonceGroup, final long nonce) throws IOException {<a name="line.2514"></a>
-<span class="sourceLineNo">2515</span> checkInitialized();<a name="line.2515"></a>
-<span class="sourceLineNo">2516</span> checkTableExists(tableName);<a name="line.2516"></a>
-<span class="sourceLineNo">2517</span> return modifyTable(tableName, new TableDescriptorGetter() {<a name="line.2517"></a>
+<span class="sourceLineNo">2512</span> /**<a name="line.2512"></a>
+<span class="sourceLineNo">2513</span> * Implement to return TableDescriptor after pre-checks<a name="line.2513"></a>
+<span class="sourceLineNo">2514</span> */<a name="line.2514"></a>
+<span class="sourceLineNo">2515</span> protected interface TableDescriptorGetter {<a name="line.2515"></a>
+<span class="sourceLineNo">2516</span> TableDescriptor get() throws IOException;<a name="line.2516"></a>
+<span class="sourceLineNo">2517</span> }<a name="line.2517"></a>
<span class="sourceLineNo">2518</span><a name="line.2518"></a>
-<span class="sourceLineNo">2519</span> @Override<a name="line.2519"></a>
-<span class="sourceLineNo">2520</span> public TableDescriptor get() throws IOException {<a name="line.2520"></a>
-<span class="sourceLineNo">2521</span> TableDescriptor old = getTableDescriptors().get(tableName);<a name="line.2521"></a>
-<span class="sourceLineNo">2522</span> if (!old.hasColumnFamily(descriptor.getName())) {<a name="line.2522"></a>
-<span class="sourceLineNo">2523</span> throw new InvalidFamilyOperationException("Family '" + descriptor.getNameAsString()<a name="line.2523"></a>
-<span class="sourceLineNo">2524</span> + "' does not exist, so it cannot be modified");<a name="line.2524"></a>
-<span class="sourceLineNo">2525</span> }<a name="line.2525"></a>
-<span class="sourceLineNo">2526</span><a name="line.2526"></a>
-<span class="sourceLineNo">2527</span> return TableDescriptorBuilder.newBuilder(old).modifyColumnFamily(descriptor).build();<a name="line.2527"></a>
-<span class="sourceLineNo">2528</span> }<a name="line.2528"></a>
-<span class="sourceLineNo">2529</span> }, nonceGroup, nonce);<a name="line.2529"></a>
-<span class="sourceLineNo">2530</span> }<a name="line.2530"></a>
-<span class="sourceLineNo">2531</span><a name="line.2531"></a>
-<span class="sourceLineNo">2532</span> @Override<a name="line.2532"></a>
-<span class="sourceLineNo">2533</span> public long deleteColumn(final TableName tableName, final byte[] columnName,<a name="line.2533"></a>
-<span class="sourceLineNo">2534</span> final long nonceGroup, final long nonce) throws IOException {<a name="line.2534"></a>
-<span class="sourceLineNo">2535</span> checkInitialized();<a name="line.2535"></a>
-<span class="sourceLineNo">2536</span> checkTableExists(tableName);<a name="line.2536"></a>
-<span class="sourceLineNo">2537</span><a name="line.2537"></a>
-<span class="sourceLineNo">2538</span> return modifyTable(tableName, new TableDescriptorGetter() {<a name="line.2538"></a>
-<span class="sourceLineNo">2539</span><a name="line.2539"></a>
-<span class="sourceLineNo">2540</span> @Override<a name="line.2540"></a>
-<span class="sourceLineNo">2541</span> public TableDescriptor get() throws IOException {<a name="line.2541"></a>
-<span class="sourceLineNo">2542</span> TableDescriptor old = getTableDescriptors().get(tableName);<a name="line.2542"></a>
-<span class="sourceLineNo">2543</span><a name="line.2543"></a>
-<span class="sourceLineNo">2544</span> if (!old.hasColumnFamily(columnName)) {<a name="line.2544"></a>
-<span class="sourceLineNo">2545</span> throw new InvalidFamilyOperationException("Family '" + Bytes.toString(columnName)<a name="line.2545"></a>
-<span class="sourceLineNo">2546</span> + "' does not exist, so it cannot be deleted");<a name="line.2546"></a>
-<span class="sourceLineNo">2547</span> }<a name="line.2547"></a>
-<span class="sourceLineNo">2548</span> if (old.getColumnFamilyCount() == 1) {<a name="line.2548"></a>
-<span class="sourceLineNo">2549</span> throw new InvalidFamilyOperationException("Family '" + Bytes.toString(columnName)<a name="line.2549"></a>
-<span class="sourceLineNo">2550</span> + "' is the only column family in the table, so it cannot be deleted");<a name="line.2550"></a>
-<span class="sourceLineNo">2551</span> }<a name="line.2551"></a>
-<span class="sourceLineNo">2552</span> return TableDescriptorBuilder.newBuilder(old).removeColumnFamily(columnName).build();<a name="line.2552"></a>
-<span class="sourceLineNo">2553</span> }<a name="line.2553"></a>
-<span class="sourceLineNo">2554</span> }, nonceGroup, nonce);<a name="line.2554"></a>
-<span class="sourceLineNo">2555</span> }<a name="line.2555"></a>
-<span class="sourceLineNo">2556</span><a name="line.2556"></a>
-<span class="sourceLineNo">2557</span> @Override<a name="line.2557"></a>
-<span class="sourceLineNo">2558</span> public long enableTable(final TableName tableName, final long nonceGroup, final long nonce)<a name="line.2558"></a>
-<span class="sourceLineNo">2559</span> throws IOException {<a name="line.2559"></a>
-<span class="sourceLineNo">2560</span> checkInitialized();<a name="line.2560"></a>
-<span class="sourceLineNo">2561</span><a name="line.2561"></a>
-<span class="sourceLineNo">2562</span> return MasterProcedureUtil.submitProcedure(<a name="line.2562"></a>
-<span class="sourceLineNo">2563</span> new MasterProcedureUtil.NonceProcedureRunnable(this, nonceGroup, nonce) {<a name="line.2563"></a>
-<span class="sourceLineNo">2564</span> @Override<a name="line.2564"></a>
-<span class="sourceLineNo">2565</span> protected void run() throws IOException {<a name="line.2565"></a>
-<span class="sourceLineNo">2566</span> getMaster().getMasterCoprocessorHost().preEnableTable(tableName);<a name="line.2566"></a>
-<span class="sourceLineNo">2567</span><a name="line.2567"></a>
-<span class="sourceLineNo">2568</span> // Normally, it would make sense for this authorization check to exist inside<a name="line.2568"></a>
-<span class="sourceLineNo">2569</span> // AccessController, but because the authorization check is done based on internal state<a name="line.2569"></a>
-<span class="sourceLineNo">2570</span> // (rather than explicit permissions) we'll do the check here instead of in the<a name="line.2570"></a>
-<span class="sourceLineNo">2571</span> // coprocessor.<a name="line.2571"></a>
-<span class="sourceLineNo">2572</span> MasterQuotaManager quotaManager = getMasterQuotaManager();<a name="line.2572"></a>
-<span class="sourceLineNo">2573</span> if (quotaManager != null) {<a name="line.2573"></a>
-<span class="sourceLineNo">2574</span> if (quotaManager.isQuotaInitialized()) {<a name="line.2574"></a>
-<span class="sourceLineNo">2575</span> Quotas quotaForTable = QuotaUtil.getTableQuota(getConnection(), tableName);<a name="line.2575"></a>
-<span class="sourceLineNo">2576</span> if (quotaForTable != null && quotaForTable.hasSpace()) {<a name="line.2576"></a>
-<span class="sourceLineNo">2577</span> SpaceViolationPolicy policy = quotaForTable.getSpace().getViolationPolicy();<a name="line.2577"></a>
-<span class="sourceLineNo">2578</span> if (SpaceViolationPolicy.DISABLE == policy) {<a name="line.2578"></a>
-<span class="sourceLineNo">2579</span> throw new AccessDeniedException("Enabling the table '" + tableName<a name="line.2579"></a>
-<span class="sourceLineNo">2580</span> + "' is disallowed due to a violated space quota.");<a name="line.2580"></a>
-<span class="sourceLineNo">2581</span> }<a name="line.2581"></a>
-<span class="sourceLineNo">2582</span> }<a name="line.2582"></a>
-<span class="sourceLineNo">2583</span> } else if (LOG.isTraceEnabled()) {<a name="line.2583"></a>
-<span class="sourceLineNo">2584</span> LOG.trace("Unable to check for space quotas as the MasterQuotaManager is not enabled");<a name="line.2584"></a>
-<span class="sourceLineNo">2585</span> }<a name="line.2585"></a>
-<span class="sourceLineNo">2586</span> }<a name="line.2586"></a>
-<span class="sourceLineNo">2587</span><a name="line.2587"></a>
-<span class="sourceLineNo">2588</span> LOG.info(getClientIdAuditPrefix() + " enable " + tableName);<a name="line.2588"></a>
-<span class="sourceLineNo">2589</span><a name="line.2589"></a>
-<span class="sourceLineNo">2590</span> // Execute the operation asynchronously - client will check the progress of the operation<a name="line.2590"></a>
-<span class="sourceLineNo">2591</span> // In case the request is from a <1.1 client before returning,<a name="line.2591"></a>
-<span class="sourceLineNo">2592</span> // we want to make sure that the table is prepared to be<a name="line.2592"></a>
-<span class="sourceLineNo">2593</span> // enabled (the table is locked and the table state is set).<a name="line.2593"></a>
-<span class="sourceLineNo">2594</span> // Note: if the procedure throws exception, we will catch it and rethrow.<a name="line.2594"></a>
-<span class="sourceLineNo">2595</span> final ProcedurePrepareLatch prepareLatch = ProcedurePrepareLatch.createLatch();<a name="line.2595"></a>
-<span class="sourceLineNo">2596</span> submitProcedure(new EnableTableProcedure(procedureExecutor.getEnvironment(),<a name="line.2596"></a>
-<span class="sourceLineNo">2597</span> tableName, prepareLatch));<a name="line.2597"></a>
-<span class="sourceLineNo">2598</span> prepareLatch.await();<a name="line.2598"></a>
-<span class="sourceLineNo">2599</span><a name="line.2599"></a>
-<span class="sourceLineNo">2600</span> getMaster().getMasterCoprocessorHost().postEnableTable(tableName);<a name="line.2600"></a>
-<span class="sourceLineNo">2601</span> }<a name="line.2601"></a>
-<span class="sourceLineNo">2602</span><a name="line.2602"></a>
-<span class="sourceLineNo">2603</span> @Override<a name="line.2603"></a>
-<span class="sourceLineNo">2604</span> protected String getDescription() {<a name="line.2604"></a>
-<span class="sourceLineNo">2605</span> return "EnableTableProcedure";<a name="line.2605"></a>
-<span class="sourceLineNo">2606</span> }<a name="line.2606"></a>
-<span class="sourceLineNo">2607</span> });<a name="line.2607"></a>
-<span class="sourceLineNo">2608</span> }<a name="line.2608"></a>
+<span class="sourceLineNo">2519</span> @Override<a name="line.2519"></a>
+<span class="sourceLineNo">2520</span> public long modifyColumn(final TableName tableName, final ColumnFamilyDescriptor descriptor,<a name="line.2520"></a>
+<span class="sourceLineNo">2521</span> final long nonceGroup, final long nonce) throws IOException {<a name="line.2521"></a>
+<span class="sourceLineNo">2522</span> checkInitialized();<a name="line.2522"></a>
+<span class="sourceLineNo">2523</span> checkTableExists(tableName);<a name="line.2523"></a>
+<span class="sourceLineNo">2524</span> return modifyTable(tableName, new TableDescriptorGetter() {<a name="line.2524"></a>
+<span class="sourceLineNo">2525</span><a name="line.2525"></a>
+<span class="sourceLineNo">2526</span> @Override<a name="line.2526"></a>
+<span class="sourceLineNo">2527</span> public TableDescriptor get() throws IOException {<a name="line.2527"></a>
+<span class="sourceLineNo">2528</span> TableDescriptor old = getTableDescriptors().get(tableName);<a name="line.2528"></a>
+<span class="sourceLineNo">2529</span> if (!old.hasColumnFamily(descriptor.getName())) {<a name="line.2529"></a>
+<span class="sourceLineNo">2530</span> throw new InvalidFamilyOperationException("Family '" + descriptor.getNameAsString()<a name="line.2530"></a>
+<span class="sourceLineNo">2531</span> + "' does not exist, so it cannot be modified");<a name="line.2531"></a>
+<span class="sourceLineNo">2532</span> }<a name="line.2532"></a>
+<span class="sourceLineNo">2533</span><a name="line.2533"></a>
+<span class="sourceLineNo">2534</span> return TableDescriptorBuilder.newBuilder(old).modifyColumnFamily(descriptor).build();<a name="line.2534"></a>
+<span class="sourceLineNo">2535</span> }<a name="line.2535"></a>
+<span class="sourceLineNo">2536</span> }, nonceGroup, nonce);<a name="line.2536"></a>
+<span class="sourceLineNo">2537</span> }<a name="line.2537"></a>
+<span class="sourceLineNo">2538</span><a name="line.2538"></a>
+<span class="sourceLineNo">2539</span> @Override<a name="line.2539"></a>
+<span class="sourceLineNo">2540</span> public long deleteColumn(final TableName tableName, final byte[] columnName,<a name="line.2540"></a>
+<span class="sourceLineNo">2541</span> final long nonceGroup, final long nonce) throws IOException {<a name="line.2541"></a>
+<span class="sourceLineNo">2542</span> checkInitialized();<a name="line.2542"></a>
+<span class="sourceLineNo">2543</span> checkTableExists(tableName);<a name="line.2543"></a>
+<span class="sourceLineNo">2544</span><a name="line.2544"></a>
+<span class="sourceLineNo">2545</span> return modifyTable(tableName, new TableDescriptorGetter() {<a name="line.2545"></a>
+<span class="sourceLineNo">2546</span><a name="line.2546"></a>
+<span class="sourceLineNo">2547</span> @Override<a name="line.2547"></a>
+<span class="sourceLineNo">2548</span> public TableDescriptor get() throws IOException {<a name="line.2548"></a>
+<span class="sourceLineNo">2549</span> TableDescriptor old = getTableDescriptors().get(tableName);<a name="line.2549"></a>
+<span class="sourceLineNo">2550</span><a name="line.2550"></a>
+<span class="sourceLineNo">2551</span> if (!old.hasColumnFamily(columnName)) {<a name="line.2551"></a>
+<span class="sourceLineNo">2552</span> throw new InvalidFamilyOperationException("Family '" + Bytes.toString(columnName)<a name="line.2552"></a>
+<span class="sourceLineNo">2553</span> + "' does not exist, so it cannot be deleted");<a name="line.2553"></a>
+<span class="sourceLineNo">2554</span> }<a name="line.2554"></a>
+<span class="sourceLineNo">2555</span> if (old.getColumnFamilyCount() == 1) {<a name="line.2555"></a>
+<span class="sourceLineNo">2556</span> throw new InvalidFamilyOperationException("Family '" + Bytes.toString(columnName)<a name="line.2556"></a>
+<span class="sourceLineNo">2557</span> + "' is the only column family in the table, so it cannot be deleted");<a name="line.2557"></a>
+<span class="sourceLineNo">2558</span> }<a name="line.2558"></a>
+<span class="sourceLineNo">2559</span> return TableDescriptorBuilder.newBuilder(old).removeColumnFamily(columnName).build();<a name="line.2559"></a>
+<span class="sourceLineNo">2560</span> }<a name="line.2560"></a>
+<span class="sourceLineNo">2561</span> }, nonceGroup, nonce);<a name="line.2561"></a>
+<span class="sourceLineNo">2562</span> }<a name="line.2562"></a>
+<span class="sourceLineNo">2563</span><a name="line.2563"></a>
+<span class="sourceLineNo">2564</span> @Override<a name="line.2564"></a>
+<span class="sourceLineNo">2565</span> public long enableTable(final TableName tableName, final long nonceGroup, final long nonce)<a name="line.2565"></a>
+<span class="sourceLineNo">2566</span> throws IOException {<a name="line.2566"></a>
+<span class="sourceLineNo">2567</span> checkInitialized();<a name="line.2567"></a>
+<span class="sourceLineNo">2568</span><a name="line.2568"></a>
+<span class="sourceLineNo">2569</span> return MasterProcedureUtil.submitProcedure(<a name="line.2569"></a>
+<span class="sourceLineNo">2570</span> new MasterProcedureUtil.NonceProcedureRunnable(this, nonceGroup, nonce) {<a name="line.2570"></a>
+<span class="sourceLineNo">2571</span> @Override<a name="line.2571"></a>
+<span class="sourceLineNo">2572</span> protected void run() throws IOException {<a name="line.2572"></a>
+<span class="sourceLineNo">2573</span> getMaster().getMasterCoprocessorHost().preEnableTable(tableName);<a name="line.2573"></a>
+<span class="sourceLineNo">2574</span><a name="line.2574"></a>
+<span class="sourceLineNo">2575</span> // Normally, it would make sense for this authorization check to exist inside<a name="line.2575"></a>
+<span class="sourceLineNo">2576</span> // AccessController, but because the authorization check is done based on internal state<a name="line.2576"></a>
+<span class="sourceLineNo">2577</span> // (rather than explicit permissions) we'll do the check here instead of in the<a name="line.2577"></a>
+<span class="sourceLineNo">2578</span> // coprocessor.<a name="line.2578"></a>
+<span class="sourceLineNo">2579</span> MasterQuotaManager quotaManager = getMasterQuotaManager();<a name="line.2579"></a>
+<span class="sourceLineNo">2580</span> if (quotaManager != null) {<a name="line.2580"></a>
+<span class="sourceLineNo">2581</span> if (quotaManager.isQuotaInitialized()) {<a name="line.2581"></a>
+<span class="sourceLineNo">2582</span> Quotas quotaForTable = QuotaUtil.getTableQuota(getConnection(), tableName);<a name="line.2582"></a>
+<span class="sourceLineNo">2583</span> if (quotaForTable != null && quotaForTable.hasSpace()) {<a name="line.2583"></a>
+<span class="sourceLineNo">2584</span> SpaceViolationPolicy policy = quotaForTable.getSpace().getViolationPolicy();<a name="line.2584"></a>
+<span class="sourceLineNo">2585</span> if (SpaceViolationPolicy.DISABLE == policy) {<a name="line.2585"></a>
+<span class="sourceLineNo">2586</span> throw new AccessDeniedException("Enabling the table '" + tableName<a name="line.2586"></a>
+<span class="sourceLineNo">2587</span> + "' is disallowed due to a violated space quota.");<a name="line.2587"></a>
+<span class="sourceLineNo">2588</span> }<a name="line.2588"></a>
+<span class="sourceLineNo">2589</span> }<a name="line.2589"></a>
+<span class="sourceLineNo">2590</span> } else if (LOG.isTraceEnabled()) {<a name="line.2590"></a>
+<span class="sourceLineNo">2591</span> LOG.trace("Unable to check for space quotas as the MasterQuotaManager is not enabled");<a name="line.2591"></a>
+<span class="sourceLineNo">2592</span> }<a name="line.2592"></a>
+<span class="sourceLineNo">2593</span> }<a name="line.2593"></a>
+<span class="sourceLineNo">2594</span><a name="line.2594"></a>
+<span class="sourceLineNo">2595</span> LOG.info(getClientIdAuditPrefix() + " enable " + tableName);<a name="line.2595"></a>
+<span class="sourceLineNo">2596</span><a name="line.2596"></a>
+<span class="sourceLineNo">2597</span> // Execute the operation asynchronously - client will check the progress of the operation<a name="line.2597"></a>
+<span class="sourceLineNo">2598</span> // In case the request is from a <1.1 client before returning,<a name="line.2598"></a>
+<span class="sourceLineNo">2599</span> // we want to make sure that the table is prepared to be<a name="line.2599"></a>
+<span class="sourceLineNo">2600</span> // enabled (the table is locked and the table state is set).<a name="line.2600"></a>
+<span class="sourceLineNo">2601</span> // Note: if the procedure throws exception, we will catch it and rethrow.<a name="line.2601"></a>
+<span class="sourceLineNo">2602</span> final ProcedurePrepareLatch prepareLatch = ProcedurePrepareLatch.createLatch();<a name="line.2602"></a>
+<span class="sourceLineNo">2603</span> submitProcedure(new EnableTableProcedure(procedureExecutor.getEnvironment(),<a name="line.2603"></a>
+<span class="sourceLineNo">2604</span> tableName, prepareLatch));<a name="line.2604"></a>
+<span class="sourceLineNo">2605</span> prepareLatch.await();<a name="line.2605"></a>
+<span class="sourceLineNo">2606</span><a name="line.2606"></a>
+<span class="sourceLineNo">2607</span> getMaster().getMasterCoprocessorHost().postEnableTable(tableName);<a name="line.2607"></a>
+<span class="sourceLineNo">2608</span> }<a name="line.2608"></a>
<span class="sourceLineNo">2609</span><a name="line.2609"></a>
-<span class="sourceLineNo">2610</span> @Override<a name="line.2610"></a>
-<span class="sourceLineNo">2611</span> public long disableTable(final TableName tableName, final long nonceGroup, final long nonce)<a name="line.2611"></a>
-<span class="sourceLineNo">2612</span> throws IOException {<a name="line.2612"></a>
-<span class="sourceLineNo">2613</span> checkInitialized();<a name="line.2613"></a>
-<span class="sourceLineNo">2614</span><a name="line.2614"></a>
-<span class="sourceLineNo">2615</span> return MasterProcedureUtil.submitProcedure(<a name="line.2615"></a>
-<span class="sourceLineNo">2616</span> new MasterProcedureUtil.NonceProcedureRunnable(this, nonceGroup, nonce) {<a name="line.2616"></a>
-<span class="sourceLineNo">2617</span> @Override<a name="line.2617"></a>
-<span class="sourceLineNo">2618</span> protected void run() throws IOException {<a name="line.2618"></a>
-<span class="sourceLineNo">2619</span> getMaster().getMasterCoprocessorHost().preDisableTable(tableName);<a name="line.2619"></a>
-<span class="sourceLineNo">2620</span><a name="line.2620"></a>
-<span class="sourceLineNo">2621</span> LOG.info(getClientIdAuditPrefix() + " disable " + tableName);<a name="line.2621"></a>
-<span class="sourceLineNo">2622</span><a name="line.2622"></a>
-<span class="sourceLineNo">2623</span> // Execute the operation asynchronously - client will check the progress of the operation<a name="line.2623"></a>
-<span class="sourceLineNo">2624</span> // In case the request is from a <1.1 client before returning,<a name="line.2624"></a>
-<span class="sourceLineNo">2625</span> // we want to make sure that the table is prepared to be<a name="line.2625"></a>
-<span class="sourceLineNo">2626</span> // enabled (the table is locked and the table state is set).<a name="line.2626"></a>
-<span class="sourceLineNo">2627</span> // Note: if the procedure throws exception, we will catch it and rethrow.<a name="line.2627"></a>
-<span class="sourceLineNo">2628</span> //<a name="line.2628"></a>
-<span class="sourceLineNo">2629</span> // We need to wait for the procedure to potentially fail due to "prepare" sanity<a name="line.2629"></a>
-<span class="sourceLineNo">2630</span> // checks. This will block only the beginning of the procedure. See HBASE-19953.<a name="line.2630"></a>
-<span class="sourceLineNo">2631</span> final ProcedurePrepareLatch prepareLatch = ProcedurePrepareLatch.createBlockingLatch();<a name="line.2631"></a>
-<span class="sourceLineNo">2632</span> submitProcedure(new DisableTableProcedure(procedureExecutor.getEnvironment(),<a name="line.2632"></a>
-<span class="sourceLineNo">2633</span> tableName, false, prepareLatch));<a name="line.2633"></a>
-<span class="sourceLineNo">2634</span> prepareLatch.await();<a name="line.2634"></a>
-<span class="sourceLineNo">2635</span><a
<TRUNCATED>