From 5c9ab0ce09709e7e47eddfdfc8c4e43198120c91 Mon Sep 17 00:00:00 2001
From: lzx404243 <lzx404243@hotmail.com>
Date: Sun, 29 Aug 2021 19:39:33 -0400
Subject: [PATCH] MAPREDUCE-7342. Stop RMService in
 TestClientRedirect.testRedirect() (#2968)

Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
(cherry picked from commit 7b5be74228cb4a68d11f52ac061829b70a4f3144)
---
 .../java/org/apache/hadoop/mapred/TestClientRedirect.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientRedirect.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientRedirect.java
index 5972f65e961..f034f34742a 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientRedirect.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClientRedirect.java
@@ -279,6 +279,14 @@ public class TestClientRedirect {
       super(name);
     }
 
+    @Override
+    protected void serviceStop() throws Exception {
+      if (server != null) {
+        server.stop();
+      }
+      super.serviceStop();
+    }
+
     @Override
     protected void serviceInit(Configuration conf) throws Exception {
       clientServiceBindAddress = RMADDRESS;