Skip to content

Draft: Use patched method to sort the db records by ES returned order

Changzheng Liu requested to merge 291032_flaky_es_records into master

What does this MR do?

This MR is to try to fix the flaky spec mentioned in #291032 (closed).

According to the monkey patch at https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/lib/gem_extensions/elasticsearch/model/adapter/active_record/records.rb#L21, method records is actually defined there which sorts the db records by the order returned by ES, because defined?(::ActiveRecord) && ::ActiveRecord::VERSION::MAJOR >= 5 evaluates to true. Though both to_a and records passed on my local testing, it may be safer to use records based on the logic in the monkey-patched code.

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 Changzheng Liu

Merge request reports