You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2014/12/02 13:43:38 UTC
hbase git commit: HBASE-12559 Addendum fixes findbugs warnings
Repository: hbase
Updated Branches:
refs/heads/master 94d57f81d -> 5cc071484
HBASE-12559 Addendum fixes findbugs warnings
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5cc07148
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5cc07148
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5cc07148
Branch: refs/heads/master
Commit: 5cc0714840bf8f7797a118e4bac5dabdd20e3f67
Parents: 94d57f8
Author: tedyu <yu...@gmail.com>
Authored: Tue Dec 2 04:43:34 2014 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Tue Dec 2 04:43:34 2014 -0800
----------------------------------------------------------------------
.../hbase/master/balancer/StochasticLoadBalancer.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/5cc07148/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java
index bc60e8f..9d8c7cb 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java
@@ -185,7 +185,7 @@ public class StochasticLoadBalancer extends BaseLoadBalancer {
}
@Override
- public void setClusterStatus(ClusterStatus st) {
+ public synchronized void setClusterStatus(ClusterStatus st) {
super.setClusterStatus(st);
updateRegionLoad();
for(CostFromRegionLoadFunction cost : regionLoadFunctions) {
@@ -194,7 +194,7 @@ public class StochasticLoadBalancer extends BaseLoadBalancer {
}
@Override
- public void setMasterServices(MasterServices masterServices) {
+ public synchronized void setMasterServices(MasterServices masterServices) {
super.setMasterServices(masterServices);
this.localityCost.setServices(masterServices);
this.localityCandidateGenerator.setServices(masterServices);
@@ -202,7 +202,7 @@ public class StochasticLoadBalancer extends BaseLoadBalancer {
}
@Override
- protected boolean areSomeRegionReplicasColocated(Cluster c) {
+ protected synchronized boolean areSomeRegionReplicasColocated(Cluster c) {
regionReplicaHostCostFunction.init(c);
if (regionReplicaHostCostFunction.cost() > 0) return true;
regionReplicaRackCostFunction.init(c);
@@ -215,7 +215,8 @@ public class StochasticLoadBalancer extends BaseLoadBalancer {
* should always approach the optimal state given enough steps.
*/
@Override
- public List<RegionPlan> balanceCluster(Map<ServerName, List<HRegionInfo>> clusterState) {
+ public synchronized List<RegionPlan> balanceCluster(Map<ServerName,
+ List<HRegionInfo>> clusterState) {
List<RegionPlan> plans = balanceMasterRegions(clusterState);
if (plans != null || clusterState == null || clusterState.size() <= 1) {
return plans;