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

Move CAS operations in TokenService to sequence numbers #38311

Merged
merged 1 commit into from Feb 4, 2019

Conversation

Projects
None yet
4 participants
@bleskes
Copy link
Member

commented Feb 4, 2019

Relates #37872
Relates #10708

@elasticmachine

This comment has been minimized.

Copy link

commented Feb 4, 2019

@bleskes

This comment has been minimized.

Copy link
Member Author

commented Feb 4, 2019

@elasticmachine run elasticsearch-ci/1 please.

@bleskes

This comment has been minimized.

Copy link
Member Author

commented Feb 4, 2019

@elasticmachine run elasticsearch-ci/1

@bleskes bleskes requested a review from albertzaharovits Feb 4, 2019

updateRequest.setIfPrimaryTerm(response.getPrimaryTerm());
} else {
updateRequest.setVersion(response.getVersion());
}

This comment has been minimized.

Copy link
@albertzaharovits

albertzaharovits Feb 4, 2019

Contributor

Small suggestion to make the condition tight proof (an assert could also work).

if (clusterService.state().nodes().getMinNodeVersion().onOrAfter(Version.V_6_7_0)
  && response.getSeqNo() != UNASSIGNED_SEQ_NO) {
    updateRequest.setIfSeqNo(response.getSeqNo());
    updateRequest.setIfPrimaryTerm(response.getPrimaryTerm());
} else {
    updateRequest.setVersion(response.getVersion());
}

There might be guarantees in other places in the code, I haven't looked for it thoroughly, you know better.

This comment has been minimized.

Copy link
@bleskes

bleskes Feb 4, 2019

Author Member

@albertzaharovits sorry, I didn't see this version of the comment before merging. I'll add it in a follow up.

@albertzaharovits
Copy link
Contributor

left a comment

LGTM

@bleskes bleskes merged commit e49b593 into elastic:master Feb 4, 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_token_service branch Feb 4, 2019

@bleskes

This comment has been minimized.

Copy link
Member Author

commented Feb 4, 2019

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

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

Merge remote-tracking branch 'elastic/6.x' into retention-lease-backg…
…round-sync-6.x

* elastic/6.x:
  Fix testRestoreIncreasesPrimaryTerms on 6.x (elastic#38314)
  SQL: Remove exceptions from Analyzer (elastic#38260) (elastic#38287)
  SQL: Move metrics tracking inside PlanExecutor (elastic#38259) (elastic#38288)
  Backport of elastic#38311: Move TokenService to seqno powered cas
  Handle scheduler exceptions (elastic#38183)
  Mute MlMigrationFullClusterRestartIT#testMigration (elastic#38316)
  6.x Backport of elastic#38278: Move ML Optimistic Concurrency Control to Seq No
  Cleanup construction of interceptors (elastic#38296)
  Throw if two inner_hits have the same name (elastic#37645) (elastic#38194)
  AsyncTwoPhaseIndexerTests race condition fixed elastic#38195 Backport#37830
  Enable SSL in reindex with security QA tests (elastic#38293)
  Ensure ILM policies run safely on leader indices  (elastic#38140)
  Introduce ssl settings to reindex from remote (elastic#38292)
  Fix ordering problem in add or renew lease test (elastic#38281)
  Mute ReplicationTrackerRetentionLeaseTests#testAddOrRenewRetentionLease (elastic#38276)
  Fix NPE in Logfile Audit Filter (elastic#38120) (elastic#38271)
  Enable trace log in FollowerFailOverIT (elastic#38148)
  SQL: Generate relevant error message when grouping functions are not used in GROUP BY (elastic#38017)

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

bleskes added a commit to bleskes/elasticsearch that referenced this pull request Feb 7, 2019

bleskes added a commit that referenced this pull request Feb 11, 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.