[ML] Fix acceptable model snapshot versions in ML deprecation checker #81060

droberts195 · 2021-11-25T16:30:52Z

This is a followup to #81039.

The same requirement to tolerate model snapshots back to 6.4.0
that applies to the job opening code also applies to the deprecation
checker. Again, we tell the user that 7.0.0 is the model snapshot
version we support, but we actually have to support versions going
back to 6.4.0 because we didn't update the constant in the C++ in
7.0.0.

Additionally, the wording of the ML deprecation messages is very
slightly updated. The messages are different in the 7.16 branch,
where they were updated by #79387. This wording is copied forward
to master, but with the tiny change that "Snapshot" is changed to
"Model snapshot" in one place. This should make it clearer for
users that we're talking about ML model snapshots and not cluster
snapshots (which are completely different things). Another reason
to change the wording is that the UI is looking for the pattern
/[Mm]odel snapshot/ to decide when to display the "Fix" button for
upgrading ML model snapshots - see elastic/kibana#119745.

This is a followup to elastic#81039. The same requirement to tolerate model snapshots back to 6.4.0 that applies to the job opening code also applies to the deprecation checker. Again, we tell the user that 7.0.0 is the model snapshot version we support, but we actually have to support versions going back to 6.4.0 because we didn't update the constant in the C++ in 7.0.0. Additionally, the wording of the ML deprecation messages is very slightly updated. The messages are different in the 7.16 branch, where they were updated by elastic#79387. This wording is copied forward to master, but with the tiny change that "Snapshot" is changed to "Model snapshot" in one place. This should make it clearer for users that we're talking about ML model snapshots and not cluster snapshots (which are completely different things). Another reason to change the wording is that the UI is looking for the pattern /[Mm]odel snapshot/ to decide when to display the "Fix" button for upgrading ML model snapshots - see elastic/kibana#119745.

elasticmachine · 2021-11-25T16:30:56Z

Pinging @elastic/ml-core (Team:ML)

droberts195 · 2021-11-25T16:40:19Z

...ugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/MlDeprecationChecker.java

-                    "model snapshot [%s] for job [%s] supports minimum version [%s] and needs to be at least [%s].",
+                    // Important: the Kibana upgrade assistant expects this to match the pattern /[Mm]odel snapshot/
+                    // and if it doesn't then the expected "Fix" button won't appear for this deprecation.
+                    "Model snapshot [%s] for job [%s] has an obsolete minimum version [%s].",


@masseyke and @debadair I've added one word compared to what you used in #79387: "Model snapshot" instead of just "Snapshot" at the beginning. Please let me know if you strongly object to this.

droberts195 · 2021-11-25T17:01:56Z

Jenkins run elasticsearch-ci/bwc

droberts195 · 2021-11-25T17:07:05Z

Jenkins run elasticsearch-ci/bwc

droberts195 · 2021-11-25T17:25:51Z

Jenkins run elasticsearch-ci/part-1

droberts195 · 2021-11-25T17:41:17Z

Jenkins run elasticsearch-ci/part-2

droberts195 · 2021-11-25T18:06:31Z

Jenkins run elasticsearch-ci/part-2

davidkyle

LGTM

