[3/3] hbase git commit: HBASE-14969 Add throughput controller for flush

2016-01-28 Thread zhangduo 
HBASE-14969 Add throughput controller for flush

Signed-off-by: zhangduo 


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

Branch: refs/heads/master
Commit: b3b1ce99c63d79401ddda9c114850dea61af0afb
Parents: 14dd959
Author: Yu Li 
Authored: Fri Jan 29 09:30:20 2016 +0800
Committer: zhangduo 
Committed: Fri Jan 29 09:32:01 2016 +0800

--
 .../hbase/mob/DefaultMobStoreCompactor.java |   4 +-
 .../hbase/mob/DefaultMobStoreFlusher.java   |   3 +-
 .../hbase/regionserver/CompactSplitThread.java  |  10 +-
 .../hbase/regionserver/CompactionTool.java  |   4 +-
 .../hbase/regionserver/DefaultStoreEngine.java  |  10 +-
 .../hbase/regionserver/DefaultStoreFlusher.java |   5 +-
 .../hadoop/hbase/regionserver/HMobStore.java|   4 +-
 .../hadoop/hbase/regionserver/HRegion.java  |  18 +-
 .../hbase/regionserver/HRegionServer.java   |  35 ++-
 .../hadoop/hbase/regionserver/HStore.java   |  23 +-
 .../regionserver/RegionServerServices.java  |  13 +
 .../apache/hadoop/hbase/regionserver/Store.java |  12 +-
 .../hadoop/hbase/regionserver/StoreFlusher.java |  51 +++-
 .../hbase/regionserver/StripeStoreEngine.java   |   8 +-
 .../hbase/regionserver/StripeStoreFlusher.java  |   5 +-
 .../compactions/CompactionContext.java  |   5 +-
 .../CompactionThroughputController.java |  52 
 .../CompactionThroughputControllerFactory.java  |  61 
 .../regionserver/compactions/Compactor.java |  28 +-
 .../compactions/DefaultCompactor.java   |  10 +-
 .../NoLimitCompactionThroughputController.java  |  66 
 ...sureAwareCompactionThroughputController.java | 263 
 .../compactions/StripeCompactionPolicy.java |   9 +-
 .../compactions/StripeCompactor.java|  11 +-
 .../CompactionThroughputControllerFactory.java  |  91 ++
 .../FlushThroughputControllerFactory.java   |  65 
 .../throttle/NoLimitThroughputController.java   |  62 
 ...sureAwareCompactionThroughputController.java | 153 ++
 .../PressureAwareFlushThroughputController.java | 136 +
 .../PressureAwareThroughputController.java  | 177 +++
 .../throttle/ThroughputControlUtil.java |  55 
 .../throttle/ThroughputController.java  |  52 
 .../hadoop/hbase/MockRegionServerServices.java  |  10 +
 .../org/apache/hadoop/hbase/TestIOFencing.java  |   7 +-
 .../TestRegionObserverScannerOpenHook.java  |   8 +-
 .../hadoop/hbase/master/MockRegionServer.java   |  10 +
 .../regionserver/TestCompactSplitThread.java|   4 +-
 .../hbase/regionserver/TestCompaction.java  |  20 +-
 .../hbase/regionserver/TestHMobStore.java   |   4 +-
 .../regionserver/TestHRegionReplayEvents.java   |   4 +-
 .../TestSplitTransactionOnCluster.java  |   4 +-
 .../hadoop/hbase/regionserver/TestStore.java|   4 +-
 .../hbase/regionserver/TestStripeCompactor.java |   6 +-
 .../regionserver/TestStripeStoreEngine.java |  10 +-
 .../TestCompactionWithThroughputController.java | 302 --
 .../compactions/TestStripeCompactionPolicy.java |  15 +-
 .../TestCompactionWithThroughputController.java | 306 +++
 .../TestFlushWithThroughputController.java  | 217 +
 .../hbase/regionserver/wal/TestWALReplay.java   |  18 +-
 49 files changed, 1559 insertions(+), 891 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/b3b1ce99/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.java
index b5f412d..33eb7b9 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.java
@@ -45,8 +45,8 @@ import org.apache.hadoop.hbase.regionserver.Store;
 import org.apache.hadoop.hbase.regionserver.StoreFile;
 import org.apache.hadoop.hbase.regionserver.StoreFile.Writer;
 import org.apache.hadoop.hbase.regionserver.StoreFileScanner;
-import 
org.apache.hadoop.hbase.regionserver.compactions.CompactionThroughputController;
 import org.apache.hadoop.hbase.regionserver.compactions.DefaultCompactor;
