Skip to content

Commit 05d3316

Browse files
authored
Adjust serialisation versioning after ingest geoip processor change (elastic#74328)
Adjust serialisation versioning now that: 'change GeoIP downloader policy after 30 days of no updates' change has been back ported via elastic#74296
1 parent ac7f14d commit 05d3316

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public static GeoIpTaskState fromXContent(XContentParser parser) throws IOExcept
6969
in -> {
7070
long lastUpdate = in.readLong();
7171
return new Metadata(lastUpdate, in.readVInt(), in.readVInt(), in.readString(),
72-
in.getVersion().onOrAfter(Version.V_8_0_0) ? in.readLong() : lastUpdate);
72+
in.getVersion().onOrAfter(Version.V_7_14_0) ? in.readLong() : lastUpdate);
7373
}));
7474
}
7575

@@ -135,7 +135,7 @@ public void writeTo(StreamOutput out) throws IOException {
135135
o.writeVInt(v.firstChunk);
136136
o.writeVInt(v.lastChunk);
137137
o.writeString(v.md5);
138-
if (o.getVersion().onOrAfter(Version.V_8_0_0)) {
138+
if (o.getVersion().onOrAfter(Version.V_7_14_0)) {
139139
o.writeLong(v.lastCheck);
140140
}
141141
});

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public GeoIpDownloaderStats(StreamInput in) throws IOException {
5959
totalDownloadTime = in.readVLong();
6060
databasesCount = in.readVInt();
6161
skippedDownloads = in.readVInt();
62-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
62+
if (in.getVersion().onOrAfter(Version.V_7_14_0)) {
6363
expiredDatabases = in.readVInt();
6464
} else {
6565
expiredDatabases = 0;
@@ -149,7 +149,7 @@ public void writeTo(StreamOutput out) throws IOException {
149149
out.writeVLong(totalDownloadTime);
150150
out.writeVInt(databasesCount);
151151
out.writeVInt(skippedDownloads);
152-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
152+
if (out.getVersion().onOrAfter(Version.V_7_14_0)) {
153153
out.writeVInt(expiredDatabases);
154154
}
155155
}

0 commit comments

Comments
 (0)