Ver Fonte

Adjust serialisation versioning after ingest geoip processor change (#74328)

Adjust serialisation versioning now that: 'change GeoIP downloader policy after 30 days of no updates'  change has been back ported via #74296
Przemko Robakowski há 4 anos atrás
pai
commit
05d3316a76

+ 2 - 2
modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpTaskState.java

@@ -69,7 +69,7 @@ class GeoIpTaskState implements PersistentTaskState, VersionedNamedWriteable {
             in -> {
                 long lastUpdate = in.readLong();
                 return new Metadata(lastUpdate, in.readVInt(), in.readVInt(), in.readString(),
-                    in.getVersion().onOrAfter(Version.V_8_0_0) ? in.readLong() : lastUpdate);
+                    in.getVersion().onOrAfter(Version.V_7_14_0) ? in.readLong() : lastUpdate);
             }));
     }
 
@@ -135,7 +135,7 @@ class GeoIpTaskState implements PersistentTaskState, VersionedNamedWriteable {
             o.writeVInt(v.firstChunk);
             o.writeVInt(v.lastChunk);
             o.writeString(v.md5);
-            if (o.getVersion().onOrAfter(Version.V_8_0_0)) {
+            if (o.getVersion().onOrAfter(Version.V_7_14_0)) {
                 o.writeLong(v.lastCheck);
             }
         });

+ 2 - 2
modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/stats/GeoIpDownloaderStats.java

@@ -59,7 +59,7 @@ public class GeoIpDownloaderStats implements Task.Status {
         totalDownloadTime = in.readVLong();
         databasesCount = in.readVInt();
         skippedDownloads = in.readVInt();
-        if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
+        if (in.getVersion().onOrAfter(Version.V_7_14_0)) {
             expiredDatabases = in.readVInt();
         } else {
             expiredDatabases = 0;
@@ -149,7 +149,7 @@ public class GeoIpDownloaderStats implements Task.Status {
         out.writeVLong(totalDownloadTime);
         out.writeVInt(databasesCount);
         out.writeVInt(skippedDownloads);
-        if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_7_14_0)) {
             out.writeVInt(expiredDatabases);
         }
     }