From 2e9b8df963eae74e390c090be82142a7bacd3f51 Mon Sep 17 00:00:00 2001 From: Eli Collins Date: Thu, 23 Feb 2012 07:58:33 +0000 Subject: [PATCH] HDFS-2993. HA: BackupNode#checkOperation should permit CHECKPOINT operations. Contributed by Eli Collins git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1292688 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt | 2 ++ .../org/apache/hadoop/hdfs/server/namenode/BackupNode.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt index baa7cec6e7..fbdf1ecf36 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt @@ -228,3 +228,5 @@ HDFS-2972. Small optimization building incremental block report (todd) HDFS-2973. Re-enable NO_ACK optimization for block deletion. (todd) HDFS-2922. HA: close out operation categories (eli) + +HDFS-2993. HA: BackupNode#checkOperation should permit CHECKPOINT operations (eli) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/BackupNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/BackupNode.java index 5e7de78d77..9ffd208576 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/BackupNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/BackupNode.java @@ -407,7 +407,8 @@ private class BNHAContext extends NameNodeHAContext { @Override // NameNode public void checkOperation(OperationCategory op) throws StandbyException { - if (op == OperationCategory.UNCHECKED) { + if (op == OperationCategory.UNCHECKED || + op == OperationCategory.CHECKPOINT) { return; } if (OperationCategory.JOURNAL != op &&