From a0e2cac08deed9268a3269b9c2d2e4b3c7a0bd90 Mon Sep 17 00:00:00 2001
From: Steve Vaughan Jr <s_vaughan@apple.com>
Date: Mon, 22 Aug 2022 17:13:35 -0400
Subject: [PATCH] Restore shutdown IOException

The signature for close() can't throw an exception for AutoCloseable, but the definition of shutdown() didn't have to change.  Move the try-catch into close().
---
 .../hadoop/hdfs/qjournal/MiniQJMHACluster.java      | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/MiniQJMHACluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/MiniQJMHACluster.java
index a6a5dbd5f68a6..0791e0ace1c0a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/MiniQJMHACluster.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/MiniQJMHACluster.java
@@ -185,18 +185,19 @@ public MiniJournalCluster getJournalCluster() {
     return journalCluster;
   }
 
-  public void shutdown() {
+  public void shutdown() throws IOException {
     cluster.shutdown();
+    journalCluster.shutdown();
+  }
+
+  @Override
+  public void close() {
     try {
-      journalCluster.shutdown();
+      shutdown();
     } catch (IOException shutdownFailure) {
       LOG.warn("Exception while closing journal cluster", shutdownFailure);
     }
-  }
 
-  @Override
-  public void close() {
-    shutdown();
   }
 
 }