1. 08 Nov, 2017 26 commits
  2. 07 Nov, 2017 14 commits
    • Jacob Schatz's avatar
      Remove comments in JSON. · 98b6175e
      Jacob Schatz authored
      98b6175e
    • Jacob Schatz's avatar
      Add changelog · 430c42e1
      Jacob Schatz authored
      430c42e1
    • Jacob Schatz's avatar
      c2555e72
    • Yorick Peterse's avatar
      6e242e82
    • Yorick Peterse's avatar
      Rewrite the GitHub importer from scratch · 4dfe26cd
      Yorick Peterse authored
      Prior to this MR there were two GitHub related importers:
      
      * Github::Import: the main importer used for GitHub projects
      * Gitlab::GithubImport: importer that's somewhat confusingly used for
        importing Gitea projects (apparently they have a compatible API)
      
      This MR renames the Gitea importer to Gitlab::LegacyGithubImport and
      introduces a new GitHub importer in the Gitlab::GithubImport namespace.
      This new GitHub importer uses Sidekiq for importing multiple resources
      in parallel, though it also has the ability to import data sequentially
      should this be necessary.
      
      The new code is spread across the following directories:
      
      * lib/gitlab/github_import: this directory contains most of the importer
        code such as the classes used for importing resources.
      * app/workers/gitlab/github_import: this directory contains the Sidekiq
        workers, most of which simply use the code from the directory above.
      * app/workers/concerns/gitlab/github_import: this directory provides a
        few modules that are included in every GitHub importer worker.
      
      == Stages
      
      The import work is divided into separate stages, with each stage
      importing a specific set of data. Stages will schedule the work that
      needs to be performed, followed by scheduling a job for the
      "AdvanceStageWorker" worker. This worker will periodically check if all
      work is completed and schedule the next stage if this is the case. If
      work is not yet completed this worker will reschedule itself.
      
      Using this approach we don't have to block threads by calling `sleep()`,
      as doing so for large projects could block the thread from doing any
      work for many hours.
      
      == Retrying Work
      
      Workers will reschedule themselves whenever necessary. For example,
      hitting the GitHub API's rate limit will result in jobs rescheduling
      themselves. These jobs are not processed until the rate limit has been
      reset.
      
      == User Lookups
      
      Part of the importing process involves looking up user details in the
      GitHub API so we can map them to GitLab users. The old importer used
      an in-memory cache, but this obviously doesn't work when the work is
      spread across different threads.
      
      The new importer uses a Redis cache and makes sure we only perform
      API/database calls if absolutely necessary.  Frequently used keys are
      refreshed, and lookup misses are also cached; removing the need for
      performing API/database calls if we know we don't have the data we're
      looking for.
      
      == Performance & Models
      
      The new importer in various places uses raw INSERT statements (as
      generated by `Gitlab::Database.bulk_insert`) instead of using Rails
      models. This allows us to bypass any validations and callbacks,
      drastically reducing the number of SQL queries and Gitaly RPC calls
      necessary to import projects.
      
      To ensure the code produces valid data the corresponding tests check if
      the produced rows are valid according to the model validation rules.
      4dfe26cd
    • Marcia Ramos's avatar
      Merge branch 'docs-add-glcom-reg-restictions' into 'master' · ac4a976c
      Marcia Ramos authored
      Add note on registry restrictions on GitLab.com
      
      See merge request gitlab-org/gitlab-ce!15174
      ac4a976c
    • Chenjerai Katanda's avatar
      b67d7295
    • Annabel Dunstone Gray's avatar
      Merge branch '37824-many-branches-lock-server' into 'master' · d9313795
      Annabel Dunstone Gray authored
      Project with many branches can lock server running "git branch --contains XXX"
      
      Closes #37824
      
      See merge request gitlab-org/gitlab-ce!14812
      d9313795
    • Jose Ivan Vargas's avatar
      fix karma config file · 4bd90ec3
      Jose Ivan Vargas authored
      4bd90ec3
    • Yorick Peterse's avatar
      Cache feature names in RequestStore · 90be53c5
      Yorick Peterse authored
      The GitHub importer (and probably other parts of our code) ends up
      calling Feature.persisted? many times (via Gitaly). By storing this data
      in RequestStore we can save ourselves _a lot_ of database queries.
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/39361
      90be53c5
    • Yorick Peterse's avatar
      Add returning IDs to Gitlab::Database.bulk_insert · bda30182
      Yorick Peterse authored
      This adds the keyword argument "return_ids" to
      Gitlab::Database.bulk_insert. When set to `true` (and PostgreSQL is
      used) this method will return an Array of the IDs of the inserted rows,
      otherwise it will return an empty Array.
      bda30182
    • Yorick Peterse's avatar
      Refactor User.find_by_any_email · 44be82dd
      Yorick Peterse authored
      By using SQL::Union we can return a proper ActiveRecord::Relation,
      making it possible to select the columns we're interested in (instead of
      all of them).
      44be82dd
    • Annabel Dunstone Gray's avatar
      Remove truncate mixin · fb41187b
      Annabel Dunstone Gray authored
      fb41187b
    • Filipa Lacerda's avatar
      Update mr_widget_options_spec.js · 1aa4604f
      Filipa Lacerda authored
      1aa4604f