From 96e7da53c7397a3a0178cbadf35dbf05b9438802 Mon Sep 17 00:00:00 2001
From: Lee Hinman <lee@writequit.org>
Date: Fri, 26 Jan 2018 09:03:51 -0700
Subject: [PATCH] [TEST] Expand assert to mention which files are not deleted

Relates to #25335
---
 .../java/org/elasticsearch/env/NodeEnvironment.java | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/server/src/main/java/org/elasticsearch/env/NodeEnvironment.java b/server/src/main/java/org/elasticsearch/env/NodeEnvironment.java
index ecf0b31934c..6f2fabd5188 100644
--- a/server/src/main/java/org/elasticsearch/env/NodeEnvironment.java
+++ b/server/src/main/java/org/elasticsearch/env/NodeEnvironment.java
@@ -450,7 +450,18 @@ public final class NodeEnvironment  implements Closeable {
             IOUtils.rm(customLocation);
         }
         logger.trace("deleted shard {} directory, paths: [{}]", shardId, paths);
-        assert FileSystemUtils.exists(paths) == false;
+        assert assertPathsDoNotExist(paths);
+    }
+
+    private static boolean assertPathsDoNotExist(final Path[] paths) {
+        Set<Path> existingPaths = new HashSet<>();
+        for (Path path : paths) {
+            if (FileSystemUtils.exists(paths)) {
+                existingPaths.add(path);
+            }
+        }
+        assert existingPaths.size() == 0 : "Paths exist that should have been deleted: " + existingPaths;
+        return existingPaths.size() == 0;
     }
 
     private boolean isShardLocked(ShardId id) {