From 913ba7451280c71fc64b15d901dcdc527b53bf52 Mon Sep 17 00:00:00 2001 From: Todd Lipcon Date: Thu, 7 Jun 2012 21:30:54 +0000 Subject: [PATCH] Move HDFS-3042 changes into main CHANGES.txt files for branch-2 git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347805 13f79535-47bb-0310-9956-ffa450edef68 --- .../hadoop-common/CHANGES.HDFS-3042.txt | 29 --------------- .../hadoop-common/CHANGES.txt | 35 +++++++++++++++++++ .../hadoop-hdfs/CHANGES.HDFS-3042.txt | 19 ---------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 19 ++++++++++ 4 files changed, 54 insertions(+), 48 deletions(-) delete mode 100644 hadoop-common-project/hadoop-common/CHANGES.HDFS-3042.txt delete mode 100644 hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-3042.txt diff --git a/hadoop-common-project/hadoop-common/CHANGES.HDFS-3042.txt b/hadoop-common-project/hadoop-common/CHANGES.HDFS-3042.txt deleted file mode 100644 index 8bf3d88c9ac..00000000000 --- a/hadoop-common-project/hadoop-common/CHANGES.HDFS-3042.txt +++ /dev/null @@ -1,29 +0,0 @@ -Changes for HDFS-3042 branch. - -This change list will be merged into the trunk CHANGES.txt when the HDFS-3-42 -branch is merged. ------------------------------- - -HADOOP-8220. ZKFailoverController doesn't handle failure to become active correctly (todd) - -HADOOP-8228. Auto HA: Refactor tests and add stress tests. (todd) - -HADOOP-8215. Security support for ZK Failover controller (todd) - -HADOOP-8245. Fix flakiness in TestZKFailoverController (todd) - -HADOOP-8257. TestZKFailoverControllerStress occasionally fails with Mockito error (todd) - -HADOOP-8260. Replace ClientBaseWithFixes with our own modified copy of the class (todd) - -HADOOP-8246. Auto-HA: automatically scope znode by nameservice ID (todd) - -HADOOP-8247. Add a config to enable auto-HA, which disables manual FailoverController (todd) - -HADOOP-8306. ZKFC: improve error message when ZK is not running. (todd) - -HADOOP-8279. Allow manual failover to be invoked when auto-failover is enabled. (todd) - -HADOOP-8276. Auto-HA: add config for java options to pass to zkfc daemon (todd via eli) - -HADOOP-8405. ZKFC tests leak ZK instances. (todd) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 09d84994c0f..ad2d00f3663 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -9,6 +9,9 @@ Release 2.0.1-alpha - UNRELEASED NEW FEATURES + HDFS-3042. Automatic failover support for NameNode HA (todd) + (see dedicated section below for breakdown of subtasks) + IMPROVEMENTS HADOOP-8340. SNAPSHOT build versions should compare as less than their eventual @@ -69,6 +72,38 @@ Release 2.0.1-alpha - UNRELEASED HADOOP-8485. Don't hardcode "Apache Hadoop 0.23" in the docs. (eli) + BREAKDOWN OF HDFS-3042 SUBTASKS + + HADOOP-8220. ZKFailoverController doesn't handle failure to become active + correctly (todd) + + HADOOP-8228. Auto HA: Refactor tests and add stress tests. (todd) + + HADOOP-8215. Security support for ZK Failover controller (todd) + + HADOOP-8245. Fix flakiness in TestZKFailoverController (todd) + + HADOOP-8257. TestZKFailoverControllerStress occasionally fails with Mockito + error (todd) + + HADOOP-8260. Replace ClientBaseWithFixes with our own modified copy of the + class (todd) + + HADOOP-8246. Auto-HA: automatically scope znode by nameservice ID (todd) + + HADOOP-8247. Add a config to enable auto-HA, which disables manual + FailoverController (todd) + + HADOOP-8306. ZKFC: improve error message when ZK is not running. (todd) + + HADOOP-8279. Allow manual failover to be invoked when auto-failover is + enabled. (todd) + + HADOOP-8276. Auto-HA: add config for java options to pass to zkfc daemon + (todd via eli) + + HADOOP-8405. ZKFC tests leak ZK instances. (todd) + Release 2.0.0-alpha - 05-23-2012 INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-3042.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-3042.txt deleted file mode 100644 index 394064f36e5..00000000000 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-3042.txt +++ /dev/null @@ -1,19 +0,0 @@ -Changes for HDFS-3042 branch. - -This change list will be merged into the trunk CHANGES.txt when the HDFS-3042 -branch is merged. ------------------------------- - -HDFS-2185. HDFS portion of ZK-based FailoverController (todd) - -HDFS-3200. Scope all ZKFC configurations by nameservice (todd) - -HDFS-3223. add zkfc to hadoop-daemon.sh script (todd) - -HDFS-3261. TestHASafeMode fails on HDFS-3042 branch (todd) - -HDFS-3159. Document NN auto-failover setup and configuration (todd) - -HDFS-3412. Fix findbugs warnings in auto-HA branch (todd) - -HDFS-3432. TestDFSZKFailoverController tries to fail over too early (todd) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 427cbe35b1b..9c7b683f010 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -8,6 +8,9 @@ Release 2.0.1-alpha - UNRELEASED HDFS-744. Support hsync in HDFS. (Lars Hofhansl via szetszwo) + HDFS-3042. Automatic failover support for NameNode HA (todd) + (see dedicated section below for breakdown of subtasks) + IMPROVEMENTS HDFS-3390. DFSAdmin should print full stack traces of errors when DEBUG @@ -162,6 +165,22 @@ Release 2.0.1-alpha - UNRELEASED HDFS-3485. DataTransferThrottler will over-throttle when currentTimeMillis jumps (Andy Isaacson via todd) + BREAKDOWN OF HDFS-3042 SUBTASKS + + HDFS-2185. HDFS portion of ZK-based FailoverController (todd) + + HDFS-3200. Scope all ZKFC configurations by nameservice (todd) + + HDFS-3223. add zkfc to hadoop-daemon.sh script (todd) + + HDFS-3261. TestHASafeMode fails on HDFS-3042 branch (todd) + + HDFS-3159. Document NN auto-failover setup and configuration (todd) + + HDFS-3412. Fix findbugs warnings in auto-HA branch (todd) + + HDFS-3432. TestDFSZKFailoverController tries to fail over too early (todd) + Release 2.0.0-alpha - 05-23-2012 INCOMPATIBLE CHANGES