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.

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

[ILM] Add unfollow action #36970

Merged
merged 46 commits into from
Jan 18, 2019
Merged
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
c0fc17e
[ILM] Add unfollow action
martijnvg Dec 22, 2018
f9f530e
Replaced ccr / ilm integ test with multi cluster integ test and
martijnvg Dec 24, 2018
80bb2ef
Fixed tests
martijnvg Dec 24, 2018
a265c2a
Added more tests
martijnvg Dec 24, 2018
e281b03
Rename class to WaitForIndexingCompleteStep
gwbrown Jan 3, 2019
07f0136
Factor "ccr" out into constant
gwbrown Jan 3, 2019
509718c
Add note about leader index to error message
gwbrown Jan 3, 2019
974bb8b
Factor out mocking into methods
gwbrown Jan 3, 2019
97df36b
Merge branch 'master' into pr/36970
gwbrown Jan 4, 2019
37bd0ef
Fix error message in test
gwbrown Jan 4, 2019
94dc951
[WIP] Add rollover-based test case
gwbrown Jan 5, 2019
e996f83
Merge branch 'master' into pr/36970
gwbrown Jan 5, 2019
3949445
Decreased read_poll_timeout from 60 seconds to 1 second.
martijnvg Jan 7, 2019
0ef7002
Adjusted testGetNextActionName() test
martijnvg Jan 7, 2019
6bb4055
Merge branch 'master' into pr/36970
gwbrown Jan 8, 2019
2d368ab
More informative message when following is paused
gwbrown Jan 8, 2019
7485773
Remove index settings from step info
gwbrown Jan 8, 2019
d96ebbb
Javadoc for UnfollowAction
gwbrown Jan 8, 2019
464c256
UnfollowAction hashcode
gwbrown Jan 8, 2019
5d63a5a
Handle deleted indices in WaitForIndexingComplete
gwbrown Jan 8, 2019
f63e73d
added assertion messages
martijnvg Jan 9, 2019
deac47a
Merge remote-tracking branch 'es/master' into ccr_ilm_follower_indices
martijnvg Jan 9, 2019
886a3f5
Moved pause follower index, close follower index and
martijnvg Jan 9, 2019
2b60e54
Remove unused imports
gwbrown Jan 9, 2019
6d0e236
Merge remote-tracking branch 'es/master' into ccr_ilm_follower_indices
martijnvg Jan 10, 2019
533bc4f
Allow UnfollowAction in Warm and Cold phases
gwbrown Jan 10, 2019
731d8d2
Add Unfollow action to HLRC
gwbrown Jan 11, 2019
67f970e
added docs for the unfollow action
martijnvg Jan 11, 2019
272b8d6
added wait for yellow step. That will run after open index step,
martijnvg Jan 11, 2019
ea93eda
Merge remote-tracking branch 'es/master' into ccr_ilm_follower_indices
martijnvg Jan 11, 2019
e9b252e
Merge remote-tracking branch 'es/master' into ccr_ilm_follower_indices
martijnvg Jan 14, 2019
0416490
docs iter
martijnvg Jan 14, 2019
443fc4a
changed WaitForYellowStep to be a AsyncWaitStep
martijnvg Jan 14, 2019
5abf557
take into account no IndexRoutingTable
martijnvg Jan 14, 2019
caa13ce
Add Unfollow to Warm/Cold phase ordering test
gwbrown Jan 14, 2019
7f521e8
Merge remote-tracking branch 'es/master' into ccr_ilm_follower_indices
martijnvg Jan 15, 2019
5d3d661
OpenFollowerIndexStep cannot extend from AbstractUnfollowIndexStep,
martijnvg Jan 15, 2019
f7e74d4
Add `indexing_complete` setting to Wait step info
gwbrown Jan 15, 2019
7c1749b
Added Unfollow to the Actions docs ToC
gwbrown Jan 15, 2019
fcf34e6
Switch Info to hardcoded false
gwbrown Jan 15, 2019
c02f8cb
fixed checkstyle violation
martijnvg Jan 16, 2019
a9b2663
Merge remote-tracking branch 'es/master' into ccr_ilm_follower_indices
martijnvg Jan 17, 2019
bb67cdb
Merge branch 'master' into pr/36970
gwbrown Jan 17, 2019
3ee6298
Fix a couple tests
gwbrown Jan 17, 2019
f1c05bd
Run SetPriority before Unfollow
gwbrown Jan 18, 2019
ca0d2cc
Merge branch 'master' into pr/36970
gwbrown Jan 18, 2019
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
Prev Previous commit
Next Next commit
More informative message when following is paused
  • Loading branch information
gwbrown committed Jan 8, 2019
commit 2d368aba15f9287b02da88407d939fbe5fa11bba
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,12 @@ List<ShardFollowTaskInfo> getShardFollowTaskInfos() {
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
builder.startObject();
builder.field(SHARD_FOLLOW_TASKS.getPreferredName(), shardFollowTaskInfos);
String message = "Waiting for [" + shardFollowTaskInfos.size() + "] shard follow tasks to be in sync";
String message;
if (shardFollowTaskInfos.size() > 0) {
message = "Waiting for [" + shardFollowTaskInfos.size() + "] shard follow tasks to be in sync";
} else {
message = "Waiting for following to be unpaused and all shard follow tasks to be up to date";
}
builder.field(MESSAGE.getPreferredName(), message);
builder.endObject();
return builder;
Expand Down