From f091ab4cee9fbde4d25375c44db36890352a110c Mon Sep 17 00:00:00 2001 From: Ali Yousafzai Date: Tue, 30 May 2017 11:24:38 -0700 Subject: [PATCH] HBASE-18054 log when we add/remove failed servers in client --- .../org/apache/hadoop/hbase/ipc/FailedServers.java | 6 +++ .../apache/hadoop/hbase/ipc/TestFailedServers.java | 61 ++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestFailedServers.java diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/FailedServers.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/FailedServers.java index 868cdc681b..327ff9b0bb 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/FailedServers.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/FailedServers.java @@ -21,6 +21,8 @@ import java.net.InetSocketAddress; import java.util.Iterator; import java.util.LinkedList; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; @@ -33,6 +35,7 @@ import org.apache.hadoop.hbase.util.Pair; public class FailedServers { private final LinkedList> failedServers = new LinkedList<>(); private final int recheckServersTimeout; + private static Log LOG = LogFactory.getLog(FailedServers.class); public FailedServers(Configuration conf) { this.recheckServersTimeout = conf.getInt( @@ -45,6 +48,9 @@ public class FailedServers { public synchronized void addToFailedServers(InetSocketAddress address) { final long expiry = EnvironmentEdgeManager.currentTime() + recheckServersTimeout; failedServers.addFirst(new Pair<>(expiry, address.toString())); + if (LOG.isDebugEnabled()) { + LOG.debug("Added failed server with address " + address.toString() + " to list"); + } } /** diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestFailedServers.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestFailedServers.java new file mode 100644 index 0000000000..c3ee123bf1 --- /dev/null +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestFailedServers.java @@ -0,0 +1,61 @@ +package org.apache.hadoop.hbase.ipc; + +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; + +import java.net.InetSocketAddress; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; +import org.apache.log4j.Appender; +import org.apache.log4j.Level; +import org.apache.log4j.LogManager; +import org.apache.log4j.spi.LoggingEvent; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.runners.MockitoJUnitRunner; + +@RunWith(MockitoJUnitRunner.class) +@Category({ ClientTests.class, SmallTests.class }) +public class TestFailedServers { + static final int TEST_PORT = 9999; + + @Mock + private Appender mockAppender; + + @Captor + private ArgumentCaptor captorLoggingEvent; + + @Before + public void setup() { + LogManager.getRootLogger().addAppender(mockAppender); + } + + @After + public void teardown() { + LogManager.getRootLogger().removeAppender(mockAppender); + } + + @Test + public void testAddToFailedServersLogging() { + FailedServers fs = new FailedServers(new Configuration()); + InetSocketAddress addr = new InetSocketAddress(TEST_PORT); + fs.addToFailedServers(addr); + Mockito.verify(mockAppender).doAppend((LoggingEvent) captorLoggingEvent.capture()); + LoggingEvent loggingEvent = (LoggingEvent) captorLoggingEvent.getValue(); + assertThat(loggingEvent.getLevel(), is(Level.DEBUG)); + assertEquals(loggingEvent.getRenderedMessage(), + "Added failed server with address " + addr.toString() + " to list"); + + } + +} -- 2.11.0 (Apple Git-81)