You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/02/07 15:14:02 UTC
[08/42] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/6bdadd97/testdevapidocs/src-html/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.CoDelEnvironmentEdge.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.CoDelEnvironmentEdge.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.CoDelEnvironmentEdge.html
index 79490ae..0110217 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.CoDelEnvironmentEdge.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.CoDelEnvironmentEdge.html
@@ -436,173 +436,175 @@
<span class="sourceLineNo">428</span><a name="line.428"></a>
<span class="sourceLineNo">429</span> schedConf.setInt(HConstants.REGION_SERVER_HANDLER_COUNT, 0);<a name="line.429"></a>
<span class="sourceLineNo">430</span> schedConf.setInt("hbase.ipc.server.max.callqueue.length", 5);<a name="line.430"></a>
-<span class="sourceLineNo">431</span><a name="line.431"></a>
-<span class="sourceLineNo">432</span> PriorityFunction priority = mock(PriorityFunction.class);<a name="line.432"></a>
-<span class="sourceLineNo">433</span> when(priority.getPriority(any(), any(), any())).thenReturn(HConstants.NORMAL_QOS);<a name="line.433"></a>
-<span class="sourceLineNo">434</span> SimpleRpcScheduler scheduler = new SimpleRpcScheduler(schedConf, 0, 0, 0, priority,<a name="line.434"></a>
-<span class="sourceLineNo">435</span> HConstants.QOS_THRESHOLD);<a name="line.435"></a>
-<span class="sourceLineNo">436</span> try {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> scheduler.start();<a name="line.437"></a>
-<span class="sourceLineNo">438</span><a name="line.438"></a>
-<span class="sourceLineNo">439</span> CallRunner putCallTask = mock(CallRunner.class);<a name="line.439"></a>
-<span class="sourceLineNo">440</span> ServerCall putCall = mock(ServerCall.class);<a name="line.440"></a>
-<span class="sourceLineNo">441</span> putCall.param = RequestConverter.buildMutateRequest(<a name="line.441"></a>
-<span class="sourceLineNo">442</span> Bytes.toBytes("abc"), new Put(Bytes.toBytes("row")));<a name="line.442"></a>
-<span class="sourceLineNo">443</span> RequestHeader putHead = RequestHeader.newBuilder().setMethodName("mutate").build();<a name="line.443"></a>
-<span class="sourceLineNo">444</span> when(putCallTask.getRpcCall()).thenReturn(putCall);<a name="line.444"></a>
-<span class="sourceLineNo">445</span> when(putCall.getHeader()).thenReturn(putHead);<a name="line.445"></a>
-<span class="sourceLineNo">446</span><a name="line.446"></a>
-<span class="sourceLineNo">447</span> assertTrue(scheduler.dispatch(putCallTask));<a name="line.447"></a>
+<span class="sourceLineNo">431</span> schedConf.set(RpcExecutor.CALL_QUEUE_TYPE_CONF_KEY,<a name="line.431"></a>
+<span class="sourceLineNo">432</span> RpcExecutor.CALL_QUEUE_TYPE_DEADLINE_CONF_VALUE);<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span> PriorityFunction priority = mock(PriorityFunction.class);<a name="line.434"></a>
+<span class="sourceLineNo">435</span> when(priority.getPriority(any(), any(), any())).thenReturn(HConstants.NORMAL_QOS);<a name="line.435"></a>
+<span class="sourceLineNo">436</span> SimpleRpcScheduler scheduler = new SimpleRpcScheduler(schedConf, 0, 0, 0, priority,<a name="line.436"></a>
+<span class="sourceLineNo">437</span> HConstants.QOS_THRESHOLD);<a name="line.437"></a>
+<span class="sourceLineNo">438</span> try {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> scheduler.start();<a name="line.439"></a>
+<span class="sourceLineNo">440</span><a name="line.440"></a>
+<span class="sourceLineNo">441</span> CallRunner putCallTask = mock(CallRunner.class);<a name="line.441"></a>
+<span class="sourceLineNo">442</span> ServerCall putCall = mock(ServerCall.class);<a name="line.442"></a>
+<span class="sourceLineNo">443</span> putCall.param = RequestConverter.buildMutateRequest(<a name="line.443"></a>
+<span class="sourceLineNo">444</span> Bytes.toBytes("abc"), new Put(Bytes.toBytes("row")));<a name="line.444"></a>
+<span class="sourceLineNo">445</span> RequestHeader putHead = RequestHeader.newBuilder().setMethodName("mutate").build();<a name="line.445"></a>
+<span class="sourceLineNo">446</span> when(putCallTask.getRpcCall()).thenReturn(putCall);<a name="line.446"></a>
+<span class="sourceLineNo">447</span> when(putCall.getHeader()).thenReturn(putHead);<a name="line.447"></a>
<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span> schedConf.setInt("hbase.ipc.server.max.callqueue.length", 0);<a name="line.449"></a>
-<span class="sourceLineNo">450</span> scheduler.onConfigurationChange(schedConf);<a name="line.450"></a>
-<span class="sourceLineNo">451</span> assertFalse(scheduler.dispatch(putCallTask));<a name="line.451"></a>
-<span class="sourceLineNo">452</span> waitUntilQueueEmpty(scheduler);<a name="line.452"></a>
-<span class="sourceLineNo">453</span> schedConf.setInt("hbase.ipc.server.max.callqueue.length", 1);<a name="line.453"></a>
-<span class="sourceLineNo">454</span> scheduler.onConfigurationChange(schedConf);<a name="line.454"></a>
-<span class="sourceLineNo">455</span> assertTrue(scheduler.dispatch(putCallTask));<a name="line.455"></a>
-<span class="sourceLineNo">456</span> } finally {<a name="line.456"></a>
-<span class="sourceLineNo">457</span> scheduler.stop();<a name="line.457"></a>
-<span class="sourceLineNo">458</span> }<a name="line.458"></a>
-<span class="sourceLineNo">459</span> }<a name="line.459"></a>
-<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span> private static final class CoDelEnvironmentEdge implements EnvironmentEdge {<a name="line.461"></a>
+<span class="sourceLineNo">449</span> assertTrue(scheduler.dispatch(putCallTask));<a name="line.449"></a>
+<span class="sourceLineNo">450</span><a name="line.450"></a>
+<span class="sourceLineNo">451</span> schedConf.setInt("hbase.ipc.server.max.callqueue.length", 0);<a name="line.451"></a>
+<span class="sourceLineNo">452</span> scheduler.onConfigurationChange(schedConf);<a name="line.452"></a>
+<span class="sourceLineNo">453</span> assertFalse(scheduler.dispatch(putCallTask));<a name="line.453"></a>
+<span class="sourceLineNo">454</span> waitUntilQueueEmpty(scheduler);<a name="line.454"></a>
+<span class="sourceLineNo">455</span> schedConf.setInt("hbase.ipc.server.max.callqueue.length", 1);<a name="line.455"></a>
+<span class="sourceLineNo">456</span> scheduler.onConfigurationChange(schedConf);<a name="line.456"></a>
+<span class="sourceLineNo">457</span> assertTrue(scheduler.dispatch(putCallTask));<a name="line.457"></a>
+<span class="sourceLineNo">458</span> } finally {<a name="line.458"></a>
+<span class="sourceLineNo">459</span> scheduler.stop();<a name="line.459"></a>
+<span class="sourceLineNo">460</span> }<a name="line.460"></a>
+<span class="sourceLineNo">461</span> }<a name="line.461"></a>
<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span> private final BlockingQueue<Long> timeQ = new LinkedBlockingQueue<>();<a name="line.463"></a>
+<span class="sourceLineNo">463</span> private static final class CoDelEnvironmentEdge implements EnvironmentEdge {<a name="line.463"></a>
<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span> private long offset;<a name="line.465"></a>
+<span class="sourceLineNo">465</span> private final BlockingQueue<Long> timeQ = new LinkedBlockingQueue<>();<a name="line.465"></a>
<span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span> private final Set<String> threadNamePrefixs = new HashSet<>();<a name="line.467"></a>
+<span class="sourceLineNo">467</span> private long offset;<a name="line.467"></a>
<span class="sourceLineNo">468</span><a name="line.468"></a>
-<span class="sourceLineNo">469</span> @Override<a name="line.469"></a>
-<span class="sourceLineNo">470</span> public long currentTime() {<a name="line.470"></a>
-<span class="sourceLineNo">471</span> for (String threadNamePrefix : threadNamePrefixs) {<a name="line.471"></a>
-<span class="sourceLineNo">472</span> String threadName = Thread.currentThread().getName();<a name="line.472"></a>
-<span class="sourceLineNo">473</span> if (threadName.startsWith(threadNamePrefix)) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span> return timeQ.poll().longValue() + offset;<a name="line.474"></a>
-<span class="sourceLineNo">475</span> }<a name="line.475"></a>
-<span class="sourceLineNo">476</span> }<a name="line.476"></a>
-<span class="sourceLineNo">477</span> return System.currentTimeMillis();<a name="line.477"></a>
-<span class="sourceLineNo">478</span> }<a name="line.478"></a>
-<span class="sourceLineNo">479</span> }<a name="line.479"></a>
-<span class="sourceLineNo">480</span><a name="line.480"></a>
-<span class="sourceLineNo">481</span> // FIX. I don't get this test (St.Ack). When I time this test, the minDelay is > 2 * codel delay from the get go.<a name="line.481"></a>
-<span class="sourceLineNo">482</span> // So we are always overloaded. The test below would seem to complete the queuing of all the CallRunners inside<a name="line.482"></a>
-<span class="sourceLineNo">483</span> // the codel check interval. I don't think we are skipping codel checking. Second, I think this test has been<a name="line.483"></a>
-<span class="sourceLineNo">484</span> // broken since HBASE-16089 Add on FastPath for CoDel went in. The thread name we were looking for was the name<a name="line.484"></a>
-<span class="sourceLineNo">485</span> // BEFORE we updated: i.e. "RpcServer.CodelBQ.default.handler". But same patch changed the name of the codel<a name="line.485"></a>
-<span class="sourceLineNo">486</span> // fastpath thread to: new FastPathBalancedQueueRpcExecutor("CodelFPBQ.default", handlerCount, numCallQueues...<a name="line.486"></a>
-<span class="sourceLineNo">487</span> // Codel is hard to test. This test is going to be flakey given it all timer-based. Disabling for now till chat<a name="line.487"></a>
-<span class="sourceLineNo">488</span> // with authors.<a name="line.488"></a>
-<span class="sourceLineNo">489</span> @Test<a name="line.489"></a>
-<span class="sourceLineNo">490</span> public void testCoDelScheduling() throws Exception {<a name="line.490"></a>
-<span class="sourceLineNo">491</span> CoDelEnvironmentEdge envEdge = new CoDelEnvironmentEdge();<a name="line.491"></a>
-<span class="sourceLineNo">492</span> envEdge.threadNamePrefixs.add("RpcServer.default.FPBQ.Codel.handler");<a name="line.492"></a>
-<span class="sourceLineNo">493</span> Configuration schedConf = HBaseConfiguration.create();<a name="line.493"></a>
-<span class="sourceLineNo">494</span> schedConf.setInt(RpcScheduler.IPC_SERVER_MAX_CALLQUEUE_LENGTH, 250);<a name="line.494"></a>
-<span class="sourceLineNo">495</span> schedConf.set(RpcExecutor.CALL_QUEUE_TYPE_CONF_KEY,<a name="line.495"></a>
-<span class="sourceLineNo">496</span> RpcExecutor.CALL_QUEUE_TYPE_CODEL_CONF_VALUE);<a name="line.496"></a>
-<span class="sourceLineNo">497</span> PriorityFunction priority = mock(PriorityFunction.class);<a name="line.497"></a>
-<span class="sourceLineNo">498</span> when(priority.getPriority(any(), any(), any())).thenReturn(HConstants.NORMAL_QOS);<a name="line.498"></a>
-<span class="sourceLineNo">499</span> SimpleRpcScheduler scheduler =<a name="line.499"></a>
-<span class="sourceLineNo">500</span> new SimpleRpcScheduler(schedConf, 1, 1, 1, priority, HConstants.QOS_THRESHOLD);<a name="line.500"></a>
-<span class="sourceLineNo">501</span> try {<a name="line.501"></a>
-<span class="sourceLineNo">502</span> // Loading mocked call runner can take a good amount of time the first time through (haven't looked why).<a name="line.502"></a>
-<span class="sourceLineNo">503</span> // Load it for first time here outside of the timed loop.<a name="line.503"></a>
-<span class="sourceLineNo">504</span> getMockedCallRunner(System.currentTimeMillis(), 2);<a name="line.504"></a>
-<span class="sourceLineNo">505</span> scheduler.start();<a name="line.505"></a>
-<span class="sourceLineNo">506</span> EnvironmentEdgeManager.injectEdge(envEdge);<a name="line.506"></a>
-<span class="sourceLineNo">507</span> envEdge.offset = 5;<a name="line.507"></a>
-<span class="sourceLineNo">508</span> // Calls faster than min delay<a name="line.508"></a>
-<span class="sourceLineNo">509</span> // LOG.info("Start");<a name="line.509"></a>
-<span class="sourceLineNo">510</span> for (int i = 0; i < 100; i++) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span> long time = System.currentTimeMillis();<a name="line.511"></a>
-<span class="sourceLineNo">512</span> envEdge.timeQ.put(time);<a name="line.512"></a>
-<span class="sourceLineNo">513</span> CallRunner cr = getMockedCallRunner(time, 2);<a name="line.513"></a>
-<span class="sourceLineNo">514</span> // LOG.info("" + i + " " + (System.currentTimeMillis() - now) + " cr=" + cr);<a name="line.514"></a>
-<span class="sourceLineNo">515</span> scheduler.dispatch(cr);<a name="line.515"></a>
-<span class="sourceLineNo">516</span> }<a name="line.516"></a>
-<span class="sourceLineNo">517</span> // LOG.info("Loop done");<a name="line.517"></a>
-<span class="sourceLineNo">518</span> // make sure fast calls are handled<a name="line.518"></a>
-<span class="sourceLineNo">519</span> waitUntilQueueEmpty(scheduler);<a name="line.519"></a>
-<span class="sourceLineNo">520</span> Thread.sleep(100);<a name="line.520"></a>
-<span class="sourceLineNo">521</span> assertEquals("None of these calls should have been discarded", 0,<a name="line.521"></a>
-<span class="sourceLineNo">522</span> scheduler.getNumGeneralCallsDropped());<a name="line.522"></a>
-<span class="sourceLineNo">523</span><a name="line.523"></a>
-<span class="sourceLineNo">524</span> envEdge.offset = 151;<a name="line.524"></a>
-<span class="sourceLineNo">525</span> // calls slower than min delay, but not individually slow enough to be dropped<a name="line.525"></a>
-<span class="sourceLineNo">526</span> for (int i = 0; i < 20; i++) {<a name="line.526"></a>
-<span class="sourceLineNo">527</span> long time = System.currentTimeMillis();<a name="line.527"></a>
-<span class="sourceLineNo">528</span> envEdge.timeQ.put(time);<a name="line.528"></a>
-<span class="sourceLineNo">529</span> CallRunner cr = getMockedCallRunner(time, 2);<a name="line.529"></a>
-<span class="sourceLineNo">530</span> scheduler.dispatch(cr);<a name="line.530"></a>
-<span class="sourceLineNo">531</span> }<a name="line.531"></a>
-<span class="sourceLineNo">532</span><a name="line.532"></a>
-<span class="sourceLineNo">533</span> // make sure somewhat slow calls are handled<a name="line.533"></a>
-<span class="sourceLineNo">534</span> waitUntilQueueEmpty(scheduler);<a name="line.534"></a>
-<span class="sourceLineNo">535</span> Thread.sleep(100);<a name="line.535"></a>
-<span class="sourceLineNo">536</span> assertEquals("None of these calls should have been discarded", 0,<a name="line.536"></a>
-<span class="sourceLineNo">537</span> scheduler.getNumGeneralCallsDropped());<a name="line.537"></a>
-<span class="sourceLineNo">538</span><a name="line.538"></a>
-<span class="sourceLineNo">539</span> envEdge.offset = 2000;<a name="line.539"></a>
-<span class="sourceLineNo">540</span> // now slow calls and the ones to be dropped<a name="line.540"></a>
-<span class="sourceLineNo">541</span> for (int i = 0; i < 60; i++) {<a name="line.541"></a>
-<span class="sourceLineNo">542</span> long time = System.currentTimeMillis();<a name="line.542"></a>
-<span class="sourceLineNo">543</span> envEdge.timeQ.put(time);<a name="line.543"></a>
-<span class="sourceLineNo">544</span> CallRunner cr = getMockedCallRunner(time, 100);<a name="line.544"></a>
-<span class="sourceLineNo">545</span> scheduler.dispatch(cr);<a name="line.545"></a>
-<span class="sourceLineNo">546</span> }<a name="line.546"></a>
-<span class="sourceLineNo">547</span><a name="line.547"></a>
-<span class="sourceLineNo">548</span> // make sure somewhat slow calls are handled<a name="line.548"></a>
-<span class="sourceLineNo">549</span> waitUntilQueueEmpty(scheduler);<a name="line.549"></a>
-<span class="sourceLineNo">550</span> Thread.sleep(100);<a name="line.550"></a>
-<span class="sourceLineNo">551</span> assertTrue(<a name="line.551"></a>
-<span class="sourceLineNo">552</span> "There should have been at least 12 calls dropped however there were "<a name="line.552"></a>
-<span class="sourceLineNo">553</span> + scheduler.getNumGeneralCallsDropped(),<a name="line.553"></a>
-<span class="sourceLineNo">554</span> scheduler.getNumGeneralCallsDropped() > 12);<a name="line.554"></a>
-<span class="sourceLineNo">555</span> } finally {<a name="line.555"></a>
-<span class="sourceLineNo">556</span> scheduler.stop();<a name="line.556"></a>
-<span class="sourceLineNo">557</span> }<a name="line.557"></a>
-<span class="sourceLineNo">558</span> }<a name="line.558"></a>
-<span class="sourceLineNo">559</span><a name="line.559"></a>
-<span class="sourceLineNo">560</span> // Get mocked call that has the CallRunner sleep for a while so that the fast<a name="line.560"></a>
-<span class="sourceLineNo">561</span> // path isn't hit.<a name="line.561"></a>
-<span class="sourceLineNo">562</span> private CallRunner getMockedCallRunner(long timestamp, final long sleepTime) throws IOException {<a name="line.562"></a>
-<span class="sourceLineNo">563</span> ServerCall putCall = new ServerCall(1, null, null,<a name="line.563"></a>
-<span class="sourceLineNo">564</span> RPCProtos.RequestHeader.newBuilder().setMethodName("mutate").build(),<a name="line.564"></a>
-<span class="sourceLineNo">565</span> RequestConverter.buildMutateRequest(Bytes.toBytes("abc"), new Put(Bytes.toBytes("row"))),<a name="line.565"></a>
-<span class="sourceLineNo">566</span> null, null, 9, null, timestamp, 0, null, null, null) {<a name="line.566"></a>
-<span class="sourceLineNo">567</span><a name="line.567"></a>
-<span class="sourceLineNo">568</span> @Override<a name="line.568"></a>
-<span class="sourceLineNo">569</span> public void sendResponseIfReady() throws IOException {<a name="line.569"></a>
-<span class="sourceLineNo">570</span> }<a name="line.570"></a>
-<span class="sourceLineNo">571</span> };<a name="line.571"></a>
-<span class="sourceLineNo">572</span><a name="line.572"></a>
-<span class="sourceLineNo">573</span> CallRunner cr = new CallRunner(null, putCall) {<a name="line.573"></a>
-<span class="sourceLineNo">574</span> @Override<a name="line.574"></a>
-<span class="sourceLineNo">575</span> public void run() {<a name="line.575"></a>
-<span class="sourceLineNo">576</span> if (sleepTime <= 0) return;<a name="line.576"></a>
-<span class="sourceLineNo">577</span> try {<a name="line.577"></a>
-<span class="sourceLineNo">578</span> LOG.warn("Sleeping for " + sleepTime);<a name="line.578"></a>
-<span class="sourceLineNo">579</span> Thread.sleep(sleepTime);<a name="line.579"></a>
-<span class="sourceLineNo">580</span> LOG.warn("Done Sleeping for " + sleepTime);<a name="line.580"></a>
-<span class="sourceLineNo">581</span> } catch (InterruptedException e) {<a name="line.581"></a>
-<span class="sourceLineNo">582</span> }<a name="line.582"></a>
-<span class="sourceLineNo">583</span> }<a name="line.583"></a>
-<span class="sourceLineNo">584</span><a name="line.584"></a>
-<span class="sourceLineNo">585</span> @Override<a name="line.585"></a>
-<span class="sourceLineNo">586</span> public RpcCall getRpcCall() {<a name="line.586"></a>
-<span class="sourceLineNo">587</span> return putCall;<a name="line.587"></a>
-<span class="sourceLineNo">588</span> }<a name="line.588"></a>
-<span class="sourceLineNo">589</span><a name="line.589"></a>
-<span class="sourceLineNo">590</span> @Override<a name="line.590"></a>
-<span class="sourceLineNo">591</span> public void drop() {<a name="line.591"></a>
-<span class="sourceLineNo">592</span> }<a name="line.592"></a>
-<span class="sourceLineNo">593</span> };<a name="line.593"></a>
-<span class="sourceLineNo">594</span><a name="line.594"></a>
-<span class="sourceLineNo">595</span> return cr;<a name="line.595"></a>
-<span class="sourceLineNo">596</span> }<a name="line.596"></a>
-<span class="sourceLineNo">597</span>}<a name="line.597"></a>
+<span class="sourceLineNo">469</span> private final Set<String> threadNamePrefixs = new HashSet<>();<a name="line.469"></a>
+<span class="sourceLineNo">470</span><a name="line.470"></a>
+<span class="sourceLineNo">471</span> @Override<a name="line.471"></a>
+<span class="sourceLineNo">472</span> public long currentTime() {<a name="line.472"></a>
+<span class="sourceLineNo">473</span> for (String threadNamePrefix : threadNamePrefixs) {<a name="line.473"></a>
+<span class="sourceLineNo">474</span> String threadName = Thread.currentThread().getName();<a name="line.474"></a>
+<span class="sourceLineNo">475</span> if (threadName.startsWith(threadNamePrefix)) {<a name="line.475"></a>
+<span class="sourceLineNo">476</span> return timeQ.poll().longValue() + offset;<a name="line.476"></a>
+<span class="sourceLineNo">477</span> }<a name="line.477"></a>
+<span class="sourceLineNo">478</span> }<a name="line.478"></a>
+<span class="sourceLineNo">479</span> return System.currentTimeMillis();<a name="line.479"></a>
+<span class="sourceLineNo">480</span> }<a name="line.480"></a>
+<span class="sourceLineNo">481</span> }<a name="line.481"></a>
+<span class="sourceLineNo">482</span><a name="line.482"></a>
+<span class="sourceLineNo">483</span> // FIX. I don't get this test (St.Ack). When I time this test, the minDelay is > 2 * codel delay from the get go.<a name="line.483"></a>
+<span class="sourceLineNo">484</span> // So we are always overloaded. The test below would seem to complete the queuing of all the CallRunners inside<a name="line.484"></a>
+<span class="sourceLineNo">485</span> // the codel check interval. I don't think we are skipping codel checking. Second, I think this test has been<a name="line.485"></a>
+<span class="sourceLineNo">486</span> // broken since HBASE-16089 Add on FastPath for CoDel went in. The thread name we were looking for was the name<a name="line.486"></a>
+<span class="sourceLineNo">487</span> // BEFORE we updated: i.e. "RpcServer.CodelBQ.default.handler". But same patch changed the name of the codel<a name="line.487"></a>
+<span class="sourceLineNo">488</span> // fastpath thread to: new FastPathBalancedQueueRpcExecutor("CodelFPBQ.default", handlerCount, numCallQueues...<a name="line.488"></a>
+<span class="sourceLineNo">489</span> // Codel is hard to test. This test is going to be flakey given it all timer-based. Disabling for now till chat<a name="line.489"></a>
+<span class="sourceLineNo">490</span> // with authors.<a name="line.490"></a>
+<span class="sourceLineNo">491</span> @Test<a name="line.491"></a>
+<span class="sourceLineNo">492</span> public void testCoDelScheduling() throws Exception {<a name="line.492"></a>
+<span class="sourceLineNo">493</span> CoDelEnvironmentEdge envEdge = new CoDelEnvironmentEdge();<a name="line.493"></a>
+<span class="sourceLineNo">494</span> envEdge.threadNamePrefixs.add("RpcServer.default.FPBQ.Codel.handler");<a name="line.494"></a>
+<span class="sourceLineNo">495</span> Configuration schedConf = HBaseConfiguration.create();<a name="line.495"></a>
+<span class="sourceLineNo">496</span> schedConf.setInt(RpcScheduler.IPC_SERVER_MAX_CALLQUEUE_LENGTH, 250);<a name="line.496"></a>
+<span class="sourceLineNo">497</span> schedConf.set(RpcExecutor.CALL_QUEUE_TYPE_CONF_KEY,<a name="line.497"></a>
+<span class="sourceLineNo">498</span> RpcExecutor.CALL_QUEUE_TYPE_CODEL_CONF_VALUE);<a name="line.498"></a>
+<span class="sourceLineNo">499</span> PriorityFunction priority = mock(PriorityFunction.class);<a name="line.499"></a>
+<span class="sourceLineNo">500</span> when(priority.getPriority(any(), any(), any())).thenReturn(HConstants.NORMAL_QOS);<a name="line.500"></a>
+<span class="sourceLineNo">501</span> SimpleRpcScheduler scheduler =<a name="line.501"></a>
+<span class="sourceLineNo">502</span> new SimpleRpcScheduler(schedConf, 1, 1, 1, priority, HConstants.QOS_THRESHOLD);<a name="line.502"></a>
+<span class="sourceLineNo">503</span> try {<a name="line.503"></a>
+<span class="sourceLineNo">504</span> // Loading mocked call runner can take a good amount of time the first time through (haven't looked why).<a name="line.504"></a>
+<span class="sourceLineNo">505</span> // Load it for first time here outside of the timed loop.<a name="line.505"></a>
+<span class="sourceLineNo">506</span> getMockedCallRunner(System.currentTimeMillis(), 2);<a name="line.506"></a>
+<span class="sourceLineNo">507</span> scheduler.start();<a name="line.507"></a>
+<span class="sourceLineNo">508</span> EnvironmentEdgeManager.injectEdge(envEdge);<a name="line.508"></a>
+<span class="sourceLineNo">509</span> envEdge.offset = 5;<a name="line.509"></a>
+<span class="sourceLineNo">510</span> // Calls faster than min delay<a name="line.510"></a>
+<span class="sourceLineNo">511</span> // LOG.info("Start");<a name="line.511"></a>
+<span class="sourceLineNo">512</span> for (int i = 0; i < 100; i++) {<a name="line.512"></a>
+<span class="sourceLineNo">513</span> long time = System.currentTimeMillis();<a name="line.513"></a>
+<span class="sourceLineNo">514</span> envEdge.timeQ.put(time);<a name="line.514"></a>
+<span class="sourceLineNo">515</span> CallRunner cr = getMockedCallRunner(time, 2);<a name="line.515"></a>
+<span class="sourceLineNo">516</span> // LOG.info("" + i + " " + (System.currentTimeMillis() - now) + " cr=" + cr);<a name="line.516"></a>
+<span class="sourceLineNo">517</span> scheduler.dispatch(cr);<a name="line.517"></a>
+<span class="sourceLineNo">518</span> }<a name="line.518"></a>
+<span class="sourceLineNo">519</span> // LOG.info("Loop done");<a name="line.519"></a>
+<span class="sourceLineNo">520</span> // make sure fast calls are handled<a name="line.520"></a>
+<span class="sourceLineNo">521</span> waitUntilQueueEmpty(scheduler);<a name="line.521"></a>
+<span class="sourceLineNo">522</span> Thread.sleep(100);<a name="line.522"></a>
+<span class="sourceLineNo">523</span> assertEquals("None of these calls should have been discarded", 0,<a name="line.523"></a>
+<span class="sourceLineNo">524</span> scheduler.getNumGeneralCallsDropped());<a name="line.524"></a>
+<span class="sourceLineNo">525</span><a name="line.525"></a>
+<span class="sourceLineNo">526</span> envEdge.offset = 151;<a name="line.526"></a>
+<span class="sourceLineNo">527</span> // calls slower than min delay, but not individually slow enough to be dropped<a name="line.527"></a>
+<span class="sourceLineNo">528</span> for (int i = 0; i < 20; i++) {<a name="line.528"></a>
+<span class="sourceLineNo">529</span> long time = System.currentTimeMillis();<a name="line.529"></a>
+<span class="sourceLineNo">530</span> envEdge.timeQ.put(time);<a name="line.530"></a>
+<span class="sourceLineNo">531</span> CallRunner cr = getMockedCallRunner(time, 2);<a name="line.531"></a>
+<span class="sourceLineNo">532</span> scheduler.dispatch(cr);<a name="line.532"></a>
+<span class="sourceLineNo">533</span> }<a name="line.533"></a>
+<span class="sourceLineNo">534</span><a name="line.534"></a>
+<span class="sourceLineNo">535</span> // make sure somewhat slow calls are handled<a name="line.535"></a>
+<span class="sourceLineNo">536</span> waitUntilQueueEmpty(scheduler);<a name="line.536"></a>
+<span class="sourceLineNo">537</span> Thread.sleep(100);<a name="line.537"></a>
+<span class="sourceLineNo">538</span> assertEquals("None of these calls should have been discarded", 0,<a name="line.538"></a>
+<span class="sourceLineNo">539</span> scheduler.getNumGeneralCallsDropped());<a name="line.539"></a>
+<span class="sourceLineNo">540</span><a name="line.540"></a>
+<span class="sourceLineNo">541</span> envEdge.offset = 2000;<a name="line.541"></a>
+<span class="sourceLineNo">542</span> // now slow calls and the ones to be dropped<a name="line.542"></a>
+<span class="sourceLineNo">543</span> for (int i = 0; i < 60; i++) {<a name="line.543"></a>
+<span class="sourceLineNo">544</span> long time = System.currentTimeMillis();<a name="line.544"></a>
+<span class="sourceLineNo">545</span> envEdge.timeQ.put(time);<a name="line.545"></a>
+<span class="sourceLineNo">546</span> CallRunner cr = getMockedCallRunner(time, 100);<a name="line.546"></a>
+<span class="sourceLineNo">547</span> scheduler.dispatch(cr);<a name="line.547"></a>
+<span class="sourceLineNo">548</span> }<a name="line.548"></a>
+<span class="sourceLineNo">549</span><a name="line.549"></a>
+<span class="sourceLineNo">550</span> // make sure somewhat slow calls are handled<a name="line.550"></a>
+<span class="sourceLineNo">551</span> waitUntilQueueEmpty(scheduler);<a name="line.551"></a>
+<span class="sourceLineNo">552</span> Thread.sleep(100);<a name="line.552"></a>
+<span class="sourceLineNo">553</span> assertTrue(<a name="line.553"></a>
+<span class="sourceLineNo">554</span> "There should have been at least 12 calls dropped however there were "<a name="line.554"></a>
+<span class="sourceLineNo">555</span> + scheduler.getNumGeneralCallsDropped(),<a name="line.555"></a>
+<span class="sourceLineNo">556</span> scheduler.getNumGeneralCallsDropped() > 12);<a name="line.556"></a>
+<span class="sourceLineNo">557</span> } finally {<a name="line.557"></a>
+<span class="sourceLineNo">558</span> scheduler.stop();<a name="line.558"></a>
+<span class="sourceLineNo">559</span> }<a name="line.559"></a>
+<span class="sourceLineNo">560</span> }<a name="line.560"></a>
+<span class="sourceLineNo">561</span><a name="line.561"></a>
+<span class="sourceLineNo">562</span> // Get mocked call that has the CallRunner sleep for a while so that the fast<a name="line.562"></a>
+<span class="sourceLineNo">563</span> // path isn't hit.<a name="line.563"></a>
+<span class="sourceLineNo">564</span> private CallRunner getMockedCallRunner(long timestamp, final long sleepTime) throws IOException {<a name="line.564"></a>
+<span class="sourceLineNo">565</span> ServerCall putCall = new ServerCall(1, null, null,<a name="line.565"></a>
+<span class="sourceLineNo">566</span> RPCProtos.RequestHeader.newBuilder().setMethodName("mutate").build(),<a name="line.566"></a>
+<span class="sourceLineNo">567</span> RequestConverter.buildMutateRequest(Bytes.toBytes("abc"), new Put(Bytes.toBytes("row"))),<a name="line.567"></a>
+<span class="sourceLineNo">568</span> null, null, 9, null, timestamp, 0, null, null, null) {<a name="line.568"></a>
+<span class="sourceLineNo">569</span><a name="line.569"></a>
+<span class="sourceLineNo">570</span> @Override<a name="line.570"></a>
+<span class="sourceLineNo">571</span> public void sendResponseIfReady() throws IOException {<a name="line.571"></a>
+<span class="sourceLineNo">572</span> }<a name="line.572"></a>
+<span class="sourceLineNo">573</span> };<a name="line.573"></a>
+<span class="sourceLineNo">574</span><a name="line.574"></a>
+<span class="sourceLineNo">575</span> CallRunner cr = new CallRunner(null, putCall) {<a name="line.575"></a>
+<span class="sourceLineNo">576</span> @Override<a name="line.576"></a>
+<span class="sourceLineNo">577</span> public void run() {<a name="line.577"></a>
+<span class="sourceLineNo">578</span> if (sleepTime <= 0) return;<a name="line.578"></a>
+<span class="sourceLineNo">579</span> try {<a name="line.579"></a>
+<span class="sourceLineNo">580</span> LOG.warn("Sleeping for " + sleepTime);<a name="line.580"></a>
+<span class="sourceLineNo">581</span> Thread.sleep(sleepTime);<a name="line.581"></a>
+<span class="sourceLineNo">582</span> LOG.warn("Done Sleeping for " + sleepTime);<a name="line.582"></a>
+<span class="sourceLineNo">583</span> } catch (InterruptedException e) {<a name="line.583"></a>
+<span class="sourceLineNo">584</span> }<a name="line.584"></a>
+<span class="sourceLineNo">585</span> }<a name="line.585"></a>
+<span class="sourceLineNo">586</span><a name="line.586"></a>
+<span class="sourceLineNo">587</span> @Override<a name="line.587"></a>
+<span class="sourceLineNo">588</span> public RpcCall getRpcCall() {<a name="line.588"></a>
+<span class="sourceLineNo">589</span> return putCall;<a name="line.589"></a>
+<span class="sourceLineNo">590</span> }<a name="line.590"></a>
+<span class="sourceLineNo">591</span><a name="line.591"></a>
+<span class="sourceLineNo">592</span> @Override<a name="line.592"></a>
+<span class="sourceLineNo">593</span> public void drop() {<a name="line.593"></a>
+<span class="sourceLineNo">594</span> }<a name="line.594"></a>
+<span class="sourceLineNo">595</span> };<a name="line.595"></a>
+<span class="sourceLineNo">596</span><a name="line.596"></a>
+<span class="sourceLineNo">597</span> return cr;<a name="line.597"></a>
+<span class="sourceLineNo">598</span> }<a name="line.598"></a>
+<span class="sourceLineNo">599</span>}<a name="line.599"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/6bdadd97/testdevapidocs/src-html/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.html
index 79490ae..0110217 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.html
@@ -436,173 +436,175 @@
<span class="sourceLineNo">428</span><a name="line.428"></a>
<span class="sourceLineNo">429</span> schedConf.setInt(HConstants.REGION_SERVER_HANDLER_COUNT, 0);<a name="line.429"></a>
<span class="sourceLineNo">430</span> schedConf.setInt("hbase.ipc.server.max.callqueue.length", 5);<a name="line.430"></a>
-<span class="sourceLineNo">431</span><a name="line.431"></a>
-<span class="sourceLineNo">432</span> PriorityFunction priority = mock(PriorityFunction.class);<a name="line.432"></a>
-<span class="sourceLineNo">433</span> when(priority.getPriority(any(), any(), any())).thenReturn(HConstants.NORMAL_QOS);<a name="line.433"></a>
-<span class="sourceLineNo">434</span> SimpleRpcScheduler scheduler = new SimpleRpcScheduler(schedConf, 0, 0, 0, priority,<a name="line.434"></a>
-<span class="sourceLineNo">435</span> HConstants.QOS_THRESHOLD);<a name="line.435"></a>
-<span class="sourceLineNo">436</span> try {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> scheduler.start();<a name="line.437"></a>
-<span class="sourceLineNo">438</span><a name="line.438"></a>
-<span class="sourceLineNo">439</span> CallRunner putCallTask = mock(CallRunner.class);<a name="line.439"></a>
-<span class="sourceLineNo">440</span> ServerCall putCall = mock(ServerCall.class);<a name="line.440"></a>
-<span class="sourceLineNo">441</span> putCall.param = RequestConverter.buildMutateRequest(<a name="line.441"></a>
-<span class="sourceLineNo">442</span> Bytes.toBytes("abc"), new Put(Bytes.toBytes("row")));<a name="line.442"></a>
-<span class="sourceLineNo">443</span> RequestHeader putHead = RequestHeader.newBuilder().setMethodName("mutate").build();<a name="line.443"></a>
-<span class="sourceLineNo">444</span> when(putCallTask.getRpcCall()).thenReturn(putCall);<a name="line.444"></a>
-<span class="sourceLineNo">445</span> when(putCall.getHeader()).thenReturn(putHead);<a name="line.445"></a>
-<span class="sourceLineNo">446</span><a name="line.446"></a>
-<span class="sourceLineNo">447</span> assertTrue(scheduler.dispatch(putCallTask));<a name="line.447"></a>
+<span class="sourceLineNo">431</span> schedConf.set(RpcExecutor.CALL_QUEUE_TYPE_CONF_KEY,<a name="line.431"></a>
+<span class="sourceLineNo">432</span> RpcExecutor.CALL_QUEUE_TYPE_DEADLINE_CONF_VALUE);<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span> PriorityFunction priority = mock(PriorityFunction.class);<a name="line.434"></a>
+<span class="sourceLineNo">435</span> when(priority.getPriority(any(), any(), any())).thenReturn(HConstants.NORMAL_QOS);<a name="line.435"></a>
+<span class="sourceLineNo">436</span> SimpleRpcScheduler scheduler = new SimpleRpcScheduler(schedConf, 0, 0, 0, priority,<a name="line.436"></a>
+<span class="sourceLineNo">437</span> HConstants.QOS_THRESHOLD);<a name="line.437"></a>
+<span class="sourceLineNo">438</span> try {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> scheduler.start();<a name="line.439"></a>
+<span class="sourceLineNo">440</span><a name="line.440"></a>
+<span class="sourceLineNo">441</span> CallRunner putCallTask = mock(CallRunner.class);<a name="line.441"></a>
+<span class="sourceLineNo">442</span> ServerCall putCall = mock(ServerCall.class);<a name="line.442"></a>
+<span class="sourceLineNo">443</span> putCall.param = RequestConverter.buildMutateRequest(<a name="line.443"></a>
+<span class="sourceLineNo">444</span> Bytes.toBytes("abc"), new Put(Bytes.toBytes("row")));<a name="line.444"></a>
+<span class="sourceLineNo">445</span> RequestHeader putHead = RequestHeader.newBuilder().setMethodName("mutate").build();<a name="line.445"></a>
+<span class="sourceLineNo">446</span> when(putCallTask.getRpcCall()).thenReturn(putCall);<a name="line.446"></a>
+<span class="sourceLineNo">447</span> when(putCall.getHeader()).thenReturn(putHead);<a name="line.447"></a>
<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span> schedConf.setInt("hbase.ipc.server.max.callqueue.length", 0);<a name="line.449"></a>
-<span class="sourceLineNo">450</span> scheduler.onConfigurationChange(schedConf);<a name="line.450"></a>
-<span class="sourceLineNo">451</span> assertFalse(scheduler.dispatch(putCallTask));<a name="line.451"></a>
-<span class="sourceLineNo">452</span> waitUntilQueueEmpty(scheduler);<a name="line.452"></a>
-<span class="sourceLineNo">453</span> schedConf.setInt("hbase.ipc.server.max.callqueue.length", 1);<a name="line.453"></a>
-<span class="sourceLineNo">454</span> scheduler.onConfigurationChange(schedConf);<a name="line.454"></a>
-<span class="sourceLineNo">455</span> assertTrue(scheduler.dispatch(putCallTask));<a name="line.455"></a>
-<span class="sourceLineNo">456</span> } finally {<a name="line.456"></a>
-<span class="sourceLineNo">457</span> scheduler.stop();<a name="line.457"></a>
-<span class="sourceLineNo">458</span> }<a name="line.458"></a>
-<span class="sourceLineNo">459</span> }<a name="line.459"></a>
-<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span> private static final class CoDelEnvironmentEdge implements EnvironmentEdge {<a name="line.461"></a>
+<span class="sourceLineNo">449</span> assertTrue(scheduler.dispatch(putCallTask));<a name="line.449"></a>
+<span class="sourceLineNo">450</span><a name="line.450"></a>
+<span class="sourceLineNo">451</span> schedConf.setInt("hbase.ipc.server.max.callqueue.length", 0);<a name="line.451"></a>
+<span class="sourceLineNo">452</span> scheduler.onConfigurationChange(schedConf);<a name="line.452"></a>
+<span class="sourceLineNo">453</span> assertFalse(scheduler.dispatch(putCallTask));<a name="line.453"></a>
+<span class="sourceLineNo">454</span> waitUntilQueueEmpty(scheduler);<a name="line.454"></a>
+<span class="sourceLineNo">455</span> schedConf.setInt("hbase.ipc.server.max.callqueue.length", 1);<a name="line.455"></a>
+<span class="sourceLineNo">456</span> scheduler.onConfigurationChange(schedConf);<a name="line.456"></a>
+<span class="sourceLineNo">457</span> assertTrue(scheduler.dispatch(putCallTask));<a name="line.457"></a>
+<span class="sourceLineNo">458</span> } finally {<a name="line.458"></a>
+<span class="sourceLineNo">459</span> scheduler.stop();<a name="line.459"></a>
+<span class="sourceLineNo">460</span> }<a name="line.460"></a>
+<span class="sourceLineNo">461</span> }<a name="line.461"></a>
<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span> private final BlockingQueue<Long> timeQ = new LinkedBlockingQueue<>();<a name="line.463"></a>
+<span class="sourceLineNo">463</span> private static final class CoDelEnvironmentEdge implements EnvironmentEdge {<a name="line.463"></a>
<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span> private long offset;<a name="line.465"></a>
+<span class="sourceLineNo">465</span> private final BlockingQueue<Long> timeQ = new LinkedBlockingQueue<>();<a name="line.465"></a>
<span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span> private final Set<String> threadNamePrefixs = new HashSet<>();<a name="line.467"></a>
+<span class="sourceLineNo">467</span> private long offset;<a name="line.467"></a>
<span class="sourceLineNo">468</span><a name="line.468"></a>
-<span class="sourceLineNo">469</span> @Override<a name="line.469"></a>
-<span class="sourceLineNo">470</span> public long currentTime() {<a name="line.470"></a>
-<span class="sourceLineNo">471</span> for (String threadNamePrefix : threadNamePrefixs) {<a name="line.471"></a>
-<span class="sourceLineNo">472</span> String threadName = Thread.currentThread().getName();<a name="line.472"></a>
-<span class="sourceLineNo">473</span> if (threadName.startsWith(threadNamePrefix)) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span> return timeQ.poll().longValue() + offset;<a name="line.474"></a>
-<span class="sourceLineNo">475</span> }<a name="line.475"></a>
-<span class="sourceLineNo">476</span> }<a name="line.476"></a>
-<span class="sourceLineNo">477</span> return System.currentTimeMillis();<a name="line.477"></a>
-<span class="sourceLineNo">478</span> }<a name="line.478"></a>
-<span class="sourceLineNo">479</span> }<a name="line.479"></a>
-<span class="sourceLineNo">480</span><a name="line.480"></a>
-<span class="sourceLineNo">481</span> // FIX. I don't get this test (St.Ack). When I time this test, the minDelay is > 2 * codel delay from the get go.<a name="line.481"></a>
-<span class="sourceLineNo">482</span> // So we are always overloaded. The test below would seem to complete the queuing of all the CallRunners inside<a name="line.482"></a>
-<span class="sourceLineNo">483</span> // the codel check interval. I don't think we are skipping codel checking. Second, I think this test has been<a name="line.483"></a>
-<span class="sourceLineNo">484</span> // broken since HBASE-16089 Add on FastPath for CoDel went in. The thread name we were looking for was the name<a name="line.484"></a>
-<span class="sourceLineNo">485</span> // BEFORE we updated: i.e. "RpcServer.CodelBQ.default.handler". But same patch changed the name of the codel<a name="line.485"></a>
-<span class="sourceLineNo">486</span> // fastpath thread to: new FastPathBalancedQueueRpcExecutor("CodelFPBQ.default", handlerCount, numCallQueues...<a name="line.486"></a>
-<span class="sourceLineNo">487</span> // Codel is hard to test. This test is going to be flakey given it all timer-based. Disabling for now till chat<a name="line.487"></a>
-<span class="sourceLineNo">488</span> // with authors.<a name="line.488"></a>
-<span class="sourceLineNo">489</span> @Test<a name="line.489"></a>
-<span class="sourceLineNo">490</span> public void testCoDelScheduling() throws Exception {<a name="line.490"></a>
-<span class="sourceLineNo">491</span> CoDelEnvironmentEdge envEdge = new CoDelEnvironmentEdge();<a name="line.491"></a>
-<span class="sourceLineNo">492</span> envEdge.threadNamePrefixs.add("RpcServer.default.FPBQ.Codel.handler");<a name="line.492"></a>
-<span class="sourceLineNo">493</span> Configuration schedConf = HBaseConfiguration.create();<a name="line.493"></a>
-<span class="sourceLineNo">494</span> schedConf.setInt(RpcScheduler.IPC_SERVER_MAX_CALLQUEUE_LENGTH, 250);<a name="line.494"></a>
-<span class="sourceLineNo">495</span> schedConf.set(RpcExecutor.CALL_QUEUE_TYPE_CONF_KEY,<a name="line.495"></a>
-<span class="sourceLineNo">496</span> RpcExecutor.CALL_QUEUE_TYPE_CODEL_CONF_VALUE);<a name="line.496"></a>
-<span class="sourceLineNo">497</span> PriorityFunction priority = mock(PriorityFunction.class);<a name="line.497"></a>
-<span class="sourceLineNo">498</span> when(priority.getPriority(any(), any(), any())).thenReturn(HConstants.NORMAL_QOS);<a name="line.498"></a>
-<span class="sourceLineNo">499</span> SimpleRpcScheduler scheduler =<a name="line.499"></a>
-<span class="sourceLineNo">500</span> new SimpleRpcScheduler(schedConf, 1, 1, 1, priority, HConstants.QOS_THRESHOLD);<a name="line.500"></a>
-<span class="sourceLineNo">501</span> try {<a name="line.501"></a>
-<span class="sourceLineNo">502</span> // Loading mocked call runner can take a good amount of time the first time through (haven't looked why).<a name="line.502"></a>
-<span class="sourceLineNo">503</span> // Load it for first time here outside of the timed loop.<a name="line.503"></a>
-<span class="sourceLineNo">504</span> getMockedCallRunner(System.currentTimeMillis(), 2);<a name="line.504"></a>
-<span class="sourceLineNo">505</span> scheduler.start();<a name="line.505"></a>
-<span class="sourceLineNo">506</span> EnvironmentEdgeManager.injectEdge(envEdge);<a name="line.506"></a>
-<span class="sourceLineNo">507</span> envEdge.offset = 5;<a name="line.507"></a>
-<span class="sourceLineNo">508</span> // Calls faster than min delay<a name="line.508"></a>
-<span class="sourceLineNo">509</span> // LOG.info("Start");<a name="line.509"></a>
-<span class="sourceLineNo">510</span> for (int i = 0; i < 100; i++) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span> long time = System.currentTimeMillis();<a name="line.511"></a>
-<span class="sourceLineNo">512</span> envEdge.timeQ.put(time);<a name="line.512"></a>
-<span class="sourceLineNo">513</span> CallRunner cr = getMockedCallRunner(time, 2);<a name="line.513"></a>
-<span class="sourceLineNo">514</span> // LOG.info("" + i + " " + (System.currentTimeMillis() - now) + " cr=" + cr);<a name="line.514"></a>
-<span class="sourceLineNo">515</span> scheduler.dispatch(cr);<a name="line.515"></a>
-<span class="sourceLineNo">516</span> }<a name="line.516"></a>
-<span class="sourceLineNo">517</span> // LOG.info("Loop done");<a name="line.517"></a>
-<span class="sourceLineNo">518</span> // make sure fast calls are handled<a name="line.518"></a>
-<span class="sourceLineNo">519</span> waitUntilQueueEmpty(scheduler);<a name="line.519"></a>
-<span class="sourceLineNo">520</span> Thread.sleep(100);<a name="line.520"></a>
-<span class="sourceLineNo">521</span> assertEquals("None of these calls should have been discarded", 0,<a name="line.521"></a>
-<span class="sourceLineNo">522</span> scheduler.getNumGeneralCallsDropped());<a name="line.522"></a>
-<span class="sourceLineNo">523</span><a name="line.523"></a>
-<span class="sourceLineNo">524</span> envEdge.offset = 151;<a name="line.524"></a>
-<span class="sourceLineNo">525</span> // calls slower than min delay, but not individually slow enough to be dropped<a name="line.525"></a>
-<span class="sourceLineNo">526</span> for (int i = 0; i < 20; i++) {<a name="line.526"></a>
-<span class="sourceLineNo">527</span> long time = System.currentTimeMillis();<a name="line.527"></a>
-<span class="sourceLineNo">528</span> envEdge.timeQ.put(time);<a name="line.528"></a>
-<span class="sourceLineNo">529</span> CallRunner cr = getMockedCallRunner(time, 2);<a name="line.529"></a>
-<span class="sourceLineNo">530</span> scheduler.dispatch(cr);<a name="line.530"></a>
-<span class="sourceLineNo">531</span> }<a name="line.531"></a>
-<span class="sourceLineNo">532</span><a name="line.532"></a>
-<span class="sourceLineNo">533</span> // make sure somewhat slow calls are handled<a name="line.533"></a>
-<span class="sourceLineNo">534</span> waitUntilQueueEmpty(scheduler);<a name="line.534"></a>
-<span class="sourceLineNo">535</span> Thread.sleep(100);<a name="line.535"></a>
-<span class="sourceLineNo">536</span> assertEquals("None of these calls should have been discarded", 0,<a name="line.536"></a>
-<span class="sourceLineNo">537</span> scheduler.getNumGeneralCallsDropped());<a name="line.537"></a>
-<span class="sourceLineNo">538</span><a name="line.538"></a>
-<span class="sourceLineNo">539</span> envEdge.offset = 2000;<a name="line.539"></a>
-<span class="sourceLineNo">540</span> // now slow calls and the ones to be dropped<a name="line.540"></a>
-<span class="sourceLineNo">541</span> for (int i = 0; i < 60; i++) {<a name="line.541"></a>
-<span class="sourceLineNo">542</span> long time = System.currentTimeMillis();<a name="line.542"></a>
-<span class="sourceLineNo">543</span> envEdge.timeQ.put(time);<a name="line.543"></a>
-<span class="sourceLineNo">544</span> CallRunner cr = getMockedCallRunner(time, 100);<a name="line.544"></a>
-<span class="sourceLineNo">545</span> scheduler.dispatch(cr);<a name="line.545"></a>
-<span class="sourceLineNo">546</span> }<a name="line.546"></a>
-<span class="sourceLineNo">547</span><a name="line.547"></a>
-<span class="sourceLineNo">548</span> // make sure somewhat slow calls are handled<a name="line.548"></a>
-<span class="sourceLineNo">549</span> waitUntilQueueEmpty(scheduler);<a name="line.549"></a>
-<span class="sourceLineNo">550</span> Thread.sleep(100);<a name="line.550"></a>
-<span class="sourceLineNo">551</span> assertTrue(<a name="line.551"></a>
-<span class="sourceLineNo">552</span> "There should have been at least 12 calls dropped however there were "<a name="line.552"></a>
-<span class="sourceLineNo">553</span> + scheduler.getNumGeneralCallsDropped(),<a name="line.553"></a>
-<span class="sourceLineNo">554</span> scheduler.getNumGeneralCallsDropped() > 12);<a name="line.554"></a>
-<span class="sourceLineNo">555</span> } finally {<a name="line.555"></a>
-<span class="sourceLineNo">556</span> scheduler.stop();<a name="line.556"></a>
-<span class="sourceLineNo">557</span> }<a name="line.557"></a>
-<span class="sourceLineNo">558</span> }<a name="line.558"></a>
-<span class="sourceLineNo">559</span><a name="line.559"></a>
-<span class="sourceLineNo">560</span> // Get mocked call that has the CallRunner sleep for a while so that the fast<a name="line.560"></a>
-<span class="sourceLineNo">561</span> // path isn't hit.<a name="line.561"></a>
-<span class="sourceLineNo">562</span> private CallRunner getMockedCallRunner(long timestamp, final long sleepTime) throws IOException {<a name="line.562"></a>
-<span class="sourceLineNo">563</span> ServerCall putCall = new ServerCall(1, null, null,<a name="line.563"></a>
-<span class="sourceLineNo">564</span> RPCProtos.RequestHeader.newBuilder().setMethodName("mutate").build(),<a name="line.564"></a>
-<span class="sourceLineNo">565</span> RequestConverter.buildMutateRequest(Bytes.toBytes("abc"), new Put(Bytes.toBytes("row"))),<a name="line.565"></a>
-<span class="sourceLineNo">566</span> null, null, 9, null, timestamp, 0, null, null, null) {<a name="line.566"></a>
-<span class="sourceLineNo">567</span><a name="line.567"></a>
-<span class="sourceLineNo">568</span> @Override<a name="line.568"></a>
-<span class="sourceLineNo">569</span> public void sendResponseIfReady() throws IOException {<a name="line.569"></a>
-<span class="sourceLineNo">570</span> }<a name="line.570"></a>
-<span class="sourceLineNo">571</span> };<a name="line.571"></a>
-<span class="sourceLineNo">572</span><a name="line.572"></a>
-<span class="sourceLineNo">573</span> CallRunner cr = new CallRunner(null, putCall) {<a name="line.573"></a>
-<span class="sourceLineNo">574</span> @Override<a name="line.574"></a>
-<span class="sourceLineNo">575</span> public void run() {<a name="line.575"></a>
-<span class="sourceLineNo">576</span> if (sleepTime <= 0) return;<a name="line.576"></a>
-<span class="sourceLineNo">577</span> try {<a name="line.577"></a>
-<span class="sourceLineNo">578</span> LOG.warn("Sleeping for " + sleepTime);<a name="line.578"></a>
-<span class="sourceLineNo">579</span> Thread.sleep(sleepTime);<a name="line.579"></a>
-<span class="sourceLineNo">580</span> LOG.warn("Done Sleeping for " + sleepTime);<a name="line.580"></a>
-<span class="sourceLineNo">581</span> } catch (InterruptedException e) {<a name="line.581"></a>
-<span class="sourceLineNo">582</span> }<a name="line.582"></a>
-<span class="sourceLineNo">583</span> }<a name="line.583"></a>
-<span class="sourceLineNo">584</span><a name="line.584"></a>
-<span class="sourceLineNo">585</span> @Override<a name="line.585"></a>
-<span class="sourceLineNo">586</span> public RpcCall getRpcCall() {<a name="line.586"></a>
-<span class="sourceLineNo">587</span> return putCall;<a name="line.587"></a>
-<span class="sourceLineNo">588</span> }<a name="line.588"></a>
-<span class="sourceLineNo">589</span><a name="line.589"></a>
-<span class="sourceLineNo">590</span> @Override<a name="line.590"></a>
-<span class="sourceLineNo">591</span> public void drop() {<a name="line.591"></a>
-<span class="sourceLineNo">592</span> }<a name="line.592"></a>
-<span class="sourceLineNo">593</span> };<a name="line.593"></a>
-<span class="sourceLineNo">594</span><a name="line.594"></a>
-<span class="sourceLineNo">595</span> return cr;<a name="line.595"></a>
-<span class="sourceLineNo">596</span> }<a name="line.596"></a>
-<span class="sourceLineNo">597</span>}<a name="line.597"></a>
+<span class="sourceLineNo">469</span> private final Set<String> threadNamePrefixs = new HashSet<>();<a name="line.469"></a>
+<span class="sourceLineNo">470</span><a name="line.470"></a>
+<span class="sourceLineNo">471</span> @Override<a name="line.471"></a>
+<span class="sourceLineNo">472</span> public long currentTime() {<a name="line.472"></a>
+<span class="sourceLineNo">473</span> for (String threadNamePrefix : threadNamePrefixs) {<a name="line.473"></a>
+<span class="sourceLineNo">474</span> String threadName = Thread.currentThread().getName();<a name="line.474"></a>
+<span class="sourceLineNo">475</span> if (threadName.startsWith(threadNamePrefix)) {<a name="line.475"></a>
+<span class="sourceLineNo">476</span> return timeQ.poll().longValue() + offset;<a name="line.476"></a>
+<span class="sourceLineNo">477</span> }<a name="line.477"></a>
+<span class="sourceLineNo">478</span> }<a name="line.478"></a>
+<span class="sourceLineNo">479</span> return System.currentTimeMillis();<a name="line.479"></a>
+<span class="sourceLineNo">480</span> }<a name="line.480"></a>
+<span class="sourceLineNo">481</span> }<a name="line.481"></a>
+<span class="sourceLineNo">482</span><a name="line.482"></a>
+<span class="sourceLineNo">483</span> // FIX. I don't get this test (St.Ack). When I time this test, the minDelay is > 2 * codel delay from the get go.<a name="line.483"></a>
+<span class="sourceLineNo">484</span> // So we are always overloaded. The test below would seem to complete the queuing of all the CallRunners inside<a name="line.484"></a>
+<span class="sourceLineNo">485</span> // the codel check interval. I don't think we are skipping codel checking. Second, I think this test has been<a name="line.485"></a>
+<span class="sourceLineNo">486</span> // broken since HBASE-16089 Add on FastPath for CoDel went in. The thread name we were looking for was the name<a name="line.486"></a>
+<span class="sourceLineNo">487</span> // BEFORE we updated: i.e. "RpcServer.CodelBQ.default.handler". But same patch changed the name of the codel<a name="line.487"></a>
+<span class="sourceLineNo">488</span> // fastpath thread to: new FastPathBalancedQueueRpcExecutor("CodelFPBQ.default", handlerCount, numCallQueues...<a name="line.488"></a>
+<span class="sourceLineNo">489</span> // Codel is hard to test. This test is going to be flakey given it all timer-based. Disabling for now till chat<a name="line.489"></a>
+<span class="sourceLineNo">490</span> // with authors.<a name="line.490"></a>
+<span class="sourceLineNo">491</span> @Test<a name="line.491"></a>
+<span class="sourceLineNo">492</span> public void testCoDelScheduling() throws Exception {<a name="line.492"></a>
+<span class="sourceLineNo">493</span> CoDelEnvironmentEdge envEdge = new CoDelEnvironmentEdge();<a name="line.493"></a>
+<span class="sourceLineNo">494</span> envEdge.threadNamePrefixs.add("RpcServer.default.FPBQ.Codel.handler");<a name="line.494"></a>
+<span class="sourceLineNo">495</span> Configuration schedConf = HBaseConfiguration.create();<a name="line.495"></a>
+<span class="sourceLineNo">496</span> schedConf.setInt(RpcScheduler.IPC_SERVER_MAX_CALLQUEUE_LENGTH, 250);<a name="line.496"></a>
+<span class="sourceLineNo">497</span> schedConf.set(RpcExecutor.CALL_QUEUE_TYPE_CONF_KEY,<a name="line.497"></a>
+<span class="sourceLineNo">498</span> RpcExecutor.CALL_QUEUE_TYPE_CODEL_CONF_VALUE);<a name="line.498"></a>
+<span class="sourceLineNo">499</span> PriorityFunction priority = mock(PriorityFunction.class);<a name="line.499"></a>
+<span class="sourceLineNo">500</span> when(priority.getPriority(any(), any(), any())).thenReturn(HConstants.NORMAL_QOS);<a name="line.500"></a>
+<span class="sourceLineNo">501</span> SimpleRpcScheduler scheduler =<a name="line.501"></a>
+<span class="sourceLineNo">502</span> new SimpleRpcScheduler(schedConf, 1, 1, 1, priority, HConstants.QOS_THRESHOLD);<a name="line.502"></a>
+<span class="sourceLineNo">503</span> try {<a name="line.503"></a>
+<span class="sourceLineNo">504</span> // Loading mocked call runner can take a good amount of time the first time through (haven't looked why).<a name="line.504"></a>
+<span class="sourceLineNo">505</span> // Load it for first time here outside of the timed loop.<a name="line.505"></a>
+<span class="sourceLineNo">506</span> getMockedCallRunner(System.currentTimeMillis(), 2);<a name="line.506"></a>
+<span class="sourceLineNo">507</span> scheduler.start();<a name="line.507"></a>
+<span class="sourceLineNo">508</span> EnvironmentEdgeManager.injectEdge(envEdge);<a name="line.508"></a>
+<span class="sourceLineNo">509</span> envEdge.offset = 5;<a name="line.509"></a>
+<span class="sourceLineNo">510</span> // Calls faster than min delay<a name="line.510"></a>
+<span class="sourceLineNo">511</span> // LOG.info("Start");<a name="line.511"></a>
+<span class="sourceLineNo">512</span> for (int i = 0; i < 100; i++) {<a name="line.512"></a>
+<span class="sourceLineNo">513</span> long time = System.currentTimeMillis();<a name="line.513"></a>
+<span class="sourceLineNo">514</span> envEdge.timeQ.put(time);<a name="line.514"></a>
+<span class="sourceLineNo">515</span> CallRunner cr = getMockedCallRunner(time, 2);<a name="line.515"></a>
+<span class="sourceLineNo">516</span> // LOG.info("" + i + " " + (System.currentTimeMillis() - now) + " cr=" + cr);<a name="line.516"></a>
+<span class="sourceLineNo">517</span> scheduler.dispatch(cr);<a name="line.517"></a>
+<span class="sourceLineNo">518</span> }<a name="line.518"></a>
+<span class="sourceLineNo">519</span> // LOG.info("Loop done");<a name="line.519"></a>
+<span class="sourceLineNo">520</span> // make sure fast calls are handled<a name="line.520"></a>
+<span class="sourceLineNo">521</span> waitUntilQueueEmpty(scheduler);<a name="line.521"></a>
+<span class="sourceLineNo">522</span> Thread.sleep(100);<a name="line.522"></a>
+<span class="sourceLineNo">523</span> assertEquals("None of these calls should have been discarded", 0,<a name="line.523"></a>
+<span class="sourceLineNo">524</span> scheduler.getNumGeneralCallsDropped());<a name="line.524"></a>
+<span class="sourceLineNo">525</span><a name="line.525"></a>
+<span class="sourceLineNo">526</span> envEdge.offset = 151;<a name="line.526"></a>
+<span class="sourceLineNo">527</span> // calls slower than min delay, but not individually slow enough to be dropped<a name="line.527"></a>
+<span class="sourceLineNo">528</span> for (int i = 0; i < 20; i++) {<a name="line.528"></a>
+<span class="sourceLineNo">529</span> long time = System.currentTimeMillis();<a name="line.529"></a>
+<span class="sourceLineNo">530</span> envEdge.timeQ.put(time);<a name="line.530"></a>
+<span class="sourceLineNo">531</span> CallRunner cr = getMockedCallRunner(time, 2);<a name="line.531"></a>
+<span class="sourceLineNo">532</span> scheduler.dispatch(cr);<a name="line.532"></a>
+<span class="sourceLineNo">533</span> }<a name="line.533"></a>
+<span class="sourceLineNo">534</span><a name="line.534"></a>
+<span class="sourceLineNo">535</span> // make sure somewhat slow calls are handled<a name="line.535"></a>
+<span class="sourceLineNo">536</span> waitUntilQueueEmpty(scheduler);<a name="line.536"></a>
+<span class="sourceLineNo">537</span> Thread.sleep(100);<a name="line.537"></a>
+<span class="sourceLineNo">538</span> assertEquals("None of these calls should have been discarded", 0,<a name="line.538"></a>
+<span class="sourceLineNo">539</span> scheduler.getNumGeneralCallsDropped());<a name="line.539"></a>
+<span class="sourceLineNo">540</span><a name="line.540"></a>
+<span class="sourceLineNo">541</span> envEdge.offset = 2000;<a name="line.541"></a>
+<span class="sourceLineNo">542</span> // now slow calls and the ones to be dropped<a name="line.542"></a>
+<span class="sourceLineNo">543</span> for (int i = 0; i < 60; i++) {<a name="line.543"></a>
+<span class="sourceLineNo">544</span> long time = System.currentTimeMillis();<a name="line.544"></a>
+<span class="sourceLineNo">545</span> envEdge.timeQ.put(time);<a name="line.545"></a>
+<span class="sourceLineNo">546</span> CallRunner cr = getMockedCallRunner(time, 100);<a name="line.546"></a>
+<span class="sourceLineNo">547</span> scheduler.dispatch(cr);<a name="line.547"></a>
+<span class="sourceLineNo">548</span> }<a name="line.548"></a>
+<span class="sourceLineNo">549</span><a name="line.549"></a>
+<span class="sourceLineNo">550</span> // make sure somewhat slow calls are handled<a name="line.550"></a>
+<span class="sourceLineNo">551</span> waitUntilQueueEmpty(scheduler);<a name="line.551"></a>
+<span class="sourceLineNo">552</span> Thread.sleep(100);<a name="line.552"></a>
+<span class="sourceLineNo">553</span> assertTrue(<a name="line.553"></a>
+<span class="sourceLineNo">554</span> "There should have been at least 12 calls dropped however there were "<a name="line.554"></a>
+<span class="sourceLineNo">555</span> + scheduler.getNumGeneralCallsDropped(),<a name="line.555"></a>
+<span class="sourceLineNo">556</span> scheduler.getNumGeneralCallsDropped() > 12);<a name="line.556"></a>
+<span class="sourceLineNo">557</span> } finally {<a name="line.557"></a>
+<span class="sourceLineNo">558</span> scheduler.stop();<a name="line.558"></a>
+<span class="sourceLineNo">559</span> }<a name="line.559"></a>
+<span class="sourceLineNo">560</span> }<a name="line.560"></a>
+<span class="sourceLineNo">561</span><a name="line.561"></a>
+<span class="sourceLineNo">562</span> // Get mocked call that has the CallRunner sleep for a while so that the fast<a name="line.562"></a>
+<span class="sourceLineNo">563</span> // path isn't hit.<a name="line.563"></a>
+<span class="sourceLineNo">564</span> private CallRunner getMockedCallRunner(long timestamp, final long sleepTime) throws IOException {<a name="line.564"></a>
+<span class="sourceLineNo">565</span> ServerCall putCall = new ServerCall(1, null, null,<a name="line.565"></a>
+<span class="sourceLineNo">566</span> RPCProtos.RequestHeader.newBuilder().setMethodName("mutate").build(),<a name="line.566"></a>
+<span class="sourceLineNo">567</span> RequestConverter.buildMutateRequest(Bytes.toBytes("abc"), new Put(Bytes.toBytes("row"))),<a name="line.567"></a>
+<span class="sourceLineNo">568</span> null, null, 9, null, timestamp, 0, null, null, null) {<a name="line.568"></a>
+<span class="sourceLineNo">569</span><a name="line.569"></a>
+<span class="sourceLineNo">570</span> @Override<a name="line.570"></a>
+<span class="sourceLineNo">571</span> public void sendResponseIfReady() throws IOException {<a name="line.571"></a>
+<span class="sourceLineNo">572</span> }<a name="line.572"></a>
+<span class="sourceLineNo">573</span> };<a name="line.573"></a>
+<span class="sourceLineNo">574</span><a name="line.574"></a>
+<span class="sourceLineNo">575</span> CallRunner cr = new CallRunner(null, putCall) {<a name="line.575"></a>
+<span class="sourceLineNo">576</span> @Override<a name="line.576"></a>
+<span class="sourceLineNo">577</span> public void run() {<a name="line.577"></a>
+<span class="sourceLineNo">578</span> if (sleepTime <= 0) return;<a name="line.578"></a>
+<span class="sourceLineNo">579</span> try {<a name="line.579"></a>
+<span class="sourceLineNo">580</span> LOG.warn("Sleeping for " + sleepTime);<a name="line.580"></a>
+<span class="sourceLineNo">581</span> Thread.sleep(sleepTime);<a name="line.581"></a>
+<span class="sourceLineNo">582</span> LOG.warn("Done Sleeping for " + sleepTime);<a name="line.582"></a>
+<span class="sourceLineNo">583</span> } catch (InterruptedException e) {<a name="line.583"></a>
+<span class="sourceLineNo">584</span> }<a name="line.584"></a>
+<span class="sourceLineNo">585</span> }<a name="line.585"></a>
+<span class="sourceLineNo">586</span><a name="line.586"></a>
+<span class="sourceLineNo">587</span> @Override<a name="line.587"></a>
+<span class="sourceLineNo">588</span> public RpcCall getRpcCall() {<a name="line.588"></a>
+<span class="sourceLineNo">589</span> return putCall;<a name="line.589"></a>
+<span class="sourceLineNo">590</span> }<a name="line.590"></a>
+<span class="sourceLineNo">591</span><a name="line.591"></a>
+<span class="sourceLineNo">592</span> @Override<a name="line.592"></a>
+<span class="sourceLineNo">593</span> public void drop() {<a name="line.593"></a>
+<span class="sourceLineNo">594</span> }<a name="line.594"></a>
+<span class="sourceLineNo">595</span> };<a name="line.595"></a>
+<span class="sourceLineNo">596</span><a name="line.596"></a>
+<span class="sourceLineNo">597</span> return cr;<a name="line.597"></a>
+<span class="sourceLineNo">598</span> }<a name="line.598"></a>
+<span class="sourceLineNo">599</span>}<a name="line.599"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/6bdadd97/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.html
index 2353fc3..072018d 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.html
@@ -137,8 +137,8 @@
<span class="sourceLineNo">129</span><a name="line.129"></a>
<span class="sourceLineNo">130</span> @Test(timeout = 180000)<a name="line.130"></a>
<span class="sourceLineNo">131</span> public void testSelectiveFlushWhenEnabled() throws IOException {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> // Set up the configuration<a name="line.132"></a>
-<span class="sourceLineNo">133</span> Configuration conf = HBaseConfiguration.create();<a name="line.133"></a>
+<span class="sourceLineNo">132</span> // Set up the configuration, use new one to not conflict with minicluster in other tests<a name="line.132"></a>
+<span class="sourceLineNo">133</span> Configuration conf = new HBaseTestingUtility().getConfiguration();<a name="line.133"></a>
<span class="sourceLineNo">134</span> conf.setLong(HConstants.HREGION_MEMSTORE_FLUSH_SIZE, 200 * 1024);<a name="line.134"></a>
<span class="sourceLineNo">135</span> conf.set(FlushPolicyFactory.HBASE_FLUSH_POLICY_KEY, FlushAllLargeStoresPolicy.class.getName());<a name="line.135"></a>
<span class="sourceLineNo">136</span> conf.setLong(FlushLargeStoresPolicy.HREGION_COLUMNFAMILY_FLUSH_SIZE_LOWER_BOUND_MIN,<a name="line.136"></a>
@@ -279,8 +279,8 @@
<span class="sourceLineNo">271</span><a name="line.271"></a>
<span class="sourceLineNo">272</span> @Test(timeout = 180000)<a name="line.272"></a>
<span class="sourceLineNo">273</span> public void testSelectiveFlushWhenNotEnabled() throws IOException {<a name="line.273"></a>
-<span class="sourceLineNo">274</span> // Set up the configuration<a name="line.274"></a>
-<span class="sourceLineNo">275</span> Configuration conf = HBaseConfiguration.create();<a name="line.275"></a>
+<span class="sourceLineNo">274</span> // Set up the configuration, use new one to not conflict with minicluster in other tests<a name="line.274"></a>
+<span class="sourceLineNo">275</span> Configuration conf = new HBaseTestingUtility().getConfiguration();<a name="line.275"></a>
<span class="sourceLineNo">276</span> conf.setLong(HConstants.HREGION_MEMSTORE_FLUSH_SIZE, 200 * 1024);<a name="line.276"></a>
<span class="sourceLineNo">277</span> conf.set(FlushPolicyFactory.HBASE_FLUSH_POLICY_KEY, FlushAllStoresPolicy.class.getName());<a name="line.277"></a>
<span class="sourceLineNo">278</span><a name="line.278"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/6bdadd97/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestShutdownWhileWALBroken.MyRegionServer.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestShutdownWhileWALBroken.MyRegionServer.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestShutdownWhileWALBroken.MyRegionServer.html
new file mode 100644
index 0000000..18fc446
--- /dev/null
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestShutdownWhileWALBroken.MyRegionServer.html
@@ -0,0 +1,236 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+<title>Source code</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a>
+<span class="sourceLineNo">002</span> * Licensed to the Apache Software Foundation (ASF) under one<a name="line.2"></a>
+<span class="sourceLineNo">003</span> * or more contributor license agreements. See the NOTICE file<a name="line.3"></a>
+<span class="sourceLineNo">004</span> * distributed with this work for additional information<a name="line.4"></a>
+<span class="sourceLineNo">005</span> * regarding copyright ownership. The ASF licenses this file<a name="line.5"></a>
+<span class="sourceLineNo">006</span> * to you under the Apache License, Version 2.0 (the<a name="line.6"></a>
+<span class="sourceLineNo">007</span> * "License"); you may not use this file except in compliance<a name="line.7"></a>
+<span class="sourceLineNo">008</span> * with the License. You may obtain a copy of the License at<a name="line.8"></a>
+<span class="sourceLineNo">009</span> *<a name="line.9"></a>
+<span class="sourceLineNo">010</span> * http://www.apache.org/licenses/LICENSE-2.0<a name="line.10"></a>
+<span class="sourceLineNo">011</span> *<a name="line.11"></a>
+<span class="sourceLineNo">012</span> * Unless required by applicable law or agreed to in writing, software<a name="line.12"></a>
+<span class="sourceLineNo">013</span> * distributed under the License is distributed on an "AS IS" BASIS,<a name="line.13"></a>
+<span class="sourceLineNo">014</span> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.<a name="line.14"></a>
+<span class="sourceLineNo">015</span> * See the License for the specific language governing permissions and<a name="line.15"></a>
+<span class="sourceLineNo">016</span> * limitations under the License.<a name="line.16"></a>
+<span class="sourceLineNo">017</span> */<a name="line.17"></a>
+<span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.regionserver;<a name="line.18"></a>
+<span class="sourceLineNo">019</span><a name="line.19"></a>
+<span class="sourceLineNo">020</span>import static org.junit.Assert.assertTrue;<a name="line.20"></a>
+<span class="sourceLineNo">021</span><a name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.io.IOException;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import java.util.Arrays;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import java.util.List;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.util.concurrent.CountDownLatch;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.conf.Configuration;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.HConstants;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.TableName;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.Waiter.ExplainingPredicate;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.YouAreDeadException;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.client.Table;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.testclassification.RegionServerTests;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.wal.WALFactory;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.zookeeper.KeeperException.SessionExpiredException;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.junit.After;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.junit.Before;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.junit.ClassRule;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.junit.Test;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.junit.experimental.categories.Category;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.junit.runner.RunWith;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.junit.runners.Parameterized;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.junit.runners.Parameterized.Parameter;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.junit.runners.Parameterized.Parameters;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.slf4j.Logger;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.slf4j.LoggerFactory;<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span>/**<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * See HBASE-19929 for more details.<a name="line.53"></a>
+<span class="sourceLineNo">054</span> */<a name="line.54"></a>
+<span class="sourceLineNo">055</span>@RunWith(Parameterized.class)<a name="line.55"></a>
+<span class="sourceLineNo">056</span>@Category({ RegionServerTests.class, MediumTests.class })<a name="line.56"></a>
+<span class="sourceLineNo">057</span>public class TestShutdownWhileWALBroken {<a name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span> @ClassRule<a name="line.59"></a>
+<span class="sourceLineNo">060</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.60"></a>
+<span class="sourceLineNo">061</span> HBaseClassTestRule.forClass(TestShutdownWhileWALBroken.class);<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span> private static final Logger LOG = LoggerFactory.getLogger(TestShutdownWhileWALBroken.class);<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span> private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span> private static TableName TABLE_NAME = TableName.valueOf("TestShutdownWhileWALBroken");<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span> private static byte[] CF = Bytes.toBytes("CF");<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span> @Parameter<a name="line.71"></a>
+<span class="sourceLineNo">072</span> public String walType;<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span> @Parameters(name = "{index}: WAL={0}")<a name="line.74"></a>
+<span class="sourceLineNo">075</span> public static List<Object[]> params() {<a name="line.75"></a>
+<span class="sourceLineNo">076</span> return Arrays.asList(new Object[] { "asyncfs" }, new Object[] { "filesystem" });<a name="line.76"></a>
+<span class="sourceLineNo">077</span> }<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span> public static final class MyRegionServer extends HRegionServer {<a name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span> private final CountDownLatch latch = new CountDownLatch(1);<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span> public MyRegionServer(Configuration conf) throws IOException {<a name="line.83"></a>
+<span class="sourceLineNo">084</span> super(conf);<a name="line.84"></a>
+<span class="sourceLineNo">085</span> }<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span> @Override<a name="line.87"></a>
+<span class="sourceLineNo">088</span> protected void tryRegionServerReport(long reportStartTime, long reportEndTime)<a name="line.88"></a>
+<span class="sourceLineNo">089</span> throws IOException {<a name="line.89"></a>
+<span class="sourceLineNo">090</span> try {<a name="line.90"></a>
+<span class="sourceLineNo">091</span> super.tryRegionServerReport(reportStartTime, reportEndTime);<a name="line.91"></a>
+<span class="sourceLineNo">092</span> } catch (YouAreDeadException e) {<a name="line.92"></a>
+<span class="sourceLineNo">093</span> LOG.info("Caught YouAreDeadException, ignore", e);<a name="line.93"></a>
+<span class="sourceLineNo">094</span> }<a name="line.94"></a>
+<span class="sourceLineNo">095</span> }<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span> @Override<a name="line.97"></a>
+<span class="sourceLineNo">098</span> public void abort(String reason, Throwable cause) {<a name="line.98"></a>
+<span class="sourceLineNo">099</span> if (cause instanceof SessionExpiredException) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> // called from ZKWatcher, let's wait a bit to make sure that we call stop before calling<a name="line.100"></a>
+<span class="sourceLineNo">101</span> // abort.<a name="line.101"></a>
+<span class="sourceLineNo">102</span> try {<a name="line.102"></a>
+<span class="sourceLineNo">103</span> latch.await();<a name="line.103"></a>
+<span class="sourceLineNo">104</span> } catch (InterruptedException e) {<a name="line.104"></a>
+<span class="sourceLineNo">105</span> }<a name="line.105"></a>
+<span class="sourceLineNo">106</span> } else {<a name="line.106"></a>
+<span class="sourceLineNo">107</span> // abort from other classes, usually LogRoller, now we can make progress on abort.<a name="line.107"></a>
+<span class="sourceLineNo">108</span> latch.countDown();<a name="line.108"></a>
+<span class="sourceLineNo">109</span> }<a name="line.109"></a>
+<span class="sourceLineNo">110</span> super.abort(reason, cause);<a name="line.110"></a>
+<span class="sourceLineNo">111</span> }<a name="line.111"></a>
+<span class="sourceLineNo">112</span> }<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span> @Before<a name="line.114"></a>
+<span class="sourceLineNo">115</span> public void setUp() throws Exception {<a name="line.115"></a>
+<span class="sourceLineNo">116</span> UTIL.getConfiguration().setClass(HConstants.REGION_SERVER_IMPL, MyRegionServer.class,<a name="line.116"></a>
+<span class="sourceLineNo">117</span> HRegionServer.class);<a name="line.117"></a>
+<span class="sourceLineNo">118</span> UTIL.getConfiguration().set(WALFactory.WAL_PROVIDER, walType);<a name="line.118"></a>
+<span class="sourceLineNo">119</span> UTIL.getConfiguration().set(WALFactory.META_WAL_PROVIDER, walType);<a name="line.119"></a>
+<span class="sourceLineNo">120</span> UTIL.startMiniCluster(2);<a name="line.120"></a>
+<span class="sourceLineNo">121</span> }<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span> @After<a name="line.123"></a>
+<span class="sourceLineNo">124</span> public void tearDown() throws Exception {<a name="line.124"></a>
+<span class="sourceLineNo">125</span> UTIL.shutdownMiniCluster();<a name="line.125"></a>
+<span class="sourceLineNo">126</span> }<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span> @Test<a name="line.128"></a>
+<span class="sourceLineNo">129</span> public void test() throws Exception {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> UTIL.createMultiRegionTable(TABLE_NAME, CF);<a name="line.130"></a>
+<span class="sourceLineNo">131</span> try (Table table = UTIL.getConnection().getTable(TABLE_NAME)) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span> UTIL.loadTable(table, CF);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> }<a name="line.133"></a>
+<span class="sourceLineNo">134</span> int numRegions = UTIL.getMiniHBaseCluster().getRegions(TABLE_NAME).size();<a name="line.134"></a>
+<span class="sourceLineNo">135</span> RegionServerThread rst0 = UTIL.getMiniHBaseCluster().getRegionServerThreads().get(0);<a name="line.135"></a>
+<span class="sourceLineNo">136</span> RegionServerThread rst1 = UTIL.getMiniHBaseCluster().getRegionServerThreads().get(1);<a name="line.136"></a>
+<span class="sourceLineNo">137</span> HRegionServer liveRS;<a name="line.137"></a>
+<span class="sourceLineNo">138</span> RegionServerThread toKillRSThread;<a name="line.138"></a>
+<span class="sourceLineNo">139</span> if (rst1.getRegionServer().getRegions(TableName.META_TABLE_NAME).isEmpty()) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span> liveRS = rst0.getRegionServer();<a name="line.140"></a>
+<span class="sourceLineNo">141</span> toKillRSThread = rst1;<a name="line.141"></a>
+<span class="sourceLineNo">142</span> } else {<a name="line.142"></a>
+<span class="sourceLineNo">143</span> liveRS = rst1.getRegionServer();<a name="line.143"></a>
+<span class="sourceLineNo">144</span> toKillRSThread = rst0;<a name="line.144"></a>
+<span class="sourceLineNo">145</span> }<a name="line.145"></a>
+<span class="sourceLineNo">146</span> assertTrue(liveRS.getRegions(TABLE_NAME).size() < numRegions);<a name="line.146"></a>
+<span class="sourceLineNo">147</span> UTIL.expireSession(toKillRSThread.getRegionServer().getZooKeeper(), false);<a name="line.147"></a>
+<span class="sourceLineNo">148</span> UTIL.waitFor(30000, new ExplainingPredicate<Exception>() {<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span> @Override<a name="line.150"></a>
+<span class="sourceLineNo">151</span> public boolean evaluate() throws Exception {<a name="line.151"></a>
+<span class="sourceLineNo">152</span> return liveRS.getRegions(TABLE_NAME).size() == numRegions;<a name="line.152"></a>
+<span class="sourceLineNo">153</span> }<a name="line.153"></a>
+<span class="sourceLineNo">154</span><a name="line.154"></a>
+<span class="sourceLineNo">155</span> @Override<a name="line.155"></a>
+<span class="sourceLineNo">156</span> public String explainFailure() throws Exception {<a name="line.156"></a>
+<span class="sourceLineNo">157</span> return "Failover is not finished yet";<a name="line.157"></a>
+<span class="sourceLineNo">158</span> }<a name="line.158"></a>
+<span class="sourceLineNo">159</span> });<a name="line.159"></a>
+<span class="sourceLineNo">160</span> toKillRSThread.getRegionServer().stop("Stop for test");<a name="line.160"></a>
+<span class="sourceLineNo">161</span> // make sure that we can successfully quit<a name="line.161"></a>
+<span class="sourceLineNo">162</span> toKillRSThread.join();<a name="line.162"></a>
+<span class="sourceLineNo">163</span> }<a name="line.163"></a>
+<span class="sourceLineNo">164</span>}<a name="line.164"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>