From 0b3af2a66b3e357e7eade8d0580e232f420116a4 Mon Sep 17 00:00:00 2001 From: Todd Lipcon Date: Thu, 7 Jun 2012 21:35:30 +0000 Subject: [PATCH] Move HDFS-3042 (automatic failover) to branch-2 section of CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1347809 13f79535-47bb-0310-9956-ffa450edef68 --- .../hadoop-common/CHANGES.txt | 70 +++++++++---------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 38 +++++----- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 477e336c1e4..b6a3631ee35 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -12,9 +12,6 @@ Trunk (unreleased changes) HADOOP-8135. Add ByteBufferReadable interface to FSDataInputStream. (Henry Robinson via atm) - HDFS-3042. Automatic failover support for NameNode HA (todd) - (see dedicated section below for breakdown of subtasks) - IMPROVEMENTS HADOOP-8017. Configure hadoop-main pom to get rid of M2E plugin execution @@ -165,38 +162,6 @@ Trunk (unreleased changes) HADOOP-7761. Improve the performance of raw comparisons. (todd) - 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) - Branch-2 ( Unreleased changes ) INCOMPATIBLE CHANGES @@ -206,6 +171,9 @@ Branch-2 ( Unreleased changes ) 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 @@ -269,6 +237,38 @@ Branch-2 ( Unreleased changes ) 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.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 2fad18ecc7f..504faffdf7e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -15,9 +15,6 @@ Trunk (unreleased changes) HDFS-744. Support hsync in HDFS. (Lars Hofhansl via szetszwo) - HDFS-3042. Automatic failover support for NameNode HA (todd) - (see dedicated section below for subtask breakdown) - IMPROVEMENTS HDFS-1620. Rename HdfsConstants -> HdfsServerConstants, FSConstants -> @@ -162,28 +159,15 @@ Trunk (unreleased changes) HDFS-3462. TestDFSClientRetries.busyTest() should restore default xceiver count in the config. (Madhukara Phatak via harsh) - 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) - Branch-2 ( Unreleased changes ) INCOMPATIBLE CHANGES NEW FEATURES + 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 @@ -313,6 +297,22 @@ Branch-2 ( Unreleased changes ) 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