0395c47193
This commit migrates events data in such a way that push events are stored much more efficiently. This is done by creating a shadow table called "events_for_migration", and a table called "push_event_payloads" which is used for storing push data of push events. The background migration in this commit will copy events from the "events" table into the "events_for_migration" table, push events in will also have a row created in "push_event_payloads". This approach allows us to reclaim space in the next release by simply swapping the "events" and "events_for_migration" tables, then dropping the old events (now "events_for_migration") table. The new table structure is also optimised for storage space, and does not include the unused "title" column nor the "data" column (since this data is moved to "push_event_payloads"). == Newly Created Events Newly created events are inserted into both "events" and "events_for_migration", both using the exact same primary key value. The table "push_event_payloads" in turn has a foreign key to the _shadow_ table. This removes the need for recreating and validating the foreign key after swapping the tables. Since the shadow table also has a foreign key to "projects.id" we also don't have to worry about orphaned rows. This approach however does require some additional storage as we're duplicating a portion of the events data for at least 1 release. The exact amount is hard to estimate, but for GitLab.com this is expected to be between 10 and 20 GB at most. The background migration in this commit deliberately does _not_ update the "events" table as doing so would put a lot of pressure on PostgreSQL's auto vacuuming system. == Supporting Both Old And New Events Application code has also been adjusted to support push events using both the old and new data formats. This is done by creating a PushEvent class which extends the regular Event class. Using Rails' Single Table Inheritance system we can ensure the right class is used for the right data, which in this case is based on the value of `events.action`. To support displaying old and new data at the same time the PushEvent class re-defines a few methods of the Event class, falling back to their original implementations for push events in the old format. Once all existing events have been migrated the various push event related methods can be removed from the Event model, and the calls to `super` can be removed from the methods in the PushEvent model. The UI and event atom feed have also been slightly changed to better handle this new setup, fortunately only a few changes were necessary to make this work. == API Changes The API only displays push data of events in the new format. Supporting both formats in the API is a bit more difficult compared to the UI. Since the old push data was not really well documented (apart from one example that used an incorrect "action" nmae) I decided that supporting both was not worth the effort, especially since events will be migrated in a few days _and_ new events are created in the correct format.
268 lines
7.9 KiB
Ruby
268 lines
7.9 KiB
Ruby
module SharedProject
|
|
include Spinach::DSL
|
|
|
|
# Create a project without caring about what it's called
|
|
step "I own a project" do
|
|
@project = create(:project, :repository, namespace: @user.namespace)
|
|
@project.team << [@user, :master]
|
|
end
|
|
|
|
step "I own a project in some group namespace" do
|
|
@group = create(:group, name: 'some group')
|
|
@project = create(:project, namespace: @group)
|
|
@project.team << [@user, :master]
|
|
end
|
|
|
|
step "project exists in some group namespace" do
|
|
@group = create(:group, name: 'some group')
|
|
@project = create(:project, :repository, namespace: @group, public_builds: false)
|
|
end
|
|
|
|
# Create a specific project called "Shop"
|
|
step 'I own project "Shop"' do
|
|
@project = Project.find_by(name: "Shop")
|
|
@project ||= create(:project, :repository, name: "Shop", namespace: @user.namespace)
|
|
@project.team << [@user, :master]
|
|
end
|
|
|
|
step 'I disable snippets in project' do
|
|
@project.snippets_enabled = false
|
|
@project.save
|
|
end
|
|
|
|
step 'I disable issues and merge requests in project' do
|
|
@project.issues_enabled = false
|
|
@project.merge_requests_enabled = false
|
|
@project.save
|
|
end
|
|
|
|
# Add another user to project "Shop"
|
|
step 'I add a user to project "Shop"' do
|
|
@project = Project.find_by(name: "Shop")
|
|
other_user = create(:user, name: 'Alpha')
|
|
@project.team << [other_user, :master]
|
|
end
|
|
|
|
# Create another specific project called "Forum"
|
|
step 'I own project "Forum"' do
|
|
@project = Project.find_by(name: "Forum")
|
|
@project ||= create(:project, :repository, name: "Forum", namespace: @user.namespace, path: 'forum_project')
|
|
@project.build_project_feature
|
|
@project.project_feature.save
|
|
@project.team << [@user, :master]
|
|
end
|
|
|
|
# Create an empty project without caring about the name
|
|
step 'I own an empty project' do
|
|
@project = create(:project,
|
|
name: 'Empty Project', namespace: @user.namespace)
|
|
@project.team << [@user, :master]
|
|
end
|
|
|
|
step 'I visit my empty project page' do
|
|
project = Project.find_by(name: 'Empty Project')
|
|
visit project_path(project)
|
|
end
|
|
|
|
step 'I visit project "Shop" activity page' do
|
|
project = Project.find_by(name: 'Shop')
|
|
visit project_path(project)
|
|
end
|
|
|
|
step 'project "Shop" has push event' do
|
|
@project = Project.find_by(name: "Shop")
|
|
@event = create(:push_event, project: @project, author: @user)
|
|
|
|
create(:push_event_payload,
|
|
event: @event,
|
|
action: :created,
|
|
commit_to: '6d394385cf567f80a8fd85055db1ab4c5295806f',
|
|
ref: 'fix',
|
|
commit_count: 1)
|
|
end
|
|
|
|
step 'I should see project "Shop" activity feed' do
|
|
project = Project.find_by(name: "Shop")
|
|
expect(page).to have_content "#{@user.name} pushed new branch fix at #{project.name_with_namespace}"
|
|
end
|
|
|
|
step 'I should see project settings' do
|
|
expect(current_path).to eq edit_project_path(@project)
|
|
expect(page).to have_content("Project name")
|
|
expect(page).to have_content("Sharing and permissions")
|
|
end
|
|
|
|
def current_project
|
|
@project ||= Project.first
|
|
end
|
|
|
|
# ----------------------------------------
|
|
# Project permissions
|
|
# ----------------------------------------
|
|
|
|
step 'I am member of a project with a guest role' do
|
|
@project.team << [@user, Gitlab::Access::GUEST]
|
|
end
|
|
|
|
step 'I am member of a project with a reporter role' do
|
|
@project.team << [@user, Gitlab::Access::REPORTER]
|
|
end
|
|
|
|
# ----------------------------------------
|
|
# Visibility of archived project
|
|
# ----------------------------------------
|
|
|
|
step 'archived project "Archive"' do
|
|
create(:project, :archived, :public, :repository, name: 'Archive')
|
|
end
|
|
|
|
step 'I should not see project "Archive"' do
|
|
project = Project.find_by(name: "Archive")
|
|
expect(page).not_to have_content project.name_with_namespace
|
|
end
|
|
|
|
step 'I should see project "Archive"' do
|
|
project = Project.find_by(name: "Archive")
|
|
expect(page).to have_content project.name_with_namespace
|
|
end
|
|
|
|
step 'project "Archive" has comments' do
|
|
project = Project.find_by(name: "Archive")
|
|
2.times { create(:note_on_issue, project: project) }
|
|
end
|
|
|
|
# ----------------------------------------
|
|
# Visibility level
|
|
# ----------------------------------------
|
|
|
|
step 'private project "Enterprise"' do
|
|
create(:project, :private, :repository, name: 'Enterprise')
|
|
end
|
|
|
|
step 'I should see project "Enterprise"' do
|
|
expect(page).to have_content "Enterprise"
|
|
end
|
|
|
|
step 'I should not see project "Enterprise"' do
|
|
expect(page).not_to have_content "Enterprise"
|
|
end
|
|
|
|
step 'internal project "Internal"' do
|
|
create(:project, :internal, :repository, name: 'Internal')
|
|
end
|
|
|
|
step 'I should see project "Internal"' do
|
|
page.within '.js-projects-list-holder' do
|
|
expect(page).to have_content "Internal"
|
|
end
|
|
end
|
|
|
|
step 'I should not see project "Internal"' do
|
|
page.within '.js-projects-list-holder' do
|
|
expect(page).not_to have_content "Internal"
|
|
end
|
|
end
|
|
|
|
step 'public project "Community"' do
|
|
create(:project, :public, :repository, name: 'Community')
|
|
end
|
|
|
|
step 'I should see project "Community"' do
|
|
expect(page).to have_content "Community"
|
|
end
|
|
|
|
step 'I should not see project "Community"' do
|
|
expect(page).not_to have_content "Community"
|
|
end
|
|
|
|
step '"John Doe" owns private project "Enterprise"' do
|
|
user_owns_project(
|
|
user_name: 'John Doe',
|
|
project_name: 'Enterprise'
|
|
)
|
|
end
|
|
|
|
step '"Mary Jane" owns private project "Enterprise"' do
|
|
user_owns_project(
|
|
user_name: 'Mary Jane',
|
|
project_name: 'Enterprise'
|
|
)
|
|
end
|
|
|
|
step '"John Doe" owns internal project "Internal"' do
|
|
user_owns_project(
|
|
user_name: 'John Doe',
|
|
project_name: 'Internal',
|
|
visibility: :internal
|
|
)
|
|
end
|
|
|
|
step '"John Doe" owns public project "Community"' do
|
|
user_owns_project(
|
|
user_name: 'John Doe',
|
|
project_name: 'Community',
|
|
visibility: :public
|
|
)
|
|
end
|
|
|
|
step 'public empty project "Empty Public Project"' do
|
|
create :project_empty_repo, :public, name: "Empty Public Project"
|
|
end
|
|
|
|
step 'project "Community" has comments' do
|
|
project = Project.find_by(name: "Community")
|
|
2.times { create(:note_on_issue, project: project) }
|
|
end
|
|
|
|
step 'trending projects are refreshed' do
|
|
TrendingProject.refresh!
|
|
end
|
|
|
|
step 'project "Shop" has labels: "bug", "feature", "enhancement"' do
|
|
project = Project.find_by(name: "Shop")
|
|
create(:label, project: project, title: 'bug')
|
|
create(:label, project: project, title: 'feature')
|
|
create(:label, project: project, title: 'enhancement')
|
|
end
|
|
|
|
step 'project "Shop" has CI enabled' do
|
|
project = Project.find_by(name: "Shop")
|
|
project.enable_ci
|
|
end
|
|
|
|
step 'project "Shop" has CI build' do
|
|
project = Project.find_by(name: "Shop")
|
|
pipeline = create :ci_pipeline, project: project, sha: project.commit.sha, ref: 'master'
|
|
pipeline.skip
|
|
end
|
|
|
|
step 'I should see last commit with CI status' do
|
|
page.within ".blob-commit-info" do
|
|
expect(page).to have_content(project.commit.sha[0..6])
|
|
expect(page).to have_link("Commit: skipped")
|
|
end
|
|
end
|
|
|
|
step 'The project is internal' do
|
|
@project.update(visibility_level: Gitlab::VisibilityLevel::INTERNAL)
|
|
end
|
|
|
|
step 'public access for builds is enabled' do
|
|
@project.update(public_builds: true)
|
|
end
|
|
|
|
step 'public access for builds is disabled' do
|
|
@project.update(public_builds: false)
|
|
end
|
|
|
|
step 'project "Shop" has a "Bugfix MR" merge request open' do
|
|
create(:merge_request, title: "Bugfix MR", target_project: project, source_project: project, author: project.users.first)
|
|
end
|
|
|
|
def user_owns_project(user_name:, project_name:, visibility: :private)
|
|
user = user_exists(user_name, username: user_name.gsub(/\s/, '').underscore)
|
|
project = Project.find_by(name: project_name)
|
|
project ||= create(:project, visibility, name: project_name, namespace: user.namespace)
|
|
project.team << [user, :master]
|
|
end
|
|
end
|