Skip to content

HBASE-24687: Use existing HMaster Connection in MobFileCleanerChore #5509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbeaudreault merged 6 commits into from
Nov 13, 2023
Merged

HBASE-24687: Use existing HMaster Connection in MobFileCleanerChore #5509

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
059fcc4
Use existing HMaster Connection in MobFileCleanerChore
charlesconnell Nov 7, 2023
9a0352c
fix TestMobFileCleanerChore
charlesconnell Nov 7, 2023
5eb7a02
Support more test uses of MobFileCleanerChore
charlesconnell Nov 8, 2023
e6d88c7
Move bulk of MobFileCleanerChore into MobFileCleanupUtil to simplify …
charlesconnell Nov 11, 2023
12bfea2
Split part of MobFileCleanupUtil.cleanupObsoleteMobFiles() out for ch…
charlesconnell Nov 12, 2023
47bd4b5
Rename TestMobFileCleanerChore as TestMobFileCleanupUtil
charlesconnell Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/mob/MobFileCleanerChore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
import org.apache.hadoop.hbase.backup.HFileArchiver;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.client.TableDescriptor;
import org.apache.hadoop.hbase.io.hfile.CacheConfig;
import org.apache.hadoop.hbase.master.HMaster;
Expand Down Expand Up @@ -94,10 +92,6 @@ private void checkObsoleteConfigurations() {
}
}

public MobFileCleanerChore() {
Comment thread
bbeaudreault marked this conversation as resolved.
this.master = null;
}

@Override
protected void chore() {
TableDescriptors htds = master.getTableDescriptors();
Expand Down Expand Up @@ -148,8 +142,7 @@ public void cleanupObsoleteMobFiles(Configuration conf, TableName table) throws
// So, if MOB file creation time is greater than this maxTimeToArchive,
// this will be skipped and won't be archived.
long maxCreationTimeToArchive = EnvironmentEdgeManager.currentTime() - minAgeToArchive;
try (final Connection conn = ConnectionFactory.createConnection(conf);
final Admin admin = conn.getAdmin();) {
try (final Admin admin = master.getConnection().getAdmin()) {
TableDescriptor htd = admin.getDescriptor(table);
List<ColumnFamilyDescriptor> list = MobUtils.getMobColumnFamilies(htd);
if (list.size() == 0) {
Expand Down
2 changes: 1 addition & 1 deletion hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobFileCleanerChore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public void setUp() throws Exception {

HTU.startMiniCluster();
admin = HTU.getAdmin();
chore = new MobFileCleanerChore();
chore = new MobFileCleanerChore(HTU.getMiniHBaseCluster().getMaster());
familyDescriptor = ColumnFamilyDescriptorBuilder.newBuilder(fam).setMobEnabled(true)
.setMobThreshold(mobLen).setMaxVersions(1).build();
tableDescriptor = HTU.createModifyableTableDescriptor("testMobCompactTable")
Expand Down