…upgrade (#119745) The deprecations for ML snapshots that are too old and need upgrading are supposed to have a "Fix" button next to them. Unfortunately this disappeared when a message was reworded in elastic/elasticsearch#79387. This change adjusts the regex that the upgrade assistant uses to detect which deprecations to add the "Fix" button to so that it will match both "Model snapshot" and "model snapshot". The test data is also updated to match the new backend text. This change is designed to work with elastic/elasticsearch#81060.

…elastic#81060) This is a followup to elastic#81039. The same requirement to tolerate model snapshots back to 6.4.0 that applies to the job opening code also applies to the deprecation checker. Again, we tell the user that 7.0.0 is the model snapshot version we support, but we actually have to support versions going back to 6.4.0 because we didn't update the constant in the C++ in 7.0.0. Additionally, the wording of the ML deprecation messages is very slightly updated. The messages are different in the 7.16 branch, where they were updated by elastic#79387. This wording is copied forward to master, but with the tiny change that "Snapshot" is changed to "Model snapshot" in one place. This should make it clearer for users that we're talking about ML model snapshots and not cluster snapshots (which are completely different things). Another reason to change the wording is that the UI is looking for the pattern /[Mm]odel snapshot/ to decide when to display the "Fix" button for upgrading ML model snapshots - see elastic/kibana#119745.

elasticsearchmachine · 2021-11-29T14:50:57Z

💔 Backport failed

Status	Branch	Result
✅	8.0
❌	7.16	Commit could not be cherrypicked due to conflicts

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 81060

…upgrade (elastic#119745) The deprecations for ML snapshots that are too old and need upgrading are supposed to have a "Fix" button next to them. Unfortunately this disappeared when a message was reworded in elastic/elasticsearch#79387. This change adjusts the regex that the upgrade assistant uses to detect which deprecations to add the "Fix" button to so that it will match both "Model snapshot" and "model snapshot". The test data is also updated to match the new backend text. This change is designed to work with elastic/elasticsearch#81060.

…checker This is a followup to elastic#81039. The same requirement to tolerate model snapshots back to 6.4.0 that applies to the job opening code also applies to the deprecation checker. Again, we tell the user that 7.0.0 is the model snapshot version we support, but we actually have to support versions going back to 6.4.0 because we didn't update the constant in the C++ in 7.0.0. Additionally, the wording of the ML deprecation messages is very slightly updated. The messages are different in the 7.16 branch, where they were updated by elastic#79387. This wording is copied forward to master, but with the tiny change that "Snapshot" is changed to "Model snapshot" in one place. This should make it clearer for users that we're talking about ML model snapshots and not cluster snapshots (which are completely different things). Another reason to change the wording is that the UI is looking for the pattern /[Mm]odel snapshot/ to decide when to display the "Fix" button for upgrading ML model snapshots - see elastic/kibana#119745. Backport of elastic#81060

…#81060) (#81101) This is a followup to #81039. The same requirement to tolerate model snapshots back to 6.4.0 that applies to the job opening code also applies to the deprecation checker. Again, we tell the user that 7.0.0 is the model snapshot version we support, but we actually have to support versions going back to 6.4.0 because we didn't update the constant in the C++ in 7.0.0. Additionally, the wording of the ML deprecation messages is very slightly updated. The messages are different in the 7.16 branch, where they were updated by #79387. This wording is copied forward to master, but with the tiny change that "Snapshot" is changed to "Model snapshot" in one place. This should make it clearer for users that we're talking about ML model snapshots and not cluster snapshots (which are completely different things). Another reason to change the wording is that the UI is looking for the pattern /[Mm]odel snapshot/ to decide when to display the "Fix" button for upgrading ML model snapshots - see elastic/kibana#119745.

This is a fix to the fix of elastic#81060. In the original fix where I tried to port the changes from elastic#79387 to master I didn't notice that the text of the message and detail of the deprecation had been largely switched around. My tweaks to the wording in elastic#81060 did not make this major switch. This PR switches the two strings we generate.

…upgrade (#119745) (#119850) The deprecations for ML snapshots that are too old and need upgrading are supposed to have a "Fix" button next to them. Unfortunately this disappeared when a message was reworded in elastic/elasticsearch#79387. This change adjusts the regex that the upgrade assistant uses to detect which deprecations to add the "Fix" button to so that it will match both "Model snapshot" and "model snapshot". The test data is also updated to match the new backend text. This change is designed to work with elastic/elasticsearch#81060. Co-authored-by: David Roberts <dave.roberts@elastic.co>

…upgrade (#119745) (#119851) The deprecations for ML snapshots that are too old and need upgrading are supposed to have a "Fix" button next to them. Unfortunately this disappeared when a message was reworded in elastic/elasticsearch#79387. This change adjusts the regex that the upgrade assistant uses to detect which deprecations to add the "Fix" button to so that it will match both "Model snapshot" and "model snapshot". The test data is also updated to match the new backend text. This change is designed to work with elastic/elasticsearch#81060. Co-authored-by: David Roberts <dave.roberts@elastic.co>

…checker (#81105) This is a followup to #81039. The same requirement to tolerate model snapshots back to 6.4.0 that applies to the job opening code also applies to the deprecation checker. Again, we tell the user that 7.0.0 is the model snapshot version we support, but we actually have to support versions going back to 6.4.0 because we didn't update the constant in the C++ in 7.0.0. Additionally, the wording of the ML deprecation messages is very slightly updated. The messages are different in the 7.16 branch, where they were updated by #79387. This wording is copied forward to master, but with the tiny change that "Snapshot" is changed to "Model snapshot" in one place. This should make it clearer for users that we're talking about ML model snapshots and not cluster snapshots (which are completely different things). Another reason to change the wording is that the UI is looking for the pattern /[Mm]odel snapshot/ to decide when to display the "Fix" button for upgrading ML model snapshots - see elastic/kibana#119745. Backport of #81060

This is a fix to the fix of #81060. In the original fix where I tried to port the changes from #79387 to master I didn't notice that the text of the message and detail of the deprecation had been largely switched around. My tweaks to the wording in #81060 did not make this major switch. This PR switches the two strings we generate. This is only for 8.0 and 8.1. For 7.16 the discrepancy became obvious in the backport of #81060 to that branch, so it's already correct there.

…ic#81108) This is a fix to the fix of elastic#81060. In the original fix where I tried to port the changes from elastic#79387 to master I didn't notice that the text of the message and detail of the deprecation had been largely switched around. My tweaks to the wording in elastic#81060 did not make this major switch. This PR switches the two strings we generate. This is only for 8.0 and 8.1. For 7.16 the discrepancy became obvious in the backport of elastic#81060 to that branch, so it's already correct there.

… (#81114) This is a fix to the fix of #81060. In the original fix where I tried to port the changes from #79387 to master I didn't notice that the text of the message and detail of the deprecation had been largely switched around. My tweaks to the wording in #81060 did not make this major switch. This PR switches the two strings we generate. This is only for 8.0 and 8.1. For 7.16 the discrepancy became obvious in the backport of #81060 to that branch, so it's already correct there.

* upstream/master: (150 commits) Fix ComposableIndexTemplate equals when composed_of is null (elastic#80864) Optimize DLS bitset building for matchAll query (elastic#81030) URL option for BaseRunAsSuperuserCommand (elastic#81025) Less Verbose Serialization of Snapshot Failure in SLM Metadata (elastic#80942) Fix shadowed vars pt7 (elastic#80996) Fail shards early when we can detect a type missmatch (elastic#79869) Delegate Ref Counting to ByteBuf in Netty Transport (elastic#81096) Clarify `unassigned.reason` docs (elastic#81017) Strip blocks from settings for reindex targets (elastic#80887) Split off the values supplier for ScriptDocValues (elastic#80635) [ML] Switch message and detail for model snapshot deprecations (elastic#81108) [DOCS] Update xrefs for snapshot restore docs (elastic#81023) [ML] Updates visiblity of validate API (elastic#81061) Track histogram of transport handling times (elastic#80581) [ML] Fix datafeed preview with remote indices (elastic#81099) [ML] Fix acceptable model snapshot versions in ML deprecation checker (elastic#81060) [ML] Add logging for failing PyTorch test (elastic#81044) Extending the timeout waiting for snapshot to be ready (elastic#81018) [ML] Fix incorrect logging of unexpected model size error (elastic#81089) [ML] Make inference timeout test more reliable (elastic#81094) ... # Conflicts: # server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java

* upstream/master: (55 commits) Fix ComposableIndexTemplate equals when composed_of is null (elastic#80864) Optimize DLS bitset building for matchAll query (elastic#81030) URL option for BaseRunAsSuperuserCommand (elastic#81025) Less Verbose Serialization of Snapshot Failure in SLM Metadata (elastic#80942) Fix shadowed vars pt7 (elastic#80996) Fail shards early when we can detect a type missmatch (elastic#79869) Delegate Ref Counting to ByteBuf in Netty Transport (elastic#81096) Clarify `unassigned.reason` docs (elastic#81017) Strip blocks from settings for reindex targets (elastic#80887) Split off the values supplier for ScriptDocValues (elastic#80635) [ML] Switch message and detail for model snapshot deprecations (elastic#81108) [DOCS] Update xrefs for snapshot restore docs (elastic#81023) [ML] Updates visiblity of validate API (elastic#81061) Track histogram of transport handling times (elastic#80581) [ML] Fix datafeed preview with remote indices (elastic#81099) [ML] Fix acceptable model snapshot versions in ML deprecation checker (elastic#81060) [ML] Add logging for failing PyTorch test (elastic#81044) Extending the timeout waiting for snapshot to be ready (elastic#81018) [ML] Fix incorrect logging of unexpected model size error (elastic#81089) [ML] Make inference timeout test more reliable (elastic#81094) ...

…upgrade (elastic#119745) The deprecations for ML snapshots that are too old and need upgrading are supposed to have a "Fix" button next to them. Unfortunately this disappeared when a message was reworded in elastic/elasticsearch#79387. This change adjusts the regex that the upgrade assistant uses to detect which deprecations to add the "Fix" button to so that it will match both "Model snapshot" and "model snapshot". The test data is also updated to match the new backend text. This change is designed to work with elastic/elasticsearch#81060.

droberts195 added >bug :ml Machine learning v8.0.0 auto-backport-and-merge v7.16.1 v8.1.0 labels Nov 25, 2021

elasticmachine added the Team:ML Meta label for the ML team label Nov 25, 2021

droberts195 commented Nov 25, 2021

View reviewed changes

Fixing test

6b21c73

droberts195 mentioned this pull request Nov 25, 2021

[Upgrade assistant] Fix the "Fix" button for ML snapshots in need of upgrade elastic/kibana#119745

Merged

davidkyle approved these changes Nov 29, 2021

View reviewed changes

droberts195 merged commit 34ae3dd into elastic:master Nov 29, 2021

droberts195 deleted the fix_deprecation_checker_for_old_snapshots branch November 29, 2021 14:49

droberts195 mentioned this pull request Nov 29, 2021

[8.0] [ML] Fix acceptable model snapshot versions in ML deprecation checker (#81060) #81101

Merged

droberts195 mentioned this pull request Nov 29, 2021

[7.16] [ML] Fix acceptable model snapshot versions in ML deprecation checker #81105

Merged

droberts195 mentioned this pull request Nov 29, 2021

[ML] Switch message and detail for model snapshot deprecations #81108

Merged

danhermann added v7.16.0 and removed v7.16.1 labels Dec 3, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[ML] Fix acceptable model snapshot versions in ML deprecation checker #81060

[ML] Fix acceptable model snapshot versions in ML deprecation checker #81060

Uh oh!

droberts195 commented Nov 25, 2021

Uh oh!

elasticmachine commented Nov 25, 2021

Uh oh!

droberts195 Nov 25, 2021

Uh oh!

droberts195 commented Nov 25, 2021

Uh oh!

droberts195 commented Nov 25, 2021

Uh oh!

droberts195 commented Nov 25, 2021

Uh oh!

droberts195 commented Nov 25, 2021

Uh oh!

droberts195 commented Nov 25, 2021

Uh oh!

davidkyle left a comment

Uh oh!

elasticsearchmachine commented Nov 29, 2021

Uh oh!

Uh oh!

[ML] Fix acceptable model snapshot versions in ML deprecation checker #81060

[ML] Fix acceptable model snapshot versions in ML deprecation checker #81060

Uh oh!

Conversation

droberts195 commented Nov 25, 2021

Uh oh!

elasticmachine commented Nov 25, 2021

Uh oh!

droberts195 Nov 25, 2021

Choose a reason for hiding this comment

Uh oh!

droberts195 commented Nov 25, 2021

Uh oh!

droberts195 commented Nov 25, 2021

Uh oh!

droberts195 commented Nov 25, 2021

Uh oh!

droberts195 commented Nov 25, 2021

Uh oh!

droberts195 commented Nov 25, 2021

Uh oh!

davidkyle left a comment

Choose a reason for hiding this comment

Uh oh!

elasticsearchmachine commented Nov 29, 2021

💔 Backport failed

Uh oh!

Uh oh!