Skip to content

HBASE-25854 Remove redundant AM in-memory state changes in CatalogJanitor #3234

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
apurtell merged 2 commits into from
May 6, 2021
Merged

HBASE-25854 Remove redundant AM in-memory state changes in CatalogJanitor #3234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c368fa
HBASE-25854 Remove redundant AM in-memory state changes in CatalogJan…
apurtell May 5, 2021
e7db51f
Fix TestCatalogJanitorInMemoryStates
apurtell May 6, 2021
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
10 changes: 0 additions & 10 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/master/janitor/CatalogJanitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,12 +280,6 @@ private boolean cleanMergeRegion(final RegionInfo mergedRegion, List<RegionInfo>
LOG.debug("Submitted procedure {} for merged region {}", mergeRegionProcedure,
mergedRegion);
}
// TODO: The above scheduled GCMultipleMergedRegionsProcedure does the below.
// Do we need this?
for (RegionInfo ri : parents) {
this.services.getAssignmentManager().getRegionStates().deleteRegion(ri);
this.services.getServerManager().removeRegion(ri);
}
return true;
}
return false;
Expand Down Expand Up @@ -356,10 +350,6 @@ static boolean cleanParent(MasterServices services, RegionInfo parent, Result ro
if (LOG.isDebugEnabled()) {
LOG.debug("Submitted procedure {} for split parent {}", gcRegionProcedure, parent);
}
// Remove from in-memory states
// TODO: The above scheduled GCRegionProcedure does the below. Do we need this?
services.getAssignmentManager().getRegionStates().deleteRegion(parent);
services.getServerManager().removeRegion(parent);
return true;
} else {
if (LOG.isDebugEnabled()) {
Expand Down
21 changes: 21 additions & 0 deletions ...rc/test/java/org/apache/hadoop/hbase/master/janitor/TestCatalogJanitorInMemoryStates.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.apache.hadoop.hbase.MetaTableAccessor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.TableNameTestRule;
import org.apache.hadoop.hbase.Waiter;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;
Expand All @@ -44,6 +45,10 @@
import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.master.ServerManager;
import org.apache.hadoop.hbase.master.assignment.AssignmentManager;
import org.apache.hadoop.hbase.master.assignment.GCRegionProcedure;
import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv;
import org.apache.hadoop.hbase.procedure2.Procedure;
import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;
import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
Expand Down Expand Up @@ -120,6 +125,22 @@ public void testInMemoryParentCleanup()
Result r = MetaMockingUtil.getMetaTableRowResult(parent.getRegion(), null,
daughters.get(0).getRegion(), daughters.get(1).getRegion());
CatalogJanitor.cleanParent(master, parent.getRegion(), r);

// wait for procedures to complete
Waiter.waitFor(TEST_UTIL.getConfiguration(), 10 * 1000, new Waiter.Predicate<Exception>() {
@Override
public boolean evaluate() throws Exception {
ProcedureExecutor<MasterProcedureEnv> pe = master.getMasterProcedureExecutor();
for (Procedure<MasterProcedureEnv> proc: pe.getProcedures()) {
if (proc.getClass().isAssignableFrom(GCRegionProcedure.class) &&
proc.isFinished()) {
return true;
}
}
return false;
}
});

assertFalse("Parent region should have been removed from RegionStates",
am.getRegionStates().isRegionInRegionStates(parent.getRegion()));
assertFalse("Parent region should have been removed from ServerManager",
Expand Down