[CCR] Adjust list retryable errors #33985
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The following changes were made: * Added ElasticsearchSecurityException. For in the case the current user has insufficient privileges while an index is being followed. Prior to following ccr checks whether the current user has sufficient privileges and if not the follow api fails with an error. * Added Index block exception. If the leader index gets closed, this exception is returned. * Added ClusterBlockException service unavailable. In case for example the leader cluster is without elected master. * Removed IndexNotFoundException. If the leader / follower index has been deleted, ccr will need to stop the shard follow tasks with an error. Closes elastic#33954 Depends on elastic#33983
martijnvg
added
review
:Distributed Indexing/CCR
|
Pinging @elastic/es-distributed |
dnhatn
approved these changes
Sep 26, 2018
There was a problem hiding this comment.
Thanks @martijnvg for adding many great tests. I left some minor comments. LGTM.
|
|
||
| client().admin().indices().open(new OpenIndexRequest("index1")).actionGet(); | ||
| client().prepareIndex("index1", "doc", "2").setSource("{}", XContentType.JSON).get(); | ||
| assertBusy(() -> assertThat(client().prepareSearch("index2").get().getHits().totalHits, equalTo(2L))); |
There was a problem hiding this comment.
Maybe just use atLeastDocsIndexed.
There was a problem hiding this comment.
Sorry @martijnvg, I was wrong. We should strictly assert here instead of using at least. I think we should use the previous form.
There was a problem hiding this comment.
yes, now I think about it that makes sense. I changed that here: 327ef72
| client().execute(CreateAndFollowIndexAction.INSTANCE, createAndFollowRequest).get(); | ||
|
|
||
| client().prepareIndex("index1", "doc", "1").setSource("{}", XContentType.JSON).get(); | ||
| assertBusy(() -> assertThat(client().prepareSearch("index2").get().getHits().totalHits, equalTo(1L))); |
There was a problem hiding this comment.
Maybe just use atLeastDocsIndexed.
| assertThat(response.getStatsResponses().get(0).status().numberOfFailedBulkOperations(), greaterThanOrEqualTo(1L)); | ||
| }); | ||
| client().admin().indices().open(new OpenIndexRequest("index2")).actionGet(); | ||
| assertBusy(() -> assertThat(client().prepareSearch("index2").get().getHits().totalHits, equalTo(2L))); |
x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowNodeTask.java
Show resolved
Hide resolved
| .put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1) | ||
| .put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 0) | ||
| .build())); | ||
| ensureGreen("index1"); |
There was a problem hiding this comment.
By default, we will wait until the primary shard gets allocated. Thus, we do not have to call ensureGreen if the number of replicas is 0.
martijnvg
added a commit
that referenced
this pull request
Sep 28, 2018
The following changes were made: * Added ElasticsearchSecurityException. For in the case the current user has insufficient privileges while an index is being followed. Prior to following ccr checks whether the current user has sufficient privileges and if not the follow api fails with an error. * Added Index block exception. If the leader index gets closed, this exception is returned. * Added ClusterBlockException service unavailable. In case for example the leader cluster is without elected master. * Removed IndexNotFoundException. If the leader / follower index has been deleted, ccr will need to stop the shard follow tasks with an error. Closes #33954
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
Sep 28, 2018
* master: Use more precise does S3 bucket exist method (elastic#34123) LLREST: Introduce a strict mode (elastic#33708) [CCR] Adjust list retryable errors (elastic#33985) Fix AggregationFactories.Builder equality and hash regarding order (elastic#34005) MINOR: Remove some deadcode in NodeEnv and Related (elastic#34133) Rest-Api-Spec: Correct spelling in filter_path description (elastic#33154) Core: Don't rely on java time for epoch seconds formatting (elastic#34086) Retry errors when fetching follower global checkpoint. (elastic#34019) Watcher: Reenable watcher stats REST tests (elastic#34107) Remove special-casing of Synonym filters in AnalysisRegistry (elastic#34034) Rename CCR APIs (elastic#34027) Fixed CCR stats api serialization issues and (elastic#33983) Support 'string'-style queries on metadata fields when reasonable. (elastic#34089) Logging: Drop Settings from security logger get calls (elastic#33940) SQL: Internal refactoring of operators as functions (elastic#34097)
kcm
pushed a commit
that referenced
this pull request
Oct 30, 2018
The following changes were made: * Added ElasticsearchSecurityException. For in the case the current user has insufficient privileges while an index is being followed. Prior to following ccr checks whether the current user has sufficient privileges and if not the follow api fails with an error. * Added Index block exception. If the leader index gets closed, this exception is returned. * Added ClusterBlockException service unavailable. In case for example the leader cluster is without elected master. * Removed IndexNotFoundException. If the leader / follower index has been deleted, ccr will need to stop the shard follow tasks with an error. Closes #33954
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The following changes were made:
Closes #33954
Depends on #33983