[19/35] hbase-site git commit: Published site at 42d5447cfbc593becfc26684e03f482eb3a0fc49.

Tue, 17 Apr 2018 07:47:59 -0700 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.ExceptionInjector.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.ExceptionInjector.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.ExceptionInjector.html
index 7b206fe..39db60b 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.ExceptionInjector.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.ExceptionInjector.html
@@ -39,7 +39,7 @@
 <span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.31"></a>
 <span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.exceptions.ClientExceptionsUtil;<a name="line.32"></a>
 <span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.exceptions.RegionOpeningException;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.quotas.ThrottlingException;<a name="line.34"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.quotas.RpcThrottlingException;<a name="line.34"></a>
 <span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.regionserver.HRegionServer;<a name="line.35"></a>
 <span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.regionserver.RSRpcServices;<a name="line.36"></a>
 <span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.37"></a>
@@ -201,12 +201,12 @@
 <span class="sourceLineNo">193</span><a name="line.193"></a>
 <span class="sourceLineNo">194</span>  public static List&lt;Throwable&gt; 
metaCachePreservingExceptions() {<a name="line.194"></a>
 <span class="sourceLineNo">195</span>    return new 
ArrayList&lt;Throwable&gt;() {{<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      add(new RegionOpeningException(" 
"));<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      add(new 
RegionTooBusyException("Some old message"));<a name="line.197"></a>
-<span class="sourceLineNo">198</span>      add(new ThrottlingException(" 
"));<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      add(new MultiActionResultTooLarge(" 
"));<a name="line.199"></a>
-<span class="sourceLineNo">200</span>      add(new RetryImmediatelyException(" 
"));<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      add(new 
CallQueueTooBigException());<a name="line.201"></a>
+<span class="sourceLineNo">196</span>        add(new RegionOpeningException(" 
"));<a name="line.196"></a>
+<span class="sourceLineNo">197</span>        add(new 
RegionTooBusyException("Some old message"));<a name="line.197"></a>
+<span class="sourceLineNo">198</span>        add(new RpcThrottlingException(" 
"));<a name="line.198"></a>
+<span class="sourceLineNo">199</span>        add(new 
MultiActionResultTooLarge(" "));<a name="line.199"></a>
+<span class="sourceLineNo">200</span>        add(new 
RetryImmediatelyException(" "));<a name="line.200"></a>
+<span class="sourceLineNo">201</span>        add(new 
CallQueueTooBigException());<a name="line.201"></a>
 <span class="sourceLineNo">202</span>    }};<a name="line.202"></a>
 <span class="sourceLineNo">203</span>  }<a name="line.203"></a>
 <span class="sourceLineNo">204</span><a name="line.204"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.FakeRSRpcServices.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.FakeRSRpcServices.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.FakeRSRpcServices.html
index 7b206fe..39db60b 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.FakeRSRpcServices.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.FakeRSRpcServices.html
@@ -39,7 +39,7 @@
 <span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.31"></a>
 <span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.exceptions.ClientExceptionsUtil;<a name="line.32"></a>
 <span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.exceptions.RegionOpeningException;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.quotas.ThrottlingException;<a name="line.34"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.quotas.RpcThrottlingException;<a name="line.34"></a>
 <span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.regionserver.HRegionServer;<a name="line.35"></a>
 <span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.regionserver.RSRpcServices;<a name="line.36"></a>
 <span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.37"></a>
@@ -201,12 +201,12 @@
 <span class="sourceLineNo">193</span><a name="line.193"></a>
 <span class="sourceLineNo">194</span>  public static List&lt;Throwable&gt; 
metaCachePreservingExceptions() {<a name="line.194"></a>
 <span class="sourceLineNo">195</span>    return new 
ArrayList&lt;Throwable&gt;() {{<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      add(new RegionOpeningException(" 
"));<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      add(new 
RegionTooBusyException("Some old message"));<a name="line.197"></a>
-<span class="sourceLineNo">198</span>      add(new ThrottlingException(" 
"));<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      add(new MultiActionResultTooLarge(" 
"));<a name="line.199"></a>
-<span class="sourceLineNo">200</span>      add(new RetryImmediatelyException(" 
"));<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      add(new 
CallQueueTooBigException());<a name="line.201"></a>
+<span class="sourceLineNo">196</span>        add(new RegionOpeningException(" 
"));<a name="line.196"></a>
+<span class="sourceLineNo">197</span>        add(new 
RegionTooBusyException("Some old message"));<a name="line.197"></a>
+<span class="sourceLineNo">198</span>        add(new RpcThrottlingException(" 
"));<a name="line.198"></a>
+<span class="sourceLineNo">199</span>        add(new 
MultiActionResultTooLarge(" "));<a name="line.199"></a>
+<span class="sourceLineNo">200</span>        add(new 
RetryImmediatelyException(" "));<a name="line.200"></a>
+<span class="sourceLineNo">201</span>        add(new 
CallQueueTooBigException());<a name="line.201"></a>
 <span class="sourceLineNo">202</span>    }};<a name="line.202"></a>
 <span class="sourceLineNo">203</span>  }<a name="line.203"></a>
 <span class="sourceLineNo">204</span><a name="line.204"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.RegionServerWithFakeRpcServices.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.RegionServerWithFakeRpcServices.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.RegionServerWithFakeRpcServices.html
index 7b206fe..39db60b 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.RegionServerWithFakeRpcServices.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.RegionServerWithFakeRpcServices.html
@@ -39,7 +39,7 @@
 <span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.31"></a>
 <span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.exceptions.ClientExceptionsUtil;<a name="line.32"></a>
 <span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.exceptions.RegionOpeningException;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.quotas.ThrottlingException;<a name="line.34"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.quotas.RpcThrottlingException;<a name="line.34"></a>
 <span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.regionserver.HRegionServer;<a name="line.35"></a>
 <span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.regionserver.RSRpcServices;<a name="line.36"></a>
 <span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.37"></a>
@@ -201,12 +201,12 @@
 <span class="sourceLineNo">193</span><a name="line.193"></a>
 <span class="sourceLineNo">194</span>  public static List&lt;Throwable&gt; 
metaCachePreservingExceptions() {<a name="line.194"></a>
 <span class="sourceLineNo">195</span>    return new 
ArrayList&lt;Throwable&gt;() {{<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      add(new RegionOpeningException(" 
"));<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      add(new 
RegionTooBusyException("Some old message"));<a name="line.197"></a>
-<span class="sourceLineNo">198</span>      add(new ThrottlingException(" 
"));<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      add(new MultiActionResultTooLarge(" 
"));<a name="line.199"></a>
-<span class="sourceLineNo">200</span>      add(new RetryImmediatelyException(" 
"));<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      add(new 
CallQueueTooBigException());<a name="line.201"></a>
+<span class="sourceLineNo">196</span>        add(new RegionOpeningException(" 
"));<a name="line.196"></a>
+<span class="sourceLineNo">197</span>        add(new 
RegionTooBusyException("Some old message"));<a name="line.197"></a>
+<span class="sourceLineNo">198</span>        add(new RpcThrottlingException(" 
"));<a name="line.198"></a>
+<span class="sourceLineNo">199</span>        add(new 
MultiActionResultTooLarge(" "));<a name="line.199"></a>
+<span class="sourceLineNo">200</span>        add(new 
RetryImmediatelyException(" "));<a name="line.200"></a>
+<span class="sourceLineNo">201</span>        add(new 
CallQueueTooBigException());<a name="line.201"></a>
 <span class="sourceLineNo">202</span>    }};<a name="line.202"></a>
 <span class="sourceLineNo">203</span>  }<a name="line.203"></a>
 <span class="sourceLineNo">204</span><a name="line.204"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.RoundRobinExceptionInjector.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.RoundRobinExceptionInjector.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.RoundRobinExceptionInjector.html
index 7b206fe..39db60b 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.RoundRobinExceptionInjector.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.RoundRobinExceptionInjector.html
@@ -39,7 +39,7 @@
 <span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.31"></a>
 <span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.exceptions.ClientExceptionsUtil;<a name="line.32"></a>
 <span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.exceptions.RegionOpeningException;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.quotas.ThrottlingException;<a name="line.34"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.quotas.RpcThrottlingException;<a name="line.34"></a>
 <span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.regionserver.HRegionServer;<a name="line.35"></a>
 <span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.regionserver.RSRpcServices;<a name="line.36"></a>
 <span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.37"></a>
@@ -201,12 +201,12 @@
 <span class="sourceLineNo">193</span><a name="line.193"></a>
 <span class="sourceLineNo">194</span>  public static List&lt;Throwable&gt; 
metaCachePreservingExceptions() {<a name="line.194"></a>
 <span class="sourceLineNo">195</span>    return new 
ArrayList&lt;Throwable&gt;() {{<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      add(new RegionOpeningException(" 
"));<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      add(new 
RegionTooBusyException("Some old message"));<a name="line.197"></a>
-<span class="sourceLineNo">198</span>      add(new ThrottlingException(" 
"));<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      add(new MultiActionResultTooLarge(" 
"));<a name="line.199"></a>
-<span class="sourceLineNo">200</span>      add(new RetryImmediatelyException(" 
"));<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      add(new 
CallQueueTooBigException());<a name="line.201"></a>
+<span class="sourceLineNo">196</span>        add(new RegionOpeningException(" 
"));<a name="line.196"></a>
+<span class="sourceLineNo">197</span>        add(new 
RegionTooBusyException("Some old message"));<a name="line.197"></a>
+<span class="sourceLineNo">198</span>        add(new RpcThrottlingException(" 
"));<a name="line.198"></a>
+<span class="sourceLineNo">199</span>        add(new 
MultiActionResultTooLarge(" "));<a name="line.199"></a>
+<span class="sourceLineNo">200</span>        add(new 
RetryImmediatelyException(" "));<a name="line.200"></a>
+<span class="sourceLineNo">201</span>        add(new 
CallQueueTooBigException());<a name="line.201"></a>
 <span class="sourceLineNo">202</span>    }};<a name="line.202"></a>
 <span class="sourceLineNo">203</span>  }<a name="line.203"></a>
 <span class="sourceLineNo">204</span><a name="line.204"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.html 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.html
index 7b206fe..39db60b 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestMetaCache.html
@@ -39,7 +39,7 @@
 <span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.31"></a>
 <span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.exceptions.ClientExceptionsUtil;<a name="line.32"></a>
 <span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.exceptions.RegionOpeningException;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.quotas.ThrottlingException;<a name="line.34"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.quotas.RpcThrottlingException;<a name="line.34"></a>
 <span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.regionserver.HRegionServer;<a name="line.35"></a>
 <span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.regionserver.RSRpcServices;<a name="line.36"></a>
 <span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.37"></a>
@@ -201,12 +201,12 @@
 <span class="sourceLineNo">193</span><a name="line.193"></a>
 <span class="sourceLineNo">194</span>  public static List&lt;Throwable&gt; 
metaCachePreservingExceptions() {<a name="line.194"></a>
 <span class="sourceLineNo">195</span>    return new 
ArrayList&lt;Throwable&gt;() {{<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      add(new RegionOpeningException(" 
"));<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      add(new 
RegionTooBusyException("Some old message"));<a name="line.197"></a>
-<span class="sourceLineNo">198</span>      add(new ThrottlingException(" 
"));<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      add(new MultiActionResultTooLarge(" 
"));<a name="line.199"></a>
-<span class="sourceLineNo">200</span>      add(new RetryImmediatelyException(" 
"));<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      add(new 
CallQueueTooBigException());<a name="line.201"></a>
+<span class="sourceLineNo">196</span>        add(new RegionOpeningException(" 
"));<a name="line.196"></a>
+<span class="sourceLineNo">197</span>        add(new 
RegionTooBusyException("Some old message"));<a name="line.197"></a>
+<span class="sourceLineNo">198</span>        add(new RpcThrottlingException(" 
"));<a name="line.198"></a>
+<span class="sourceLineNo">199</span>        add(new 
MultiActionResultTooLarge(" "));<a name="line.199"></a>
+<span class="sourceLineNo">200</span>        add(new 
RetryImmediatelyException(" "));<a name="line.200"></a>
+<span class="sourceLineNo">201</span>        add(new 
CallQueueTooBigException());<a name="line.201"></a>
 <span class="sourceLineNo">202</span>    }};<a name="line.202"></a>
 <span class="sourceLineNo">203</span>  }<a name="line.203"></a>
 <span class="sourceLineNo">204</span><a name="line.204"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a610f23a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/replication/TestReplicationAdminWithClusters.TestUpdatableReplicationEndpoint.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/replication/TestReplicationAdminWithClusters.TestUpdatableReplicationEndpoint.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/replication/TestReplicationAdminWithClusters.TestUpdatableReplicationEndpoint.html
index 19c72a2..f6a8245 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/replication/TestReplicationAdminWithClusters.TestUpdatableReplicationEndpoint.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/replication/TestReplicationAdminWithClusters.TestUpdatableReplicationEndpoint.html
@@ -104,213 +104,219 @@
 <span class="sourceLineNo">096</span>    admin1.modifyTable(tableName, 
table);<a name="line.96"></a>
 <span class="sourceLineNo">097</span>    admin1.enableTable(tableName);<a 
name="line.97"></a>
 <span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span>    
admin1.disableTableReplication(tableName);<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    table = 
admin1.getTableDescriptor(tableName);<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    for (HColumnDescriptor fam : 
table.getColumnFamilies()) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>      
assertEquals(HConstants.REPLICATION_SCOPE_LOCAL, fam.getScope());<a 
name="line.103"></a>
-<span class="sourceLineNo">104</span>    }<a name="line.104"></a>
-<span class="sourceLineNo">105</span>  }<a name="line.105"></a>
-<span class="sourceLineNo">106</span><a name="line.106"></a>
-<span class="sourceLineNo">107</span>  @Test<a name="line.107"></a>
-<span class="sourceLineNo">108</span>  public void 
testEnableReplicationWhenSlaveClusterDoesntHaveTable() throws Exception {<a 
name="line.108"></a>
-<span class="sourceLineNo">109</span>    
admin1.disableTableReplication(tableName);<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    admin2.disableTable(tableName);<a 
name="line.110"></a>
-<span class="sourceLineNo">111</span>    admin2.deleteTable(tableName);<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span>    
assertFalse(admin2.tableExists(tableName));<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    
admin1.enableTableReplication(tableName);<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    
assertTrue(admin2.tableExists(tableName));<a name="line.114"></a>
-<span class="sourceLineNo">115</span>  }<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>  @Test<a name="line.117"></a>
-<span class="sourceLineNo">118</span>  public void 
testEnableReplicationWhenReplicationNotEnabled() throws Exception {<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>    HTableDescriptor table = new 
HTableDescriptor(admin1.getTableDescriptor(tableName));<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    for (HColumnDescriptor fam : 
table.getColumnFamilies()) {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>      
fam.setScope(HConstants.REPLICATION_SCOPE_LOCAL);<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    }<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    admin1.disableTable(tableName);<a 
name="line.123"></a>
-<span class="sourceLineNo">124</span>    admin1.modifyTable(tableName, 
table);<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    admin1.enableTable(tableName);<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span>    admin2.disableTable(tableName);<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>    admin2.modifyTable(tableName, 
table);<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    admin2.enableTable(tableName);<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span>    
admin1.enableTableReplication(tableName);<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    table = 
admin1.getTableDescriptor(tableName);<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    for (HColumnDescriptor fam : 
table.getColumnFamilies()) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      
assertEquals(HConstants.REPLICATION_SCOPE_GLOBAL, fam.getScope());<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>    }<a name="line.135"></a>
-<span class="sourceLineNo">136</span>  }<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span>  @Test<a name="line.138"></a>
-<span class="sourceLineNo">139</span>  public void 
testEnableReplicationWhenTableDescriptorIsNotSameInClusters() throws Exception 
{<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    HTableDescriptor table = new 
HTableDescriptor(admin2.getTableDescriptor(tableName));<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    HColumnDescriptor f = new 
HColumnDescriptor("newFamily");<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    table.addFamily(f);<a 
name="line.142"></a>
-<span class="sourceLineNo">143</span>    admin2.disableTable(tableName);<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>    admin2.modifyTable(tableName, 
table);<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    admin2.enableTable(tableName);<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span>    try {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      
admin1.enableTableReplication(tableName);<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      fail("Exception should be thrown if 
table descriptors in the clusters are not same.");<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    } catch (RuntimeException ignored) 
{<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span>    }<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    admin1.disableTable(tableName);<a 
name="line.153"></a>
-<span class="sourceLineNo">154</span>    admin1.modifyTable(tableName, 
table);<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    admin1.enableTable(tableName);<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>    
admin1.enableTableReplication(tableName);<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    table = 
admin1.getTableDescriptor(tableName);<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    for (HColumnDescriptor fam : 
table.getColumnFamilies()) {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>      
assertEquals(HConstants.REPLICATION_SCOPE_GLOBAL, fam.getScope());<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>    }<a name="line.160"></a>
-<span class="sourceLineNo">161</span>  }<a name="line.161"></a>
+<span class="sourceLineNo">099</span>    
admin1.disableTableReplication(tableName);<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    table = 
admin1.getTableDescriptor(tableName);<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    for (HColumnDescriptor fam : 
table.getColumnFamilies()) {<a name="line.101"></a>
+<span class="sourceLineNo">102</span>      
assertEquals(HConstants.REPLICATION_SCOPE_LOCAL, fam.getScope());<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>    }<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span>    
admin1.deleteColumnFamily(table.getTableName(), f.getName());<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>  }<a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span>  @Test<a name="line.108"></a>
+<span class="sourceLineNo">109</span>  public void 
testEnableReplicationWhenSlaveClusterDoesntHaveTable() throws Exception {<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>    
admin1.disableTableReplication(tableName);<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    admin2.disableTable(tableName);<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>    admin2.deleteTable(tableName);<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>    
assertFalse(admin2.tableExists(tableName));<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    
admin1.enableTableReplication(tableName);<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    
assertTrue(admin2.tableExists(tableName));<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>  @Test<a name="line.118"></a>
+<span class="sourceLineNo">119</span>  public void 
testEnableReplicationWhenReplicationNotEnabled() throws Exception {<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>    HTableDescriptor table = new 
HTableDescriptor(admin1.getTableDescriptor(tableName));<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    for (HColumnDescriptor fam : 
table.getColumnFamilies()) {<a name="line.121"></a>
+<span class="sourceLineNo">122</span>      
fam.setScope(HConstants.REPLICATION_SCOPE_LOCAL);<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    }<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    admin1.disableTable(tableName);<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>    admin1.modifyTable(tableName, 
table);<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    admin1.enableTable(tableName);<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span>    admin2.disableTable(tableName);<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>    admin2.modifyTable(tableName, 
table);<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    admin2.enableTable(tableName);<a 
name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span>    
admin1.enableTableReplication(tableName);<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    table = 
admin1.getTableDescriptor(tableName);<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    for (HColumnDescriptor fam : 
table.getColumnFamilies()) {<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      
assertEquals(HConstants.REPLICATION_SCOPE_GLOBAL, fam.getScope());<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>    }<a name="line.136"></a>
+<span class="sourceLineNo">137</span>  }<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span>  @Test<a name="line.139"></a>
+<span class="sourceLineNo">140</span>  public void 
testEnableReplicationWhenTableDescriptorIsNotSameInClusters() throws Exception 
{<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    HTableDescriptor table = new 
HTableDescriptor(admin2.getTableDescriptor(tableName));<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    HColumnDescriptor f = new 
HColumnDescriptor("newFamily");<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    table.addFamily(f);<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span>    admin2.disableTable(tableName);<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>    admin2.modifyTable(tableName, 
table);<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    admin2.enableTable(tableName);<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span><a name="line.147"></a>
+<span class="sourceLineNo">148</span>    try {<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      
admin1.enableTableReplication(tableName);<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      fail("Exception should be thrown if 
table descriptors in the clusters are not same.");<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    } catch (RuntimeException ignored) 
{<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span>    }<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    admin1.disableTable(tableName);<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>    admin1.modifyTable(tableName, 
table);<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    admin1.enableTable(tableName);<a 
name="line.156"></a>
+<span class="sourceLineNo">157</span>    
admin1.enableTableReplication(tableName);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    table = 
admin1.getTableDescriptor(tableName);<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    for (HColumnDescriptor fam : 
table.getColumnFamilies()) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      
assertEquals(HConstants.REPLICATION_SCOPE_GLOBAL, fam.getScope());<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>    }<a name="line.161"></a>
 <span class="sourceLineNo">162</span><a name="line.162"></a>
-<span class="sourceLineNo">163</span>  @Test<a name="line.163"></a>
-<span class="sourceLineNo">164</span>  public void 
testDisableAndEnableReplication() throws Exception {<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    
admin1.disableTableReplication(tableName);<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    HTableDescriptor table = 
admin1.getTableDescriptor(tableName);<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    for (HColumnDescriptor fam : 
table.getColumnFamilies()) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span>      
assertEquals(HConstants.REPLICATION_SCOPE_LOCAL, fam.getScope());<a 
name="line.168"></a>
-<span class="sourceLineNo">169</span>    }<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    
admin1.enableTableReplication(tableName);<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    table = 
admin1.getTableDescriptor(tableName);<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    for (HColumnDescriptor fam : 
table.getColumnFamilies()) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      
assertEquals(HConstants.REPLICATION_SCOPE_GLOBAL, fam.getScope());<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>    }<a name="line.174"></a>
-<span class="sourceLineNo">175</span>  }<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span>  @Test(expected = 
TableNotFoundException.class)<a name="line.177"></a>
-<span class="sourceLineNo">178</span>  public void 
testDisableReplicationForNonExistingTable() throws Exception {<a 
name="line.178"></a>
-<span class="sourceLineNo">179</span>    
admin1.disableTableReplication(TableName.valueOf(name.getMethodName()));<a 
name="line.179"></a>
-<span class="sourceLineNo">180</span>  }<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span>  @Test(expected = 
TableNotFoundException.class)<a name="line.182"></a>
-<span class="sourceLineNo">183</span>  public void 
testEnableReplicationForNonExistingTable() throws Exception {<a 
name="line.183"></a>
-<span class="sourceLineNo">184</span>    
admin1.enableTableReplication(TableName.valueOf(name.getMethodName()));<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>  @Test(expected = 
IllegalArgumentException.class)<a name="line.187"></a>
-<span class="sourceLineNo">188</span>  public void 
testDisableReplicationWhenTableNameAsNull() throws Exception {<a 
name="line.188"></a>
-<span class="sourceLineNo">189</span>    
admin1.disableTableReplication(null);<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>  @Test(expected = 
IllegalArgumentException.class)<a name="line.192"></a>
-<span class="sourceLineNo">193</span>  public void 
testEnableReplicationWhenTableNameAsNull() throws Exception {<a 
name="line.193"></a>
-<span class="sourceLineNo">194</span>    
admin1.enableTableReplication(null);<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>  /*<a name="line.197"></a>
-<span class="sourceLineNo">198</span>   * Test enable table replication should 
create table only in user explicit specified table-cfs.<a name="line.198"></a>
-<span class="sourceLineNo">199</span>   * HBASE-14717<a name="line.199"></a>
-<span class="sourceLineNo">200</span>   */<a name="line.200"></a>
-<span class="sourceLineNo">201</span>  @Test<a name="line.201"></a>
-<span class="sourceLineNo">202</span>  public void 
testEnableReplicationForExplicitSetTableCfs() throws Exception {<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>    final TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    String peerId = "2";<a 
name="line.204"></a>
-<span class="sourceLineNo">205</span>    if 
(admin2.isTableAvailable(TestReplicationBase.tableName)) {<a 
name="line.205"></a>
-<span class="sourceLineNo">206</span>      
admin2.disableTable(TestReplicationBase.tableName);<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      
admin2.deleteTable(TestReplicationBase.tableName);<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    }<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    assertFalse("Table should not exists 
in the peer cluster",<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      
admin2.isTableAvailable(TestReplicationBase.tableName));<a name="line.210"></a>
-<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span>    // update peer config<a 
name="line.212"></a>
-<span class="sourceLineNo">213</span>    ReplicationPeerConfig rpc = 
admin1.getReplicationPeerConfig(peerId);<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    
rpc.setReplicateAllUserTables(false);<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    
admin1.updateReplicationPeerConfig(peerId, rpc);<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span>    Map&lt;TableName, ? extends 
Collection&lt;String&gt;&gt; tableCfs = new HashMap&lt;&gt;();<a 
name="line.217"></a>
-<span class="sourceLineNo">218</span>    tableCfs.put(tableName, null);<a 
name="line.218"></a>
-<span class="sourceLineNo">219</span>    try {<a name="line.219"></a>
-<span class="sourceLineNo">220</span>      adminExt.setPeerTableCFs(peerId, 
tableCfs);<a name="line.220"></a>
-<span class="sourceLineNo">221</span>      
admin1.enableTableReplication(TestReplicationBase.tableName);<a 
name="line.221"></a>
-<span class="sourceLineNo">222</span>      assertFalse("Table should not be 
created if user has set table cfs explicitly for the "<a name="line.222"></a>
-<span class="sourceLineNo">223</span>          + "peer and this is not part of 
that collection",<a name="line.223"></a>
-<span class="sourceLineNo">224</span>        
admin2.isTableAvailable(TestReplicationBase.tableName));<a name="line.224"></a>
-<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span>      
tableCfs.put(TestReplicationBase.tableName, null);<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      adminExt.setPeerTableCFs(peerId, 
tableCfs);<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      
admin1.enableTableReplication(TestReplicationBase.tableName);<a 
name="line.228"></a>
-<span class="sourceLineNo">229</span>      assertTrue(<a name="line.229"></a>
-<span class="sourceLineNo">230</span>        "Table should be created if user 
has explicitly added table into table cfs collection",<a name="line.230"></a>
-<span class="sourceLineNo">231</span>        
admin2.isTableAvailable(TestReplicationBase.tableName));<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    } finally {<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      adminExt.removePeerTableCFs(peerId, 
adminExt.getPeerTableCFs(peerId));<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      
admin1.disableTableReplication(TestReplicationBase.tableName);<a 
name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span>      rpc = 
admin1.getReplicationPeerConfig(peerId);<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      
rpc.setReplicateAllUserTables(true);<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      
admin1.updateReplicationPeerConfig(peerId, rpc);<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    }<a name="line.239"></a>
-<span class="sourceLineNo">240</span>  }<a name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span>  @Test<a name="line.242"></a>
-<span class="sourceLineNo">243</span>  public void 
testReplicationPeerConfigUpdateCallback() throws Exception {<a 
name="line.243"></a>
-<span class="sourceLineNo">244</span>    String peerId = "1";<a 
name="line.244"></a>
-<span class="sourceLineNo">245</span>    ReplicationPeerConfig rpc = new 
ReplicationPeerConfig();<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    
rpc.setClusterKey(utility2.getClusterKey());<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    
rpc.setReplicationEndpointImpl(TestUpdatableReplicationEndpoint.class.getName());<a
 name="line.247"></a>
-<span class="sourceLineNo">248</span>    rpc.getConfiguration().put("key1", 
"value1");<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span>    admin1.addReplicationPeer(peerId, 
rpc);<a name="line.250"></a>
-<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span>    rpc.getConfiguration().put("key1", 
"value2");<a name="line.252"></a>
-<span class="sourceLineNo">253</span>    admin.updatePeerConfig(peerId, 
rpc);<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    if 
(!TestUpdatableReplicationEndpoint.hasCalledBack()) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span>      
synchronized(TestUpdatableReplicationEndpoint.class) {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>        
TestUpdatableReplicationEndpoint.class.wait(2000L);<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><a name="line.259"></a>
-<span class="sourceLineNo">260</span>    assertEquals(true, 
TestUpdatableReplicationEndpoint.hasCalledBack());<a name="line.260"></a>
-<span class="sourceLineNo">261</span>  }<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>  public static class 
TestUpdatableReplicationEndpoint extends BaseReplicationEndpoint {<a 
name="line.263"></a>
-<span class="sourceLineNo">264</span>    private static boolean calledBack = 
false;<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    public static boolean 
hasCalledBack(){<a name="line.265"></a>
-<span class="sourceLineNo">266</span>      return calledBack;<a 
name="line.266"></a>
-<span class="sourceLineNo">267</span>    }<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    @Override<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    public synchronized void 
peerConfigUpdated(ReplicationPeerConfig rpc){<a name="line.269"></a>
-<span class="sourceLineNo">270</span>      calledBack = true;<a 
name="line.270"></a>
-<span class="sourceLineNo">271</span>      notifyAll();<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">163</span>    admin1.deleteColumnFamily(tableName, 
f.getName());<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    admin2.deleteColumnFamily(tableName, 
f.getName());<a name="line.164"></a>
+<span class="sourceLineNo">165</span>  }<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span>  @Test<a name="line.167"></a>
+<span class="sourceLineNo">168</span>  public void 
testDisableAndEnableReplication() throws Exception {<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    
admin1.disableTableReplication(tableName);<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    HTableDescriptor table = 
admin1.getTableDescriptor(tableName);<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    for (HColumnDescriptor fam : 
table.getColumnFamilies()) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      
assertEquals(HConstants.REPLICATION_SCOPE_LOCAL, fam.getScope());<a 
name="line.172"></a>
+<span class="sourceLineNo">173</span>    }<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    
admin1.enableTableReplication(tableName);<a name="line.174"></a>
+<span class="sourceLineNo">175</span>    table = 
admin1.getTableDescriptor(tableName);<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    for (HColumnDescriptor fam : 
table.getColumnFamilies()) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      
assertEquals(HConstants.REPLICATION_SCOPE_GLOBAL, fam.getScope());<a 
name="line.177"></a>
+<span class="sourceLineNo">178</span>    }<a name="line.178"></a>
+<span class="sourceLineNo">179</span>  }<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span>  @Test(expected = 
TableNotFoundException.class)<a name="line.181"></a>
+<span class="sourceLineNo">182</span>  public void 
testDisableReplicationForNonExistingTable() throws Exception {<a 
name="line.182"></a>
+<span class="sourceLineNo">183</span>    
admin1.disableTableReplication(TableName.valueOf(name.getMethodName()));<a 
name="line.183"></a>
+<span class="sourceLineNo">184</span>  }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span>  @Test(expected = 
TableNotFoundException.class)<a name="line.186"></a>
+<span class="sourceLineNo">187</span>  public void 
testEnableReplicationForNonExistingTable() throws Exception {<a 
name="line.187"></a>
+<span class="sourceLineNo">188</span>    
admin1.enableTableReplication(TableName.valueOf(name.getMethodName()));<a 
name="line.188"></a>
+<span class="sourceLineNo">189</span>  }<a name="line.189"></a>
+<span class="sourceLineNo">190</span><a name="line.190"></a>
+<span class="sourceLineNo">191</span>  @Test(expected = 
IllegalArgumentException.class)<a name="line.191"></a>
+<span class="sourceLineNo">192</span>  public void 
testDisableReplicationWhenTableNameAsNull() throws Exception {<a 
name="line.192"></a>
+<span class="sourceLineNo">193</span>    
admin1.disableTableReplication(null);<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>  @Test(expected = 
IllegalArgumentException.class)<a name="line.196"></a>
+<span class="sourceLineNo">197</span>  public void 
testEnableReplicationWhenTableNameAsNull() throws Exception {<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>    
admin1.enableTableReplication(null);<a name="line.198"></a>
+<span class="sourceLineNo">199</span>  }<a name="line.199"></a>
+<span class="sourceLineNo">200</span><a name="line.200"></a>
+<span class="sourceLineNo">201</span>  /*<a name="line.201"></a>
+<span class="sourceLineNo">202</span>   * Test enable table replication should 
create table only in user explicit specified table-cfs.<a name="line.202"></a>
+<span class="sourceLineNo">203</span>   * HBASE-14717<a name="line.203"></a>
+<span class="sourceLineNo">204</span>   */<a name="line.204"></a>
+<span class="sourceLineNo">205</span>  @Test<a name="line.205"></a>
+<span class="sourceLineNo">206</span>  public void 
testEnableReplicationForExplicitSetTableCfs() throws Exception {<a 
name="line.206"></a>
+<span class="sourceLineNo">207</span>    final TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    String peerId = "2";<a 
name="line.208"></a>
+<span class="sourceLineNo">209</span>    if 
(admin2.isTableAvailable(TestReplicationBase.tableName)) {<a 
name="line.209"></a>
+<span class="sourceLineNo">210</span>      
admin2.disableTable(TestReplicationBase.tableName);<a name="line.210"></a>
+<span class="sourceLineNo">211</span>      
admin2.deleteTable(TestReplicationBase.tableName);<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    }<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    assertFalse("Table should not exists 
in the peer cluster",<a name="line.213"></a>
+<span class="sourceLineNo">214</span>      
admin2.isTableAvailable(TestReplicationBase.tableName));<a name="line.214"></a>
+<span class="sourceLineNo">215</span><a name="line.215"></a>
+<span class="sourceLineNo">216</span>    // update peer config<a 
name="line.216"></a>
+<span class="sourceLineNo">217</span>    ReplicationPeerConfig rpc = 
admin1.getReplicationPeerConfig(peerId);<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    
rpc.setReplicateAllUserTables(false);<a name="line.218"></a>
+<span class="sourceLineNo">219</span>    
admin1.updateReplicationPeerConfig(peerId, rpc);<a name="line.219"></a>
+<span class="sourceLineNo">220</span><a name="line.220"></a>
+<span class="sourceLineNo">221</span>    Map&lt;TableName, ? extends 
Collection&lt;String&gt;&gt; tableCfs = new HashMap&lt;&gt;();<a 
name="line.221"></a>
+<span class="sourceLineNo">222</span>    tableCfs.put(tableName, null);<a 
name="line.222"></a>
+<span class="sourceLineNo">223</span>    try {<a name="line.223"></a>
+<span class="sourceLineNo">224</span>      adminExt.setPeerTableCFs(peerId, 
tableCfs);<a name="line.224"></a>
+<span class="sourceLineNo">225</span>      
admin1.enableTableReplication(TestReplicationBase.tableName);<a 
name="line.225"></a>
+<span class="sourceLineNo">226</span>      assertFalse("Table should not be 
created if user has set table cfs explicitly for the "<a name="line.226"></a>
+<span class="sourceLineNo">227</span>          + "peer and this is not part of 
that collection",<a name="line.227"></a>
+<span class="sourceLineNo">228</span>        
admin2.isTableAvailable(TestReplicationBase.tableName));<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span>      
tableCfs.put(TestReplicationBase.tableName, null);<a name="line.230"></a>
+<span class="sourceLineNo">231</span>      adminExt.setPeerTableCFs(peerId, 
tableCfs);<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      
admin1.enableTableReplication(TestReplicationBase.tableName);<a 
name="line.232"></a>
+<span class="sourceLineNo">233</span>      assertTrue(<a name="line.233"></a>
+<span class="sourceLineNo">234</span>        "Table should be created if user 
has explicitly added table into table cfs collection",<a name="line.234"></a>
+<span class="sourceLineNo">235</span>        
admin2.isTableAvailable(TestReplicationBase.tableName));<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    } finally {<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      adminExt.removePeerTableCFs(peerId, 
adminExt.getPeerTableCFs(peerId));<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      
admin1.disableTableReplication(TestReplicationBase.tableName);<a 
name="line.238"></a>
+<span class="sourceLineNo">239</span><a name="line.239"></a>
+<span class="sourceLineNo">240</span>      rpc = 
admin1.getReplicationPeerConfig(peerId);<a name="line.240"></a>
+<span class="sourceLineNo">241</span>      
rpc.setReplicateAllUserTables(true);<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      
admin1.updateReplicationPeerConfig(peerId, rpc);<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    }<a name="line.243"></a>
+<span class="sourceLineNo">244</span>  }<a name="line.244"></a>
+<span class="sourceLineNo">245</span><a name="line.245"></a>
+<span class="sourceLineNo">246</span>  @Test<a name="line.246"></a>
+<span class="sourceLineNo">247</span>  public void 
testReplicationPeerConfigUpdateCallback() throws Exception {<a 
name="line.247"></a>
+<span class="sourceLineNo">248</span>    String peerId = "1";<a 
name="line.248"></a>
+<span class="sourceLineNo">249</span>    ReplicationPeerConfig rpc = new 
ReplicationPeerConfig();<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    
rpc.setClusterKey(utility2.getClusterKey());<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    
rpc.setReplicationEndpointImpl(TestUpdatableReplicationEndpoint.class.getName());<a
 name="line.251"></a>
+<span class="sourceLineNo">252</span>    rpc.getConfiguration().put("key1", 
"value1");<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span>    admin1.addReplicationPeer(peerId, 
rpc);<a name="line.254"></a>
+<span class="sourceLineNo">255</span><a name="line.255"></a>
+<span class="sourceLineNo">256</span>    rpc.getConfiguration().put("key1", 
"value2");<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    admin.updatePeerConfig(peerId, 
rpc);<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    if 
(!TestUpdatableReplicationEndpoint.hasCalledBack()) {<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      synchronized 
(TestUpdatableReplicationEndpoint.class) {<a name="line.259"></a>
+<span class="sourceLineNo">260</span>        
TestUpdatableReplicationEndpoint.class.wait(2000L);<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      }<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>    assertEquals(true, 
TestUpdatableReplicationEndpoint.hasCalledBack());<a name="line.264"></a>
+<span class="sourceLineNo">265</span><a name="line.265"></a>
+<span class="sourceLineNo">266</span>    admin.removePeer(peerId);<a 
name="line.266"></a>
+<span class="sourceLineNo">267</span>  }<a name="line.267"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span>  public static class 
TestUpdatableReplicationEndpoint extends BaseReplicationEndpoint {<a 
name="line.269"></a>
+<span class="sourceLineNo">270</span>    private static boolean calledBack = 
false;<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    public static boolean 
hasCalledBack(){<a name="line.271"></a>
+<span class="sourceLineNo">272</span>      return calledBack;<a 
name="line.272"></a>
+<span class="sourceLineNo">273</span>    }<a name="line.273"></a>
 <span class="sourceLineNo">274</span>    @Override<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    public void start() {<a 
name="line.275"></a>
-<span class="sourceLineNo">276</span>      startAsync();<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    }<a name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span>    @Override<a name="line.279"></a>
-<span class="sourceLineNo">280</span>    public void stop() {<a 
name="line.280"></a>
-<span class="sourceLineNo">281</span>      stopAsync();<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    }<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span>    @Override<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    protected void doStart() {<a 
name="line.285"></a>
-<span class="sourceLineNo">286</span>      notifyStarted();<a 
name="line.286"></a>
-<span class="sourceLineNo">287</span>    }<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span>    @Override<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    protected void doStop() {<a 
name="line.290"></a>
-<span class="sourceLineNo">291</span>      notifyStopped();<a 
name="line.291"></a>
-<span class="sourceLineNo">292</span>    }<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
+<span class="sourceLineNo">275</span>    public synchronized void 
peerConfigUpdated(ReplicationPeerConfig rpc){<a name="line.275"></a>
+<span class="sourceLineNo">276</span>      calledBack = true;<a 
name="line.276"></a>
+<span class="sourceLineNo">277</span>      notifyAll();<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    }<a name="line.278"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span>    @Override<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    public void start() {<a 
name="line.281"></a>
+<span class="sourceLineNo">282</span>      startAsync();<a name="line.282"></a>
+<span class="sourceLineNo">283</span>    }<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span>    @Override<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    public void stop() {<a 
name="line.286"></a>
+<span class="sourceLineNo">287</span>      stopAsync();<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    }<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span>    @Override<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    protected void doStart() {<a 
name="line.291"></a>
+<span class="sourceLineNo">292</span>      notifyStarted();<a 
name="line.292"></a>
+<span class="sourceLineNo">293</span>    }<a name="line.293"></a>
 <span class="sourceLineNo">294</span><a name="line.294"></a>
 <span class="sourceLineNo">295</span>    @Override<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    public UUID getPeerUUID() {<a 
name="line.296"></a>
-<span class="sourceLineNo">297</span>      return UUID.randomUUID();<a 
name="line.297"></a>
+<span class="sourceLineNo">296</span>    protected void doStop() {<a 
name="line.296"></a>
+<span class="sourceLineNo">297</span>      notifyStopped();<a 
name="line.297"></a>
 <span class="sourceLineNo">298</span>    }<a name="line.298"></a>
 <span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span>    @Override<a name="line.300"></a>
-<span class="sourceLineNo">301</span>    public boolean 
replicate(ReplicateContext replicateContext) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span>      return false;<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>}<a name="line.305"></a>
+<span class="sourceLineNo">300</span><a name="line.300"></a>
+<span class="sourceLineNo">301</span>    @Override<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    public UUID getPeerUUID() {<a 
name="line.302"></a>
+<span class="sourceLineNo">303</span>      return UUID.randomUUID();<a 
name="line.303"></a>
+<span class="sourceLineNo">304</span>    }<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span>    @Override<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    public boolean 
replicate(ReplicateContext replicateContext) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      return false;<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    }<a name="line.309"></a>
+<span class="sourceLineNo">310</span>  }<a name="line.310"></a>
+<span class="sourceLineNo">311</span>}<a name="line.311"></a>

Reply via email to