You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2015/01/03 02:19:33 UTC
[1/3] hbase git commit: HBASE-12732 Log messages in FileLink#tryOpen
are reversed (Tobi Vollebregt)
Repository: hbase
Updated Branches:
refs/heads/branch-1.0 2ebeddfc4 -> 1c4da6627
HBASE-12732 Log messages in FileLink#tryOpen are reversed (Tobi Vollebregt)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/15c43815
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/15c43815
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/15c43815
Branch: refs/heads/branch-1.0
Commit: 15c43815ecf250fe0a7c36a410ce41beba2ef93d
Parents: 2ebeddf
Author: stack <st...@apache.org>
Authored: Fri Dec 19 17:47:11 2014 -0800
Committer: Enis Soztutar <en...@apache.org>
Committed: Fri Jan 2 17:07:59 2015 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/io/FileLink.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/15c43815/hbase-server/src/main/java/org/apache/hadoop/hbase/io/FileLink.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/FileLink.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/FileLink.java
index b7cab0f..4c1f8c5 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/FileLink.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/FileLink.java
@@ -290,7 +290,7 @@ public class FileLink {
if (pos != 0) in.seek(pos);
assert(in.getPos() == pos) : "Link unable to seek to the right position=" + pos;
if (LOG.isTraceEnabled()) {
- if (currentPath != null) {
+ if (currentPath == null) {
LOG.debug("link open path=" + path);
} else {
LOG.trace("link switch from path=" + currentPath + " to path=" + path);
[3/3] hbase git commit: HBASE-12697 Don't use RegionLocationFinder if
localityCost == 0
Posted by en...@apache.org.
HBASE-12697 Don't use RegionLocationFinder if localityCost == 0
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1c4da662
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1c4da662
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1c4da662
Branch: refs/heads/branch-1.0
Commit: 1c4da662788676c010d17da6e020171b78868573
Parents: 9403a1b
Author: Elliott Clark <ec...@apache.org>
Authored: Mon Dec 15 19:11:54 2014 -0800
Committer: Enis Soztutar <en...@apache.org>
Committed: Fri Jan 2 17:17:57 2015 -0800
----------------------------------------------------------------------
.../hbase/master/balancer/StochasticLoadBalancer.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/1c4da662/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 a9afd3e..e58f855 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
@@ -229,10 +229,19 @@ public class StochasticLoadBalancer extends BaseLoadBalancer {
clusterState.remove(masterServerName);
}
+ // On clusters with lots of HFileLinks or lots of reference files,
+ // instantiating the storefile infos can be quite expensive.
+ // Allow turning this feature off if the locality cost is not going to
+ // be used in any computations.
+ RegionLocationFinder finder = null;
+ if (this.localityCost != null && this.localityCost.getMultiplier() > 0) {
+ finder = this.regionFinder;
+ }
+
//The clusterState that is given to this method contains the state
//of all the regions in the table(s) (that's true today)
// Keep track of servers to iterate through them.
- Cluster cluster = new Cluster(clusterState, loads, regionFinder, rackManager);
+ Cluster cluster = new Cluster(clusterState, loads, finder, rackManager);
if (!needsBalance(cluster)) {
return null;
}
[2/3] hbase git commit: HBASE-12750 getRequestsCount() in
ClusterStatus returns total number of request (Weichen Ye)
Posted by en...@apache.org.
HBASE-12750 getRequestsCount() in ClusterStatus returns total number of request (Weichen Ye)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9403a1b6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9403a1b6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9403a1b6
Branch: refs/heads/branch-1.0
Commit: 9403a1b640eda5f292a5bcd2594f37f986802618
Parents: 15c4381
Author: tedyu <yu...@gmail.com>
Authored: Tue Dec 23 10:26:49 2014 -0800
Committer: Enis Soztutar <en...@apache.org>
Committed: Fri Jan 2 17:13:46 2015 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/ClusterStatus.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/9403a1b6/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
index 7599e3e..40fcfcf 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
@@ -160,7 +160,7 @@ public class ClusterStatus extends VersionedWritable {
public int getRequestsCount() {
int count = 0;
for (Map.Entry<ServerName, ServerLoad> e: this.liveServers.entrySet()) {
- count += e.getValue().getTotalNumberOfRequests();
+ count += e.getValue().getNumberOfRequests();
}
return count;
}