Skip to content

Clean up RepositoryConflictException wire protocol #122735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
DaveCTurner wants to merge 1 commit into from
Closed

Clean up RepositoryConflictException wire protocol #122735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions server/src/main/java/org/elasticsearch/TransportVersions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ static TransportVersion def(int id) {
public static final TransportVersion REMOVE_ALL_APPLICABLE_SELECTOR = def(9_009_0_00);
public static final TransportVersion SLM_UNHEALTHY_IF_NO_SNAPSHOT_WITHIN = def(9_010_0_00);
public static final TransportVersion ESQL_SUPPORT_PARTIAL_RESULTS = def(9_011_0_00);
public static final TransportVersion REPO_CONFLICT_EXCEPTION_UNUSED_STRING = def(9_012_0_00);

/*
* STOP! READ THIS FIRST! No, really,
Expand Down
13 changes: 8 additions & 5 deletions server/src/main/java/org/elasticsearch/repositories/RepositoryConflictException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@

import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.core.UpdateForV9;
import org.elasticsearch.rest.RestStatus;

import java.io.IOException;

import static org.elasticsearch.TransportVersions.REPO_CONFLICT_EXCEPTION_UNUSED_STRING;

/**
* Repository conflict exception
*/
Expand All @@ -29,16 +30,18 @@ public RestStatus status() {
return RestStatus.CONFLICT;
}

@UpdateForV9(owner = UpdateForV9.Owner.DISTRIBUTED_COORDINATION) // drop unneeded string from wire format
public RepositoryConflictException(StreamInput in) throws IOException {
super(in);
in.readString();
if (in.getTransportVersion().before(REPO_CONFLICT_EXCEPTION_UNUSED_STRING)) {
in.readString();
}
}

@Override
@UpdateForV9(owner = UpdateForV9.Owner.DISTRIBUTED_COORDINATION) // drop unneeded string from wire format
protected void writeTo(StreamOutput out, Writer<Throwable> nestedExceptionsWriter) throws IOException {
super.writeTo(out, nestedExceptionsWriter);
out.writeString("");
if (out.getTransportVersion().before(REPO_CONFLICT_EXCEPTION_UNUSED_STRING)) {
out.writeString("");
}
}
}