From a5a56c3564d486f8df258e64ad5c243395def12a Mon Sep 17 00:00:00 2001
From: Allen Wittenauer <aw@apache.org>
Date: Tue, 28 Jun 2016 07:21:04 -0700
Subject: [PATCH] HADOOP-13034. Log message about input options in distcp lacks
 some items (Takashi Ohnishi via aw)

(cherry picked from commit 422c73a8657d8699920f7db13d4be200e16c4272)
---
 .../src/main/java/org/apache/hadoop/tools/DistCpOptions.java  | 4 ++++
 .../test/java/org/apache/hadoop/tools/TestDistCpOptions.java  | 1 +
 .../test/java/org/apache/hadoop/tools/TestOptionsParser.java  | 1 +
 3 files changed, 6 insertions(+)

diff --git a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java
index b81bc038af2..a3af9176ecf 100644
--- a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java
+++ b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java
@@ -680,6 +680,10 @@ public class DistCpOptions {
         ", deleteMissing=" + deleteMissing +
         ", ignoreFailures=" + ignoreFailures +
         ", overwrite=" + overwrite +
+        ", append=" + append +
+        ", useDiff=" + useDiff +
+        ", fromSnapshot=" + fromSnapshot +
+        ", toSnapshot=" + toSnapshot +
         ", skipCRC=" + skipCRC +
         ", blocking=" + blocking +
         ", numListstatusThreads=" + numListstatusThreads +
diff --git a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpOptions.java b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpOptions.java
index 5a56cc31ee5..7f15a60334c 100644
--- a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpOptions.java
+++ b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpOptions.java
@@ -305,6 +305,7 @@ public class TestDistCpOptions {
     DistCpOptions option = new DistCpOptions(new Path("abc"), new Path("xyz"));
     final String val = "DistCpOptions{atomicCommit=false, syncFolder=false, "
         + "deleteMissing=false, ignoreFailures=false, overwrite=false, "
+        + "append=false, useDiff=false, fromSnapshot=null, toSnapshot=null, "
         + "skipCRC=false, blocking=true, numListstatusThreads=0, maxMaps=20, "
         + "mapBandwidth=100, sslConfigurationFile='null', "
         + "copyStrategy='uniformsize', preserveStatus=[], "
diff --git a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java
index 4dd05de40b1..907fc24c127 100644
--- a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java
+++ b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java
@@ -400,6 +400,7 @@ public class TestOptionsParser {
     DistCpOptions option = new DistCpOptions(new Path("abc"), new Path("xyz"));
     String val = "DistCpOptions{atomicCommit=false, syncFolder=false, "
         + "deleteMissing=false, ignoreFailures=false, overwrite=false, "
+        + "append=false, useDiff=false, fromSnapshot=null, toSnapshot=null, "
         + "skipCRC=false, blocking=true, numListstatusThreads=0, maxMaps=20, "
         + "mapBandwidth=100, sslConfigurationFile='null', "
         + "copyStrategy='uniformsize', preserveStatus=[], "