Skip to content
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

Update version peer recovery constants to 7_9 #57829

Merged
merged 4 commits into from
Jun 8, 2020
Merged

Update version peer recovery constants to 7_9 #57829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20c27ac
Update version peer recovery constants to 7_9
Tim-Brooks Jun 8, 2020
2ca9b48
Merge remote-tracking branch 'upstream/master' into peer_recovery_ver…
Tim-Brooks Jun 8, 2020
c85fa49
BWC
Tim-Brooks Jun 8, 2020
c6a3b0e
Merge remote-tracking branch 'upstream/master' into peer_recovery_ver…
Tim-Brooks Jun 8, 2020
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
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ tasks.register("verifyVersions") {
* after the backport of the backcompat code is complete.
*/

boolean bwc_tests_enabled = false
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/57827" /* place a PR link here when committing bwc changes */
boolean bwc_tests_enabled = true
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
if (bwc_tests_enabled == false) {
if (bwc_tests_disabled_issue.isEmpty()) {
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")
Expand Down
3 changes: 1 addition & 2 deletions server/src/main/java/org/elasticsearch/ElasticsearchException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,12 +1042,11 @@ private enum ElasticsearchExceptionHandle {
org.elasticsearch.ingest.IngestProcessorException::new,
157,
Version.V_7_5_0),
// TODO: Version after backport
PEER_RECOVERY_NOT_FOUND_EXCEPTION(
org.elasticsearch.indices.recovery.PeerRecoveryNotFound.class,
org.elasticsearch.indices.recovery.PeerRecoveryNotFound::new,
158,
Version.V_8_0_0);
Version.V_7_9_0);

final Class<? extends ElasticsearchException> exceptionClass;
final CheckedFunction<StreamInput, ? extends ElasticsearchException, IOException> constructor;
Expand Down
3 changes: 1 addition & 2 deletions server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,8 +628,7 @@ private void onException(Exception e) {
if (cause instanceof ConnectTransportException) {
logger.debug("delaying recovery of {} for [{}] due to networking error [{}]", request.shardId(),
recoverySettings.retryDelayNetwork(), cause.getMessage());
// TODO: Change after backport
if (request.sourceNode().getVersion().onOrAfter(Version.V_8_0_0)) {
if (request.sourceNode().getVersion().onOrAfter(Version.V_7_9_0)) {
reestablishRecovery(request, cause.getMessage(), recoverySettings.retryDelayNetwork());
} else {
retryRecovery(recoveryId, cause.getMessage(), recoverySettings.retryDelayNetwork(),
Expand Down
7 changes: 3 additions & 4 deletions server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTransportRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

package org.elasticsearch.indices.recovery;

import org.elasticsearch.Version;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.index.seqno.SequenceNumbers;
Expand All @@ -32,8 +33,7 @@ public abstract class RecoveryTransportRequest extends TransportRequest {

RecoveryTransportRequest(StreamInput in) throws IOException {
super(in);
// TODO: Change after backport
if (in.getVersion().onOrAfter(org.elasticsearch.Version.V_8_0_0)) {
if (in.getVersion().onOrAfter(Version.V_7_9_0)) {
requestSeqNo = in.readLong();
} else {
requestSeqNo = SequenceNumbers.UNASSIGNED_SEQ_NO;
Expand All @@ -51,8 +51,7 @@ public long requestSeqNo() {
@Override
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
// TODO: Change after backport
if (out.getVersion().onOrAfter(org.elasticsearch.Version.V_8_0_0)) {
if (out.getVersion().onOrAfter(Version.V_7_9_0)) {
out.writeLong(requestSeqNo);
}
}
Expand Down
3 changes: 1 addition & 2 deletions server/src/main/java/org/elasticsearch/indices/recovery/RemoteRecoveryTargetHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ public RemoteRecoveryTargetHandler(long recoveryId, ShardId shardId, TransportSe
.withType(TransportRequestOptions.Type.RECOVERY)
.withTimeout(recoverySettings.internalActionTimeout())
.build();
// TODO: Change after backport
this.retriesSupported = targetNode.getVersion().onOrAfter(Version.V_8_0_0);
this.retriesSupported = targetNode.getVersion().onOrAfter(Version.V_7_9_0);
}

@Override
Expand Down