1. 08 Nov, 2017 12 commits
    • Yorick Peterse's avatar
      94b8336b
    • Yorick Peterse's avatar
      Rewrite the GitHub importer from scratch · d6ceb5e5
      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.
      d6ceb5e5
    • Yorick Peterse's avatar
      Cache feature names in RequestStore · 353c6895
      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
      353c6895
    • Yorick Peterse's avatar
      Add returning IDs to Gitlab::Database.bulk_insert · d43ac640
      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.
      d43ac640
    • Yorick Peterse's avatar
      Refactor User.find_by_any_email · b603a513
      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).
      b603a513
    • Douwe Maan's avatar
      Merge branch 'bvl-free-paths-ee' into 'master' · ce57217b
      Douwe Maan authored
      (EE-port) Free up reserved words that were used under the `groups` route
      
      See merge request gitlab-org/gitlab-ee!3299
      ce57217b
    • Nick Thomas's avatar
      Merge branch 'sh-show-geo-node-creation-errors' into 'master' · 105ed5f4
      Nick Thomas authored
      Properly report errors when GeoNode fails to create
      
      Closes #3948
      
      See merge request gitlab-org/gitlab-ee!3300
      105ed5f4
    • Bob Van Landuyt's avatar
      5141ff3c
    • Bob Van Landuyt's avatar
      Free up reserved words that were used under the `groups` route · 613b1c39
      Bob Van Landuyt authored
      Free up `labels` as a group name
      
      Free up `avatar`, `group_members` and `milestones` as paths
      
      Free up some group reserved words
      
      Update failure message when finding new routes in `PathRegex`
      
      Check redirecting with a querystring
      
      Remove EE-specific group paths
      
      redirect the EE specific routes
      613b1c39
    • Rémy Coutable's avatar
      Merge branch 'ce-to-ee' into 'master' · 747646b7
      Rémy Coutable authored
      CE Upstream - Monday
      
      Closes gitlab-ce#39776, gitlab-ce#39771 et #3544
      
      See merge request gitlab-org/gitlab-ee!3277
      747646b7
    • Stan Hu's avatar
      Merge branch 'pawel/fix_backend_transaction_protected_labels_method' into 'master' · b1e572b3
      Stan Hu authored
      Make BackgroundTransaction#labels public
      
      See merge request gitlab-org/gitlab-ce!15257
      b1e572b3
    • Stan Hu's avatar
      Properly report errors when GeoNode fails to create · 5701f415
      Stan Hu authored
      Closes #3948
      5701f415
  2. 07 Nov, 2017 27 commits
  3. 06 Nov, 2017 1 commit