More robust marking of cleaning up of resources

Author: craigtaverner

x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/EsqlSpecTestCase.java

@@ -126,7 +126,6 @@ protected EsqlSpecTestCase(
     }
 
     private static class Protected {
-        private final Object lock = new Object();
         private volatile boolean completed = false;
         private volatile boolean started = false;
         private volatile Throwable failure = null;
@@ -136,7 +135,7 @@ private void protectedBlock(Callable<Void> callable) {
                 return;
             }
             // In case tests get run in parallel, we ensure only one setup is run, and other tests wait for this
-            synchronized (lock) {
+            synchronized (this) {
                 if (completed) {
                     return;
                 }
@@ -157,6 +156,12 @@ private void protectedBlock(Callable<Void> callable) {
                 }
             }
         }
+
+        private synchronized void reset() {
+            completed = false;
+            started = false;
+            failure = null;
+        }
     }
 
     private static final Protected INGEST = new Protected();
@@ -184,15 +189,16 @@ public void setup() {
     @AfterClass
     public static void wipeTestData() throws IOException {
         try {
-            INGEST.completed = false;
             adminClient().performRequest(new Request("DELETE", "/*"));
         } catch (ResponseException e) {
             // 404 here just means we had no indexes
             if (e.getResponse().getStatusLine().getStatusCode() != 404) {
                 throw e;
             }
         }
+        INGEST.reset();
         deleteViews(adminClient());
+        VIEWS.reset();
         deleteInferenceEndpoints(adminClient());
     }