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

`if_seq_no` and `if_primary_term` parameters aren't wired correctly in REST Client's CRUD API #38411

Merged
merged 5 commits into from Feb 5, 2019

Conversation

Projects
None yet
4 participants
@bleskes
Copy link
Member

commented Feb 5, 2019

No description provided.

@elasticmachine

This comment has been minimized.

Copy link

commented Feb 5, 2019

@javanna

javanna approved these changes Feb 5, 2019

Copy link
Member

left a comment

LGTM thanks @bleskes

@@ -3,7 +3,7 @@

- skip:
version: " - 6.99.99"
reason: cas ops are introduced in 7.0.0
reason: typesless api was introduces in 7.0

This comment has been minimized.

Copy link
@javanna

javanna Feb 5, 2019

Member

s/typesless/typeless s/introduces/introduced

@bleskes bleskes changed the title `if_seq_no` and `if_primary_term` parameters aren't wired correctly in REST Client's bulk `if_seq_no` and `if_primary_term` parameters aren't wired correctly in REST Client's CRUD API Feb 5, 2019

@bleskes bleskes requested a review from javanna Feb 5, 2019

@javanna

javanna approved these changes Feb 5, 2019

@@ -131,6 +132,7 @@
import static org.hamcrest.Matchers.hasKey;
import static org.hamcrest.Matchers.nullValue;

@Repeat(iterations = 200)

This comment has been minimized.

Copy link
@javanna

javanna Feb 5, 2019

Member

leftover?

request.setIfPrimaryTerm(primaryTerm);
expectedParams.put("if_primary_term", Long.toString(primaryTerm));
}
}

This comment has been minimized.

Copy link
@javanna

javanna Feb 5, 2019

Member

could these two methods be static?

bleskes added some commits Feb 5, 2019

@bleskes

This comment has been minimized.

Copy link
Member Author

commented Feb 5, 2019

@elasticmachine run elasticsearch-ci/packaging-sample

@bleskes bleskes merged commit 12657fd into elastic:master Feb 5, 2019

7 checks passed

CLA Commit author is a member of Elasticsearch
Details
elasticsearch-ci/1 Build finished.
Details
elasticsearch-ci/2 Build finished.
Details
elasticsearch-ci/default-distro Build finished.
Details
elasticsearch-ci/docbldesx Build finished.
Details
elasticsearch-ci/oss-distro-docs Build finished.
Details
elasticsearch-ci/packaging-sample Build finished.
Details

@bleskes bleskes deleted the bleskes:cas_bulk_rest branch Feb 5, 2019

bleskes added a commit that referenced this pull request Feb 5, 2019

Backport of #38411: `if_seq_no` and `if_primary_term` parameters aren…
…'t wired correctly in REST Client's CRUD API

jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request Feb 5, 2019

Merge branch 'master' into retention-leases-recovery
* master: (23 commits)
  Lift retention lease expiration to index shard (elastic#38380)
  Make Ccr recovery file chunk size configurable (elastic#38370)
  Prevent CCR recovery from missing documents (elastic#38237)
  re-enables awaitsfixed datemath tests (elastic#38376)
  Types removal fix FullClusterRestartIT warnings (elastic#38445)
  Make sure to reject mappings with type _doc when include_type_name is false. (elastic#38270)
  Updates the grok patterns to be consistent with logstash (elastic#27181)
  Ignore type-removal warnings in XPackRestTestHelper (elastic#38431)
  testHlrcFromXContent() should respect assertToXContentEquivalence() (elastic#38232)
  add basic REST test for geohash_grid (elastic#37996)
  Remove DiscoveryPlugin#getDiscoveryTypes (elastic#38414)
  Fix the clock resolution to millis in GetWatchResponseTests (elastic#38405)
  Throw AssertionError when no master (elastic#38432)
  `if_seq_no` and `if_primary_term` parameters aren't wired correctly in REST Client's CRUD API (elastic#38411)
  Enable CronEvalToolTest.testEnsureDateIsShownInRootLocale (elastic#38394)
  Fix failures in BulkProcessorIT#testGlobalParametersAndBulkProcessor. (elastic#38129)
  SQL: Implement CURRENT_DATE (elastic#38175)
  Mute testReadRequestsReturnLatestMappingVersion (elastic#38438)
  [ML] Report index unavailable instead of waiting for lazy node (elastic#38423)
  Update Rollup Caps to allow unknown fields (elastic#38339)
  ...

jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request Feb 6, 2019

Merge branch '6.x' into retention-leases-recovery-6.x
* 6.x: (25 commits)
  Backport of types removal for Put/Get index templates (elastic#38465)
  Add support for API keys to access Elasticsearch (elastic#38291) (elastic#38399)
  Deprecate support for internal versioning for concurrency control (elastic#38451)
  Deprecate types in rollover index API (elastic#38389) (elastic#38458)
  Add typless client side GetIndexRequest calls and response class (elastic#38422)
  [ML] Report index unavailable instead of waiting for lazy node (elastic#38444)
  await fix CurtIT#testIndex until elastic#38451 is merged (elastic#38466)
  Update ilm-api.asciidoc, point to REMOVE policy (elastic#38235) (elastic#38464)
  SQL: Fix esType for DATETIME/DATE and INTERVALS (elastic#38179)
  Clean up duplicate follow config parameter code (elastic#37688) (elastic#38443)
  Deprecation check for No Master Block setting (elastic#38383)
  Bubble-up exceptions from scheduler (elastic#38441)
  Lift retention lease expiration to index shard (elastic#38391)
  Deprecate maxRetryTimeout in RestClient and increase default value (elastic#38425)
  Update Rollup Caps to allow unknown fields (elastic#38446)
  Backport of elastic#38411: `if_seq_no` and `if_primary_term` parameters aren't wired correctly in REST Client's CRUD API
  Support unknown fields in ingest pipeline map configuration (elastic#38429)
  SQL: Implement CURRENT_DATE (elastic#38175)
  Backport changes to the release notes script. (elastic#38346)
  Fix ILM explain response to allow unknown fields (elastic#38363)
  ...

@colings86 colings86 added v7.0.0-beta1 and removed v7.0.0 labels Feb 7, 2019

dimitris-athanasiou added a commit to dimitris-athanasiou/elasticsearch that referenced this pull request Feb 12, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.