You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sh...@apache.org on 2019/10/03 23:49:59 UTC
[hadoop] branch branch-2 updated (72b37e8 -> 56e2ad2)
This is an automated email from the ASF dual-hosted git repository.
shv pushed a change to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hadoop.git.
from 72b37e8 HDFS-12979. StandbyNode should upload FsImage to ObserverNode after checkpointing. Contributed by Chen Liang.
new c87b1f6 HDFS-14494. Move Server logging of StatedId inside receiveRequestState(). Contributed by Shweta Yakkali.
new a3b9b95 HDFS-14660. [SBN Read] ObserverNameNode should throw StandbyException for requests not from ObserverProxyProvider. Contributed by Chao Sun.
new 56e2ad2 HDFS-14262. [SBN read] Make Log.WARN message in GlobalStateIdContext more informative. Contributed by Shweta Yakkali.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../hdfs/server/namenode/GlobalStateIdContext.java | 30 +++++++++++++++---
.../namenode/ha/TestConsistentReadsObserver.java | 37 ++++++++++++++++++++++
2 files changed, 62 insertions(+), 5 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 01/03: HDFS-14494. Move Server logging of StatedId inside
receiveRequestState(). Contributed by Shweta Yakkali.
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shv pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit c87b1f6f5bc345c163874de13324c198ad1b7a1b
Author: Shweta Yakkali <sh...@cloudera.com>
AuthorDate: Mon Jun 10 10:22:16 2019 -0700
HDFS-14494. Move Server logging of StatedId inside receiveRequestState(). Contributed by Shweta Yakkali.
Signed-off-by: Wei-Chiu Chuang <we...@apache.org>
---
.../apache/hadoop/hdfs/server/namenode/GlobalStateIdContext.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/GlobalStateIdContext.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/GlobalStateIdContext.java
index 2ac6381..0e6ac29 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/GlobalStateIdContext.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/GlobalStateIdContext.java
@@ -126,9 +126,11 @@ class GlobalStateIdContext implements AlignmentContext {
@Override
public long receiveRequestState(RpcRequestHeaderProto header,
long clientWaitTime) throws RetriableException {
- long serverStateId =
- namesystem.getFSImage().getCorrectLastAppliedOrWrittenTxId();
+ long serverStateId = getLastSeenStateId();
long clientStateId = header.getStateId();
+ FSNamesystem.LOG.trace("Client State ID= {} and Server State ID= {}",
+ clientStateId, serverStateId);
+
if (clientStateId > serverStateId &&
HAServiceState.ACTIVE.equals(namesystem.getState())) {
FSNamesystem.LOG.warn("A client sent stateId: " + clientStateId +
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 02/03: HDFS-14660. [SBN Read] ObserverNameNode should
throw StandbyException for requests not from ObserverProxyProvider.
Contributed by Chao Sun.
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shv pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit a3b9b955be94a08695f82e7c3347d3a0c744889c
Author: Ayush Saxena <ay...@apache.org>
AuthorDate: Sun Jul 28 08:41:42 2019 +0530
HDFS-14660. [SBN Read] ObserverNameNode should throw StandbyException for requests not from ObserverProxyProvider. Contributed by Chao Sun.
---
.../hdfs/server/namenode/GlobalStateIdContext.java | 22 +++++++++++--
.../namenode/ha/TestConsistentReadsObserver.java | 37 ++++++++++++++++++++++
2 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/GlobalStateIdContext.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/GlobalStateIdContext.java
index 0e6ac29..b410a8e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/GlobalStateIdContext.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/GlobalStateIdContext.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.hdfs.server.namenode;
import java.lang.annotation.Annotation;
+import java.io.IOException;
import java.lang.reflect.Method;
import java.util.HashSet;
import java.util.concurrent.TimeUnit;
@@ -27,9 +28,11 @@ import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.ha.HAServiceProtocol.HAServiceState;
import org.apache.hadoop.hdfs.protocol.ClientProtocol;
+import org.apache.hadoop.hdfs.server.namenode.ha.ObserverReadProxyProvider;
import org.apache.hadoop.hdfs.server.namenode.ha.ReadOnly;
import org.apache.hadoop.ipc.AlignmentContext;
import org.apache.hadoop.ipc.RetriableException;
+import org.apache.hadoop.ipc.StandbyException;
import org.apache.hadoop.ipc.protobuf.RpcHeaderProtos.RpcRequestHeaderProto;
import org.apache.hadoop.ipc.protobuf.RpcHeaderProtos.RpcResponseHeaderProto;
@@ -125,11 +128,24 @@ class GlobalStateIdContext implements AlignmentContext {
*/
@Override
public long receiveRequestState(RpcRequestHeaderProto header,
- long clientWaitTime) throws RetriableException {
+ long clientWaitTime) throws IOException {
+ if (!header.hasStateId() &&
+ HAServiceState.OBSERVER.equals(namesystem.getState())) {
+ // This could happen if client configured with non-observer proxy provider
+ // (e.g., ConfiguredFailoverProxyProvider) is accessing a cluster with
+ // observers. In this case, we should let the client failover to the
+ // active node, rather than potentially serving stale result (client
+ // stateId is 0 if not set).
+ throw new StandbyException("Observer Node received request without "
+ + "stateId. This mostly likely is because client is not configured "
+ + "with " + ObserverReadProxyProvider.class.getSimpleName());
+ }
long serverStateId = getLastSeenStateId();
long clientStateId = header.getStateId();
- FSNamesystem.LOG.trace("Client State ID= {} and Server State ID= {}",
- clientStateId, serverStateId);
+ if (FSNamesystem.LOG.isTraceEnabled()) {
+ FSNamesystem.LOG.trace("Client State ID= " + clientStateId +
+ " and Server State ID= " + serverStateId);
+ }
if (clientStateId > serverStateId &&
HAServiceState.ACTIVE.equals(namesystem.getState())) {
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestConsistentReadsObserver.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestConsistentReadsObserver.java
index 1485dda..780f807 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestConsistentReadsObserver.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestConsistentReadsObserver.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.fail;
import com.google.common.base.Supplier;
import java.io.IOException;
+import java.util.Collections;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
@@ -35,13 +36,16 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.hdfs.DistributedFileSystem;
import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.client.HdfsClientConfigKeys;
import org.apache.hadoop.hdfs.protocol.HdfsConstants;
import org.apache.hadoop.hdfs.qjournal.MiniQJMHACluster;
import org.apache.hadoop.hdfs.server.namenode.NameNode;
import org.apache.hadoop.hdfs.server.namenode.NameNodeAdapter;
import org.apache.hadoop.ipc.ProcessingDetails;
+import org.apache.hadoop.ipc.RemoteException;
import org.apache.hadoop.ipc.RpcScheduler;
import org.apache.hadoop.ipc.Schedulable;
+import org.apache.hadoop.ipc.StandbyException;
import org.apache.hadoop.test.GenericTestUtils;
import org.apache.hadoop.util.Time;
import org.junit.After;
@@ -376,6 +380,39 @@ public class TestConsistentReadsObserver {
reader.interrupt();
}
+ @Test
+ public void testRequestFromNonObserverProxyProvider() throws Exception {
+ // Create another HDFS client using ConfiguredFailoverProvider
+ Configuration conf2 = new Configuration(conf);
+
+ // Populate the above configuration with only a single observer in the
+ // namenode list. Also reduce retries to make test finish faster.
+ HATestUtil.setFailoverConfigurations(
+ conf2,
+ HATestUtil.getLogicalHostname(dfsCluster),
+ Collections.singletonList(
+ dfsCluster.getNameNode(2).getNameNodeAddress()),
+ ConfiguredFailoverProxyProvider.class);
+ conf2.setBoolean("fs.hdfs.impl.disable.cache", true);
+ conf2.setInt(HdfsClientConfigKeys.Retry.MAX_ATTEMPTS_KEY, 1);
+ conf2.setInt(HdfsClientConfigKeys.Failover.MAX_ATTEMPTS_KEY, 1);
+ FileSystem dfs2 = FileSystem.get(conf2);
+
+ dfs.mkdir(testPath, FsPermission.getDefault());
+ dfsCluster.rollEditLogAndTail(0);
+
+ try {
+ // Request should be rejected by observer and throw StandbyException
+ dfs2.listStatus(testPath);
+ fail("listStatus should have thrown exception");
+ } catch (RemoteException re) {
+ IOException e = re.unwrapRemoteException();
+ assertTrue("should have thrown StandbyException but got "
+ + e.getClass().getSimpleName(),
+ e instanceof StandbyException);
+ }
+ }
+
private void assertSentTo(int nnIdx) throws IOException {
assertTrue("Request was not sent to the expected namenode " + nnIdx,
HATestUtil.isSentToAnyOfNameNodes(dfs, dfsCluster, nnIdx));
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 03/03: HDFS-14262. [SBN read] Make Log.WARN message in
GlobalStateIdContext more informative. Contributed by Shweta Yakkali.
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shv pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 56e2ad2dcee8013dd11860f8ab35ba3b303b55fa
Author: Shweta Yakkali <sh...@cloudera.com>
AuthorDate: Thu Feb 14 00:22:13 2019 -0800
HDFS-14262. [SBN read] Make Log.WARN message in GlobalStateIdContext more informative. Contributed by Shweta Yakkali.
---
.../apache/hadoop/hdfs/server/namenode/GlobalStateIdContext.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/GlobalStateIdContext.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/GlobalStateIdContext.java
index b410a8e..2e38d52 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/GlobalStateIdContext.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/GlobalStateIdContext.java
@@ -149,8 +149,10 @@ class GlobalStateIdContext implements AlignmentContext {
if (clientStateId > serverStateId &&
HAServiceState.ACTIVE.equals(namesystem.getState())) {
- FSNamesystem.LOG.warn("A client sent stateId: " + clientStateId +
- ", but server state is: " + serverStateId);
+ FSNamesystem.LOG.warn("The client stateId: "
+ + clientStateId + " is greater than the server stateId: "
+ + serverStateId + " This is unexpected. "
+ + "Resetting client stateId to server stateId");
return serverStateId;
}
if (HAServiceState.OBSERVER.equals(namesystem.getState()) &&
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org