From cf0f71640cdf47c4aee76a9fe56f37f1a87d6807 Mon Sep 17 00:00:00 2001
From: zhanghaobo <hfutzhanghb@163.com>
Date: Sat, 15 Jul 2023 00:04:15 +0800
Subject: [PATCH] fix some typos.

---
 .../main/java/org/apache/hadoop/fs/TrashPolicyDefault.java    | 2 +-
 .../hadoop-common/src/main/resources/core-default.xml         | 4 ++--
 .../src/test/java/org/apache/hadoop/fs/TestTrash.java         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
index e23e73900e8ee..2fb4bff09f9fa 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
@@ -384,7 +384,7 @@ private void deleteCheckpoint(Path trashRoot, boolean deleteImmediately)
       } catch (ParseException e) {
         if (cleanNonCheckpointUnderTrashRoot) {
           fs.delete(path, true);
-          LOG.warn("Unexpected item in trash: " + dir + ". Force to delete it.");
+          LOG.warn("Unexpected item in trash: " + dir + ". Deleting.");
           continue;
         } else {
           LOG.warn("Unexpected item in trash: " + dir + ". Ignoring.");
diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
index 024bc881bba10..c8d81ef7a4d39 100644
--- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
+++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
@@ -977,8 +977,8 @@
 <property>
   <name>fs.trash.clean.trashroot.enable</name>
   <value>false</value>
-  <description>Whether clean some directories or files
-    at home of Trash which are not under checkpoint directory or not.
+  <description>Whether clean some directories and files
+    in Trash home which are not under checkpoint directory.
   </description>
 </property>
 
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
index f345998b6cd94..30c9a31fda4ea 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
@@ -788,7 +788,7 @@ public void testTrashEmptier() throws Exception {
   }
 
   /**
-   * Test trash emptier can whether delete non-checkpoint dir or not.
+   * Test trash emptier can delete non-checkpoint dir or not.
    * @throws Exception
    */
   @Test()