From 4299bc0d3e6ad1cf70702225b7e41a2acfb7a3ce Mon Sep 17 00:00:00 2001 From: Chen Liang Date: Wed, 18 Sep 2019 16:48:58 -0700 Subject: [PATCH] HDFS-14822. [SBN read] Revisit GlobalStateIdContext locking when getting server state id. Contributed by Chen Liang. --- .../hadoop/hdfs/server/namenode/GlobalStateIdContext.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 a8c7141f05b..0da8995cd4b 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 @@ -147,7 +147,9 @@ public long receiveRequestState(RpcRequestHeaderProto header, @Override public long getLastSeenStateId() { - return namesystem.getFSImage().getCorrectLastAppliedOrWrittenTxId(); + // Should not need to call getCorrectLastAppliedOrWrittenTxId() + // see HDFS-14822. + return namesystem.getFSImage().getLastAppliedOrWrittenTxId(); } @Override