Repository: accumulo Updated Branches: refs/heads/master e7c5e2474 -> f51949924
ACCUMULO-4662 Fix ambiguous table reference Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/722d5eb5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/722d5eb5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/722d5eb5 Branch: refs/heads/master Commit: 722d5eb5c4c2ebb61628abe8d018e3a0e7bc2a6d Parents: f630f6a Author: Mike Miller <mmil...@apache.org> Authored: Thu Jun 22 11:42:28 2017 -0400 Committer: Mike Miller <mmil...@apache.org> Committed: Thu Jun 22 11:42:28 2017 -0400 ---------------------------------------------------------------------- .../accumulo/server/master/balancer/ChaoticLoadBalancer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/722d5eb5/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java index 995ccba..0720f83 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java +++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java @@ -131,11 +131,11 @@ public class ChaoticLoadBalancer extends TabletBalancer { long avg = (long) Math.ceil(((double) totalTablets) / current.size() * 1.2); for (Entry<TServerInstance,TabletServerStatus> e : current.entrySet()) { - for (String table : e.getValue().getTableMap().keySet()) { - if (!moveMetadata && MetadataTable.NAME.equals(table)) + for (String tableId : e.getValue().getTableMap().keySet()) { + if (!moveMetadata && MetadataTable.ID.equals(tableId)) continue; try { - for (TabletStats ts : getOnlineTabletsForTable(e.getKey(), table)) { + for (TabletStats ts : getOnlineTabletsForTable(e.getKey(), tableId)) { KeyExtent ke = new KeyExtent(ts.extent); int index = r.nextInt(underCapacityTServer.size()); TServerInstance dest = underCapacityTServer.get(index);
