You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by se...@apache.org on 2013/04/10 00:38:16 UTC
svn commit: r1466273 - in
/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver:
DefaultStoreFileManager.java HStore.java
Author: sershe
Date: Tue Apr 9 22:38:16 2013
New Revision: 1466273
URL: http://svn.apache.org/r1466273
Log:
HBASE-7791 Compaction USER_PRIORITY is slightly broken
Modified:
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultStoreFileManager.java
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
Modified: hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultStoreFileManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultStoreFileManager.java?rev=1466273&r1=1466272&r2=1466273&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultStoreFileManager.java (original)
+++ hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultStoreFileManager.java Tue Apr 9 22:38:16 2013
@@ -131,7 +131,8 @@ class DefaultStoreFileManager implements
public int getStoreCompactionPriority() {
int blockingFileCount = conf.getInt(
HStore.BLOCKING_STOREFILES_KEY, HStore.DEFAULT_BLOCKING_STOREFILE_COUNT);
- return blockingFileCount - storefiles.size();
+ int priority = blockingFileCount - storefiles.size();
+ return (priority == HStore.PRIORITY_USER) ? priority + 1 : priority;
}
private void sortAndSetStoreFiles(List<StoreFile> storeFiles) {
Modified: hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java?rev=1466273&r1=1466272&r2=1466273&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java (original)
+++ hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java Tue Apr 9 22:38:16 2013
@@ -1658,7 +1658,11 @@ public class HStore implements Store {
@Override
public int getCompactPriority() {
- return this.storeEngine.getStoreFileManager().getStoreCompactionPriority();
+ int priority = this.storeEngine.getStoreFileManager().getStoreCompactionPriority();
+ if (priority == PRIORITY_USER) {
+ LOG.warn("Compaction priority is USER despite there being no user compaction");
+ }
+ return priority;
}
@Override