[22/50] hadoop git commit: HDFS-8808. dfs.image.transfer.bandwidthPerSec should not apply to -bootstrapStandby. Contributed by Zhe Zhang.

2015-10-27 Thread jing9 
HDFS-8808. dfs.image.transfer.bandwidthPerSec should not apply to 
-bootstrapStandby. Contributed by Zhe Zhang.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ab3c4cff
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ab3c4cff
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ab3c4cff

Branch: refs/heads/HDFS-8966
Commit: ab3c4cff4af338caaa23be0ec383fc1fe473714f
Parents: d3a34a4
Author: Zhe Zhang 
Authored: Fri Oct 23 13:58:26 2015 -0700
Committer: Zhe Zhang 
Committed: Fri Oct 23 14:01:49 2015 -0700

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt |  3 +
 .../org/apache/hadoop/hdfs/DFSConfigKeys.java   |  5 ++
 .../hdfs/server/namenode/Checkpointer.java  |  2 +-
 .../hdfs/server/namenode/ImageServlet.java  | 38 +---
 .../hdfs/server/namenode/SecondaryNameNode.java |  2 +-
 .../hdfs/server/namenode/TransferFsImage.java   |  5 +-
 .../server/namenode/ha/BootstrapStandby.java|  2 +-
 .../src/main/resources/hdfs-default.xml | 24 ++--
 .../hdfs/server/namenode/TestCheckpoint.java|  2 +-
 .../namenode/ha/TestBootstrapStandby.java   | 63 +++-
 10 files changed, 127 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ab3c4cff/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 066ae02..23a54eb 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1563,6 +1563,9 @@ Release 2.8.0 - UNRELEASED
 HDFS-9264. Minor cleanup of operations on FsVolumeList#volumes.
 (Walter Su via lei)
 
+HDFS-8808. dfs.image.transfer.bandwidthPerSec should not apply to
+-bootstrapStandby (zhz)
+
   OPTIMIZATIONS
 
 HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ab3c4cff/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
index 275e638..5f9dde0 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
@@ -520,6 +520,11 @@ public class DFSConfigKeys extends CommonConfigurationKeys 
{

"dfs.image.transfer.bandwidthPerSec";
   public static final long DFS_IMAGE_TRANSFER_RATE_DEFAULT = 0;  //no 
throttling
 
+  public static final String DFS_IMAGE_TRANSFER_BOOTSTRAP_STANDBY_RATE_KEY =
+  "dfs.image.transfer-bootstrap-standby.bandwidthPerSec";
+  public static final long DFS_IMAGE_TRANSFER_BOOTSTRAP_STANDBY_RATE_DEFAULT =
+  0;  //no throttling
+
   // Image transfer timeout
   public static final String DFS_IMAGE_TRANSFER_TIMEOUT_KEY = 
"dfs.image.transfer.timeout";
   public static final int DFS_IMAGE_TRANSFER_TIMEOUT_DEFAULT = 60 * 1000;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ab3c4cff/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/Checkpointer.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/Checkpointer.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/Checkpointer.java
index 9087629..83d835ac 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/Checkpointer.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/Checkpointer.java
@@ -222,7 +222,7 @@ class Checkpointer extends Daemon {
 "image with txid " + sig.mostRecentCheckpointTxId);
 MD5Hash downloadedHash = TransferFsImage.downloadImageToStorage(
 backupNode.nnHttpAddress, sig.mostRecentCheckpointTxId, bnStorage,
-true);
+true, false);
 bnImage.saveDigestAndRenameCheckpointImage(NameNodeFile.IMAGE,
 sig.mostRecentCheckpointTxId, downloadedHash);
 lastApplied = sig.mostRecentCheckpointTxId;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ab3c4cff/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ImageServlet.java
--
diff --git

hadoop git commit: HDFS-8808. dfs.image.transfer.bandwidthPerSec should not apply to -bootstrapStandby. Contributed by Zhe Zhang.

2015-10-23 Thread zhz 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 235e84bf3 -> 1c468c234


HDFS-8808. dfs.image.transfer.bandwidthPerSec should not apply to 
-bootstrapStandby. Contributed by Zhe Zhang.

Conflicts:

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/BootstrapStandby.java

Change-Id: I99c314bb932b96a25f9115772267176e0b815614


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1c468c23
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1c468c23
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1c468c23

Branch: refs/heads/branch-2
Commit: 1c468c2346072a4d88aeec65dfadc7a120cdc43e
Parents: 235e84b
Author: Zhe Zhang 
Authored: Fri Oct 23 13:58:26 2015 -0700
Committer: Zhe Zhang 
Committed: Fri Oct 23 14:07:05 2015 -0700

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt |  3 +
 .../org/apache/hadoop/hdfs/DFSConfigKeys.java   |  5 ++
 .../hdfs/server/namenode/Checkpointer.java  |  2 +-
 .../hdfs/server/namenode/ImageServlet.java  | 38 +---
 .../hdfs/server/namenode/SecondaryNameNode.java |  2 +-
 .../hdfs/server/namenode/TransferFsImage.java   |  5 +-
 .../server/namenode/ha/BootstrapStandby.java|  2 +-
 .../src/main/resources/hdfs-default.xml | 20 ++-
 .../hdfs/server/namenode/TestCheckpoint.java|  2 +-
 .../namenode/ha/TestBootstrapStandby.java   | 61 
 10 files changed, 124 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/1c468c23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 312b12e..b88e2ee 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -727,6 +727,9 @@ Release 2.8.0 - UNRELEASED
 HDFS-9264. Minor cleanup of operations on FsVolumeList#volumes.
 (Walter Su via lei)
 
+HDFS-8808. dfs.image.transfer.bandwidthPerSec should not apply to
+-bootstrapStandby (zhz)
+
   OPTIMIZATIONS
 
 HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than

http://git-wip-us.apache.org/repos/asf/hadoop/blob/1c468c23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
index 6a75ac3..380ec1b 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
@@ -507,6 +507,11 @@ public class DFSConfigKeys extends CommonConfigurationKeys 
{

"dfs.image.transfer.bandwidthPerSec";
   public static final long DFS_IMAGE_TRANSFER_RATE_DEFAULT = 0;  //no 
throttling
 
+  public static final String DFS_IMAGE_TRANSFER_BOOTSTRAP_STANDBY_RATE_KEY =
+  "dfs.image.transfer-bootstrap-standby.bandwidthPerSec";
+  public static final long DFS_IMAGE_TRANSFER_BOOTSTRAP_STANDBY_RATE_DEFAULT =
+  0;  //no throttling
+
   // Image transfer timeout
   public static final String DFS_IMAGE_TRANSFER_TIMEOUT_KEY = 
"dfs.image.transfer.timeout";
   public static final int DFS_IMAGE_TRANSFER_TIMEOUT_DEFAULT = 60 * 1000;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/1c468c23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/Checkpointer.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/Checkpointer.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/Checkpointer.java
index 9087629..83d835ac 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/Checkpointer.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/Checkpointer.java
@@ -222,7 +222,7 @@ class Checkpointer extends Daemon {
 "image with txid " + sig.mostRecentCheckpointTxId);
 MD5Hash downloadedHash = TransferFsImage.downloadImageToStorage(
 backupNode.nnHttpAddress, sig.mostRecentCheckpointTxId, bnStorage,
-true);
+true, false);
 bnImage.saveDigestAndRenameCheckpointImage(NameNodeFile.IMAGE,
 sig.mostRecentCheckpointTxId, downloadedHash);
 lastApplied = sig.mostRecentCheckpointTxId;