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 2015/10/27 19:17:30 UTC
hbase git commit: HBASE-14655 Addendum passes User to store#compact()
Repository: hbase
Updated Branches:
refs/heads/master f91546f2e -> e04e7402c
HBASE-14655 Addendum passes User to store#compact()
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e04e7402
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e04e7402
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e04e7402
Branch: refs/heads/master
Commit: e04e7402cd5df5fc7001101ad50fc2dbf8de5c1e
Parents: f91546f
Author: tedyu <yu...@gmail.com>
Authored: Tue Oct 27 11:17:30 2015 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Tue Oct 27 11:17:30 2015 -0700
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/e04e7402/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index 0fcdaab..19bcd33 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -1823,7 +1823,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
// We no longer need to cancel the request on the way out of this
// method because Store#compact will clean up unconditionally
requestNeedsCancellation = false;
- store.compact(compaction, throughputController);
+ store.compact(compaction, throughputController, user);
} catch (InterruptedIOException iioe) {
String msg = "compaction interrupted";
LOG.info(msg, iioe);