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

Jump to bottom

Rename ILM, ILM endpoints and drop _xpack #32564

Merged
merged 4 commits into from
Aug 2, 2018
Merged

Rename ILM, ILM endpoints and drop _xpack #32564

merged 4 commits into from
Aug 2, 2018

Conversation

jasontedor
Copy link
Member

@jasontedor jasontedor commented Aug 1, 2018 •
edited
Loading

This commit does the following:

  • renames index-lifecycle plugin to ilm
  • modifies the endpoints to ilm instead of index_lifecycle
  • drops _xpack from the endpoints
  • drops a few duplicate endpoints

@jasontedor
Remove _xpack from index lifecycle APIs
64fc292 
For a new feature like index lifecycle we will go without this extra
layer of indirection. This commit replaces all
/_xpack/index_lifecycle/_(\S+) endpoints by /_index_lifecycle/$1
endpoints.
@jasontedor jasontedor added the :Data Management/ILM+SLM Index and Snapshot lifecycle management label Aug 1, 2018
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra

bleskes
bleskes approved these changes Aug 2, 2018
View reviewed changes
Copy link
Contributor

@bleskes bleskes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jasontedor jasontedor changed the title Remove _xpack from index lifecycle APIs Rename ILM, ILM endpoints and drop _xpack Aug 2, 2018
@jasontedor jasontedor requested a review from colings86 August 2, 2018 16:55
@jasontedor
Merge remote-tracking branch 'elastic/index-lifecycle' into index-lif…
4c0b007 
…ecycle-underscore-x-pack

