This is an automated email from the ASF dual-hosted git repository.
shv pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new 2b6b547 HDFS-15290. NPE in HttpServer during NameNode startup.
Contributed by Simbarashe Dzinamarira.
2b6b547 is described below
commit 2b6b5476ba8f3a11dc2e41ba508e6f1eed3e890a
Author: Chen Liang <[email protected]>
AuthorDate: Thu Aug 20 15:25:10 2020 -0700
HDFS-15290. NPE in HttpServer during NameNode startup. Contributed by
Simbarashe Dzinamarira.
(cherry picked from commit f734455e5d76c75b7d3a0b751023f5bd02ba38d2)
---
.../hadoop/hdfs/server/namenode/ImageServlet.java | 17 +++++++-
.../hdfs/server/namenode/NameNodeAdapter.java | 12 ++++++
.../server/namenode/ha/TestStandbyCheckpoints.java | 45 ++++++++++++++++++++++
3 files changed, 72 insertions(+), 2 deletions(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ImageServlet.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ImageServlet.java
index b6fc84b..d29f1bd 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ImageServlet.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ImageServlet.java
@@ -111,12 +111,25 @@ public class ImageServlet extends HttpServlet {
recentImageCheckTimePrecision = ratio;
}
+ private FSImage getAndValidateFSImage(ServletContext context,
+ final HttpServletResponse response)
+ throws IOException {
+ final FSImage nnImage = NameNodeHttpServer.getFsImageFromContext(context);
+ if (nnImage == null) {
+ String errorMsg = "NameNode initialization not yet complete. "
+ + "FSImage has not been set in the NameNode.";
+ response.sendError(HttpServletResponse.SC_FORBIDDEN, errorMsg);
+ throw new IOException(errorMsg);
+ }
+ return nnImage;
+ }
+
@Override
public void doGet(final HttpServletRequest request,
final HttpServletResponse response) throws ServletException, IOException
{
try {
final ServletContext context = getServletContext();
- final FSImage nnImage =
NameNodeHttpServer.getFsImageFromContext(context);
+ final FSImage nnImage = getAndValidateFSImage(context, response);
final GetImageParams parsedParams = new GetImageParams(request,
response);
final Configuration conf = (Configuration) context
.getAttribute(JspHelper.CURRENT_CONF);
@@ -498,7 +511,7 @@ public class ImageServlet extends HttpServlet {
final HttpServletResponse response) throws ServletException, IOException
{
try {
ServletContext context = getServletContext();
- final FSImage nnImage =
NameNodeHttpServer.getFsImageFromContext(context);
+ final FSImage nnImage = getAndValidateFSImage(context, response);
final Configuration conf = (Configuration) getServletContext()
.getAttribute(JspHelper.CURRENT_CONF);
final PutImageParams parsedParams = new PutImageParams(request, response,
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NameNodeAdapter.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NameNodeAdapter.java
index ec4166b..4b205fd 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NameNodeAdapter.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NameNodeAdapter.java
@@ -55,6 +55,7 @@ import org.apache.hadoop.ipc.StandbyException;
import org.apache.hadoop.security.AccessControlException;
import org.mockito.Mockito;
import org.mockito.internal.util.reflection.Whitebox;
+import static
org.apache.hadoop.hdfs.server.namenode.NameNodeHttpServer.FSIMAGE_ATTRIBUTE_KEY;
/**
* This is a utility class to expose NameNode functionality for unit tests.
@@ -116,6 +117,17 @@ public class NameNodeAdapter {
return ((NameNodeRpcServer)namenode.getRpcServer()).clientRpcServer;
}
+ /**
+ * Sets the FSImage used in the NameNodeHttpServer and returns the old value.
+ */
+ public static FSImage getAndSetFSImageInHttpServer(NameNode namenode,
+ FSImage fsImage) {
+ FSImage previous = (FSImage) namenode.httpServer.getHttpServer()
+ .getAttribute(FSIMAGE_ATTRIBUTE_KEY);
+ namenode.httpServer.setFSImage(fsImage);
+ return previous;
+ }
+
public static DelegationTokenSecretManager getDtSecretManager(
final FSNamesystem ns) {
return ns.getDelegationTokenSecretManager();
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyCheckpoints.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyCheckpoints.java
index da130c7..95b16a6 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyCheckpoints.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyCheckpoints.java
@@ -31,6 +31,7 @@ import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hdfs.DFSConfigKeys;
import org.apache.hadoop.hdfs.DFSTestUtil;
+import org.apache.hadoop.hdfs.LogVerificationAppender;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.hdfs.MiniDFSNNTopology;
import org.apache.hadoop.hdfs.server.common.Util;
@@ -45,6 +46,7 @@ import org.apache.hadoop.test.GenericTestUtils;
import org.apache.hadoop.test.GenericTestUtils.DelayAnswer;
import org.apache.hadoop.test.PathUtils;
import org.apache.hadoop.util.ThreadUtil;
+import org.apache.log4j.spi.LoggingEvent;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -289,6 +291,49 @@ public class TestStandbyCheckpoints {
}
/**
+ * Tests that a null FSImage is handled gracefully by the ImageServlet.
+ * If putImage is called while a NameNode is still starting up, the FSImage
+ * may not have been initialized yet. See HDFS-15290.
+ */
+ @Test(timeout = 30000)
+ public void testCheckpointBeforeNameNodeInitializationIsComplete()
+ throws Exception {
+ final LogVerificationAppender appender = new LogVerificationAppender();
+ final org.apache.log4j.Logger logger = org.apache.log4j.Logger
+ .getRootLogger();
+ logger.addAppender(appender);
+
+ // Transition 2 to observer
+ cluster.transitionToObserver(2);
+ doEdits(0, 10);
+ // After a rollEditLog, Standby(nn1)'s next checkpoint would be
+ // ahead of observer(nn2).
+ nns[0].getRpcServer().rollEditLog();
+
+ NameNode nn2 = nns[2];
+ FSImage nnFSImage = NameNodeAdapter.getAndSetFSImageInHttpServer(nn2,
null);
+
+ // After standby creating a checkpoint, it will try to push the image to
+ // active and all observer, updating it's own txid to the most recent.
+ HATestUtil.waitForCheckpoint(cluster, 1, ImmutableList.of(12));
+ HATestUtil.waitForCheckpoint(cluster, 0, ImmutableList.of(12));
+
+ NameNodeAdapter.getAndSetFSImageInHttpServer(nn2, nnFSImage);
+ cluster.transitionToStandby(2);
+ logger.removeAppender(appender);
+
+ for (LoggingEvent event : appender.getLog()) {
+ String message = event.getRenderedMessage();
+ if (message.contains("PutImage failed") &&
+ message.contains("FSImage has not been set in the NameNode.")) {
+ //Logs have the expected exception.
+ return;
+ }
+ }
+ fail("Expected exception not present in logs.");
+ }
+
+ /**
* Test for the case when the SBN is configured to checkpoint based
* on a time period, but no transactions are happening on the
* active. Thus, it would want to save a second checkpoint at the
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
