Skip to content
Snippets Groups Projects

Handle unreachable ES host in settings check

1 unresolved thread

What does this MR do?

Related to #299991 (closed)

Fixes an error if Elasticsearch is unreachable when checking if the Elasticsearch client is available using the ping method. The ping method only handles a types of errors so I added a more generic rescue (which was present previously and replaced another MR). I had trouble reproducing this manually so I added a spec which did fail and now passes.

Screenshots (strongly suggested)

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • [-] Label as security and @ mention @gitlab-com/gl-security/appsec
  • [-] The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • [-] Security reports checked/validated by a reviewer from the AppSec team
Edited by Terri Chu

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Changzheng Liu changed milestone to %13.9

    changed milestone to %13.9

  • Dmitry Gruzd approved this merge request

    approved this merge request

  • Dmitry Gruzd assigned to @ayufan and unassigned @dgruzd

    assigned to @ayufan and unassigned @dgruzd

  • Robert Hunt approved this merge request

    approved this merge request

  • Robert Hunt assigned to @blabuschagne and unassigned @rob.hunt

    assigned to @blabuschagne and unassigned @rob.hunt

  • Brandon Labuschagne approved this merge request

    approved this merge request

  • Kamil Trzciński approved this merge request

    approved this merge request

  • Kamil Trzciński unapproved this merge request

    unapproved this merge request

  • Kamil Trzciński approved this merge request

    approved this merge request

  • Terri Chu added 1 commit

    added 1 commit

    • e9b6d53d - fixup! Handle network unreachable error in ES settings check

    Compare with previous version

  • Terri Chu marked this merge request as draft from e9b6d53d

    marked this merge request as draft from e9b6d53d

  • Terri Chu marked this merge request as ready

    marked this merge request as ready

  • mentioned in issue #299980 (closed)

  • assigned to @ayufan

  • Kamil Trzciński resolved all threads

    resolved all threads

  • @terrichu It is great :)

  • mentioned in commit 1cec26c7

  • added workflowstaging label and removed workflowin dev label

  • added workflowcanary label and removed workflowstaging label

  • added workflowstaging label and removed workflowcanary label

  • added workflowcanary label and removed workflowstaging label

  • Stan Hu added 1 deleted label

    added 1 deleted label

  • Adding ~"Pick into 13.8" because this blocks some EE customers from being able to access admin settings.

  • added workflowproduction label and removed workflowcanary label

  • GitLab Release Tools Bot removed 1 deleted label

    removed 1 deleted label

  • mentioned in merge request !53357 (merged)

  • mentioned in issue #322499 (closed)

  • added devopsdata stores label and removed devopssystems label

  • Please register or sign in to reply
    Loading