This is an automated email from the ASF dual-hosted git repository.
busbey pushed a commit to branch HBASE-22749
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit dd5f30a7aa10153fe3ad76873f0da7eb17dec721
Author: Vladimir Rodionov <vladrodio...@gmail.com>
AuthorDate: Tue Feb 4 21:24:13 2020 -0800
fixed failing mob tests
---
.../apache/hadoop/hbase/IntegrationTestMobCompaction.java | 2 +-
.../apache/hadoop/hbase/mob/DefaultMobStoreCompactor.java | 12 +++++++-----
.../org/apache/hadoop/hbase/mob/MobFileCleanerChore.java | 2 ++
.../org/apache/hadoop/hbase/mob/MobFileCompactionChore.java | 4 ++--
.../org/apache/hadoop/hbase/regionserver/StoreFileInfo.java | 4 ++--
.../org/apache/hadoop/hbase/mob/TestMobFileCleanerChore.java | 2 +-
.../org/apache/hadoop/hbase/mob/TestMobStoreCompaction.java | 3 ---
.../org/apache/hadoop/hbase/mob/TestMobStoreScanner.java | 2 --
8 files changed, 15 insertions(+), 16 deletions(-)
diff --git
a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestMobCompaction.java
b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestMobCompaction.java
index 9aa1978..093f9e4 100644
---
a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestMobCompaction.java
+++
b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestMobCompaction.java
@@ -64,7 +64,7 @@ import
org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine;
* argument 'failprob'.
* @see <a
href="https://issues.apache.org/jira/browse/HBASE-22749";>HBASE-22749</a>
* <p>
- * Sample usage:
+ * Sample usage:
* <pre>
* hbase org.apache.hadoop.hbase.IntegrationTestMobCompaction -Dservers=10
-Drows=1000000
* -Dfailprob=0.2
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 871a9d8..0a0a024 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
@@ -37,7 +37,6 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.PrivateCellUtil;
-import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.regionserver.CellSink;
import org.apache.hadoop.hbase.regionserver.HMobStore;
import org.apache.hadoop.hbase.regionserver.HStore;
@@ -516,7 +515,6 @@ public class DefaultMobStoreCompactor extends
DefaultCompactor {
// Commit last MOB writer
commitOrAbortMobWriter(mobFileWriter, fd.maxSeqId, mobCells, major);
- clearThreadLocals();
mobStore.updateCellsCountCompactedFromMob(cellsCountCompactedFromMob);
mobStore.updateCellsCountCompactedToMob(cellsCountCompactedToMob);
mobStore.updateCellsSizeCompactedFromMob(cellsSizeCompactedFromMob);
@@ -532,12 +530,15 @@ public class DefaultMobStoreCompactor extends
DefaultCompactor {
private void clearThreadLocals() {
Set<String> set = mobRefSet.get();
- if (set != null) set.clear();
+ if (set != null) {
+ set.clear();
+ }
HashMap<String, Long> map = mobLengthMap.get();
- if (map != null) map.clear();
+ if (map != null) {
+ map.clear();
+ }
}
-
private StoreFileWriter newMobWriter(FileDetails fd)
throws IOException {
try {
@@ -597,6 +598,7 @@ public class DefaultMobStoreCompactor extends
DefaultCompactor {
Set<String> refSet = mobRefSet.get();
writer.appendMobMetadata(refSet);
writer.close();
+ clearThreadLocals();
return newFiles;
}
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobFileCleanerChore.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobFileCleanerChore.java
index c7d713d..955d549 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobFileCleanerChore.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobFileCleanerChore.java
@@ -235,6 +235,8 @@ public class MobFileCleanerChore extends ScheduledChore {
LOG.debug("Found: {} mob references", mobs.length);
}
regionMobs.addAll(Arrays.asList(mobs));
+ } else {
+ LOG.debug("File {} does not have mob references",
currentPath);
}
}
} catch (FileNotFoundException e) {
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobFileCompactionChore.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobFileCompactionChore.java
index 82d4a82..6f32be4 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobFileCompactionChore.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobFileCompactionChore.java
@@ -115,8 +115,8 @@ public class MobFileCompactionChore extends ScheduledChore {
hcd.getNameAsString());
if (regionBatchSize ==
MobConstants.DEFAULT_MOB_MAJOR_COMPACTION_REGION_BATCH_SIZE) {
LOG.debug("Table={} cf ={}: batch MOB compaction is disabled,
{}=0 -"+
- " all regions will be "+ "compacted in parallel",
htd.getTableName(),
- hcd.getNameAsString(), "hbase.mob.compaction.batch.size");
+ " all regions will be compacted in parallel",
htd.getTableName(),
+ hcd.getNameAsString(), "hbase.mob.compaction.batch.size");
admin.majorCompact(htd.getTableName(), hcd.getName());
} else {
LOG.info("Table={} cf={}: performing MOB major compaction in
batches "+
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java
index 04adeb5..5eaab23 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java
@@ -242,8 +242,8 @@ public class StoreFileInfo {
/**
* @return the Reference object associated to this StoreFileInfo.
- * null if the StoreFile is not a
- * reference.
+ * null if the StoreFile is not a
+ * reference.
*/
public Reference getReference() {
return this.reference;
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobFileCleanerChore.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobFileCleanerChore.java
index 21d0a64..4db01de 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobFileCleanerChore.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobFileCleanerChore.java
@@ -197,7 +197,7 @@ public class TestMobFileCleanerChore {
Path dir = MobUtils.getMobFamilyPath(conf, tableName, family);
FileStatus[] stat = fs.listStatus(dir);
for (FileStatus st : stat) {
- LOG.debug("MOB Directory content: {}", st.getPath());
+ LOG.debug("DDDD MOB Directory content: {} size={}", st.getPath(),
st.getLen());
}
LOG.debug("MOB Directory content total files: {}", stat.length);
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobStoreCompaction.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobStoreCompaction.java
index f191ac2..99dd653 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobStoreCompaction.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobStoreCompaction.java
@@ -59,9 +59,6 @@ import org.apache.hadoop.hbase.io.hfile.CacheConfig;
import org.apache.hadoop.hbase.io.hfile.HFile;
import org.apache.hadoop.hbase.io.hfile.HFileContext;
import org.apache.hadoop.hbase.io.hfile.HFileContextBuilder;
-import org.apache.hadoop.hbase.mob.MobConstants;
-import org.apache.hadoop.hbase.mob.MobFileCache;
-import org.apache.hadoop.hbase.mob.MobUtils;
import org.apache.hadoop.hbase.regionserver.BloomType;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.HStore;
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobStoreScanner.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobStoreScanner.java
index fcafb98..3fd6dae 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobStoreScanner.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobStoreScanner.java
@@ -43,8 +43,6 @@ import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.io.hfile.CorruptHFileException;
import org.apache.hadoop.hbase.io.hfile.TestHFile;
-import org.apache.hadoop.hbase.mob.MobConstants;
-import org.apache.hadoop.hbase.mob.MobUtils;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
