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 we...@apache.org on 2020/03/02 23:43:32 UTC
[hadoop] branch branch-2.10 updated (6cbde86 -> 024c333)
This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a change to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/hadoop.git.
from 6cbde86 HADOOP-16891. Upgrade jackson-databind to 2.9.10.3 (#1865)
new cb6b6b43 HDFS-15111. stopStandbyServices() should log which service state it is transitioning from. Contributed by Xieming Li.
new 024c333 Revert "HDFS-15111. stopStandbyServices() should log which service state it is transitioning from. Contributed by Xieming Li."
The 2 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:
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 01/02: HDFS-15111. stopStandbyServices() should log which
service state it is transitioning from. Contributed by Xieming Li.
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit cb6b6b43200f0c339c7f0878dfa2b9c54bac64e7
Author: Ayush Saxena <ay...@apache.org>
AuthorDate: Thu Feb 27 04:02:26 2020 +0530
HDFS-15111. stopStandbyServices() should log which service state it is transitioning from. Contributed by Xieming Li.
(cherry picked from commit b182dd809cf42aed66806901631ad6062ca0820c)
(cherry picked from commit 7bfa123d583d94607600e38bd754e38fbafc64d2)
---
.../java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.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/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index 11ac3fc..0538d38 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -95,6 +95,7 @@ import java.util.concurrent.atomic.AtomicLong;
import static org.apache.hadoop.hdfs.server.namenode.FSDirStatAndListingOp.*;
import static org.apache.hadoop.ha.HAServiceProtocol.HAServiceState.ACTIVE;
+import static org.apache.hadoop.ha.HAServiceProtocol.HAServiceState.STANDBY;
import static org.apache.hadoop.ha.HAServiceProtocol.HAServiceState.OBSERVER;
import org.apache.hadoop.hdfs.protocol.OpenFileEntry;
import org.apache.hadoop.hdfs.server.protocol.SlowDiskReports;
@@ -1391,7 +1392,8 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
/** Stop services required in standby state */
void stopStandbyServices() throws IOException {
- LOG.info("Stopping services started for standby state");
+ HAServiceState curState = getState() == OBSERVER? OBSERVER : STANDBY;
+ LOG.info("Stopping services started for {} state", curState);
if (standbyCheckpointer != null) {
standbyCheckpointer.stop();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 02/02: Revert "HDFS-15111. stopStandbyServices() should
log which service state it is transitioning from. Contributed by Xieming
Li."
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 024c33384b18efdb4331436614d6609008c37c24
Author: Wei-Chiu Chuang <we...@cloudera.com>
AuthorDate: Mon Mar 2 15:43:13 2020 -0800
Revert "HDFS-15111. stopStandbyServices() should log which service state it is transitioning from. Contributed by Xieming Li."
This reverts commit cb6b6b43200f0c339c7f0878dfa2b9c54bac64e7.
---
.../java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index 0538d38..11ac3fc 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -95,7 +95,6 @@ import java.util.concurrent.atomic.AtomicLong;
import static org.apache.hadoop.hdfs.server.namenode.FSDirStatAndListingOp.*;
import static org.apache.hadoop.ha.HAServiceProtocol.HAServiceState.ACTIVE;
-import static org.apache.hadoop.ha.HAServiceProtocol.HAServiceState.STANDBY;
import static org.apache.hadoop.ha.HAServiceProtocol.HAServiceState.OBSERVER;
import org.apache.hadoop.hdfs.protocol.OpenFileEntry;
import org.apache.hadoop.hdfs.server.protocol.SlowDiskReports;
@@ -1392,8 +1391,7 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
/** Stop services required in standby state */
void stopStandbyServices() throws IOException {
- HAServiceState curState = getState() == OBSERVER? OBSERVER : STANDBY;
- LOG.info("Stopping services started for {} state", curState);
+ LOG.info("Stopping services started for standby state");
if (standbyCheckpointer != null) {
standbyCheckpointer.stop();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org