You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mm...@apache.org on 2017/06/22 16:55:38 UTC
[1/3] accumulo git commit: ACCUMULO-4662 Fix ambiguous table reference
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 <mm...@apache.org>
Authored: Thu Jun 22 11:42:28 2017 -0400
Committer: Mike Miller <mm...@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);
[3/3] accumulo git commit: Merge branch '1.8'
Posted by mm...@apache.org.
Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f5194992
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f5194992
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f5194992
Branch: refs/heads/master
Commit: f51949924f11dccc513a2aad063a3fbe2275ee8f
Parents: e7c5e24 d38685c
Author: Mike Miller <mm...@apache.org>
Authored: Thu Jun 22 12:32:19 2017 -0400
Committer: Mike Miller <mm...@apache.org>
Committed: Thu Jun 22 12:32:19 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/f5194992/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
----------------------------------------------------------------------
[2/3] accumulo git commit: Merge branch '1.7' into 1.8
Posted by mm...@apache.org.
Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d38685c7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d38685c7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d38685c7
Branch: refs/heads/master
Commit: d38685c70dea7378e6386f5d98903e9d382eb21e
Parents: 15055b4 722d5eb
Author: Mike Miller <mm...@apache.org>
Authored: Thu Jun 22 11:55:23 2017 -0400
Committer: Mike Miller <mm...@apache.org>
Committed: Thu Jun 22 11:55:23 2017 -0400
----------------------------------------------------------------------
.../accumulo/server/master/balancer/ChaoticLoadBalancer.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------