fixed again

Author: original-brownbear

server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java

@@ -198,7 +198,9 @@ private SnapshotsStatusResponse buildResponse(SnapshotsStatusRequest request, Li
                     SnapshotIndexShardStatus shardStatus = new SnapshotIndexShardStatus(shardEntry.key, stage);
                     shardStatusBuilder.add(shardStatus);
                 }
-                builder.add(new SnapshotStatus(entry.snapshot(), entry.state(),
+                final SnapshotsInProgress.State state = entry.state();
+                builder.add(new SnapshotStatus(entry.snapshot(),
+                    state == SnapshotsInProgress.State.SUCCESS ? SnapshotsInProgress.State.STARTED : state,
                     Collections.unmodifiableList(shardStatusBuilder), entry.includeGlobalState()));
             }
         }

x-pack/plugin/security/src/test/java/org/elasticsearch/integration/ClusterPrivilegeTests.java

@@ -139,7 +139,6 @@ public void testThatClusterPrivilegesWorkAsExpectedViaHttp() throws Exception {
         assertAccessIsDenied("user_d", "PUT", "/_cluster/settings", "{ \"transient\" : { \"search.default_search_timeout\": \"1m\" } }");
     }
 
-    @AwaitsFix( bugUrl = "https://github.com/elastic/elasticsearch/issues/38030")
     public void testThatSnapshotAndRestore() throws Exception {
         String repoJson = Strings.toString(jsonBuilder().startObject().field("type", "fs").startObject("settings").field("location",
                 repositoryLocation.toString()).endObject().endObject());