You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ay...@apache.org on 2021/04/08 15:19:33 UTC
[hadoop] branch trunk updated: HDFS-15916. DistCp: Backward
compatibility: Distcp fails from Hadoop 3 to Hadoop 2 for snapshotdiff.
(#2863). Contributed by Ayush Saxena.
This is an automated email from the ASF dual-hosted git repository.
ayushsaxena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new c6539e3 HDFS-15916. DistCp: Backward compatibility: Distcp fails from Hadoop 3 to Hadoop 2 for snapshotdiff. (#2863). Contributed by Ayush Saxena.
c6539e3 is described below
commit c6539e3289711d29f508930bbda40302f48ddf4c
Author: Ayush Saxena <ay...@apache.org>
AuthorDate: Thu Apr 8 20:49:08 2021 +0530
HDFS-15916. DistCp: Backward compatibility: Distcp fails from Hadoop 3 to Hadoop 2 for snapshotdiff. (#2863). Contributed by Ayush Saxena.
Signed-off-by: Wei-Chiu Chuang <we...@apache.org>
---
.../java/org/apache/hadoop/hdfs/DistributedFileSystem.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
index fe2d077..eda92be 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.hdfs;
+import org.apache.hadoop.ipc.RpcNoSuchMethodException;
import org.apache.hadoop.security.AccessControlException;
import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
@@ -2388,8 +2389,15 @@ public class DistributedFileSystem extends FileSystem
List<DiffReportListingEntry> deletedList = new ChunkedArrayList<>();
SnapshotDiffReportListing report;
do {
- report = dfs.getSnapshotDiffReportListing(snapshotDir, fromSnapshot,
- toSnapshot, startPath, index);
+ try {
+ report = dfs.getSnapshotDiffReportListing(snapshotDir, fromSnapshot,
+ toSnapshot, startPath, index);
+ } catch (RpcNoSuchMethodException e) {
+ // In case the server doesn't support getSnapshotDiffReportListing,
+ // fallback to getSnapshotDiffReport.
+ LOG.warn("Falling back to getSnapshotDiffReport {}", e.getMessage());
+ return dfs.getSnapshotDiffReport(snapshotDir, fromSnapshot, toSnapshot);
+ }
startPath = report.getLastPath();
index = report.getLastIndex();
modifiedList.addAll(report.getModifyList());
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org