* elastic/index-lifecycle:
  Make index.lifecycle.name setting internal (elastic#32518)
colings86
colings86 approved these changes Aug 2, 2018
View reviewed changes
Copy link
Contributor

@colings86 colings86 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM although I thought the settings in LifecycleSettings would change too. Can be done as a follow up

@jasontedor
Copy link
Member Author

The builds pass for me so I am pushing this:

[jason@totoro elasticsearch]$ ./gradlew :x-pack:plugin:integTestRunner -Dtests.seed=926577ED65FA2058 -Dtests.class=org.elasticsearch.xpack.test.rest.XPackRestIT -Dtests.method="test {p0=ilm*"
To honour the JVM settings for this build a new JVM will be forked. Please consider using the daemon: https://docs.gradle.org/4.9/userguide/gradle_daemon.html.
Daemon will be stopped at the end of the build stopping after processing

> Configure project :benchmarks
=======================================
Elasticsearch Build Hamster says Hello!
=======================================
  Gradle Version        : 4.9
  OS Info               : Linux 4.17.6-200.fc28.x86_64 (amd64)
  JDK Version           : Oracle Corporation 10.0.2 [OpenJDK 64-Bit Server VM 10.0.2+13]
  JAVA_HOME             : /opt/java/jdk-10.0.2
  Random Testing Seed   : 926577ED65FA2058

> Task :x-pack:plugin:core:compileJava
Note: Some input files use or override a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
Note: Some input files use unchecked or unsafe operations.
Note: Recompile with -Xlint:unchecked for details.
Suite: org.elasticsearch.xpack.test.rest.XPackRestIT
  1> [2018-08-02T13:01:33,062][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/50_set_policy_for_index/Test Set Policy Unmanaged Index] before test
  1> [2018-08-02T13:01:33,129][INFO ][o.e.x.t.r.XPackRestIT    ] [test] initializing REST clients against [http://[::1]:41665]

> Task :x-pack:plugin:integTestRunner
   [junit4] <JUnit4> says hi! Master seed: 926577ED65FA2058
==> Test Info: seed=926577ED65FA2058; jvm=1; suite=1

  1> [2018-08-02T13:01:33,517][INFO ][o.e.x.t.r.XPackRestIT    ] [test] initializing client, minimum es version [7.0.0-alpha1], master version, [7.0.0-alpha1], hosts [http://[::1]:41665]
  1> [2018-08-02T13:01:34,811][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/50_set_policy_for_index/Test Set Policy Unmanaged Index] after test
  1> [2018-08-02T13:01:34,830][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/60_remove_policy_for_index/Test Remove Policy Single Index] before test
  1> [2018-08-02T13:01:35,815][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/60_remove_policy_for_index/Test Remove Policy Single Index] after test
  1> [2018-08-02T13:01:35,826][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/50_set_policy_for_index/Test Set Policy Index Does Not Exist] before test
  1> [2018-08-02T13:01:36,725][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/50_set_policy_for_index/Test Set Policy Index Does Not Exist] after test
  1> [2018-08-02T13:01:36,734][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/20_move_to_step/Test Invalid Move To Step With Invalid Policy] before test
  1> [2018-08-02T13:01:37,130][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/20_move_to_step/Test Invalid Move To Step With Invalid Policy] after test
  1> [2018-08-02T13:01:37,140][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/60_operation_mode/Test Changing Operation Modes] before test
  1> [2018-08-02T13:01:37,293][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/60_operation_mode/Test Changing Operation Modes] after test
  1> [2018-08-02T13:01:37,304][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/20_move_to_step/Test Invalid Move To Step With Incorrect Current Step] before test
  1> [2018-08-02T13:01:37,706][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/20_move_to_step/Test Invalid Move To Step With Incorrect Current Step] after test
  1> [2018-08-02T13:01:37,714][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/40_explain_lifecycle/Test Wildcard Index Lifecycle Explain] before test
  1> [2018-08-02T13:01:38,548][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/40_explain_lifecycle/Test Wildcard Index Lifecycle Explain] after test
  1> [2018-08-02T13:01:38,558][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/60_remove_policy_for_index/Test Remove Policy Index Does Not Exist] before test
  1> [2018-08-02T13:01:39,423][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/60_remove_policy_for_index/Test Remove Policy Index Does Not Exist] after test
  1> [2018-08-02T13:01:39,434][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/40_explain_lifecycle/Test All Indexes Lifecycle Explain] before test
  1> [2018-08-02T13:01:40,278][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/40_explain_lifecycle/Test All Indexes Lifecycle Explain] after test
  1> [2018-08-02T13:01:40,287][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/40_explain_lifecycle/Test Basic Lifecycle Explain] before test
  1> [2018-08-02T13:01:41,132][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/40_explain_lifecycle/Test Basic Lifecycle Explain] after test
  1> [2018-08-02T13:01:41,140][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/10_basic/Test Undeletable Policy In Use] before test
  1> [2018-08-02T13:01:41,356][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/10_basic/Test Undeletable Policy In Use] after test
  1> [2018-08-02T13:01:41,366][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/30_retry/Test Invalid Re-run With Invalid Index] before test
  1> [2018-08-02T13:01:41,579][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/30_retry/Test Invalid Re-run With Invalid Index] after test
  1> [2018-08-02T13:01:41,588][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/10_basic/Test Policy Update] before test
  1> [2018-08-02T13:01:41,975][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/10_basic/Test Policy Update] after test
  1> [2018-08-02T13:01:41,985][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/20_move_to_step/Test Basic Move To Step] before test
  1> [2018-08-02T13:01:42,363][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/20_move_to_step/Test Basic Move To Step] after test
  1> [2018-08-02T13:01:42,373][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/20_move_to_step/Test Invalid Move To Step With Invalid Next Step] before test
  1> [2018-08-02T13:01:42,735][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/20_move_to_step/Test Invalid Move To Step With Invalid Next Step] after test
  1> [2018-08-02T13:01:42,746][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/30_retry/Test Invalid Retry With No Policy] before test
  1> [2018-08-02T13:01:42,958][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/30_retry/Test Invalid Retry With No Policy] after test
  1> [2018-08-02T13:01:42,970][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/50_set_policy_for_index/Test Set Policy Single Index] before test
  1> [2018-08-02T13:01:43,846][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/50_set_policy_for_index/Test Set Policy Single Index] after test
  1> [2018-08-02T13:01:43,857][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/30_retry/Test Invalid Retry With Non-errored Policy] before test
  1> [2018-08-02T13:01:44,164][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/30_retry/Test Invalid Retry With Non-errored Policy] after test
  1> [2018-08-02T13:01:44,173][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/40_explain_lifecycle/Test Unmanaged Index Lifecycle Explain] before test
  1> [2018-08-02T13:01:44,945][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/40_explain_lifecycle/Test Unmanaged Index Lifecycle Explain] after test
  1> [2018-08-02T13:01:44,954][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/50_set_policy_for_index/Test Set Policy Index Pattern] before test
  1> [2018-08-02T13:01:45,870][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/50_set_policy_for_index/Test Set Policy Index Pattern] after test
  1> [2018-08-02T13:01:45,881][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/60_remove_policy_for_index/Test Remove Policy Unmanaged Index] before test
  1> [2018-08-02T13:01:46,710][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/60_remove_policy_for_index/Test Remove Policy Unmanaged Index] after test
  1> [2018-08-02T13:01:46,719][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/60_remove_policy_for_index/Test Remove Policy Index Pattern] before test
  1> [2018-08-02T13:01:47,588][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/60_remove_policy_for_index/Test Remove Policy Index Pattern] after test
  1> [2018-08-02T13:01:47,598][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/10_basic/Test Basic Policy CRUD] before test
  1> [2018-08-02T13:01:47,672][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/10_basic/Test Basic Policy CRUD] after test
  1> [2018-08-02T13:01:47,683][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/20_move_to_step/Test Invalid Move To Step With Invalid Index] before test
  1> [2018-08-02T13:01:48,046][INFO ][o.e.x.t.r.XPackRestIT    ] [test] [p0=ilm/20_move_to_step/Test Invalid Move To Step With Invalid Index] after test
Completed [1/1] in 15.18s, 24 tests


> Task :x-pack:plugin:integTestRunner
==> Test Summary: 1 suite, 24 tests
   [junit4] JVM J0:     0.32 ..    17.27 =    16.95s
   [junit4] Execution time total: 17 seconds
   [junit4] Tests summary: 1 suite, 24 tests

BUILD SUCCESSFUL in 1m 26s
232 actionable tasks: 123 executed, 109 up-to-date
[jason@totoro elasticsearch]$ ./gradlew :x-pack:plugin:ilm:check
To honour the JVM settings for this build a new JVM will be forked. Please consider using the daemon: https://docs.gradle.org/4.9/userguide/gradle_daemon.html.
Daemon will be stopped at the end of the build stopping after processing

> Configure project :benchmarks
=======================================
Elasticsearch Build Hamster says Hello!
=======================================
  Gradle Version        : 4.9
  OS Info               : Linux 4.17.6-200.fc28.x86_64 (amd64)
  JDK Version           : Oracle Corporation 10.0.2 [OpenJDK 64-Bit Server VM 10.0.2+13]
  JAVA_HOME             : /opt/java/jdk-10.0.2
  Random Testing Seed   : 681AE0B412BD1695

> Task :x-pack:plugin:ilm:test
==> Test Info: seed=C5E9B4A8A516B534; jvms=4; suites=11

[ant:junit4] JVM J3: stderr was not empty, see: /home/jason/src/elastic/elasticsearch/x-pack/plugin/ilm/build/testrun/test/temp/junit4-J3-20180802_130222_15817469315509661441463.syserr
[ant:junit4] JVM J0: stderr was not empty, see: /home/jason/src/elastic/elasticsearch/x-pack/plugin/ilm/build/testrun/test/temp/junit4-J0-20180802_130222_1562762320542225611666.syserr
[ant:junit4] JVM J2: stderr was not empty, see: /home/jason/src/elastic/elasticsearch/x-pack/plugin/ilm/build/testrun/test/temp/junit4-J2-20180802_130222_1566702061961268374159.syserr

> Task :x-pack:plugin:ilm:test
==> Test Summary: 11 suites, 106 tests

> Task :x-pack:plugin:ilm:integTestRunner
==> Test Info: seed=FD78E600C88B0747; jvm=1; suites=2

HEARTBEAT J0 PID([email protected]): 2018-08-02T13:02:52, stalled for 12.0s at: TimeSeriesLifecycleActionsIT.testReplicasAction

> Task :x-pack:plugin:ilm:integTestRunner
Slow Tests Summary:
 50.20s | org.elasticsearch.xpack.indexlifecycle.TimeSeriesLifecycleActionsIT
  7.36s | org.elasticsearch.xpack.indexlifecycle.IndexLifecycleInitialisationIT

==> Test Summary: 2 suites, 9 tests

BUILD SUCCESSFUL in 1m 35s
186 actionable tasks: 66 executed, 120 up-to-date
[jason@totoro elasticsearch]$

@jasontedor jasontedor merged commit 5de236e into elastic:index-lifecycle Aug 2, 2018
@jasontedor jasontedor deleted the index-lifecycle-underscore-x-pack branch August 2, 2018 17:05
@jasontedor
Copy link
Member Author

LGTM although I thought the settings in LifecycleSettings would change too. Can be done as a follow up

Yes I would pick this up in a follow up because this PR was getting too large.

jasontedor added a commit that referenced this pull request Aug 17, 2018
@jasontedor
Rename ILM, ILM endpoints and drop _xpack (#32564)
276b2f7 
This commit does the following:
 - renames index-lifecycle plugin to ilm
 - modifies the endpoints to ilm instead of index_lifecycle
 - drops _xpack from the endpoints
 - drops a few duplicate endpoints
@jasontedor jasontedor mentioned this pull request Nov 28, 2018
Closed
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bleskes bleskes bleskes approved these changes

@colings86 colings86 colings86 approved these changes

Assignees
No one assigned
Labels
:Data Management/ILM+SLM Index and Snapshot lifecycle management
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jasontedor @elasticmachine @colings86 @bleskes