diff --git a/tez-dag/src/main/java/org/apache/tez/dag/api/client/DAGClientHandler.java b/tez-dag/src/main/java/org/apache/tez/dag/api/client/DAGClientHandler.java
index 4ed9d86a34..36b73dcf38 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/api/client/DAGClientHandler.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/api/client/DAGClientHandler.java
@@ -56,10 +56,6 @@ private DAG getCurrentDAG() {
     return dagAppMaster.getContext().getCurrentDAG();
   }
 
-  private Set<String> getAllDagIDs() {
-    return dagAppMaster.getContext().getAllDAGIDs();
-  }
-
   public List<String> getAllDAGs() throws TezException {
     return Collections.singletonList(getCurrentDAG().getID().toString());
   }
@@ -100,8 +96,11 @@ DAG getDAG(String dagIdStr) throws TezException {
 
     final String currentDAGIdStr = currentDAG.getID().toString();
     if (!currentDAGIdStr.equals(dagIdStr)) {
-      if (getAllDagIDs().contains(dagIdStr)) {
-        LOG.debug("Looking for finished dagId {} current dag is {}", dagIdStr, currentDAGIdStr);
+      Set<String> recentDagIds = dagAppMaster.getContext().getRecentDAGIDs();
+      if (recentDagIds.contains(dagIdStr)) {
+        if (LOG.isDebugEnabled()) {
+          LOG.debug("Looking for finished dagId " + dagIdStr + " current dag is " + currentDAGIdStr);
+        }
         throw new DAGNotRunningException("DAG " + dagIdStr + " Not running, current dag is " +
             currentDAGIdStr);
       } else {
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/AppContext.java b/tez-dag/src/main/java/org/apache/tez/dag/app/AppContext.java
index c9a7083c1d..bc58c598d3 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/AppContext.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/AppContext.java
@@ -80,7 +80,7 @@ public interface AppContext {
 
   void setDAGRecoveryData(DAGRecoveryData dagRecoveryData);
 
-  Set<String> getAllDAGIDs();
+  Set<String> getRecentDAGIDs();
 
   @SuppressWarnings("rawtypes")
   EventHandler getEventHandler();
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
index 263ac76b4c..1164a49f33 100644
--- 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
@@ -44,6 +44,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Queue;
 import java.util.Random;
 import java.util.Set;
 import java.util.Timer;
@@ -59,6 +60,7 @@
 import java.util.Objects;
 
 import com.google.common.collect.BiMap;
+import com.google.common.collect.EvictingQueue;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.Lists;
 
@@ -312,10 +314,7 @@ public class DAGAppMaster extends AbstractService {
   private final BiMap<String, Integer> containerLaunchers = HashBiMap.create();
   private final BiMap<String, Integer> taskCommunicators = HashBiMap.create();
 
-  /**
-   * set of already executed dag names.
-   */
-  Set<String> dagIDs = new HashSet<String>();
+  Queue<String> dagIDs = EvictingQueue.create(10);
 
   protected boolean isLastAMRetry = false;
 
@@ -1522,8 +1521,8 @@ public ListeningExecutorService getExecService() {
     }
 
     @Override
-    public Set<String> getAllDAGIDs() {
-      return dagIDs;
+    public Set<String> getRecentDAGIDs() {
+      return new HashSet<>(dagIDs);
     }
 
     @Override
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/TestRecoveryParser.java b/tez-dag/src/test/java/org/apache/tez/dag/app/TestRecoveryParser.java
index 57148ee7e9..43b88e4dfa 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/TestRecoveryParser.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/TestRecoveryParser.java
@@ -22,7 +22,6 @@
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
@@ -80,6 +79,7 @@
 import org.apache.tez.runtime.api.impl.TezEvent;
 import org.junit.*;
 
+import com.google.common.collect.EvictingQueue;
 import com.google.common.collect.Lists;
 
 import static org.junit.Assert.*;
@@ -108,7 +108,7 @@ public void setUp() throws IllegalArgumentException, IOException {
     this.recoveryPath = new Path(TEST_ROOT_DIR + "/" + appId + "/recovery");
     this.localFS.delete(new Path(TEST_ROOT_DIR), true);
     mockAppMaster = mock(DAGAppMaster.class);
-    mockAppMaster.dagIDs = new HashSet<String>();
+    mockAppMaster.dagIDs = EvictingQueue.create(10);
     when(mockAppMaster.getConfig()).thenReturn(new Configuration());
     mockDAGImpl = mock(DAGImpl.class);
     when(mockAppMaster.createDAG(any(), any())).thenReturn(mockDAGImpl);