Skip to content

Commit ca737a8

Browse files
committed
Fix up BWC
1 parent edad041 commit ca737a8

File tree

3 files changed

+19
-5
lines changed

3 files changed

+19
-5
lines changed

server/src/main/java/org/elasticsearch/TransportVersions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ static TransportVersion def(int id) {
214214
public static final TransportVersion ESQL_REMOVE_AGGREGATE_TYPE = def(9_045_0_00);
215215
public static final TransportVersion ADD_PROJECT_ID_TO_DSL_ERROR_INFO = def(9_046_0_00);
216216
public static final TransportVersion SEMANTIC_TEXT_CHUNKING_CONFIG = def(9_047_00_0);
217+
public static final TransportVersion REPO_ANALYSIS_COPY_BLOB = def(9_048_00_0);
217218

218219
/*
219220
* STOP! READ THIS FIRST! No, really,

x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/BlobAnalyzeAction.java

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import org.apache.logging.log4j.LogManager;
1111
import org.apache.logging.log4j.Logger;
12+
import org.elasticsearch.TransportVersions;
1213
import org.elasticsearch.action.ActionListener;
1314
import org.elasticsearch.action.ActionListenerResponseHandler;
1415
import org.elasticsearch.action.ActionRequest;
@@ -779,8 +780,11 @@ static class Request extends ActionRequest {
779780
readEarly = in.readBoolean();
780781
writeAndOverwrite = in.readBoolean();
781782
abortWrite = in.readBoolean();
782-
// BWC
783-
doCopy = in.readBoolean();
783+
if (in.getTransportVersion().onOrAfter(TransportVersions.REPO_ANALYSIS_COPY_BLOB)) {
784+
doCopy = in.readBoolean();
785+
} else {
786+
doCopy = false;
787+
}
784788
}
785789

786790
@Override
@@ -797,8 +801,14 @@ public void writeTo(StreamOutput out) throws IOException {
797801
out.writeBoolean(readEarly);
798802
out.writeBoolean(writeAndOverwrite);
799803
out.writeBoolean(abortWrite);
800-
// BWC
801-
out.writeBoolean(doCopy);
804+
if (out.getTransportVersion().onOrAfter(TransportVersions.REPO_ANALYSIS_COPY_BLOB)) {
805+
out.writeBoolean(doCopy);
806+
} else if (doCopy) {
807+
assert false : out.getTransportVersion();
808+
throw new IllegalStateException(
809+
"cannot serialize " + this + "] using transport version [" + out.getTransportVersion() + "]"
810+
);
811+
}
802812
}
803813

804814
@Override
@@ -824,6 +834,8 @@ public String getDescription() {
824834
+ writeAndOverwrite
825835
+ ", abortWrite="
826836
+ abortWrite
837+
+ ", doCopy="
838+
+ doCopy
827839
+ "]";
828840
}
829841

x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/RepositoryAnalyzeAction.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,8 @@ public void run() {
521521
final long targetLength = blobSizes.get(i);
522522
final boolean smallBlob = targetLength <= MAX_ATOMIC_WRITE_SIZE; // avoid the atomic API for larger blobs
523523
final boolean abortWrite = smallBlob && request.isAbortWritePermitted() && rarely(random);
524-
final boolean doCopy = random.nextBoolean();
524+
final boolean doCopy = minClusterTransportVersion.onOrAfter(TransportVersions.REPO_ANALYSIS_COPY_BLOB)
525+
&& random.nextBoolean();
525526
if (doCopy) {
526527
i++;
527528
if (i >= request.getBlobCount()) {

0 commit comments

Comments
 (0)