[hadoop] branch trunk updated: HDFS-14456:HAState#prepareToEnterState neednt a lock (#770) Contributed by hunshenshi.

[we...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

weichiu pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
     new a38b9e1  HDFS-14456:HAState#prepareToEnterState neednt a lock (#770) Contributed by hunshenshi.
a38b9e1 is described below

commit a38b9e137e67571d2df83a7a9505b66cffefa7c8
Author: hunshenshi <28...@qq.com>
AuthorDate: Sat Aug 17 05:53:06 2019 +0800

    HDFS-14456:HAState#prepareToEnterState neednt a lock (#770) Contributed by hunshenshi.
---
 .../src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
index c3107d5..1510839 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
@@ -982,9 +982,9 @@ public class NameNode extends ReconfigurableBase implements
     try {
       initializeGenericKeys(conf, nsId, namenodeId);
       initialize(getConf());
+      state.prepareToEnterState(haContext);
       try {
         haContext.writeLock();
-        state.prepareToEnterState(haContext);
         state.enterState(haContext);
       } finally {
         haContext.writeUnlock();


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org