From 8c848a5e6b76b68126f23ed679094eab1a17f4f1 Mon Sep 17 00:00:00 2001 From: Joseph Hwang Date: Fri, 29 Jul 2016 13:21:50 -0700 Subject: [PATCH] Addendum HBASE-16209 Removed unnecessary method and method calls from AssignmentManager and AssignmentManager UI --- .../hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon | 7 +++---- .../java/org/apache/hadoop/hbase/master/AssignmentManager.java | 4 +--- .../org/apache/hadoop/hbase/master/TestMasterStatusServlet.java | 1 - 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon index 20a9ae3..f97860b 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon @@ -108,12 +108,11 @@ int numOfPages = (int) Math.ceil(numOfRITs * 1.0 / ritsPerPage); <%java> String retryStatus = "0"; - String name = rs.getRegion().getEncodedName(); - RegionState state = assignmentManager.getState(name); - AtomicInteger numOpenRetries = failedRegionTracker.get(name); + AtomicInteger numOpenRetries = failedRegionTracker.get( + rs.getRegion().getEncodedName()); if (numOpenRetries != null ) { retryStatus = Integer.toString(numOpenRetries.get()); - } else if (state.getState() == RegionState.State.FAILED_OPEN) { + } else if (rs.getState() == RegionState.State.FAILED_OPEN) { retryStatus = "Failed"; } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java index b2e6e71..ed21cef 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java @@ -4274,9 +4274,7 @@ public class AssignmentManager extends ZooKeeperListener { } public Map getFailedOpenTracker() {return failedOpenTracker;} - - public RegionState getState(String encodedName) {return regionStates.getRegionState(encodedName);} - + /** * A region is offline. The new state should be the specified one, * if not null. If the specified state is null, the new state is Offline. diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java index 7ab5703..5e9b41c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java @@ -173,7 +173,6 @@ public class TestMasterStatusServlet { Mockito.doReturn(rs).when(am).getRegionStates(); Mockito.doReturn(regionsInTransition).when(rs).getRegionsInTransition(); Mockito.doReturn(regionsInTransition).when(rs).getRegionsInTransitionOrderedByTimestamp(); - Mockito.when(am.getState(any(String.class))).thenReturn(new RegionState(null, null)); // Render to a string StringWriter sw = new StringWriter(); -- 2.8.0-rc2