Use setter & getter.

apache · Aug 28, 2024 · 1790462 · 1790462
1 parent 9dc1b51
commit 1790462
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java b/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
@@ -937,7 +937,16 @@ public void handle(DAGAppMasterEvent event) {
   protected class DAGAppMasterShutdownHandler {
     private AtomicBoolean shutdownHandled = new AtomicBoolean(false);
     private long sleepTimeBeforeExit = TezConstants.TEZ_DAG_SLEEP_TIME_BEFORE_EXIT;
-    Date shutdownTime;
+    private Date shutdownTime;
+
+    public Date getShutdownTime() {
+      return shutdownTime;
+    }
+
+    public void setShutdownTime(Date shutdownTime) {
+      this.shutdownTime = shutdownTime;
+    }
+
     void setSleepTimeBeforeExit(long sleepTimeBeforeExit) {
       this.sleepTimeBeforeExit = sleepTimeBeforeExit;
     }
@@ -955,7 +964,7 @@ public void shutdown(boolean now) {
 
       synchronized (shutdownHandlerRunning) {
         shutdownHandlerRunning.set(true);
-        shutdownTime = new Date(System.currentTimeMillis());
+        setShutdownTime(new Date(System.currentTimeMillis()));
       }
       LOG.info("Handling DAGAppMaster shutdown");
 
@@ -1748,8 +1757,8 @@ public void setQueueName(String queueName) {
   }
 
   private String getShutdownTimeString() {
-    if (shutdownHandler != null && shutdownHandler.shutdownTime != null) {
-      return " The shutdown hook started at " + shutdownHandler.shutdownTime;
+    if (shutdownHandler != null && shutdownHandler.getShutdownTime() != null) {
+      return " The shutdown hook started at " + shutdownHandler.getShutdownTime();
     }
     return "";
   }

diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/TestDAGAppMaster.java b/tez-dag/src/test/java/org/apache/tez/dag/app/TestDAGAppMaster.java
@@ -69,6 +69,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInput;
@@ -508,11 +509,11 @@ public void testGetACLFailure() throws Exception {
         () -> dam.getContext().getApplicationACLs());
     dam.start();
     dam.stop();
-    dam.mockShutdown.shutdownTime = Date.from(Instant.ofEpochMilli(Time.now()));
+    Mockito.when(dam.mockShutdown.getShutdownTime()).thenReturn(Date.from(Instant.ofEpochMilli(Time.now())));
     LambdaTestUtils.intercept(TezUncheckedException.class,
         " Cannot get ApplicationACLs before all services have started, "
             + "The current service state is STOPPED. The shutdown hook started at "
-            + dam.mockShutdown.shutdownTime, () -> dam.getContext().getApplicationACLs());
+            + dam.mockShutdown.getShutdownTime(), () -> dam.getContext().getApplicationACLs());
   }
 
   @Test