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 so...@apache.org on 2021/03/23 15:58:27 UTC
[hadoop] branch branch-3.3 updated (91d229b -> b26d75c)
This is an automated email from the ASF dual-hosted git repository.
sodonnell pushed a change to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git.
from 91d229b MAPREDUCE-7325. Intermediate data encryption is broken in LocalJobRunner. Contributed by Ahmed Hussein
new 968c95b HDFS-10792. RedundantEditLogInputStream should log caught exceptions. Contributed by Wei-Chiu Chuang.
new b26d75c HDFS-15093. RENAME.TO_TRASH is ignored When RENAME.OVERWRITE is specified. Contributed by Ayush Saxena.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../ClientNamenodeProtocolTranslatorPB.java | 3 ++-
...lientNamenodeProtocolServerSideTranslatorPB.java | 3 ++-
.../namenode/RedundantEditLogInputStream.java | 4 +++-
.../java/org/apache/hadoop/hdfs/TestDFSRename.java | 21 +++++++++++++++++++++
4 files changed, 28 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 02/02: HDFS-15093. RENAME.TO_TRASH is ignored When
RENAME.OVERWRITE is specified. Contributed by Ayush Saxena.
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sodonnell pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit b26d75ce37128dcfda37c52c8bfc8b465ce71d48
Author: Ayush Saxena <ay...@apache.org>
AuthorDate: Sat May 23 18:38:32 2020 +0530
HDFS-15093. RENAME.TO_TRASH is ignored When RENAME.OVERWRITE is specified. Contributed by Ayush Saxena.
(cherry picked from commit e0ae232f669b2e2a6654cfacff22a090c462effc)
---
.../ClientNamenodeProtocolTranslatorPB.java | 3 ++-
...lientNamenodeProtocolServerSideTranslatorPB.java | 3 ++-
.../java/org/apache/hadoop/hdfs/TestDFSRename.java | 21 +++++++++++++++++++++
3 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolTranslatorPB.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolTranslatorPB.java
index 35b52b5..6cdce59 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolTranslatorPB.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolTranslatorPB.java
@@ -609,7 +609,8 @@ public class ClientNamenodeProtocolTranslatorPB implements
for (Rename option : options) {
if (option == Rename.OVERWRITE) {
overwrite = true;
- } else if (option == Rename.TO_TRASH) {
+ }
+ if (option == Rename.TO_TRASH) {
toTrash = true;
}
}
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolServerSideTranslatorPB.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolServerSideTranslatorPB.java
index 9bd8248..e0afe00 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolServerSideTranslatorPB.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolServerSideTranslatorPB.java
@@ -688,7 +688,8 @@ public class ClientNamenodeProtocolServerSideTranslatorPB implements
ArrayList<Rename> optionList = new ArrayList<Rename>();
if(req.getOverwriteDest()) {
optionList.add(Rename.OVERWRITE);
- } else if(req.hasMoveToTrash() && req.getMoveToTrash()) {
+ }
+ if (req.hasMoveToTrash() && req.getMoveToTrash()) {
optionList.add(Rename.TO_TRASH);
}
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSRename.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSRename.java
index e7002c3..fe2eee2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSRename.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSRename.java
@@ -30,7 +30,9 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.Options.Rename;
import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
import org.apache.hadoop.hdfs.server.blockmanagement.BlockManager;
+import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
import org.apache.hadoop.hdfs.server.namenode.NameNodeAdapter;
+import org.apache.hadoop.test.GenericTestUtils;
import org.junit.Test;
public class TestDFSRename {
@@ -175,4 +177,23 @@ public class TestDFSRename {
}
}
}
+
+ @Test
+ public void testRename2Options() throws Exception {
+ try (MiniDFSCluster cluster = new MiniDFSCluster.Builder(
+ new HdfsConfiguration()).build()) {
+ cluster.waitActive();
+ final DistributedFileSystem dfs = cluster.getFileSystem();
+ Path path = new Path("/test");
+ dfs.mkdirs(path);
+ GenericTestUtils.LogCapturer auditLog =
+ GenericTestUtils.LogCapturer.captureLogs(FSNamesystem.auditLog);
+ dfs.rename(path, new Path("/dir1"),
+ new Rename[] {Rename.OVERWRITE, Rename.TO_TRASH});
+ String auditOut = auditLog.getOutput();
+ assertTrue("Rename should have both OVERWRITE and TO_TRASH "
+ + "flags at namenode but had only " + auditOut,
+ auditOut.contains("options=[OVERWRITE, TO_TRASH]"));
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 01/02: HDFS-10792. RedundantEditLogInputStream should log
caught exceptions. Contributed by Wei-Chiu Chuang.
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sodonnell pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 968c95bfba3a6932ad68a2050fc7a8b6454a7010
Author: Ayush Saxena <ay...@apache.org>
AuthorDate: Sun May 31 17:06:44 2020 +0530
HDFS-10792. RedundantEditLogInputStream should log caught exceptions. Contributed by Wei-Chiu Chuang.
(cherry picked from commit ae13a5ccbea10fe86481adbbff574c528e03c7f6)
---
.../hadoop/hdfs/server/namenode/RedundantEditLogInputStream.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/RedundantEditLogInputStream.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/RedundantEditLogInputStream.java
index 80e6b39..15f799a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/RedundantEditLogInputStream.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/RedundantEditLogInputStream.java
@@ -170,6 +170,7 @@ class RedundantEditLogInputStream extends EditLogInputStream {
}
return nextOp();
} catch (IOException e) {
+ LOG.warn("encountered an exception", e);
return null;
}
}
@@ -228,7 +229,8 @@ class RedundantEditLogInputStream extends EditLogInputStream {
"streams are shorter than the current one! The best " +
"remaining edit log ends at transaction " +
newLast + ", but we thought we could read up to transaction " +
- oldLast + ". If you continue, metadata will be lost forever!");
+ oldLast + ". If you continue, metadata will be lost forever!",
+ prevException);
}
LOG.error("Got error reading edit log input stream " +
streams[curIdx].getName() + "; failing over to edit log " +
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org