Skip to content

Move BulkItemRequest BWC to 5.x #25511

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

Merged
bleskes merged 9 commits into from
Jul 8, 2017
Merged

Move BulkItemRequest BWC to 5.x #25511

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b14239f
don't mutate DocWriteRequest for bwc
bleskes Jul 1, 2017
973e27b
allow to run bwc test against a local branch
bleskes Jul 2, 2017
664dd2b
allow to run bwc test against a local branch
bleskes Jul 2, 2017
cf8c557
add docs
bleskes Jul 3, 2017
61c3e56
text tweaks
bleskes Jul 3, 2017
2d0a3ce
Merge branch 'bwc_local_branch' into index_req_bwc
bleskes Jul 6, 2017
9de94c7
Merge remote-tracking branch 'upstream/master' into index_req_bwc
bleskes Jul 6, 2017
f2be2e9
bwc infra feedback
bleskes Jul 6, 2017
855a16a
Merge remote-tracking branch 'upstream/master' into index_req_bwc
bleskes Jul 7, 2017
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
29 changes: 1 addition & 28 deletions core/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@

package org.elasticsearch.action.bulk;

import org.elasticsearch.Version;
import org.elasticsearch.action.DocWriteRequest;
import org.elasticsearch.action.DocWriteResponse;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.io.stream.Streamable;
Expand Down Expand Up @@ -78,37 +76,12 @@ public void readFrom(StreamInput in) throws IOException {
if (in.readBoolean()) {
primaryResponse = BulkItemResponse.readBulkItem(in);
}
if (in.getVersion().before(Version.V_6_0_0_alpha1)) { // TODO remove once backported
boolean ignoreOnReplica = in.readBoolean();
if (ignoreOnReplica == false && primaryResponse != null) {
assert primaryResponse.isFailed() == false : "expected no failure on the primary response";
}
}
}

@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeVInt(id);
if (out.getVersion().before(Version.V_6_0_0_alpha1)) { // TODO remove once backported
// old nodes expect updated version and version type on the request
if (primaryResponse != null) {
request.version(primaryResponse.getVersion());
request.versionType(request.versionType().versionTypeForReplicationAndRecovery());
DocWriteRequest.writeDocumentRequest(out, request);
} else {
DocWriteRequest.writeDocumentRequest(out, request);
}
} else {
DocWriteRequest.writeDocumentRequest(out, request);
}
DocWriteRequest.writeDocumentRequest(out, request);
out.writeOptionalStreamable(primaryResponse);
if (out.getVersion().before(Version.V_6_0_0_alpha1)) { // TODO remove once backported
if (primaryResponse != null) {
out.writeBoolean(primaryResponse.isFailed()
|| primaryResponse.getResponse().getResult() == DocWriteResponse.Result.NOOP);
} else {
out.writeBoolean(false);
}
}
}
}
17 changes: 13 additions & 4 deletions distribution/bwc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,12 @@ if (enabled) {
File checkoutDir = file("${buildDir}/bwc/checkout-${bwcBranch}")

task createClone(type: LoggedExec) {
onlyIf { checkoutDir.exists() == false }
commandLine = ['git', 'clone', rootDir, checkoutDir]
if (checkoutDir.exists() == false) {
commandLine = ['git', 'clone', rootDir, checkoutDir]
} else {
commandLine = ['git', 'fetch', 'origin']
workingDir = checkoutDir
}
}

// we use regular Exec here to ensure we always get output, regardless of logging level
Expand Down Expand Up @@ -106,9 +110,14 @@ if (enabled) {

// this is an Exec task so that the SHA that is checked out is logged
task checkoutBwcBranch(type: Exec) {
dependsOn fetchLatest
def String branch = System.getProperty("tests.bwc.branch", "upstream/${bwcBranch}")
if (branch.startsWith('upstream')) {
dependsOn fetchLatest
} else {
dependsOn createClone
}
workingDir = checkoutDir
commandLine = ['git', 'checkout', "upstream/${bwcBranch}"]
commandLine = ['git', 'checkout', branch]
}

File bwcDeb = file("${checkoutDir}/distribution/deb/build/distributions/elasticsearch-${bwcVersion}.deb")
Expand Down