accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [6/6] git commit: Merge branch '1.6'
Date Fri, 10 Oct 2014 19:40:05 GMT
Merge branch '1.6'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1c657edf
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1c657edf
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1c657edf

Branch: refs/heads/master
Commit: 1c657edf85d829fd6742700835cb31b2fff9ff8a
Parents: 5640280 a269f75
Author: Josh Elser <elserj@apache.org>
Authored: Fri Oct 10 15:39:43 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Oct 10 15:39:43 2014 -0400

----------------------------------------------------------------------
 .../accumulo/server/master/balancer/DefaultLoadBalancer.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1c657edf/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
index 2e4b39d,7d99bb7..cec21e1
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
@@@ -224,9 -228,14 +224,14 @@@ public class DefaultLoadBalancer extend
        try {
          if (onlineTabletsForTable == null) {
            onlineTabletsForTable = new HashMap<KeyExtent,TabletStats>();
-           for (TabletStats stat : getOnlineTabletsForTable(tooMuch.server, table))
+           List<TabletStats> stats = getOnlineTabletsForTable(tooMuch.server, table);
+           if (null == stats) {
+             log.warn("Unable to find tablets to move");
+             return result;
+           }
+           for (TabletStats stat : stats)
              onlineTabletsForTable.put(new KeyExtent(stat.extent), stat);
 -          onlineTablets.put(table, onlineTabletsForTable);
 +          donerTabletStats.put(table, onlineTabletsForTable);
          }
        } catch (Exception ex) {
          log.error("Unable to select a tablet to move", ex);


Mime
View raw message