Enable BWC tests after backport of #58029 (#58815)

Author: DaveCTurner

build.gradle

@@ -174,8 +174,8 @@ tasks.register("verifyVersions") {
  * after the backport of the backcompat code is complete.
  */
 
-boolean bwc_tests_enabled = false
-final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/58029" /* place a PR link here when committing bwc changes */
+boolean bwc_tests_enabled = true
+final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
 if (bwc_tests_enabled == false) {
   if (bwc_tests_disabled_issue.isEmpty()) {
     throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

server/src/main/java/org/elasticsearch/cluster/InternalClusterInfoService.java

@@ -321,7 +321,7 @@ public void onFailure(Exception e) {
             }
         });
 
-        final CountDownLatch indicesLatch = updateIndicesStats(new ActionListener<>() {
+        final CountDownLatch indicesLatch = updateIndicesStats(new ActionListener<IndicesStatsResponse>() {
             @Override
             public void onResponse(IndicesStatsResponse indicesStatsResponse) {
                 final ShardStats[] stats = indicesStatsResponse.getShards();

server/src/main/java/org/elasticsearch/index/store/StoreStats.java

@@ -37,7 +37,7 @@ public class StoreStats implements Writeable, ToXContentFragment {
      */
     public static final long UNKNOWN_RESERVED_BYTES = -1L;
 
-    public static final Version RESERVED_BYTES_VERSION = Version.V_8_0_0;
+    public static final Version RESERVED_BYTES_VERSION = Version.V_7_9_0;
 
     private long sizeInBytes;
     private long reservedSize;

server/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java

@@ -36,6 +36,7 @@
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.index.shard.IndexShard;
 import org.elasticsearch.index.shard.ShardId;
+import org.elasticsearch.index.store.StoreStats;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -717,7 +718,7 @@ public Index(StreamInput in) throws IOException {
                 File file = new File(in);
                 fileDetails.put(file.name, file);
             }
-            if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
+            if (in.getVersion().onOrAfter(StoreStats.RESERVED_BYTES_VERSION)) {
                 fileDetailsComplete = in.readBoolean();
             } else {
                 // This flag is used by disk-based allocation to decide whether the remaining bytes measurement is accurate or not; if not
@@ -738,7 +739,7 @@ public synchronized void writeTo(StreamOutput out) throws IOException {
             for (File file : files) {
                 file.writeTo(out);
             }
-            if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
+            if (out.getVersion().onOrAfter(StoreStats.RESERVED_BYTES_VERSION)) {
                 out.writeBoolean(fileDetailsComplete);
             }
             out.writeLong(sourceThrottlingInNanos);