Merge feature/searchable-snapshots branch into 7.x (#54803) #54825

tlrx · 2020-04-06T16:15:06Z

This is a backport of #54803 for 7.x.

This pull request cherry picks the squashed commit from #54803 with the additional commits:

6f50c92 which adjusts master code to 7.x
a114549 to mute a failing ILM test (Mute testDeleteActionDeletesSearchableSnapshot #54818)
48cbca1 and 50186b2 that cleans up and unmutes the previous test
aae12bb that adds a missing feature flag (Set missing feature flag in searchable snapshots QA Azure test #54861)
6f330e3 that adds missing serialization bits (Fix serialization bug in SearchableSnapshotsStatsResponse #54864)
bf72c02 that adjust the version in YAML tests
a51955f that adds some plumbing for the transport client used in integration tests

This commit merges the searchable-snapshots feature branch into master. See elastic#54803 for the complete list of squashed commits. Co-authored-by: David Turner <[email protected]> Co-authored-by: Yannick Welsch <[email protected]> Co-authored-by: Lee Hinman <[email protected]> Co-authored-by: Andrei Dan <[email protected]>

elasticmachine · 2020-04-06T16:15:09Z

Pinging @elastic/es-distributed (:Distributed/Snapshot/Restore)

…ic#54861)

) SearchableSnapshotsStatsResponse is missing the serialization of the list of SearchableSnapshotShardStats

tlrx · 2020-04-07T10:04:51Z

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/DeleteAction.java

    }

    public DeleteAction(StreamInput in) throws IOException {
+        if (in.getVersion().onOrAfter(Version.V_7_8_0)) {


@andreidan Version has been adjusted here

tlrx · 2020-04-07T10:05:02Z

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/DeleteAction.java


    @Override
    public void writeTo(StreamOutput out) throws IOException {
+        if (out.getVersion().onOrAfter(Version.V_7_8_0)) {


@andreidan Version has been adjusted here

Thanks @tlrx

DaveCTurner

I left a question about the loss of a feature flag conditional.

I'm also concerned about the number of deviations away from List.of -- I think this will make backporting future work much harder. Could you try and bring these more in line between the branches, ideally with import org.elasticsearch.common.collect.List rather than using the fully-qualified name inline?

...snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshots.java

tlrx · 2020-04-07T10:37:54Z

@DaveCTurner Thanks for your feedback. I tried to minimize the deviations away from List.of event though is most cases it ends up being a complete qualification of the org.elasticsearch.common.collect.List class.

DaveCTurner · 2020-04-07T10:45:52Z

it ends up being a complete qualification of the org.elasticsearch.common.collect.List class

Ugh, right, I see, if we also import java.util.List then we can't have both. Thanks anyway, I think it helps to align whitespace if nothing else.

DaveCTurner · 2020-04-07T11:25:24Z

LGTM, thanks @tlrx and @andreidan

andreidan

LGTM, great feature @tlrx @DaveCTurner

tlrx · 2020-04-07T11:29:26Z

Thanks David and Andrei!

This commit adjusts some versions on master now searchable snapshots has been backported to 7.x in #54825.

This fixes the version checks to use 7.8.0 instead of 8.0.0 since the changes in elastic#54825 were backported to the 7.x branch.

This fixes the version checks to use 7.8.0 instead of 8.0.0 since the changes in #54825 were backported to the 7.x branch.

tlrx and others added 3 commits April 6, 2020 17:02

Fix stuff after cherry-picking

6f50c92

Mute testDeleteActionDeletesSearchableSnapshot (elastic#54818)

a114549

tlrx added :Distributed Coordination/Snapshot/Restore Anything directly related to the `_snapshot/*` APIs backport labels Apr 6, 2020

andreidan and others added 6 commits April 6, 2020 21:35

Tests: only build the IndexMetadata once

48cbca1

Fix TimeSeriesLifecycleActionsIT

50186b2

Set missing feature flag in searchable snapshots QA Azure test (elast…

aae12bb

…ic#54861)

Fix serialization bug in SearchableSnapshotsStatsResponse (elastic#54864

6f330e3

) SearchableSnapshotsStatsResponse is missing the serialization of the list of SearchableSnapshotShardStats

Adjust skip versions in YAML tests

bf72c02

Adjust Transport client settings and plugins

a51955f

tlrx requested review from DaveCTurner and andreidan April 7, 2020 10:03

tlrx commented Apr 7, 2020

View reviewed changes

DaveCTurner reviewed Apr 7, 2020

View reviewed changes

...snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshots.java Outdated Show resolved Hide resolved

apply feedback

cba13d2

tlrx requested a review from DaveCTurner April 7, 2020 10:38

DaveCTurner approved these changes Apr 7, 2020

View reviewed changes

andreidan approved these changes Apr 7, 2020

View reviewed changes

tlrx merged commit 4d36917 into elastic:7.x Apr 7, 2020

tlrx deleted the searchable-snapshots-on-7.x branch April 7, 2020 11:28

tlrx added the v7.8.0 label Apr 7, 2020

tlrx mentioned this pull request Apr 7, 2020

Adjust versions after searchable snapshots has been backported to 7.x #54875

Merged

tlrx added a commit that referenced this pull request Apr 7, 2020

Adjust versions after backport (#54875)

3f5b2e8

This commit adjusts some versions on master now searchable snapshots has been backported to 7.x in #54825.

andreidan mentioned this pull request Apr 7, 2020

Fix IndexLifecycleExplainResponse serialization version checks #54904

Merged

andreidan added a commit that referenced this pull request Apr 7, 2020

Fix IndexLifecycleExplainResponse serialization version checks (#54904)

770caf3

This fixes the version checks to use 7.8.0 instead of 8.0.0 since the changes in #54825 were backported to the 7.x branch.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge feature/searchable-snapshots branch into 7.x (#54803) #54825

Merge feature/searchable-snapshots branch into 7.x (#54803) #54825

Uh oh!

tlrx commented Apr 6, 2020 •

edited

Loading

Uh oh!

elasticmachine commented Apr 6, 2020

Uh oh!

tlrx Apr 7, 2020

Uh oh!

tlrx Apr 7, 2020

Uh oh!

andreidan Apr 7, 2020

Uh oh!

DaveCTurner left a comment

Uh oh!

Uh oh!

tlrx commented Apr 7, 2020

Uh oh!

DaveCTurner commented Apr 7, 2020

Uh oh!

DaveCTurner commented Apr 7, 2020

Uh oh!

andreidan left a comment •

edited

Loading

Uh oh!

tlrx commented Apr 7, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Merge feature/searchable-snapshots branch into 7.x (#54803) #54825

Merge feature/searchable-snapshots branch into 7.x (#54803) #54825

Uh oh!

Conversation

tlrx commented Apr 6, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

elasticmachine commented Apr 6, 2020

Uh oh!

tlrx Apr 7, 2020

Choose a reason for hiding this comment

Uh oh!

tlrx Apr 7, 2020

Choose a reason for hiding this comment

Uh oh!

andreidan Apr 7, 2020

Choose a reason for hiding this comment

Uh oh!

DaveCTurner left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

tlrx commented Apr 7, 2020

Uh oh!

DaveCTurner commented Apr 7, 2020

Uh oh!

DaveCTurner commented Apr 7, 2020

Uh oh!

andreidan left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tlrx commented Apr 7, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

tlrx commented Apr 6, 2020 •

edited

Loading

andreidan left a comment •

edited

Loading