diff --git a/05-Reduce-memory-overhead-of-TestBPOfferService.patch b/05-Reduce-memory-overhead-of-TestBPOfferService.patch
new file mode 100644
index 0000000000000000000000000000000000000000..5e7be871a8d77cf6ee5146a27c71743f9a85c6ff
--- /dev/null
+++ b/05-Reduce-memory-overhead-of-TestBPOfferService.patch
@@ -0,0 +1,29 @@
+From df08e0de41aa9cd85c50c0f293ae6d72b997582a Mon Sep 17 00:00:00 2001
+From: Stephen O'Donnell <stephen.odonnell@gmail.com>
+Date: Mon, 19 Aug 2024 11:35:11 +0100
+Subject: [PATCH] HDFS-17605. Reduce memory overhead of TestBPOfferService
+ (#6996)
+
+---
+ .../hadoop/hdfs/server/datanode/TestBPOfferService.java      | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java
+index d5dbdbcd..2c848ae4 100644
+--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java
++++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java
+@@ -133,8 +133,9 @@ public class TestBPOfferService {
+     mockNN2 = setupNNMock(1);
+ 
+     // Set up a mock DN with the bare-bones configuration
+-    // objects, etc.
+-    mockDn = Mockito.mock(DataNode.class);
++    // objects, etc. Set as stubOnly to save memory and avoid Mockito holding
++    // references to each invocation. This can cause OOM in some runs.
++    mockDn = Mockito.mock(DataNode.class, Mockito.withSettings().stubOnly());
+     Mockito.doReturn(true).when(mockDn).shouldRun();
+     Configuration conf = new Configuration();
+     File dnDataDir = new File(new File(TEST_BUILD_DATA, "dfs"), "data");
+-- 
+2.27.0
+
diff --git a/hadoop.spec b/hadoop.spec
index a983826f979320770aae63dde35735fd2e4c0ff8..cdcd21f21ab4be3c5c9bf4db6258a65f78b2c224 100644
--- a/hadoop.spec
+++ b/hadoop.spec
@@ -11,7 +11,7 @@
 %define _binaries_in_noarch_packages_terminate_build 0
 Name:   hadoop
 Version: 3.3.6
-Release: 5
+Release: 6
 Summary: A software platform for processing vast amounts of data
 # The BSD license file is missing
 # https://issues.apache.org/jira/browse/HADOOP-9849
@@ -44,6 +44,7 @@ Patch0: 01-lock-triple-beam-version-to-1.3.0.patch
 Patch1: 02-Upgrade-os-maven-plugin-to-1.7.1.patch
 Patch2: 03-Fix-build-on-riscv.patch
 Patch3: 04-Enhance-access-control-for-RunJar.patch
+Patch4: 05-Reduce-memory-overhead-of-TestBPOfferService.patch
 
 %ifarch riscv64
 Patch1000: 1000-Added-support-for-building-the-riscv64-protoc-binari.patch
@@ -1205,6 +1206,9 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg
 
 %changelog
+* Mon Oct 21 2024 yanshuai <yanshuai01@kylinos.cn> - 3.3.6-6
+- HDFS-17605. Reduce memory overhead of TestBPOfferService
+
 * Thu Sep 26 2024 Deyuan Fan <fandeyuan@kylinos.cn> - 3.3.6-5
 - fix CVE-2024-23454