You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/05/09 15:31:50 UTC
[02/16] hbase-site git commit: Published site at
4f2dfd387779968d3b76a22f1f4189d3278b202d.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/63aade82/testdevapidocs/src-html/org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase.html
index 0a7a7cf..ef9f492 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase.html
@@ -348,741 +348,788 @@
<span class="sourceLineNo">340</span> }<a name="line.340"></a>
<span class="sourceLineNo">341</span><a name="line.341"></a>
<span class="sourceLineNo">342</span> @Test<a name="line.342"></a>
-<span class="sourceLineNo">343</span> public void testTableMoveTruncateAndDrop() throws Exception {<a name="line.343"></a>
-<span class="sourceLineNo">344</span> final byte[] familyNameBytes = Bytes.toBytes("f");<a name="line.344"></a>
-<span class="sourceLineNo">345</span> String newGroupName = getGroupName(name.getMethodName());<a name="line.345"></a>
-<span class="sourceLineNo">346</span> final RSGroupInfo newGroup = addGroup(newGroupName, 2);<a name="line.346"></a>
-<span class="sourceLineNo">347</span><a name="line.347"></a>
-<span class="sourceLineNo">348</span> TEST_UTIL.createMultiRegionTable(tableName, familyNameBytes, 5);<a name="line.348"></a>
-<span class="sourceLineNo">349</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.349"></a>
-<span class="sourceLineNo">350</span> @Override<a name="line.350"></a>
-<span class="sourceLineNo">351</span> public boolean evaluate() throws Exception {<a name="line.351"></a>
-<span class="sourceLineNo">352</span> List<String> regions = getTableRegionMap().get(tableName);<a name="line.352"></a>
-<span class="sourceLineNo">353</span> if (regions == null) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> return false;<a name="line.354"></a>
-<span class="sourceLineNo">355</span> }<a name="line.355"></a>
-<span class="sourceLineNo">356</span><a name="line.356"></a>
-<span class="sourceLineNo">357</span> return getTableRegionMap().get(tableName).size() >= 5;<a name="line.357"></a>
-<span class="sourceLineNo">358</span> }<a name="line.358"></a>
-<span class="sourceLineNo">359</span> });<a name="line.359"></a>
-<span class="sourceLineNo">360</span><a name="line.360"></a>
-<span class="sourceLineNo">361</span> RSGroupInfo tableGrp = rsGroupAdmin.getRSGroupInfoOfTable(tableName);<a name="line.361"></a>
-<span class="sourceLineNo">362</span> assertTrue(tableGrp.getName().equals(RSGroupInfo.DEFAULT_GROUP));<a name="line.362"></a>
-<span class="sourceLineNo">363</span><a name="line.363"></a>
-<span class="sourceLineNo">364</span> //change table's group<a name="line.364"></a>
-<span class="sourceLineNo">365</span> LOG.info("Moving table "+tableName+" to "+newGroup.getName());<a name="line.365"></a>
-<span class="sourceLineNo">366</span> rsGroupAdmin.moveTables(Sets.newHashSet(tableName), newGroup.getName());<a name="line.366"></a>
+<span class="sourceLineNo">343</span> public void testMoveServersFromDefaultGroup() throws Exception {<a name="line.343"></a>
+<span class="sourceLineNo">344</span> //create groups and assign servers<a name="line.344"></a>
+<span class="sourceLineNo">345</span> rsGroupAdmin.addRSGroup("foo");<a name="line.345"></a>
+<span class="sourceLineNo">346</span><a name="line.346"></a>
+<span class="sourceLineNo">347</span> RSGroupInfo fooGroup = rsGroupAdmin.getRSGroupInfo("foo");<a name="line.347"></a>
+<span class="sourceLineNo">348</span> assertEquals(0, fooGroup.getServers().size());<a name="line.348"></a>
+<span class="sourceLineNo">349</span> RSGroupInfo defaultGroup = rsGroupAdmin.getRSGroupInfo(RSGroupInfo.DEFAULT_GROUP);<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span> //test remove all servers from default<a name="line.351"></a>
+<span class="sourceLineNo">352</span> try {<a name="line.352"></a>
+<span class="sourceLineNo">353</span> rsGroupAdmin.moveServers(defaultGroup.getServers(), fooGroup.getName());<a name="line.353"></a>
+<span class="sourceLineNo">354</span> fail(RSGroupAdminServer.KEEP_ONE_SERVER_IN_DEFAULT_ERROR_MESSAGE);<a name="line.354"></a>
+<span class="sourceLineNo">355</span> } catch (ConstraintException ex) {<a name="line.355"></a>
+<span class="sourceLineNo">356</span> assertTrue(ex.getMessage().contains(RSGroupAdminServer<a name="line.356"></a>
+<span class="sourceLineNo">357</span> .KEEP_ONE_SERVER_IN_DEFAULT_ERROR_MESSAGE));<a name="line.357"></a>
+<span class="sourceLineNo">358</span> }<a name="line.358"></a>
+<span class="sourceLineNo">359</span><a name="line.359"></a>
+<span class="sourceLineNo">360</span> //test success case, remove one server from default ,keep at least one server<a name="line.360"></a>
+<span class="sourceLineNo">361</span> if (defaultGroup.getServers().size() > 1) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span> Address serverInDefaultGroup = defaultGroup.getServers().iterator().next();<a name="line.362"></a>
+<span class="sourceLineNo">363</span> LOG.info("moving server " + serverInDefaultGroup + " from group default to group " +<a name="line.363"></a>
+<span class="sourceLineNo">364</span> fooGroup.getName());<a name="line.364"></a>
+<span class="sourceLineNo">365</span> rsGroupAdmin.moveServers(Sets.newHashSet(serverInDefaultGroup), fooGroup.getName());<a name="line.365"></a>
+<span class="sourceLineNo">366</span> }<a name="line.366"></a>
<span class="sourceLineNo">367</span><a name="line.367"></a>
-<span class="sourceLineNo">368</span> //verify group change<a name="line.368"></a>
-<span class="sourceLineNo">369</span> Assert.assertEquals(newGroup.getName(),<a name="line.369"></a>
-<span class="sourceLineNo">370</span> rsGroupAdmin.getRSGroupInfoOfTable(tableName).getName());<a name="line.370"></a>
+<span class="sourceLineNo">368</span> fooGroup = rsGroupAdmin.getRSGroupInfo("foo");<a name="line.368"></a>
+<span class="sourceLineNo">369</span> LOG.info("moving servers " + fooGroup.getServers() + " to group default");<a name="line.369"></a>
+<span class="sourceLineNo">370</span> rsGroupAdmin.moveServers(fooGroup.getServers(), RSGroupInfo.DEFAULT_GROUP);<a name="line.370"></a>
<span class="sourceLineNo">371</span><a name="line.371"></a>
<span class="sourceLineNo">372</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.372"></a>
<span class="sourceLineNo">373</span> @Override<a name="line.373"></a>
<span class="sourceLineNo">374</span> public boolean evaluate() throws Exception {<a name="line.374"></a>
-<span class="sourceLineNo">375</span> Map<ServerName, List<String>> serverMap = getTableServerRegionMap().get(tableName);<a name="line.375"></a>
-<span class="sourceLineNo">376</span> int count = 0;<a name="line.376"></a>
-<span class="sourceLineNo">377</span> if (serverMap != null) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span> for (ServerName rs : serverMap.keySet()) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span> if (newGroup.containsServer(rs.getAddress())) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> count += serverMap.get(rs).size();<a name="line.380"></a>
-<span class="sourceLineNo">381</span> }<a name="line.381"></a>
-<span class="sourceLineNo">382</span> }<a name="line.382"></a>
-<span class="sourceLineNo">383</span> }<a name="line.383"></a>
-<span class="sourceLineNo">384</span> return count == 5;<a name="line.384"></a>
-<span class="sourceLineNo">385</span> }<a name="line.385"></a>
-<span class="sourceLineNo">386</span> });<a name="line.386"></a>
-<span class="sourceLineNo">387</span><a name="line.387"></a>
-<span class="sourceLineNo">388</span> //test truncate<a name="line.388"></a>
-<span class="sourceLineNo">389</span> admin.disableTable(tableName);<a name="line.389"></a>
-<span class="sourceLineNo">390</span> admin.truncateTable(tableName, true);<a name="line.390"></a>
-<span class="sourceLineNo">391</span> Assert.assertEquals(1, rsGroupAdmin.getRSGroupInfo(newGroup.getName()).getTables().size());<a name="line.391"></a>
-<span class="sourceLineNo">392</span> Assert.assertEquals(tableName, rsGroupAdmin.getRSGroupInfo(<a name="line.392"></a>
-<span class="sourceLineNo">393</span> newGroup.getName()).getTables().first());<a name="line.393"></a>
+<span class="sourceLineNo">375</span> return getNumServers() ==<a name="line.375"></a>
+<span class="sourceLineNo">376</span> rsGroupAdmin.getRSGroupInfo(RSGroupInfo.DEFAULT_GROUP).getServers().size();<a name="line.376"></a>
+<span class="sourceLineNo">377</span> }<a name="line.377"></a>
+<span class="sourceLineNo">378</span> });<a name="line.378"></a>
+<span class="sourceLineNo">379</span><a name="line.379"></a>
+<span class="sourceLineNo">380</span> fooGroup = rsGroupAdmin.getRSGroupInfo("foo");<a name="line.380"></a>
+<span class="sourceLineNo">381</span> assertEquals(0, fooGroup.getServers().size());<a name="line.381"></a>
+<span class="sourceLineNo">382</span><a name="line.382"></a>
+<span class="sourceLineNo">383</span> //test group removal<a name="line.383"></a>
+<span class="sourceLineNo">384</span> LOG.info("Remove group " + fooGroup.getName());<a name="line.384"></a>
+<span class="sourceLineNo">385</span> rsGroupAdmin.removeRSGroup(fooGroup.getName());<a name="line.385"></a>
+<span class="sourceLineNo">386</span> Assert.assertEquals(null, rsGroupAdmin.getRSGroupInfo(fooGroup.getName()));<a name="line.386"></a>
+<span class="sourceLineNo">387</span> }<a name="line.387"></a>
+<span class="sourceLineNo">388</span><a name="line.388"></a>
+<span class="sourceLineNo">389</span> @Test<a name="line.389"></a>
+<span class="sourceLineNo">390</span> public void testTableMoveTruncateAndDrop() throws Exception {<a name="line.390"></a>
+<span class="sourceLineNo">391</span> final byte[] familyNameBytes = Bytes.toBytes("f");<a name="line.391"></a>
+<span class="sourceLineNo">392</span> String newGroupName = getGroupName(name.getMethodName());<a name="line.392"></a>
+<span class="sourceLineNo">393</span> final RSGroupInfo newGroup = addGroup(newGroupName, 2);<a name="line.393"></a>
<span class="sourceLineNo">394</span><a name="line.394"></a>
-<span class="sourceLineNo">395</span> //verify removed table is removed from group<a name="line.395"></a>
-<span class="sourceLineNo">396</span> TEST_UTIL.deleteTable(tableName);<a name="line.396"></a>
-<span class="sourceLineNo">397</span> Assert.assertEquals(0, rsGroupAdmin.getRSGroupInfo(newGroup.getName()).getTables().size());<a name="line.397"></a>
-<span class="sourceLineNo">398</span> }<a name="line.398"></a>
-<span class="sourceLineNo">399</span><a name="line.399"></a>
-<span class="sourceLineNo">400</span> @Test<a name="line.400"></a>
-<span class="sourceLineNo">401</span> public void testGroupBalance() throws Exception {<a name="line.401"></a>
-<span class="sourceLineNo">402</span> LOG.info(name.getMethodName());<a name="line.402"></a>
-<span class="sourceLineNo">403</span> String newGroupName = getGroupName(name.getMethodName());<a name="line.403"></a>
-<span class="sourceLineNo">404</span> final RSGroupInfo newGroup = addGroup(newGroupName, 3);<a name="line.404"></a>
-<span class="sourceLineNo">405</span><a name="line.405"></a>
-<span class="sourceLineNo">406</span> final TableName tableName = TableName.valueOf(tablePrefix+"_ns", name.getMethodName());<a name="line.406"></a>
-<span class="sourceLineNo">407</span> admin.createNamespace(<a name="line.407"></a>
-<span class="sourceLineNo">408</span> NamespaceDescriptor.create(tableName.getNamespaceAsString())<a name="line.408"></a>
-<span class="sourceLineNo">409</span> .addConfiguration(RSGroupInfo.NAMESPACE_DESC_PROP_GROUP, newGroupName).build());<a name="line.409"></a>
-<span class="sourceLineNo">410</span> final byte[] familyNameBytes = Bytes.toBytes("f");<a name="line.410"></a>
-<span class="sourceLineNo">411</span> final HTableDescriptor desc = new HTableDescriptor(tableName);<a name="line.411"></a>
-<span class="sourceLineNo">412</span> desc.addFamily(new HColumnDescriptor("f"));<a name="line.412"></a>
-<span class="sourceLineNo">413</span> byte [] startKey = Bytes.toBytes("aaaaa");<a name="line.413"></a>
-<span class="sourceLineNo">414</span> byte [] endKey = Bytes.toBytes("zzzzz");<a name="line.414"></a>
-<span class="sourceLineNo">415</span> admin.createTable(desc, startKey, endKey, 6);<a name="line.415"></a>
-<span class="sourceLineNo">416</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.416"></a>
-<span class="sourceLineNo">417</span> @Override<a name="line.417"></a>
-<span class="sourceLineNo">418</span> public boolean evaluate() throws Exception {<a name="line.418"></a>
-<span class="sourceLineNo">419</span> List<String> regions = getTableRegionMap().get(tableName);<a name="line.419"></a>
-<span class="sourceLineNo">420</span> if (regions == null) {<a name="line.420"></a>
-<span class="sourceLineNo">421</span> return false;<a name="line.421"></a>
-<span class="sourceLineNo">422</span> }<a name="line.422"></a>
-<span class="sourceLineNo">423</span> return regions.size() >= 6;<a name="line.423"></a>
-<span class="sourceLineNo">424</span> }<a name="line.424"></a>
-<span class="sourceLineNo">425</span> });<a name="line.425"></a>
-<span class="sourceLineNo">426</span><a name="line.426"></a>
-<span class="sourceLineNo">427</span> //make assignment uneven, move all regions to one server<a name="line.427"></a>
-<span class="sourceLineNo">428</span> Map<ServerName,List<String>> assignMap =<a name="line.428"></a>
-<span class="sourceLineNo">429</span> getTableServerRegionMap().get(tableName);<a name="line.429"></a>
-<span class="sourceLineNo">430</span> final ServerName first = assignMap.entrySet().iterator().next().getKey();<a name="line.430"></a>
-<span class="sourceLineNo">431</span> for(RegionInfo region: admin.getTableRegions(tableName)) {<a name="line.431"></a>
-<span class="sourceLineNo">432</span> if(!assignMap.get(first).contains(region.getRegionNameAsString())) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> admin.move(region.getEncodedNameAsBytes(), Bytes.toBytes(first.getServerName()));<a name="line.433"></a>
-<span class="sourceLineNo">434</span> }<a name="line.434"></a>
-<span class="sourceLineNo">435</span> }<a name="line.435"></a>
-<span class="sourceLineNo">436</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> @Override<a name="line.437"></a>
-<span class="sourceLineNo">438</span> public boolean evaluate() throws Exception {<a name="line.438"></a>
-<span class="sourceLineNo">439</span> Map<ServerName, List<String>> map = getTableServerRegionMap().get(tableName);<a name="line.439"></a>
-<span class="sourceLineNo">440</span> if (map == null) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span> return true;<a name="line.441"></a>
-<span class="sourceLineNo">442</span> }<a name="line.442"></a>
-<span class="sourceLineNo">443</span> List<String> regions = map.get(first);<a name="line.443"></a>
-<span class="sourceLineNo">444</span> if (regions == null) {<a name="line.444"></a>
-<span class="sourceLineNo">445</span> return true;<a name="line.445"></a>
-<span class="sourceLineNo">446</span> }<a name="line.446"></a>
-<span class="sourceLineNo">447</span> return regions.size() >= 6;<a name="line.447"></a>
-<span class="sourceLineNo">448</span> }<a name="line.448"></a>
-<span class="sourceLineNo">449</span> });<a name="line.449"></a>
-<span class="sourceLineNo">450</span><a name="line.450"></a>
-<span class="sourceLineNo">451</span> //balance the other group and make sure it doesn't affect the new group<a name="line.451"></a>
-<span class="sourceLineNo">452</span> admin.setBalancerRunning(true,true);<a name="line.452"></a>
-<span class="sourceLineNo">453</span> rsGroupAdmin.balanceRSGroup(RSGroupInfo.DEFAULT_GROUP);<a name="line.453"></a>
-<span class="sourceLineNo">454</span> assertEquals(6, getTableServerRegionMap().get(tableName).get(first).size());<a name="line.454"></a>
-<span class="sourceLineNo">455</span><a name="line.455"></a>
-<span class="sourceLineNo">456</span> //disable balance, balancer will not be run and return false<a name="line.456"></a>
-<span class="sourceLineNo">457</span> admin.setBalancerRunning(false,true);<a name="line.457"></a>
-<span class="sourceLineNo">458</span> assertFalse(rsGroupAdmin.balanceRSGroup(newGroupName));<a name="line.458"></a>
-<span class="sourceLineNo">459</span> assertEquals(6, getTableServerRegionMap().get(tableName).get(first).size());<a name="line.459"></a>
-<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span> //enable balance<a name="line.461"></a>
-<span class="sourceLineNo">462</span> admin.setBalancerRunning(true,true);<a name="line.462"></a>
-<span class="sourceLineNo">463</span> rsGroupAdmin.balanceRSGroup(newGroupName);<a name="line.463"></a>
-<span class="sourceLineNo">464</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.464"></a>
-<span class="sourceLineNo">465</span> @Override<a name="line.465"></a>
-<span class="sourceLineNo">466</span> public boolean evaluate() throws Exception {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> for (List<String> regions : getTableServerRegionMap().get(tableName).values()) {<a name="line.467"></a>
-<span class="sourceLineNo">468</span> if (2 != regions.size()) {<a name="line.468"></a>
-<span class="sourceLineNo">469</span> return false;<a name="line.469"></a>
-<span class="sourceLineNo">470</span> }<a name="line.470"></a>
-<span class="sourceLineNo">471</span> }<a name="line.471"></a>
-<span class="sourceLineNo">472</span> return true;<a name="line.472"></a>
-<span class="sourceLineNo">473</span> }<a name="line.473"></a>
-<span class="sourceLineNo">474</span> });<a name="line.474"></a>
-<span class="sourceLineNo">475</span> admin.setBalancerRunning(false,true);<a name="line.475"></a>
-<span class="sourceLineNo">476</span> }<a name="line.476"></a>
-<span class="sourceLineNo">477</span><a name="line.477"></a>
-<span class="sourceLineNo">478</span> @Test<a name="line.478"></a>
-<span class="sourceLineNo">479</span> public void testRegionMove() throws Exception {<a name="line.479"></a>
-<span class="sourceLineNo">480</span> final RSGroupInfo newGroup = addGroup(getGroupName(name.getMethodName()), 1);<a name="line.480"></a>
-<span class="sourceLineNo">481</span> final byte[] familyNameBytes = Bytes.toBytes("f");<a name="line.481"></a>
-<span class="sourceLineNo">482</span> // All the regions created below will be assigned to the default group.<a name="line.482"></a>
-<span class="sourceLineNo">483</span> TEST_UTIL.createMultiRegionTable(tableName, familyNameBytes, 6);<a name="line.483"></a>
-<span class="sourceLineNo">484</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.484"></a>
-<span class="sourceLineNo">485</span> @Override<a name="line.485"></a>
-<span class="sourceLineNo">486</span> public boolean evaluate() throws Exception {<a name="line.486"></a>
-<span class="sourceLineNo">487</span> List<String> regions = getTableRegionMap().get(tableName);<a name="line.487"></a>
-<span class="sourceLineNo">488</span> if (regions == null) {<a name="line.488"></a>
-<span class="sourceLineNo">489</span> return false;<a name="line.489"></a>
-<span class="sourceLineNo">490</span> }<a name="line.490"></a>
-<span class="sourceLineNo">491</span><a name="line.491"></a>
-<span class="sourceLineNo">492</span> return getTableRegionMap().get(tableName).size() >= 6;<a name="line.492"></a>
-<span class="sourceLineNo">493</span> }<a name="line.493"></a>
-<span class="sourceLineNo">494</span> });<a name="line.494"></a>
-<span class="sourceLineNo">495</span><a name="line.495"></a>
-<span class="sourceLineNo">496</span> //get target region to move<a name="line.496"></a>
-<span class="sourceLineNo">497</span> Map<ServerName,List<String>> assignMap =<a name="line.497"></a>
-<span class="sourceLineNo">498</span> getTableServerRegionMap().get(tableName);<a name="line.498"></a>
-<span class="sourceLineNo">499</span> String targetRegion = null;<a name="line.499"></a>
-<span class="sourceLineNo">500</span> for(ServerName server : assignMap.keySet()) {<a name="line.500"></a>
-<span class="sourceLineNo">501</span> targetRegion = assignMap.get(server).size() > 0 ? assignMap.get(server).get(0) : null;<a name="line.501"></a>
-<span class="sourceLineNo">502</span> if(targetRegion != null) {<a name="line.502"></a>
-<span class="sourceLineNo">503</span> break;<a name="line.503"></a>
-<span class="sourceLineNo">504</span> }<a name="line.504"></a>
-<span class="sourceLineNo">505</span> }<a name="line.505"></a>
-<span class="sourceLineNo">506</span> //get server which is not a member of new group<a name="line.506"></a>
-<span class="sourceLineNo">507</span> ServerName targetServer = null;<a name="line.507"></a>
-<span class="sourceLineNo">508</span> for (ServerName server : admin.getClusterMetrics(EnumSet.of(Option.LIVE_SERVERS))<a name="line.508"></a>
-<span class="sourceLineNo">509</span> .getLiveServerMetrics().keySet()) {<a name="line.509"></a>
-<span class="sourceLineNo">510</span> if (!newGroup.containsServer(server.getAddress())) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span> targetServer = server;<a name="line.511"></a>
-<span class="sourceLineNo">512</span> break;<a name="line.512"></a>
-<span class="sourceLineNo">513</span> }<a name="line.513"></a>
-<span class="sourceLineNo">514</span> }<a name="line.514"></a>
-<span class="sourceLineNo">515</span><a name="line.515"></a>
-<span class="sourceLineNo">516</span> final AdminProtos.AdminService.BlockingInterface targetRS =<a name="line.516"></a>
-<span class="sourceLineNo">517</span> ((ClusterConnection) admin.getConnection()).getAdmin(targetServer);<a name="line.517"></a>
-<span class="sourceLineNo">518</span><a name="line.518"></a>
-<span class="sourceLineNo">519</span> //move target server to group<a name="line.519"></a>
-<span class="sourceLineNo">520</span> rsGroupAdmin.moveServers(Sets.newHashSet(targetServer.getAddress()),<a name="line.520"></a>
-<span class="sourceLineNo">521</span> newGroup.getName());<a name="line.521"></a>
-<span class="sourceLineNo">522</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> @Override<a name="line.523"></a>
-<span class="sourceLineNo">524</span> public boolean evaluate() throws Exception {<a name="line.524"></a>
-<span class="sourceLineNo">525</span> return ProtobufUtil.getOnlineRegions(targetRS).size() <= 0;<a name="line.525"></a>
-<span class="sourceLineNo">526</span> }<a name="line.526"></a>
-<span class="sourceLineNo">527</span> });<a name="line.527"></a>
-<span class="sourceLineNo">528</span><a name="line.528"></a>
-<span class="sourceLineNo">529</span> // Lets move this region to the new group.<a name="line.529"></a>
-<span class="sourceLineNo">530</span> TEST_UTIL.getAdmin().move(Bytes.toBytes(RegionInfo.encodeRegionName(<a name="line.530"></a>
-<span class="sourceLineNo">531</span> Bytes.toBytes(targetRegion))), Bytes.toBytes(targetServer.getServerName()));<a name="line.531"></a>
-<span class="sourceLineNo">532</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.532"></a>
-<span class="sourceLineNo">533</span> @Override<a name="line.533"></a>
-<span class="sourceLineNo">534</span> public boolean evaluate() throws Exception {<a name="line.534"></a>
-<span class="sourceLineNo">535</span> return<a name="line.535"></a>
-<span class="sourceLineNo">536</span> getTableRegionMap().get(tableName) != null &&<a name="line.536"></a>
-<span class="sourceLineNo">537</span> getTableRegionMap().get(tableName).size() == 6 &&<a name="line.537"></a>
-<span class="sourceLineNo">538</span> admin.getClusterMetrics(EnumSet.of(Option.REGIONS_IN_TRANSITION))<a name="line.538"></a>
-<span class="sourceLineNo">539</span> .getRegionStatesInTransition().size() < 1;<a name="line.539"></a>
+<span class="sourceLineNo">395</span> TEST_UTIL.createMultiRegionTable(tableName, familyNameBytes, 5);<a name="line.395"></a>
+<span class="sourceLineNo">396</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.396"></a>
+<span class="sourceLineNo">397</span> @Override<a name="line.397"></a>
+<span class="sourceLineNo">398</span> public boolean evaluate() throws Exception {<a name="line.398"></a>
+<span class="sourceLineNo">399</span> List<String> regions = getTableRegionMap().get(tableName);<a name="line.399"></a>
+<span class="sourceLineNo">400</span> if (regions == null) {<a name="line.400"></a>
+<span class="sourceLineNo">401</span> return false;<a name="line.401"></a>
+<span class="sourceLineNo">402</span> }<a name="line.402"></a>
+<span class="sourceLineNo">403</span><a name="line.403"></a>
+<span class="sourceLineNo">404</span> return getTableRegionMap().get(tableName).size() >= 5;<a name="line.404"></a>
+<span class="sourceLineNo">405</span> }<a name="line.405"></a>
+<span class="sourceLineNo">406</span> });<a name="line.406"></a>
+<span class="sourceLineNo">407</span><a name="line.407"></a>
+<span class="sourceLineNo">408</span> RSGroupInfo tableGrp = rsGroupAdmin.getRSGroupInfoOfTable(tableName);<a name="line.408"></a>
+<span class="sourceLineNo">409</span> assertTrue(tableGrp.getName().equals(RSGroupInfo.DEFAULT_GROUP));<a name="line.409"></a>
+<span class="sourceLineNo">410</span><a name="line.410"></a>
+<span class="sourceLineNo">411</span> //change table's group<a name="line.411"></a>
+<span class="sourceLineNo">412</span> LOG.info("Moving table "+tableName+" to "+newGroup.getName());<a name="line.412"></a>
+<span class="sourceLineNo">413</span> rsGroupAdmin.moveTables(Sets.newHashSet(tableName), newGroup.getName());<a name="line.413"></a>
+<span class="sourceLineNo">414</span><a name="line.414"></a>
+<span class="sourceLineNo">415</span> //verify group change<a name="line.415"></a>
+<span class="sourceLineNo">416</span> Assert.assertEquals(newGroup.getName(),<a name="line.416"></a>
+<span class="sourceLineNo">417</span> rsGroupAdmin.getRSGroupInfoOfTable(tableName).getName());<a name="line.417"></a>
+<span class="sourceLineNo">418</span><a name="line.418"></a>
+<span class="sourceLineNo">419</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.419"></a>
+<span class="sourceLineNo">420</span> @Override<a name="line.420"></a>
+<span class="sourceLineNo">421</span> public boolean evaluate() throws Exception {<a name="line.421"></a>
+<span class="sourceLineNo">422</span> Map<ServerName, List<String>> serverMap = getTableServerRegionMap().get(tableName);<a name="line.422"></a>
+<span class="sourceLineNo">423</span> int count = 0;<a name="line.423"></a>
+<span class="sourceLineNo">424</span> if (serverMap != null) {<a name="line.424"></a>
+<span class="sourceLineNo">425</span> for (ServerName rs : serverMap.keySet()) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span> if (newGroup.containsServer(rs.getAddress())) {<a name="line.426"></a>
+<span class="sourceLineNo">427</span> count += serverMap.get(rs).size();<a name="line.427"></a>
+<span class="sourceLineNo">428</span> }<a name="line.428"></a>
+<span class="sourceLineNo">429</span> }<a name="line.429"></a>
+<span class="sourceLineNo">430</span> }<a name="line.430"></a>
+<span class="sourceLineNo">431</span> return count == 5;<a name="line.431"></a>
+<span class="sourceLineNo">432</span> }<a name="line.432"></a>
+<span class="sourceLineNo">433</span> });<a name="line.433"></a>
+<span class="sourceLineNo">434</span><a name="line.434"></a>
+<span class="sourceLineNo">435</span> //test truncate<a name="line.435"></a>
+<span class="sourceLineNo">436</span> admin.disableTable(tableName);<a name="line.436"></a>
+<span class="sourceLineNo">437</span> admin.truncateTable(tableName, true);<a name="line.437"></a>
+<span class="sourceLineNo">438</span> Assert.assertEquals(1, rsGroupAdmin.getRSGroupInfo(newGroup.getName()).getTables().size());<a name="line.438"></a>
+<span class="sourceLineNo">439</span> Assert.assertEquals(tableName, rsGroupAdmin.getRSGroupInfo(<a name="line.439"></a>
+<span class="sourceLineNo">440</span> newGroup.getName()).getTables().first());<a name="line.440"></a>
+<span class="sourceLineNo">441</span><a name="line.441"></a>
+<span class="sourceLineNo">442</span> //verify removed table is removed from group<a name="line.442"></a>
+<span class="sourceLineNo">443</span> TEST_UTIL.deleteTable(tableName);<a name="line.443"></a>
+<span class="sourceLineNo">444</span> Assert.assertEquals(0, rsGroupAdmin.getRSGroupInfo(newGroup.getName()).getTables().size());<a name="line.444"></a>
+<span class="sourceLineNo">445</span> }<a name="line.445"></a>
+<span class="sourceLineNo">446</span><a name="line.446"></a>
+<span class="sourceLineNo">447</span> @Test<a name="line.447"></a>
+<span class="sourceLineNo">448</span> public void testGroupBalance() throws Exception {<a name="line.448"></a>
+<span class="sourceLineNo">449</span> LOG.info(name.getMethodName());<a name="line.449"></a>
+<span class="sourceLineNo">450</span> String newGroupName = getGroupName(name.getMethodName());<a name="line.450"></a>
+<span class="sourceLineNo">451</span> final RSGroupInfo newGroup = addGroup(newGroupName, 3);<a name="line.451"></a>
+<span class="sourceLineNo">452</span><a name="line.452"></a>
+<span class="sourceLineNo">453</span> final TableName tableName = TableName.valueOf(tablePrefix+"_ns", name.getMethodName());<a name="line.453"></a>
+<span class="sourceLineNo">454</span> admin.createNamespace(<a name="line.454"></a>
+<span class="sourceLineNo">455</span> NamespaceDescriptor.create(tableName.getNamespaceAsString())<a name="line.455"></a>
+<span class="sourceLineNo">456</span> .addConfiguration(RSGroupInfo.NAMESPACE_DESC_PROP_GROUP, newGroupName).build());<a name="line.456"></a>
+<span class="sourceLineNo">457</span> final byte[] familyNameBytes = Bytes.toBytes("f");<a name="line.457"></a>
+<span class="sourceLineNo">458</span> final HTableDescriptor desc = new HTableDescriptor(tableName);<a name="line.458"></a>
+<span class="sourceLineNo">459</span> desc.addFamily(new HColumnDescriptor("f"));<a name="line.459"></a>
+<span class="sourceLineNo">460</span> byte [] startKey = Bytes.toBytes("aaaaa");<a name="line.460"></a>
+<span class="sourceLineNo">461</span> byte [] endKey = Bytes.toBytes("zzzzz");<a name="line.461"></a>
+<span class="sourceLineNo">462</span> admin.createTable(desc, startKey, endKey, 6);<a name="line.462"></a>
+<span class="sourceLineNo">463</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.463"></a>
+<span class="sourceLineNo">464</span> @Override<a name="line.464"></a>
+<span class="sourceLineNo">465</span> public boolean evaluate() throws Exception {<a name="line.465"></a>
+<span class="sourceLineNo">466</span> List<String> regions = getTableRegionMap().get(tableName);<a name="line.466"></a>
+<span class="sourceLineNo">467</span> if (regions == null) {<a name="line.467"></a>
+<span class="sourceLineNo">468</span> return false;<a name="line.468"></a>
+<span class="sourceLineNo">469</span> }<a name="line.469"></a>
+<span class="sourceLineNo">470</span> return regions.size() >= 6;<a name="line.470"></a>
+<span class="sourceLineNo">471</span> }<a name="line.471"></a>
+<span class="sourceLineNo">472</span> });<a name="line.472"></a>
+<span class="sourceLineNo">473</span><a name="line.473"></a>
+<span class="sourceLineNo">474</span> //make assignment uneven, move all regions to one server<a name="line.474"></a>
+<span class="sourceLineNo">475</span> Map<ServerName,List<String>> assignMap =<a name="line.475"></a>
+<span class="sourceLineNo">476</span> getTableServerRegionMap().get(tableName);<a name="line.476"></a>
+<span class="sourceLineNo">477</span> final ServerName first = assignMap.entrySet().iterator().next().getKey();<a name="line.477"></a>
+<span class="sourceLineNo">478</span> for(RegionInfo region: admin.getTableRegions(tableName)) {<a name="line.478"></a>
+<span class="sourceLineNo">479</span> if(!assignMap.get(first).contains(region.getRegionNameAsString())) {<a name="line.479"></a>
+<span class="sourceLineNo">480</span> admin.move(region.getEncodedNameAsBytes(), Bytes.toBytes(first.getServerName()));<a name="line.480"></a>
+<span class="sourceLineNo">481</span> }<a name="line.481"></a>
+<span class="sourceLineNo">482</span> }<a name="line.482"></a>
+<span class="sourceLineNo">483</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.483"></a>
+<span class="sourceLineNo">484</span> @Override<a name="line.484"></a>
+<span class="sourceLineNo">485</span> public boolean evaluate() throws Exception {<a name="line.485"></a>
+<span class="sourceLineNo">486</span> Map<ServerName, List<String>> map = getTableServerRegionMap().get(tableName);<a name="line.486"></a>
+<span class="sourceLineNo">487</span> if (map == null) {<a name="line.487"></a>
+<span class="sourceLineNo">488</span> return true;<a name="line.488"></a>
+<span class="sourceLineNo">489</span> }<a name="line.489"></a>
+<span class="sourceLineNo">490</span> List<String> regions = map.get(first);<a name="line.490"></a>
+<span class="sourceLineNo">491</span> if (regions == null) {<a name="line.491"></a>
+<span class="sourceLineNo">492</span> return true;<a name="line.492"></a>
+<span class="sourceLineNo">493</span> }<a name="line.493"></a>
+<span class="sourceLineNo">494</span> return regions.size() >= 6;<a name="line.494"></a>
+<span class="sourceLineNo">495</span> }<a name="line.495"></a>
+<span class="sourceLineNo">496</span> });<a name="line.496"></a>
+<span class="sourceLineNo">497</span><a name="line.497"></a>
+<span class="sourceLineNo">498</span> //balance the other group and make sure it doesn't affect the new group<a name="line.498"></a>
+<span class="sourceLineNo">499</span> admin.setBalancerRunning(true,true);<a name="line.499"></a>
+<span class="sourceLineNo">500</span> rsGroupAdmin.balanceRSGroup(RSGroupInfo.DEFAULT_GROUP);<a name="line.500"></a>
+<span class="sourceLineNo">501</span> assertEquals(6, getTableServerRegionMap().get(tableName).get(first).size());<a name="line.501"></a>
+<span class="sourceLineNo">502</span><a name="line.502"></a>
+<span class="sourceLineNo">503</span> //disable balance, balancer will not be run and return false<a name="line.503"></a>
+<span class="sourceLineNo">504</span> admin.setBalancerRunning(false,true);<a name="line.504"></a>
+<span class="sourceLineNo">505</span> assertFalse(rsGroupAdmin.balanceRSGroup(newGroupName));<a name="line.505"></a>
+<span class="sourceLineNo">506</span> assertEquals(6, getTableServerRegionMap().get(tableName).get(first).size());<a name="line.506"></a>
+<span class="sourceLineNo">507</span><a name="line.507"></a>
+<span class="sourceLineNo">508</span> //enable balance<a name="line.508"></a>
+<span class="sourceLineNo">509</span> admin.setBalancerRunning(true,true);<a name="line.509"></a>
+<span class="sourceLineNo">510</span> rsGroupAdmin.balanceRSGroup(newGroupName);<a name="line.510"></a>
+<span class="sourceLineNo">511</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.511"></a>
+<span class="sourceLineNo">512</span> @Override<a name="line.512"></a>
+<span class="sourceLineNo">513</span> public boolean evaluate() throws Exception {<a name="line.513"></a>
+<span class="sourceLineNo">514</span> for (List<String> regions : getTableServerRegionMap().get(tableName).values()) {<a name="line.514"></a>
+<span class="sourceLineNo">515</span> if (2 != regions.size()) {<a name="line.515"></a>
+<span class="sourceLineNo">516</span> return false;<a name="line.516"></a>
+<span class="sourceLineNo">517</span> }<a name="line.517"></a>
+<span class="sourceLineNo">518</span> }<a name="line.518"></a>
+<span class="sourceLineNo">519</span> return true;<a name="line.519"></a>
+<span class="sourceLineNo">520</span> }<a name="line.520"></a>
+<span class="sourceLineNo">521</span> });<a name="line.521"></a>
+<span class="sourceLineNo">522</span> admin.setBalancerRunning(false,true);<a name="line.522"></a>
+<span class="sourceLineNo">523</span> }<a name="line.523"></a>
+<span class="sourceLineNo">524</span><a name="line.524"></a>
+<span class="sourceLineNo">525</span> @Test<a name="line.525"></a>
+<span class="sourceLineNo">526</span> public void testRegionMove() throws Exception {<a name="line.526"></a>
+<span class="sourceLineNo">527</span> final RSGroupInfo newGroup = addGroup(getGroupName(name.getMethodName()), 1);<a name="line.527"></a>
+<span class="sourceLineNo">528</span> final byte[] familyNameBytes = Bytes.toBytes("f");<a name="line.528"></a>
+<span class="sourceLineNo">529</span> // All the regions created below will be assigned to the default group.<a name="line.529"></a>
+<span class="sourceLineNo">530</span> TEST_UTIL.createMultiRegionTable(tableName, familyNameBytes, 6);<a name="line.530"></a>
+<span class="sourceLineNo">531</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.531"></a>
+<span class="sourceLineNo">532</span> @Override<a name="line.532"></a>
+<span class="sourceLineNo">533</span> public boolean evaluate() throws Exception {<a name="line.533"></a>
+<span class="sourceLineNo">534</span> List<String> regions = getTableRegionMap().get(tableName);<a name="line.534"></a>
+<span class="sourceLineNo">535</span> if (regions == null) {<a name="line.535"></a>
+<span class="sourceLineNo">536</span> return false;<a name="line.536"></a>
+<span class="sourceLineNo">537</span> }<a name="line.537"></a>
+<span class="sourceLineNo">538</span><a name="line.538"></a>
+<span class="sourceLineNo">539</span> return getTableRegionMap().get(tableName).size() >= 6;<a name="line.539"></a>
<span class="sourceLineNo">540</span> }<a name="line.540"></a>
<span class="sourceLineNo">541</span> });<a name="line.541"></a>
<span class="sourceLineNo">542</span><a name="line.542"></a>
-<span class="sourceLineNo">543</span> //verify that targetServer didn't open it<a name="line.543"></a>
-<span class="sourceLineNo">544</span> for (RegionInfo region: ProtobufUtil.getOnlineRegions(targetRS)) {<a name="line.544"></a>
-<span class="sourceLineNo">545</span> if (targetRegion.equals(region.getRegionNameAsString())) {<a name="line.545"></a>
-<span class="sourceLineNo">546</span> fail("Target server opened region");<a name="line.546"></a>
-<span class="sourceLineNo">547</span> }<a name="line.547"></a>
-<span class="sourceLineNo">548</span> }<a name="line.548"></a>
-<span class="sourceLineNo">549</span> }<a name="line.549"></a>
-<span class="sourceLineNo">550</span><a name="line.550"></a>
-<span class="sourceLineNo">551</span> @Test<a name="line.551"></a>
-<span class="sourceLineNo">552</span> public void testFailRemoveGroup() throws IOException, InterruptedException {<a name="line.552"></a>
-<span class="sourceLineNo">553</span> int initNumGroups = rsGroupAdmin.listRSGroups().size();<a name="line.553"></a>
-<span class="sourceLineNo">554</span> addGroup("bar", 3);<a name="line.554"></a>
-<span class="sourceLineNo">555</span> TEST_UTIL.createTable(tableName, Bytes.toBytes("f"));<a name="line.555"></a>
-<span class="sourceLineNo">556</span> rsGroupAdmin.moveTables(Sets.newHashSet(tableName), "bar");<a name="line.556"></a>
-<span class="sourceLineNo">557</span> RSGroupInfo barGroup = rsGroupAdmin.getRSGroupInfo("bar");<a name="line.557"></a>
-<span class="sourceLineNo">558</span> //group is not empty therefore it should fail<a name="line.558"></a>
-<span class="sourceLineNo">559</span> try {<a name="line.559"></a>
-<span class="sourceLineNo">560</span> rsGroupAdmin.removeRSGroup(barGroup.getName());<a name="line.560"></a>
-<span class="sourceLineNo">561</span> fail("Expected remove group to fail");<a name="line.561"></a>
-<span class="sourceLineNo">562</span> } catch(IOException e) {<a name="line.562"></a>
-<span class="sourceLineNo">563</span> }<a name="line.563"></a>
-<span class="sourceLineNo">564</span> //group cannot lose all it's servers therefore it should fail<a name="line.564"></a>
-<span class="sourceLineNo">565</span> try {<a name="line.565"></a>
-<span class="sourceLineNo">566</span> rsGroupAdmin.moveServers(barGroup.getServers(), RSGroupInfo.DEFAULT_GROUP);<a name="line.566"></a>
-<span class="sourceLineNo">567</span> fail("Expected move servers to fail");<a name="line.567"></a>
-<span class="sourceLineNo">568</span> } catch(IOException e) {<a name="line.568"></a>
-<span class="sourceLineNo">569</span> }<a name="line.569"></a>
-<span class="sourceLineNo">570</span><a name="line.570"></a>
-<span class="sourceLineNo">571</span> rsGroupAdmin.moveTables(barGroup.getTables(), RSGroupInfo.DEFAULT_GROUP);<a name="line.571"></a>
-<span class="sourceLineNo">572</span> try {<a name="line.572"></a>
-<span class="sourceLineNo">573</span> rsGroupAdmin.removeRSGroup(barGroup.getName());<a name="line.573"></a>
-<span class="sourceLineNo">574</span> fail("Expected move servers to fail");<a name="line.574"></a>
-<span class="sourceLineNo">575</span> } catch(IOException e) {<a name="line.575"></a>
-<span class="sourceLineNo">576</span> }<a name="line.576"></a>
-<span class="sourceLineNo">577</span><a name="line.577"></a>
-<span class="sourceLineNo">578</span> rsGroupAdmin.moveServers(barGroup.getServers(), RSGroupInfo.DEFAULT_GROUP);<a name="line.578"></a>
-<span class="sourceLineNo">579</span> rsGroupAdmin.removeRSGroup(barGroup.getName());<a name="line.579"></a>
-<span class="sourceLineNo">580</span><a name="line.580"></a>
-<span class="sourceLineNo">581</span> Assert.assertEquals(initNumGroups, rsGroupAdmin.listRSGroups().size());<a name="line.581"></a>
-<span class="sourceLineNo">582</span> }<a name="line.582"></a>
-<span class="sourceLineNo">583</span><a name="line.583"></a>
-<span class="sourceLineNo">584</span> @Test<a name="line.584"></a>
-<span class="sourceLineNo">585</span> public void testKillRS() throws Exception {<a name="line.585"></a>
-<span class="sourceLineNo">586</span> RSGroupInfo appInfo = addGroup("appInfo", 1);<a name="line.586"></a>
-<span class="sourceLineNo">587</span><a name="line.587"></a>
-<span class="sourceLineNo">588</span> final TableName tableName = TableName.valueOf(tablePrefix+"_ns", name.getMethodName());<a name="line.588"></a>
-<span class="sourceLineNo">589</span> admin.createNamespace(<a name="line.589"></a>
-<span class="sourceLineNo">590</span> NamespaceDescriptor.create(tableName.getNamespaceAsString())<a name="line.590"></a>
-<span class="sourceLineNo">591</span> .addConfiguration(RSGroupInfo.NAMESPACE_DESC_PROP_GROUP, appInfo.getName()).build());<a name="line.591"></a>
-<span class="sourceLineNo">592</span> final HTableDescriptor desc = new HTableDescriptor(tableName);<a name="line.592"></a>
-<span class="sourceLineNo">593</span> desc.addFamily(new HColumnDescriptor("f"));<a name="line.593"></a>
-<span class="sourceLineNo">594</span> admin.createTable(desc);<a name="line.594"></a>
-<span class="sourceLineNo">595</span> //wait for created table to be assigned<a name="line.595"></a>
-<span class="sourceLineNo">596</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.596"></a>
-<span class="sourceLineNo">597</span> @Override<a name="line.597"></a>
-<span class="sourceLineNo">598</span> public boolean evaluate() throws Exception {<a name="line.598"></a>
-<span class="sourceLineNo">599</span> return getTableRegionMap().get(desc.getTableName()) != null;<a name="line.599"></a>
-<span class="sourceLineNo">600</span> }<a name="line.600"></a>
-<span class="sourceLineNo">601</span> });<a name="line.601"></a>
-<span class="sourceLineNo">602</span><a name="line.602"></a>
-<span class="sourceLineNo">603</span> ServerName targetServer = ServerName.parseServerName(<a name="line.603"></a>
-<span class="sourceLineNo">604</span> appInfo.getServers().iterator().next().toString());<a name="line.604"></a>
-<span class="sourceLineNo">605</span> AdminProtos.AdminService.BlockingInterface targetRS =<a name="line.605"></a>
-<span class="sourceLineNo">606</span> ((ClusterConnection) admin.getConnection()).getAdmin(targetServer);<a name="line.606"></a>
-<span class="sourceLineNo">607</span> RegionInfo targetRegion = ProtobufUtil.getOnlineRegions(targetRS).get(0);<a name="line.607"></a>
-<span class="sourceLineNo">608</span> Assert.assertEquals(1, ProtobufUtil.getOnlineRegions(targetRS).size());<a name="line.608"></a>
-<span class="sourceLineNo">609</span><a name="line.609"></a>
-<span class="sourceLineNo">610</span> try {<a name="line.610"></a>
-<span class="sourceLineNo">611</span> //stopping may cause an exception<a name="line.611"></a>
-<span class="sourceLineNo">612</span> //due to the connection loss<a name="line.612"></a>
-<span class="sourceLineNo">613</span> targetRS.stopServer(null,<a name="line.613"></a>
-<span class="sourceLineNo">614</span> AdminProtos.StopServerRequest.newBuilder().setReason("Die").build());<a name="line.614"></a>
-<span class="sourceLineNo">615</span> } catch(Exception e) {<a name="line.615"></a>
+<span class="sourceLineNo">543</span> //get target region to move<a name="line.543"></a>
+<span class="sourceLineNo">544</span> Map<ServerName,List<String>> assignMap =<a name="line.544"></a>
+<span class="sourceLineNo">545</span> getTableServerRegionMap().get(tableName);<a name="line.545"></a>
+<span class="sourceLineNo">546</span> String targetRegion = null;<a name="line.546"></a>
+<span class="sourceLineNo">547</span> for(ServerName server : assignMap.keySet()) {<a name="line.547"></a>
+<span class="sourceLineNo">548</span> targetRegion = assignMap.get(server).size() > 0 ? assignMap.get(server).get(0) : null;<a name="line.548"></a>
+<span class="sourceLineNo">549</span> if(targetRegion != null) {<a name="line.549"></a>
+<span class="sourceLineNo">550</span> break;<a name="line.550"></a>
+<span class="sourceLineNo">551</span> }<a name="line.551"></a>
+<span class="sourceLineNo">552</span> }<a name="line.552"></a>
+<span class="sourceLineNo">553</span> //get server which is not a member of new group<a name="line.553"></a>
+<span class="sourceLineNo">554</span> ServerName targetServer = null;<a name="line.554"></a>
+<span class="sourceLineNo">555</span> for (ServerName server : admin.getClusterMetrics(EnumSet.of(Option.LIVE_SERVERS))<a name="line.555"></a>
+<span class="sourceLineNo">556</span> .getLiveServerMetrics().keySet()) {<a name="line.556"></a>
+<span class="sourceLineNo">557</span> if (!newGroup.containsServer(server.getAddress())) {<a name="line.557"></a>
+<span class="sourceLineNo">558</span> targetServer = server;<a name="line.558"></a>
+<span class="sourceLineNo">559</span> break;<a name="line.559"></a>
+<span class="sourceLineNo">560</span> }<a name="line.560"></a>
+<span class="sourceLineNo">561</span> }<a name="line.561"></a>
+<span class="sourceLineNo">562</span><a name="line.562"></a>
+<span class="sourceLineNo">563</span> final AdminProtos.AdminService.BlockingInterface targetRS =<a name="line.563"></a>
+<span class="sourceLineNo">564</span> ((ClusterConnection) admin.getConnection()).getAdmin(targetServer);<a name="line.564"></a>
+<span class="sourceLineNo">565</span><a name="line.565"></a>
+<span class="sourceLineNo">566</span> //move target server to group<a name="line.566"></a>
+<span class="sourceLineNo">567</span> rsGroupAdmin.moveServers(Sets.newHashSet(targetServer.getAddress()),<a name="line.567"></a>
+<span class="sourceLineNo">568</span> newGroup.getName());<a name="line.568"></a>
+<span class="sourceLineNo">569</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.569"></a>
+<span class="sourceLineNo">570</span> @Override<a name="line.570"></a>
+<span class="sourceLineNo">571</span> public boolean evaluate() throws Exception {<a name="line.571"></a>
+<span class="sourceLineNo">572</span> return ProtobufUtil.getOnlineRegions(targetRS).size() <= 0;<a name="line.572"></a>
+<span class="sourceLineNo">573</span> }<a name="line.573"></a>
+<span class="sourceLineNo">574</span> });<a name="line.574"></a>
+<span class="sourceLineNo">575</span><a name="line.575"></a>
+<span class="sourceLineNo">576</span> // Lets move this region to the new group.<a name="line.576"></a>
+<span class="sourceLineNo">577</span> TEST_UTIL.getAdmin().move(Bytes.toBytes(RegionInfo.encodeRegionName(<a name="line.577"></a>
+<span class="sourceLineNo">578</span> Bytes.toBytes(targetRegion))), Bytes.toBytes(targetServer.getServerName()));<a name="line.578"></a>
+<span class="sourceLineNo">579</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.579"></a>
+<span class="sourceLineNo">580</span> @Override<a name="line.580"></a>
+<span class="sourceLineNo">581</span> public boolean evaluate() throws Exception {<a name="line.581"></a>
+<span class="sourceLineNo">582</span> return<a name="line.582"></a>
+<span class="sourceLineNo">583</span> getTableRegionMap().get(tableName) != null &&<a name="line.583"></a>
+<span class="sourceLineNo">584</span> getTableRegionMap().get(tableName).size() == 6 &&<a name="line.584"></a>
+<span class="sourceLineNo">585</span> admin.getClusterMetrics(EnumSet.of(Option.REGIONS_IN_TRANSITION))<a name="line.585"></a>
+<span class="sourceLineNo">586</span> .getRegionStatesInTransition().size() < 1;<a name="line.586"></a>
+<span class="sourceLineNo">587</span> }<a name="line.587"></a>
+<span class="sourceLineNo">588</span> });<a name="line.588"></a>
+<span class="sourceLineNo">589</span><a name="line.589"></a>
+<span class="sourceLineNo">590</span> //verify that targetServer didn't open it<a name="line.590"></a>
+<span class="sourceLineNo">591</span> for (RegionInfo region: ProtobufUtil.getOnlineRegions(targetRS)) {<a name="line.591"></a>
+<span class="sourceLineNo">592</span> if (targetRegion.equals(region.getRegionNameAsString())) {<a name="line.592"></a>
+<span class="sourceLineNo">593</span> fail("Target server opened region");<a name="line.593"></a>
+<span class="sourceLineNo">594</span> }<a name="line.594"></a>
+<span class="sourceLineNo">595</span> }<a name="line.595"></a>
+<span class="sourceLineNo">596</span> }<a name="line.596"></a>
+<span class="sourceLineNo">597</span><a name="line.597"></a>
+<span class="sourceLineNo">598</span> @Test<a name="line.598"></a>
+<span class="sourceLineNo">599</span> public void testFailRemoveGroup() throws IOException, InterruptedException {<a name="line.599"></a>
+<span class="sourceLineNo">600</span> int initNumGroups = rsGroupAdmin.listRSGroups().size();<a name="line.600"></a>
+<span class="sourceLineNo">601</span> addGroup("bar", 3);<a name="line.601"></a>
+<span class="sourceLineNo">602</span> TEST_UTIL.createTable(tableName, Bytes.toBytes("f"));<a name="line.602"></a>
+<span class="sourceLineNo">603</span> rsGroupAdmin.moveTables(Sets.newHashSet(tableName), "bar");<a name="line.603"></a>
+<span class="sourceLineNo">604</span> RSGroupInfo barGroup = rsGroupAdmin.getRSGroupInfo("bar");<a name="line.604"></a>
+<span class="sourceLineNo">605</span> //group is not empty therefore it should fail<a name="line.605"></a>
+<span class="sourceLineNo">606</span> try {<a name="line.606"></a>
+<span class="sourceLineNo">607</span> rsGroupAdmin.removeRSGroup(barGroup.getName());<a name="line.607"></a>
+<span class="sourceLineNo">608</span> fail("Expected remove group to fail");<a name="line.608"></a>
+<span class="sourceLineNo">609</span> } catch(IOException e) {<a name="line.609"></a>
+<span class="sourceLineNo">610</span> }<a name="line.610"></a>
+<span class="sourceLineNo">611</span> //group cannot lose all it's servers therefore it should fail<a name="line.611"></a>
+<span class="sourceLineNo">612</span> try {<a name="line.612"></a>
+<span class="sourceLineNo">613</span> rsGroupAdmin.moveServers(barGroup.getServers(), RSGroupInfo.DEFAULT_GROUP);<a name="line.613"></a>
+<span class="sourceLineNo">614</span> fail("Expected move servers to fail");<a name="line.614"></a>
+<span class="sourceLineNo">615</span> } catch(IOException e) {<a name="line.615"></a>
<span class="sourceLineNo">616</span> }<a name="line.616"></a>
-<span class="sourceLineNo">617</span> assertFalse(cluster.getClusterMetrics().getLiveServerMetrics().containsKey(targetServer));<a name="line.617"></a>
-<span class="sourceLineNo">618</span><a name="line.618"></a>
-<span class="sourceLineNo">619</span> //wait for created table to be assigned<a name="line.619"></a>
-<span class="sourceLineNo">620</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.620"></a>
-<span class="sourceLineNo">621</span> @Override<a name="line.621"></a>
-<span class="sourceLineNo">622</span> public boolean evaluate() throws Exception {<a name="line.622"></a>
-<span class="sourceLineNo">623</span> return cluster.getClusterMetrics().getRegionStatesInTransition().isEmpty();<a name="line.623"></a>
-<span class="sourceLineNo">624</span> }<a name="line.624"></a>
-<span class="sourceLineNo">625</span> });<a name="line.625"></a>
-<span class="sourceLineNo">626</span> Set<Address> newServers = Sets.newHashSet();<a name="line.626"></a>
-<span class="sourceLineNo">627</span> newServers.add(<a name="line.627"></a>
-<span class="sourceLineNo">628</span> rsGroupAdmin.getRSGroupInfo(RSGroupInfo.DEFAULT_GROUP).getServers().iterator().next());<a name="line.628"></a>
-<span class="sourceLineNo">629</span> rsGroupAdmin.moveServers(newServers, appInfo.getName());<a name="line.629"></a>
+<span class="sourceLineNo">617</span><a name="line.617"></a>
+<span class="sourceLineNo">618</span> rsGroupAdmin.moveTables(barGroup.getTables(), RSGroupInfo.DEFAULT_GROUP);<a name="line.618"></a>
+<span class="sourceLineNo">619</span> try {<a name="line.619"></a>
+<span class="sourceLineNo">620</span> rsGroupAdmin.removeRSGroup(barGroup.getName());<a name="line.620"></a>
+<span class="sourceLineNo">621</span> fail("Expected move servers to fail");<a name="line.621"></a>
+<span class="sourceLineNo">622</span> } catch(IOException e) {<a name="line.622"></a>
+<span class="sourceLineNo">623</span> }<a name="line.623"></a>
+<span class="sourceLineNo">624</span><a name="line.624"></a>
+<span class="sourceLineNo">625</span> rsGroupAdmin.moveServers(barGroup.getServers(), RSGroupInfo.DEFAULT_GROUP);<a name="line.625"></a>
+<span class="sourceLineNo">626</span> rsGroupAdmin.removeRSGroup(barGroup.getName());<a name="line.626"></a>
+<span class="sourceLineNo">627</span><a name="line.627"></a>
+<span class="sourceLineNo">628</span> Assert.assertEquals(initNumGroups, rsGroupAdmin.listRSGroups().size());<a name="line.628"></a>
+<span class="sourceLineNo">629</span> }<a name="line.629"></a>
<span class="sourceLineNo">630</span><a name="line.630"></a>
-<span class="sourceLineNo">631</span> //Make sure all the table's regions get reassigned<a name="line.631"></a>
-<span class="sourceLineNo">632</span> //disabling the table guarantees no conflicting assign/unassign (ie SSH) happens<a name="line.632"></a>
-<span class="sourceLineNo">633</span> admin.disableTable(tableName);<a name="line.633"></a>
-<span class="sourceLineNo">634</span> admin.enableTable(tableName);<a name="line.634"></a>
-<span class="sourceLineNo">635</span><a name="line.635"></a>
-<span class="sourceLineNo">636</span> //wait for region to be assigned<a name="line.636"></a>
-<span class="sourceLineNo">637</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.637"></a>
-<span class="sourceLineNo">638</span> @Override<a name="line.638"></a>
-<span class="sourceLineNo">639</span> public boolean evaluate() throws Exception {<a name="line.639"></a>
-<span class="sourceLineNo">640</span> return cluster.getClusterMetrics().getRegionStatesInTransition().isEmpty();<a name="line.640"></a>
-<span class="sourceLineNo">641</span> }<a name="line.641"></a>
-<span class="sourceLineNo">642</span> });<a name="line.642"></a>
-<span class="sourceLineNo">643</span><a name="line.643"></a>
-<span class="sourceLineNo">644</span> targetServer = ServerName.parseServerName(<a name="line.644"></a>
-<span class="sourceLineNo">645</span> newServers.iterator().next().toString());<a name="line.645"></a>
-<span class="sourceLineNo">646</span> targetRS =<a name="line.646"></a>
-<span class="sourceLineNo">647</span> ((ClusterConnection) admin.getConnection()).getAdmin(targetServer);<a name="line.647"></a>
-<span class="sourceLineNo">648</span> Assert.assertEquals(1, ProtobufUtil.getOnlineRegions(targetRS).size());<a name="line.648"></a>
-<span class="sourceLineNo">649</span> Assert.assertEquals(tableName,<a name="line.649"></a>
-<span class="sourceLineNo">650</span> ProtobufUtil.getOnlineRegions(targetRS).get(0).getTable());<a name="line.650"></a>
-<span class="sourceLineNo">651</span> }<a name="line.651"></a>
-<span class="sourceLineNo">652</span><a name="line.652"></a>
-<span class="sourceLineNo">653</span> @Test<a name="line.653"></a>
-<span class="sourceLineNo">654</span> public void testValidGroupNames() throws IOException {<a name="line.654"></a>
-<span class="sourceLineNo">655</span> String[] badNames = {"foo*","foo@","-"};<a name="line.655"></a>
-<span class="sourceLineNo">656</span> String[] goodNames = {"foo_123"};<a name="line.656"></a>
-<span class="sourceLineNo">657</span><a name="line.657"></a>
-<span class="sourceLineNo">658</span> for(String entry: badNames) {<a name="line.658"></a>
-<span class="sourceLineNo">659</span> try {<a name="line.659"></a>
-<span class="sourceLineNo">660</span> rsGroupAdmin.addRSGroup(entry);<a name="line.660"></a>
-<span class="sourceLineNo">661</span> fail("Expected a constraint exception for: "+entry);<a name="line.661"></a>
-<span class="sourceLineNo">662</span> } catch(ConstraintException ex) {<a name="line.662"></a>
-<span class="sourceLineNo">663</span> //expected<a name="line.663"></a>
-<span class="sourceLineNo">664</span> }<a name="line.664"></a>
-<span class="sourceLineNo">665</span> }<a name="line.665"></a>
-<span class="sourceLineNo">666</span><a name="line.666"></a>
-<span class="sourceLineNo">667</span> for(String entry: goodNames) {<a name="line.667"></a>
-<span class="sourceLineNo">668</span> rsGroupAdmin.addRSGroup(entry);<a name="line.668"></a>
-<span class="sourceLineNo">669</span> }<a name="line.669"></a>
-<span class="sourceLineNo">670</span> }<a name="line.670"></a>
-<span class="sourceLineNo">671</span><a name="line.671"></a>
-<span class="sourceLineNo">672</span> private String getGroupName(String baseName) {<a name="line.672"></a>
-<span class="sourceLineNo">673</span> return groupPrefix+"_"+baseName+"_"+rand.nextInt(Integer.MAX_VALUE);<a name="line.673"></a>
-<span class="sourceLineNo">674</span> }<a name="line.674"></a>
-<span class="sourceLineNo">675</span><a name="line.675"></a>
-<span class="sourceLineNo">676</span> @Test<a name="line.676"></a>
-<span class="sourceLineNo">677</span> public void testMultiTableMove() throws Exception {<a name="line.677"></a>
-<span class="sourceLineNo">678</span> final TableName tableNameA = TableName.valueOf(tablePrefix + name.getMethodName() + "A");<a name="line.678"></a>
-<span class="sourceLineNo">679</span> final TableName tableNameB = TableName.valueOf(tablePrefix + name.getMethodName() + "B");<a name="line.679"></a>
-<span class="sourceLineNo">680</span> final byte[] familyNameBytes = Bytes.toBytes("f");<a name="line.680"></a>
-<span class="sourceLineNo">681</span> String newGroupName = getGroupName(name.getMethodName());<a name="line.681"></a>
-<span class="sourceLineNo">682</span> final RSGroupInfo newGroup = addGroup(newGroupName, 1);<a name="line.682"></a>
-<span class="sourceLineNo">683</span><a name="line.683"></a>
-<span class="sourceLineNo">684</span> TEST_UTIL.createTable(tableNameA, familyNameBytes);<a name="line.684"></a>
-<span class="sourceLineNo">685</span> TEST_UTIL.createTable(tableNameB, familyNameBytes);<a name="line.685"></a>
-<span class="sourceLineNo">686</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.686"></a>
-<span class="sourceLineNo">687</span> @Override<a name="line.687"></a>
-<span class="sourceLineNo">688</span> public boolean evaluate() throws Exception {<a name="line.688"></a>
-<span class="sourceLineNo">689</span> List<String> regionsA = getTableRegionMap().get(tableNameA);<a name="line.689"></a>
-<span class="sourceLineNo">690</span> if (regionsA == null) {<a name="line.690"></a>
-<span class="sourceLineNo">691</span> return false;<a name="line.691"></a>
-<span class="sourceLineNo">692</span> }<a name="line.692"></a>
-<span class="sourceLineNo">693</span><a name="line.693"></a>
-<span class="sourceLineNo">694</span> List<String> regionsB = getTableRegionMap().get(tableNameB);<a name="line.694"></a>
-<span class="sourceLineNo">695</span> if (regionsB == null) {<a name="line.695"></a>
-<span class="sourceLineNo">696</span> return false;<a name="line.696"></a>
-<span class="sourceLineNo">697</span> }<a name="line.697"></a>
-<span class="sourceLineNo">698</span><a name="line.698"></a>
-<span class="sourceLineNo">699</span> return getTableRegionMap().get(tableNameA).size() >= 1<a name="line.699"></a>
-<span class="sourceLineNo">700</span> && getTableRegionMap().get(tableNameB).size() >= 1;<a name="line.700"></a>
-<span class="sourceLineNo">701</span> }<a name="line.701"></a>
-<span class="sourceLineNo">702</span> });<a name="line.702"></a>
-<span class="sourceLineNo">703</span><a name="line.703"></a>
-<span class="sourceLineNo">704</span> RSGroupInfo tableGrpA = rsGroupAdmin.getRSGroupInfoOfTable(tableNameA);<a name="line.704"></a>
-<span class="sourceLineNo">705</span> assertTrue(tableGrpA.getName().equals(RSGroupInfo.DEFAULT_GROUP));<a name="line.705"></a>
-<span class="sourceLineNo">706</span><a name="line.706"></a>
-<span class="sourceLineNo">707</span> RSGroupInfo tableGrpB = rsGroupAdmin.getRSGroupInfoOfTable(tableNameB);<a name="line.707"></a>
-<span class="sourceLineNo">708</span> assertTrue(tableGrpB.getName().equals(RSGroupInfo.DEFAULT_GROUP));<a name="line.708"></a>
-<span class="sourceLineNo">709</span> //change table's group<a name="line.709"></a>
-<span class="sourceLineNo">710</span> LOG.info("Moving table [" + tableNameA + "," + tableNameB + "] to " + newGroup.getName());<a name="line.710"></a>
-<span class="sourceLineNo">711</span> rsGroupAdmin.moveTables(Sets.newHashSet(tableNameA, tableNameB), newGroup.getName());<a name="line.711"></a>
-<span class="sourceLineNo">712</span><a name="line.712"></a>
-<span class="sourceLineNo">713</span> //verify group change<a name="line.713"></a>
-<span class="sourceLineNo">714</span> Assert.assertEquals(newGroup.getName(),<a name="line.714"></a>
-<span class="sourceLineNo">715</span> rsGroupAdmin.getRSGroupInfoOfTable(tableNameA).getName());<a name="line.715"></a>
-<span class="sourceLineNo">716</span><a name="line.716"></a>
-<span class="sourceLineNo">717</span> Assert.assertEquals(newGroup.getName(),<a name="line.717"></a>
-<span class="sourceLineNo">718</span> rsGroupAdmin.getRSGroupInfoOfTable(tableNameB).getName());<a name="line.718"></a>
-<span class="sourceLineNo">719</span><a name="line.719"></a>
-<span class="sourceLineNo">720</span> //verify tables' not exist in old group<a name="line.720"></a>
-<span class="sourceLineNo">721</span> Set<TableName> DefaultTables = rsGroupAdmin.getRSGroupInfo(RSGroupInfo.DEFAULT_GROUP)<a name="line.721"></a>
-<span class="sourceLineNo">722</span> .getTables();<a name="line.722"></a>
-<span class="sourceLineNo">723</span> assertFalse(DefaultTables.contains(tableNameA));<a name="line.723"></a>
-<span class="sourceLineNo">724</span> assertFalse(DefaultTables.contains(tableNameB));<a name="line.724"></a>
-<span class="sourceLineNo">725</span><a name="line.725"></a>
-<span class="sourceLineNo">726</span> //verify tables' exist in new group<a name="line.726"></a>
-<span class="sourceLineNo">727</span> Set<TableName> newGroupTables = rsGroupAdmin.getRSGroupInfo(newGroupName).getTables();<a name="line.727"></a>
-<span class="sourceLineNo">728</span> assertTrue(newGroupTables.contains(tableNameA));<a name="line.728"></a>
-<span class="sourceLineNo">729</span> assertTrue(newGroupTables.contains(tableNameB));<a name="line.729"></a>
-<span class="sourceLineNo">730</span> }<a name="line.730"></a>
-<span class="sourceLineNo">731</span><a name="line.731"></a>
-<span class="sourceLineNo">732</span> @Test<a name="line.732"></a>
-<span class="sourceLineNo">733</span> public void testDisabledTableMove() throws Exception {<a name="line.733"></a>
-<span class="sourceLineNo">734</span> final byte[] familyNameBytes = Bytes.toBytes("f");<a name="line.734"></a>
-<span class="sourceLineNo">735</span> String newGroupName = getGroupName(name.getMethodName());<a name="line.735"></a>
-<span class="sourceLineNo">736</span> final RSGroupInfo newGroup = addGroup(newGroupName, 2);<a name="line.736"></a>
-<span class="sourceLineNo">737</span><a name="line.737"></a>
-<span class="sourceLineNo">738</span> TEST_UTIL.createMultiRegionTable(tableName, familyNameBytes, 5);<a name="line.738"></a>
-<span class="sourceLineNo">739</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.739"></a>
-<span class="sourceLineNo">740</span> @Override<a name="line.740"></a>
-<span class="sourceLineNo">741</span> public boolean evaluate() throws Exception {<a name="line.741"></a>
-<span class="sourceLineNo">742</span> List<String> regions = getTableRegionMap().get(tableName);<a name="line.742"></a>
-<span class="sourceLineNo">743</span> if (regions == null) {<a name="line.743"></a>
-<span class="sourceLineNo">744</span> return false;<a name="line.744"></a>
-<span class="sourceLineNo">745</span> }<a name="line.745"></a>
-<span class="sourceLineNo">746</span> return getTableRegionMap().get(tableName).size() >= 5;<a name="line.746"></a>
-<span class="sourceLineNo">747</span> }<a name="line.747"></a>
-<span class="sourceLineNo">748</span> });<a name="line.748"></a>
-<span class="sourceLineNo">749</span><a name="line.749"></a>
-<span class="sourceLineNo">750</span> RSGroupInfo tableGrp = rsGroupAdmin.getRSGroupInfoOfTable(tableName);<a name="line.750"></a>
-<span class="sourceLineNo">751</span> assertTrue(tableGrp.getName().equals(RSGroupInfo.DEFAULT_GROUP));<a name="line.751"></a>
-<span class="sourceLineNo">752</span><a name="line.752"></a>
-<span class="sourceLineNo">753</span> //test disable table<a name="line.753"></a>
-<span class="sourceLineNo">754</span> admin.disableTable(tableName);<a name="line.754"></a>
-<span class="sourceLineNo">755</span><a name="line.755"></a>
+<span class="sourceLineNo">631</span> @Test<a name="line.631"></a>
+<span class="sourceLineNo">632</span> public void testKillRS() throws Exception {<a name="line.632"></a>
+<span class="sourceLineNo">633</span> RSGroupInfo appInfo = addGroup("appInfo", 1);<a name="line.633"></a>
+<span class="sourceLineNo">634</span><a name="line.634"></a>
+<span class="sourceLineNo">635</span> final TableName tableName = TableName.valueOf(tablePrefix+"_ns", name.getMethodName());<a name="line.635"></a>
+<span class="sourceLineNo">636</span> admin.createNamespace(<a name="line.636"></a>
+<span class="sourceLineNo">637</span> NamespaceDescriptor.create(tableName.getNamespaceAsString())<a name="line.637"></a>
+<span class="sourceLineNo">638</span> .addConfiguration(RSGroupInfo.NAMESPACE_DESC_PROP_GROUP, appInfo.getName()).build());<a name="line.638"></a>
+<span class="sourceLineNo">639</span> final HTableDescriptor desc = new HTableDescriptor(tableName);<a name="line.639"></a>
+<span class="sourceLineNo">640</span> desc.addFamily(new HColumnDescriptor("f"));<a name="line.640"></a>
+<span class="sourceLineNo">641</span> admin.createTable(desc);<a name="line.641"></a>
+<span class="sourceLineNo">642</span> //wait for created table to be assigned<a name="line.642"></a>
+<span class="sourceLineNo">643</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.643"></a>
+<span class="sourceLineNo">644</span> @Override<a name="line.644"></a>
+<span class="sourceLineNo">645</span> public boolean evaluate() throws Exception {<a name="line.645"></a>
+<span class="sourceLineNo">646</span> return getTableRegionMap().get(desc.getTableName()) != null;<a name="line.646"></a>
+<span class="sourceLineNo">647</span> }<a name="line.647"></a>
+<span class="sourceLineNo">648</span> });<a name="line.648"></a>
+<span class="sourceLineNo">649</span><a name="line.649"></a>
+<span class="sourceLineNo">650</span> ServerName targetServer = ServerName.parseServerName(<a name="line.650"></a>
+<span class="sourceLineNo">651</span> appInfo.getServers().iterator().next().toString());<a name="line.651"></a>
+<span class="sourceLineNo">652</span> AdminProtos.AdminService.BlockingInterface targetRS =<a name="line.652"></a>
+<span class="sourceLineNo">653</span> ((ClusterConnection) admin.getConnection()).getAdmin(targetServer);<a name="line.653"></a>
+<span class="sourceLineNo">654</span> RegionInfo targetRegion = ProtobufUtil.getOnlineRegions(targetRS).get(0);<a name="line.654"></a>
+<span class="sourceLineNo">655</span> Assert.assertEquals(1, ProtobufUtil.getOnlineRegions(targetRS).size());<a name="line.655"></a>
+<span class="sourceLineNo">656</span><a name="line.656"></a>
+<span class="sourceLineNo">657</span> try {<a name="line.657"></a>
+<span class="sourceLineNo">658</span> //stopping may cause an exception<a name="line.658"></a>
+<span class="sourceLineNo">659</span> //due to the connection loss<a name="line.659"></a>
+<span class="sourceLineNo">660</span> targetRS.stopServer(null,<a name="line.660"></a>
+<span class="sourceLineNo">661</span> AdminProtos.StopServerRequest.newBuilder().setReason("Die").build());<a name="line.661"></a>
+<span class="sourceLineNo">662</span> } catch(Exception e) {<a name="line.662"></a>
+<span class="sourceLineNo">663</span> }<a name="line.663"></a>
+<span class="sourceLineNo">664</span> assertFalse(cluster.getClusterMetrics().getLiveServerMetrics().containsKey(targetServer));<a name="line.664"></a>
+<span class="sourceLineNo">665</span><a name="line.665"></a>
+<span class="sourceLineNo">666</span> //wait for created table to be assigned<a name="line.666"></a>
+<span class="sourceLineNo">667</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.667"></a>
+<span class="sourceLineNo">668</span> @Override<a name="line.668"></a>
+<span class="sourceLineNo">669</span> public boolean evaluate() throws Exception {<a name="line.669"></a>
+<span class="sourceLineNo">670</span> return cluster.getClusterMetrics().getRegionStatesInTransition().isEmpty();<a name="line.670"></a>
+<span class="sourceLineNo">671</span> }<a name="line.671"></a>
+<span class="sourceLineNo">672</span> });<a name="line.672"></a>
+<span class="sourceLineNo">673</span> Set<Address> newServers = Sets.newHashSet();<a name="line.673"></a>
+<span class="sourceLineNo">674</span> newServers.add(<a name="line.674"></a>
+<span class="sourceLineNo">675</span> rsGroupAdmin.getRSGroupInfo(RSGroupInfo.DEFAULT_GROUP).getServers().iterator().next());<a name="line.675"></a>
+<span class="sourceLineNo">676</span> rsGroupAdmin.moveServers(newServers, appInfo.getName());<a name="line.676"></a>
+<span class="sourceLineNo">677</span><a name="line.677"></a>
+<span class="sourceLineNo">678</span> //Make sure all the table's regions get reassigned<a name="line.678"></a>
+<span class="sourceLineNo">679</span> //disabling the table guarantees no conflicting assign/unassign (ie SSH) happens<a name="line.679"></a>
+<span class="sourceLineNo">680</span> admin.disableTable(tableName);<a name="line.680"></a>
+<span class="sourceLineNo">681</span> admin.enableTable(tableName);<a name="line.681"></a>
+<span class="sourceLineNo">682</span><a name="line.682"></a>
+<span class="sourceLineNo">683</span> //wait for region to be assigned<a name="line.683"></a>
+<span class="sourceLineNo">684</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.684"></a>
+<span class="sourceLineNo">685</span> @Override<a name="line.685"></a>
+<span class="sourceLineNo">686</span> public boolean evaluate() throws Exception {<a name="line.686"></a>
+<span class="sourceLineNo">687</span> return cluster.getClusterMetrics().getRegionStatesInTransition().isEmpty();<a name="line.687"></a>
+<span class="sourceLineNo">688</span> }<a name="line.688"></a>
+<span class="sourceLineNo">689</span> });<a name="line.689"></a>
+<span class="sourceLineNo">690</span><a name="line.690"></a>
+<span class="sourceLineNo">691</span> targetServer = ServerName.parseServerName(<a name="line.691"></a>
+<span class="sourceLineNo">692</span> newServers.iterator().next().toString());<a name="line.692"></a>
+<span class="sourceLineNo">693</span> targetRS =<a name="line.693"></a>
+<span class="sourceLineNo">694</span> ((ClusterConnection) admin.getConnection()).getAdmin(targetServer);<a name="line.694"></a>
+<span class="sourceLineNo">695</span> Assert.assertEquals(1, ProtobufUtil.getOnlineRegions(targetRS).size());<a name="line.695"></a>
+<span class="sourceLineNo">696</span> Assert.assertEquals(tableName,<a name="line.696"></a>
+<span class="sourceLineNo">697</span> ProtobufUtil.getOnlineRegions(targetRS).get(0).getTable());<a name="line.697"></a>
+<span class="sourceLineNo">698</span> }<a name="line.698"></a>
+<span class="sourceLineNo">699</span><a name="line.699"></a>
+<span class="sourceLineNo">700</span> @Test<a name="line.700"></a>
+<span class="sourceLineNo">701</span> public void testValidGroupNames() throws IOException {<a name="line.701"></a>
+<span class="sourceLineNo">702</span> String[] badNames = {"foo*","foo@","-"};<a name="line.702"></a>
+<span class="sourceLineNo">703</span> String[] goodNames = {"foo_123"};<a name="line.703"></a>
+<span class="sourceLineNo">704</span><a name="line.704"></a>
+<span class="sourceLineNo">705</span> for(String entry: badNames) {<a name="line.705"></a>
+<span class="sourceLineNo">706</span> try {<a name="line.706"></a>
+<span class="sourceLineNo">707</span> rsGroupAdmin.addRSGroup(entry);<a name="line.707"></a>
+<span class="sourceLineNo">708</span> fail("Expected a constraint exception for: "+entry);<a name="line.708"></a>
+<span class="sourceLineNo">709</span> } catch(ConstraintException ex) {<a name="line.709"></a>
+<span class="sourceLineNo">710</span> //expected<a name="line.710"></a>
+<span class="sourceLineNo">711</span> }<a name="line.711"></a>
+<span class="sourceLineNo">712</span> }<a name="line.712"></a>
+<span class="sourceLineNo">713</span><a name="line.713"></a>
+<span class="sourceLineNo">714</span> for(String entry: goodNames) {<a name="line.714"></a>
+<span class="sourceLineNo">715</span> rsGroupAdmin.addRSGroup(entry);<a name="line.715"></a>
+<span class="sourceLineNo">716</span> }<a name="line.716"></a>
+<span class="sourceLineNo">717</span> }<a name="line.717"></a>
+<span class="sourceLineNo">718</span><a name="line.718"></a>
+<span class="sourceLineNo">719</span> private String getGroupName(String baseName) {<a name="line.719"></a>
+<span class="sourceLineNo">720</span> return groupPrefix+"_"+baseName+"_"+rand.nextInt(Integer.MAX_VALUE);<a name="line.720"></a>
+<span class="sourceLineNo">721</span> }<a name="line.721"></a>
+<span class="sourceLineNo">722</span><a name="line.722"></a>
+<span class="sourceLineNo">723</span> @Test<a name="line.723"></a>
+<span class="sourceLineNo">724</span> public void testMultiTableMove() throws Exception {<a name="line.724"></a>
+<span class="sourceLineNo">725</span> final TableName tableNameA = TableName.valueOf(tablePrefix + name.getMethodName() + "A");<a name="line.725"></a>
+<span class="sourceLineNo">726</span> final TableName tableNameB = TableName.valueOf(tablePrefix + name.getMethodName() + "B");<a name="line.726"></a>
+<span class="sourceLineNo">727</span> final byte[] familyNameBytes = Bytes.toBytes("f");<a name="line.727"></a>
+<span class="sourceLineNo">728</span> String newGroupName = getGroupName(name.getMethodName());<a name="line.728"></a>
+<span class="sourceLineNo">729</span> final RSGroupInfo newGroup = addGroup(newGroupName, 1);<a name="line.729"></a>
+<span class="sourceLineNo">730</span><a name="line.730"></a>
+<span class="sourceLineNo">731</span> TEST_UTIL.createTable(tableNameA, familyNameBytes);<a name="line.731"></a>
+<span class="sourceLineNo">732</span> TEST_UTIL.createTable(tableNameB, familyNameBytes);<a name="line.732"></a>
+<span class="sourceLineNo">733</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.733"></a>
+<span class="sourceLineNo">734</span> @Override<a name="line.734"></a>
+<span class="sourceLineNo">735</span> public boolean evaluate() throws Exception {<a name="line.735"></a>
+<span class="sourceLineNo">736</span> List<String> regionsA = getTableRegionMap().get(tableNameA);<a name="line.736"></a>
+<span class="sourceLineNo">737</span> if (regionsA == null) {<a name="line.737"></a>
+<span class="sourceLineNo">738</span> return false;<a name="line.738"></a>
+<span class="sourceLineNo">739</span> }<a name="line.739"></a>
+<span class="sourceLineNo">740</span><a name="line.740"></a>
+<span class="sourceLineNo">741</span> List<String> regionsB = getTableRegionMap().get(tableNameB);<a name="line.741"></a>
+<span class="sourceLineNo">742</span> if (regionsB == null) {<a name="line.742"></a>
+<span class="sourceLineNo">743</span> return false;<a name="line.743"></a>
+<span class="sourceLineNo">744</span> }<a name="line.744"></a>
+<span class="sourceLineNo">745</span><a name="line.745"></a>
+<span class="sourceLineNo">746</span> return getTableRegionMap().get(tableNameA).size() >= 1<a name="line.746"></a>
+<span class="sourceLineNo">747</span> && getTableRegionMap().get(tableNameB).size() >= 1;<a name="line.747"></a>
+<span class="sourceLineNo">748</span> }<a name="line.748"></a>
+<span class="sourceLineNo">749</span> });<a name="line.749"></a>
+<span class="sourceLineNo">750</span><a name="line.750"></a>
+<span class="sourceLineNo">751</span> RSGroupInfo tableGrpA = rsGroupAdmin.getRSGroupInfoOfTable(tableNameA);<a name="line.751"></a>
+<span class="sourceLineNo">752</span> assertTrue(tableGrpA.getName().equals(RSGroupInfo.DEFAULT_GROUP));<a name="line.752"></a>
+<span class="sourceLineNo">753</span><a name="line.753"></a>
+<span class="sourceLineNo">754</span> RSGroupInfo tableGrpB = rsGroupAdmin.getRSGroupInfoOfTable(tableNameB);<a name="line.754"></a>
+<span class="sourceLineNo">755</span> assertTrue(tableGrpB.getName().equals(RSGroupInfo.DEFAULT_GROUP));<a name="line.755"></a>
<span class="sourceLineNo">756</span> //change table's group<a name="line.756"></a>
-<span class="sourceLineNo">757</span> LOG.info("Moving table "+ tableName + " to " + newGroup.getName());<a name="line.757"></a>
-<span class="sourceLineNo">758</span> rsGroupAdmin.moveTables(Sets.newHashSet(tableName), newGroup.getName());<a name="line.758"></a>
+<span class="sourceLineNo">757</span> LOG.info("Moving table [" + tableNameA + "," + tableNameB + "] to " + newGroup.getName());<a name="line.757"></a>
+<span class="sourceLineNo">758</span> rsGroupAdmin.moveTables(Sets.newHashSet(tableNameA, tableNameB), newGroup.getName());<a name="line.758"></a>
<span class="sourceLineNo">759</span><a name="line.759"></a>
<span class="sourceLineNo">760</span> //verify group change<a name="line.760"></a>
<span class="sourceLineNo">761</span> Assert.assertEquals(newGroup.getName(),<a name="line.761"></a>
-<span class="sourceLineNo">762</span> rsGroupAdmin.getRSGroupInfoOfTable(tableName).getName());<a name="line.762"></a>
-<span class="sourceLineNo">763</span> }<a name="line.763"></a>
-<span class="sourceLineNo">764</span><a name="line.764"></a>
-<span class="sourceLineNo">765</span> @Test<a name="line.765"></a>
-<span class="sourceLineNo">766</span> public void testNonExistentTableMove() throws Exception {<a name="line.766"></a>
-<span class="sourceLineNo">767</span> TableName tableName = TableName.valueOf(tablePrefix + name.getMethodName());<a name="line.767"></a>
-<span class="sourceLineNo">768</span><a name="line.768"></a>
-<span class="sourceLineNo">769</span> RSGroupInfo tableGrp = rsGroupAdmin.getRSGroupInfoOfTable(tableName);<a name="line.769"></a>
-<span class="sourceLineNo">770</span> assertNull(tableGrp);<a name="line.770"></a>
-<span class="sourceLineNo">771</span><a name="line.771"></a>
-<span class="sourceLineNo">772</span> //test if table exists already.<a name="line.772"></a>
-<span class="sourceLineNo">773</span> boolean exist = admin.tableExists(tableName);<a name="line.773"></a>
-<span class="sourceLineNo">774</span> assertFalse(exist);<a name="line.774"></a>
-<span class="sourceLineNo">775</span><a name="line.775"></a>
-<span class="sourceLineNo">776</span> LOG.info("Moving table "+ tableName + " to " + RSGroupInfo.DEFAULT_GROUP);<a name="line.776"></a>
-<span class="sourceLineNo">777</span> try {<a name="line.777"></a>
-<span class="sourceLineNo">778</span> rsGroupAdmin.moveTables(Sets.newHashSet(tableName), RSGroupInfo.DEFAULT_GROUP);<a name="line.778"></a>
-<span class="sourceLineNo">779</span> fail("Table " + tableName + " shouldn't have been successfully moved.");<a name="line.779"></a>
-<span class="sourceLineNo">780</span> } catch(IOException ex) {<a name="line.780"></a>
-<span class="sourceLineNo">781</span> assertTrue(ex instanceof TableNotFoundException);<a name="line.781"></a>
-<span class="sourceLineNo">782</span> }<a name="line.782"></a>
-<span class="sourceLineNo">783</span><a name="line.783"></a>
-<span class="sourceLineNo">784</span> try {<a name="line.784"></a>
-<span class="sourceLineNo">785</span> rsGroupAdmin.moveServersAndTables(<a name="line.785"></a>
-<span class="sourceLineNo">786</span> Sets.newHashSet(Address.fromParts("bogus",123)),<a name="line.786"></a>
-<span class="sourceLineNo">787</span> Sets.newHashSet(tableName), RSGroupInfo.DEFAULT_GROUP);<a name="line.787"></a>
-<span class="sourceLineNo">788</span> fail("Table " + tableName + " shouldn't have been successfully moved.");<a name="line.788"></a>
-<span class="sourceLineNo">789</span> } catch(IOException ex) {<a name="line.789"></a>
-<span class="sourceLineNo">790</span> assertTrue(ex instanceof TableNotFoundException);<a name="line.790"></a>
-<span class="sourceLineNo">791</span> }<a name="line.791"></a>
-<span class="sourceLineNo">792</span> //verify group change<a name="line.792"></a>
-<span class="sourceLineNo">793</span> assertNull(rsGroupAdmin.getRSGroupInfoOfTable(tableName));<a name="line.793"></a>
-<span class="sourceLineNo">794</span> }<a name="line.794"></a>
-<span class="sourceLineNo">795</span><a name="line.795"></a>
-<span class="sourceLineNo">796</span> @Test<a name="line.796"></a>
-<span class="sourceLineNo">797</span> public void testMoveServersAndTables() throws Exception {<a name="line.797"></a>
-<span class="sourceLineNo">798</span> LOG.info("testMoveServersAndTables");<a name="line.798"></a>
-<span class="sourceLineNo">799</span> final RSGroupInfo newGroup = addGroup(getGroupName(name.getMethodName()), 1);<a name="line.799"></a>
-<span class="sourceLineNo">800</span> //create table<a name="line.800"></a>
-<span class="sourceLineNo">801</span> final byte[] familyNameBytes = Bytes.toBytes("f");<a name="line.801"></a>
-<span class="sourceLineNo">802</span> TEST_UTIL.createMultiRegionTable(tableName, familyNameBytes, 5);<a name="line.802"></a>
-<span class="sourceLineNo">803</span> TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {<a name="line.803"></a>
-<span class="sourceLineNo">804</span> @Override<a name="line.804"></a>
-<span class="sourceLineNo">805</span> public boolean evaluate() throws Exception {<a name="line.805"></a>
-<span class="sourceLineNo">806</span> List<String> regions = getTableRegionMap().get(tableName);<a name="line.806"></a>
-<span class="sourceLineNo">807</span> if (regions == null) {<a name="line.807"></a>
-<span class="sourceLineNo">808</span> return false;<a name="line.808"></a>
-<span class="sourceLineNo">809</span> }<a name="line.809"></a>
-<span class="sourceLineNo">810</span><a name="line.810"></a>
-<span class="sourceLineNo">811</span> return getTableRegionMap().get(tableName).size() >= 5;<a name="line.811"></a>
-<span class="sourceLineNo">812</span> }<a name="line.812"></a>
-<span class="sourceLineNo">813</span> });<a name="line.813"></a>
-<span class="sourceLineNo">814</span><a name="line.814"></a>
-<span class="sourceLineNo">815</span> //get server which is not a member of new group<a name="line.815"></a>
-<span class="sourceLineNo">816</span> ServerName targetServer = null;<a name="line.816"></a>
-<span class="sourceLineNo">817</span> for(ServerName server : admin.getClusterMetrics(EnumSet.of(Option.LIVE_SERVERS))<a name="line.817"></a>
-<span class="sourceLineNo">818</span> .getLiveServerMetrics().keySet()) {<a name="line.818"></a>
-<span class="sourceLineNo">819</span> i
<TRUNCATED>