From 835d8923705bc3870475bf343cff1f2f4857b953 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Tue, 6 Mar 2018 13:45:06 -0800 Subject: [PATCH] HBASE-20143 Fix checkstyle introduced in parent 'TestRSGroups is flakey' in new test additions --- .../master/assignment/TestAssignmentManager.java | 47 +++++++++++----------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestAssignmentManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestAssignmentManager.java index c5eb9ec5a0..0d6e8e674b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestAssignmentManager.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestAssignmentManager.java @@ -729,30 +729,29 @@ public class TestAssignmentManager { protected CloseRegionResponse execCloseRegion(ServerName server, byte[] regionName) throws IOException { switch (this.invocations++) { - case 0: throw new NotServingRegionException("Fake"); - case 1: throw new RegionServerAbortedException("Fake!"); - case 2: throw new RegionServerStoppedException("Fake!"); - case 3: throw new ServerNotRunningYetException("Fake!"); - case 4: - // We will expire the server that we failed to rpc against. - throw new FailedRemoteDispatchException("Fake!"); - case 5: - // Mark this regionserver as already expiring so we go different code route; i.e. we - // FAIL to expire the remote server and presume ok to move region to CLOSED. HBASE-20137. - TestAssignmentManager.this.master.getServerManager().expireServer(server); - throw new FailedRemoteDispatchException("Fake!"); - case 6: - LOG.info("Return null response from serverName=" + server + "; means STUCK...TODO timeout"); - executor.schedule(new Runnable() { - @Override - public void run() { - LOG.info("Sending in CRASH of " + server); - doCrash(server); - } - }, 1, TimeUnit.SECONDS); - return null; - default: - return super.execCloseRegion(server, regionName); + case 0: throw new NotServingRegionException("Fake"); + case 1: throw new RegionServerAbortedException("Fake!"); + case 2: throw new RegionServerStoppedException("Fake!"); + case 3: throw new ServerNotRunningYetException("Fake!"); + case 4: + // We will expire the server that we failed to rpc against. + throw new FailedRemoteDispatchException("Fake!"); + case 5: + // Mark this regionserver as already expiring so we go different code route; i.e. we + // FAIL to expire the remote server and presume ok to move region to CLOSED. HBASE-20137. + TestAssignmentManager.this.master.getServerManager().expireServer(server); + throw new FailedRemoteDispatchException("Fake!"); + case 6: + LOG.info("Return null response from serverName=" + server + "; means STUCK...TODO timeout"); + executor.schedule(new Runnable() { + @Override + public void run() { + LOG.info("Sending in CRASH of " + server); + doCrash(server); + } + }, 1, TimeUnit.SECONDS); + return null; + default: return super.execCloseRegion(server, regionName); } } } -- 2.11.0 (Apple Git-81)