You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2012/06/23 06:10:47 UTC
svn commit: r1353063 -
/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Author: apurtell
Date: Sat Jun 23 04:10:46 2012
New Revision: 1353063
URL: http://svn.apache.org/viewvc?rev=1353063&view=rev
Log:
Amend HBASE-6246. Admin.move without specifying destination does not go through AccessController
The previous committed change for HBASE-6246 accidentally removed logic
and the omission was caught by TestSplitTransactionOnCluster failures.
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1353063&r1=1353062&r2=1353063&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Sat Jun 23 04:10:46 2012
@@ -1093,6 +1093,8 @@ Server {
destServers.remove(p.getSecond());
// If i have only one RS then destination can be null.
dest = balancer.randomAssignment(destServers);
+ } else {
+ dest = new ServerName(Bytes.toString(destServerName));
}
// Now we can do the move