Change versions

Signed-off-by: Rishikesh1159 <[email protected]>

.ci/bwcVersions

@@ -62,5 +62,3 @@ BWC_VERSION:
   - "2.4.2"
   - "2.5.0"
   - "2.5.1"
-  - "2.6.0"
-  - "2.6.1"

buildSrc/version.properties

@@ -1,4 +1,4 @@
-opensearch        = 2.7.0
+opensearch        = 2.6.0
 lucene            = 9.5.0
 
 bundled_jdk_vendor = adoptium
@@ -21,7 +21,7 @@ woodstox          = 6.4.0
 kotlin            = 1.7.10
 antlr4            = 4.11.1
 guava             = 31.1-jre
- 
+
 # when updating the JNA version, also update the version in buildSrc/build.gradle
 jna               = 5.5.0
 

server/src/main/java/org/opensearch/Version.java

@@ -110,9 +110,8 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_2_5_0 = new Version(2050099, org.apache.lucene.util.Version.LUCENE_9_4_2);
     public static final Version V_2_5_1 = new Version(2050199, org.apache.lucene.util.Version.LUCENE_9_4_2);
     public static final Version V_2_6_0 = new Version(2060099, org.apache.lucene.util.Version.LUCENE_9_5_0);
-    public static final Version V_2_6_1 = new Version(2060199, org.apache.lucene.util.Version.LUCENE_9_5_0);
-    public static final Version V_2_7_0 = new Version(2070099, org.apache.lucene.util.Version.LUCENE_9_5_0);
-    public static final Version CURRENT = V_2_7_0;
+
+    public static final Version CURRENT = V_2_6_0;
 
     public static Version readVersion(StreamInput in) throws IOException {
         return fromId(in.readVInt());

server/src/main/java/org/opensearch/action/admin/cluster/node/stats/NodeStats.java

@@ -189,7 +189,7 @@ public NodeStats(StreamInput in) throws IOException {
         } else {
             weightedRoutingStats = null;
         }
-        if (in.getVersion().onOrAfter(Version.V_2_7_0) && FeatureFlags.isEnabled(FeatureFlags.SEARCHABLE_SNAPSHOT)) {
+        if (in.getVersion().onOrAfter(Version.V_2_6_0) && FeatureFlags.isEnabled(FeatureFlags.SEARCHABLE_SNAPSHOT)) {
             fileCacheStats = in.readOptionalWriteable(FileCacheStats::new);
         } else {
             fileCacheStats = null;
@@ -409,7 +409,7 @@ public void writeTo(StreamOutput out) throws IOException {
         if (out.getVersion().onOrAfter(Version.V_2_6_0)) {
             out.writeOptionalWriteable(weightedRoutingStats);
         }
-        if (out.getVersion().onOrAfter(Version.V_2_7_0) && FeatureFlags.isEnabled(FeatureFlags.SEARCHABLE_SNAPSHOT)) {
+        if (out.getVersion().onOrAfter(Version.V_2_6_0) && FeatureFlags.isEnabled(FeatureFlags.SEARCHABLE_SNAPSHOT)) {
             out.writeOptionalWriteable(fileCacheStats);
         }
     }

server/src/main/java/org/opensearch/monitor/fs/FsInfo.java

@@ -97,7 +97,7 @@ public Path(StreamInput in) throws IOException {
             total = in.readLong();
             free = in.readLong();
             available = in.readLong();
-            if (FeatureFlags.isEnabled(FeatureFlags.SEARCHABLE_SNAPSHOT) && in.getVersion().onOrAfter(Version.V_2_7_0)) {
+            if (FeatureFlags.isEnabled(FeatureFlags.SEARCHABLE_SNAPSHOT) && in.getVersion().onOrAfter(Version.V_2_6_0)) {
                 fileCacheReserved = in.readLong();
                 fileCacheUtilized = in.readLong();
             }
@@ -111,7 +111,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeLong(total);
             out.writeLong(free);
             out.writeLong(available);
-            if (FeatureFlags.isEnabled(FeatureFlags.SEARCHABLE_SNAPSHOT) && out.getVersion().onOrAfter(Version.V_2_7_0)) {
+            if (FeatureFlags.isEnabled(FeatureFlags.SEARCHABLE_SNAPSHOT) && out.getVersion().onOrAfter(Version.V_2_6_0)) {
                 out.writeLong(fileCacheReserved);
                 out.writeLong(fileCacheUtilized);
             }