+import org.apache.hadoop.hbase.regionserver.throttle.ThroughputController;
 import org.apache.hadoop.hbase.util.Bytes;
 
 /**
@@ -151,7 +151,7 @@ public class DefaultMobStoreCompactor extends

[3/3] hbase git commit: HBASE-14969 Add throughput controller for flush

2016-01-28 Thread zhangduo 
HBASE-14969 Add throughput controller for flush

Signed-off-by: zhangduo 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0d21fa92
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0d21fa92
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0d21fa92

Branch: refs/heads/branch-1
Commit: 0d21fa92791ae7d704f48311539facba7061770b
Parents: 2f571b1
Author: 绝顶 
Authored: Fri Jan 29 09:38:13 2016 +0800
Committer: zhangduo 
Committed: Fri Jan 29 09:39:15 2016 +0800

--
 .../hbase/regionserver/CompactSplitThread.java  |  10 +-
 .../hbase/regionserver/CompactionTool.java  |   4 +-
 .../hbase/regionserver/DefaultStoreEngine.java  |  10 +-
 .../hbase/regionserver/DefaultStoreFlusher.java |   5 +-
 .../hadoop/hbase/regionserver/HRegion.java  |  16 +-
 .../hbase/regionserver/HRegionServer.java   |  34 ++-
 .../hadoop/hbase/regionserver/HStore.java   |  23 +-
 .../regionserver/RegionServerServices.java  |  13 +
 .../apache/hadoop/hbase/regionserver/Store.java |  12 +-
 .../hadoop/hbase/regionserver/StoreFlusher.java |  51 +++-
 .../hbase/regionserver/StripeStoreEngine.java   |   8 +-
 .../hbase/regionserver/StripeStoreFlusher.java  |   5 +-
 .../compactions/CompactionContext.java  |   5 +-
 .../CompactionThroughputController.java |  52 
 .../CompactionThroughputControllerFactory.java  |  16 +-
 .../regionserver/compactions/Compactor.java |  25 +-
 .../compactions/DefaultCompactor.java   |  10 +-
 .../NoLimitCompactionThroughputController.java  |  66 
 ...sureAwareCompactionThroughputController.java | 263 
 .../compactions/StripeCompactionPolicy.java |   9 +-
 .../compactions/StripeCompactor.java|  11 +-
 .../CompactionThroughputControllerFactory.java  |  91 ++
 .../FlushThroughputControllerFactory.java   |  65 
 .../throttle/NoLimitThroughputController.java   |  62 
 ...sureAwareCompactionThroughputController.java | 153 ++
 .../PressureAwareFlushThroughputController.java | 136 +
 .../PressureAwareThroughputController.java  | 177 +++
 .../throttle/ThroughputControlUtil.java |  55 
 .../throttle/ThroughputController.java  |  52 
 .../hadoop/hbase/MockRegionServerServices.java  |  11 +
 .../org/apache/hadoop/hbase/TestIOFencing.java  |   8 +-
 .../TestRegionObserverScannerOpenHook.java  |  10 +-
 .../hadoop/hbase/master/MockRegionServer.java   |  11 +
 .../regionserver/TestCompactSplitThread.java|   4 +-
 .../hbase/regionserver/TestCompaction.java  |  20 +-
 .../regionserver/TestHRegionReplayEvents.java   |   4 +-
 .../TestSplitTransactionOnCluster.java  |   5 +-
 .../hadoop/hbase/regionserver/TestStore.java|   4 +-
 .../hbase/regionserver/TestStripeCompactor.java |   6 +-
 .../regionserver/TestStripeStoreEngine.java |  10 +-
 .../TestCompactionWithThroughputController.java | 287 -
 .../compactions/TestStripeCompactionPolicy.java |  15 +-
 .../TestCompactionWithThroughputController.java | 306 +++
 .../TestFlushWithThroughputController.java  | 217 +
 .../hbase/regionserver/wal/TestWALReplay.java   |  20 +-
 45 files changed, 1562 insertions(+), 815 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/0d21fa92/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
index 93a686f..4a40025 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
@@ -41,8 +41,8 @@ import org.apache.hadoop.hbase.conf.ConfigurationManager;
 import org.apache.hadoop.hbase.conf.PropagatingConfigurationObserver;
 import org.apache.hadoop.hbase.regionserver.compactions.CompactionContext;
 import org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest;
-import 
org.apache.hadoop.hbase.regionserver.compactions.CompactionThroughputController;
-import 
org.apache.hadoop.hbase.regionserver.compactions.CompactionThroughputControllerFactory;
+import 
org.apache.hadoop.hbase.regionserver.throttle.CompactionThroughputControllerFactory;
+import org.apache.hadoop.hbase.regionserver.throttle.ThroughputController;
 import org.apache.hadoop.hbase.security.User;
 import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
 import org.apache.hadoop.hbase.util.Pair;
@@ -89,7 +89,7 @@ public class