mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 19:07:30 +00:00
feat(eventstore): increase parallel write capabilities (#5940)
This implementation increases parallel write capabilities of the eventstore. Please have a look at the technical advisories: [05](https://zitadel.com/docs/support/advisory/a10005) and [06](https://zitadel.com/docs/support/advisory/a10006). The implementation of eventstore.push is rewritten and stored events are migrated to a new table `eventstore.events2`. If you are using cockroach: make sure that the database user of ZITADEL has `VIEWACTIVITY` grant. This is used to query events.
This commit is contained in:
@@ -9,11 +9,9 @@ import (
|
||||
"github.com/zitadel/zitadel/internal/domain"
|
||||
"github.com/zitadel/zitadel/internal/errors"
|
||||
"github.com/zitadel/zitadel/internal/eventstore"
|
||||
"github.com/zitadel/zitadel/internal/eventstore/repository"
|
||||
"github.com/zitadel/zitadel/internal/eventstore/v1/models"
|
||||
"github.com/zitadel/zitadel/internal/id"
|
||||
id_mock "github.com/zitadel/zitadel/internal/id/mock"
|
||||
"github.com/zitadel/zitadel/internal/repository/member"
|
||||
"github.com/zitadel/zitadel/internal/repository/project"
|
||||
)
|
||||
|
||||
@@ -60,24 +58,18 @@ func TestCommandSide_AddProject(t *testing.T) {
|
||||
eventstore: eventstoreExpect(
|
||||
t,
|
||||
expectPushFailed(errors.ThrowAlreadyExists(nil, "ERROR", "internl"),
|
||||
[]*repository.Event{
|
||||
eventFromEventPusher(project.NewProjectAddedEvent(
|
||||
context.Background(),
|
||||
&project.NewAggregate("project1", "org1").Aggregate,
|
||||
"project", true, true, true,
|
||||
domain.PrivateLabelingSettingAllowLoginUserResourceOwnerPolicy,
|
||||
),
|
||||
),
|
||||
eventFromEventPusher(project.NewProjectMemberAddedEvent(
|
||||
context.Background(),
|
||||
&project.NewAggregate("project1", "org1").Aggregate,
|
||||
"user1",
|
||||
[]string{domain.RoleProjectOwner}...,
|
||||
),
|
||||
),
|
||||
},
|
||||
uniqueConstraintsFromEventConstraint(project.NewAddProjectNameUniqueConstraint("project", "org1")),
|
||||
uniqueConstraintsFromEventConstraint(member.NewAddMemberUniqueConstraint("project1", "user1")),
|
||||
project.NewProjectAddedEvent(
|
||||
context.Background(),
|
||||
&project.NewAggregate("project1", "org1").Aggregate,
|
||||
"project", true, true, true,
|
||||
domain.PrivateLabelingSettingAllowLoginUserResourceOwnerPolicy,
|
||||
),
|
||||
project.NewProjectMemberAddedEvent(
|
||||
context.Background(),
|
||||
&project.NewAggregate("project1", "org1").Aggregate,
|
||||
"user1",
|
||||
[]string{domain.RoleProjectOwner}...,
|
||||
),
|
||||
),
|
||||
),
|
||||
idGenerator: id_mock.NewIDGeneratorExpectIDs(t, "project1"),
|
||||
@@ -104,24 +96,18 @@ func TestCommandSide_AddProject(t *testing.T) {
|
||||
eventstore: eventstoreExpect(
|
||||
t,
|
||||
expectPush(
|
||||
[]*repository.Event{
|
||||
eventFromEventPusher(project.NewProjectAddedEvent(
|
||||
context.Background(),
|
||||
&project.NewAggregate("project1", "org1").Aggregate,
|
||||
"project", true, true, true,
|
||||
domain.PrivateLabelingSettingAllowLoginUserResourceOwnerPolicy,
|
||||
),
|
||||
),
|
||||
eventFromEventPusher(project.NewProjectMemberAddedEvent(
|
||||
context.Background(),
|
||||
&project.NewAggregate("project1", "org1").Aggregate,
|
||||
"user1",
|
||||
[]string{domain.RoleProjectOwner}...,
|
||||
),
|
||||
),
|
||||
},
|
||||
uniqueConstraintsFromEventConstraint(project.NewAddProjectNameUniqueConstraint("project", "org1")),
|
||||
uniqueConstraintsFromEventConstraint(member.NewAddMemberUniqueConstraint("project1", "user1")),
|
||||
project.NewProjectAddedEvent(
|
||||
context.Background(),
|
||||
&project.NewAggregate("project1", "org1").Aggregate,
|
||||
"project", true, true, true,
|
||||
domain.PrivateLabelingSettingAllowLoginUserResourceOwnerPolicy,
|
||||
),
|
||||
project.NewProjectMemberAddedEvent(
|
||||
context.Background(),
|
||||
&project.NewAggregate("project1", "org1").Aggregate,
|
||||
"user1",
|
||||
[]string{domain.RoleProjectOwner}...,
|
||||
),
|
||||
),
|
||||
),
|
||||
idGenerator: id_mock.NewIDGeneratorExpectIDs(t, "project1"),
|
||||
@@ -334,21 +320,16 @@ func TestCommandSide_ChangeProject(t *testing.T) {
|
||||
),
|
||||
),
|
||||
expectPush(
|
||||
[]*repository.Event{
|
||||
eventFromEventPusher(
|
||||
newProjectChangedEvent(context.Background(),
|
||||
"project1",
|
||||
"org1",
|
||||
"project",
|
||||
"project-new",
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
domain.PrivateLabelingSettingEnforceProjectResourceOwnerPolicy),
|
||||
),
|
||||
},
|
||||
uniqueConstraintsFromEventConstraint(project.NewRemoveProjectNameUniqueConstraint("project", "org1")),
|
||||
uniqueConstraintsFromEventConstraint(project.NewAddProjectNameUniqueConstraint("project-new", "org1")),
|
||||
newProjectChangedEvent(context.Background(),
|
||||
"project1",
|
||||
"org1",
|
||||
"project",
|
||||
"project-new",
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
domain.PrivateLabelingSettingEnforceProjectResourceOwnerPolicy,
|
||||
),
|
||||
),
|
||||
),
|
||||
},
|
||||
@@ -394,19 +375,16 @@ func TestCommandSide_ChangeProject(t *testing.T) {
|
||||
),
|
||||
),
|
||||
expectPush(
|
||||
[]*repository.Event{
|
||||
eventFromEventPusher(
|
||||
newProjectChangedEvent(context.Background(),
|
||||
"project1",
|
||||
"org1",
|
||||
"project",
|
||||
"",
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
domain.PrivateLabelingSettingEnforceProjectResourceOwnerPolicy),
|
||||
),
|
||||
},
|
||||
newProjectChangedEvent(context.Background(),
|
||||
"project1",
|
||||
"org1",
|
||||
"",
|
||||
"",
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
domain.PrivateLabelingSettingEnforceProjectResourceOwnerPolicy,
|
||||
),
|
||||
),
|
||||
),
|
||||
},
|
||||
@@ -598,12 +576,8 @@ func TestCommandSide_DeactivateProject(t *testing.T) {
|
||||
),
|
||||
),
|
||||
expectPush(
|
||||
[]*repository.Event{
|
||||
eventFromEventPusher(
|
||||
project.NewProjectDeactivatedEvent(context.Background(),
|
||||
&project.NewAggregate("project1", "org1").Aggregate),
|
||||
),
|
||||
},
|
||||
project.NewProjectDeactivatedEvent(context.Background(),
|
||||
&project.NewAggregate("project1", "org1").Aggregate),
|
||||
),
|
||||
),
|
||||
},
|
||||
@@ -778,12 +752,8 @@ func TestCommandSide_ReactivateProject(t *testing.T) {
|
||||
),
|
||||
),
|
||||
expectPush(
|
||||
[]*repository.Event{
|
||||
eventFromEventPusher(
|
||||
project.NewProjectReactivatedEvent(context.Background(),
|
||||
&project.NewAggregate("project1", "org1").Aggregate),
|
||||
),
|
||||
},
|
||||
project.NewProjectReactivatedEvent(context.Background(),
|
||||
&project.NewAggregate("project1", "org1").Aggregate),
|
||||
),
|
||||
),
|
||||
},
|
||||
@@ -932,15 +902,10 @@ func TestCommandSide_RemoveProject(t *testing.T) {
|
||||
// no saml application events
|
||||
expectFilter(),
|
||||
expectPush(
|
||||
[]*repository.Event{
|
||||
eventFromEventPusher(
|
||||
project.NewProjectRemovedEvent(context.Background(),
|
||||
&project.NewAggregate("project1", "org1").Aggregate,
|
||||
"project",
|
||||
nil),
|
||||
),
|
||||
},
|
||||
uniqueConstraintsFromEventConstraint(project.NewRemoveProjectNameUniqueConstraint("project", "org1")),
|
||||
project.NewProjectRemovedEvent(context.Background(),
|
||||
&project.NewAggregate("project1", "org1").Aggregate,
|
||||
"project",
|
||||
nil),
|
||||
),
|
||||
),
|
||||
},
|
||||
@@ -985,18 +950,13 @@ func TestCommandSide_RemoveProject(t *testing.T) {
|
||||
),
|
||||
),
|
||||
expectPush(
|
||||
[]*repository.Event{
|
||||
eventFromEventPusher(
|
||||
project.NewProjectRemovedEvent(context.Background(),
|
||||
&project.NewAggregate("project1", "org1").Aggregate,
|
||||
"project",
|
||||
[]*eventstore.EventUniqueConstraint{
|
||||
project.NewRemoveSAMLConfigEntityIDUniqueConstraint("https://test.com/saml/metadata"),
|
||||
}),
|
||||
),
|
||||
},
|
||||
uniqueConstraintsFromEventConstraint(project.NewRemoveProjectNameUniqueConstraint("project", "org1")),
|
||||
uniqueConstraintsFromEventConstraint(project.NewRemoveSAMLConfigEntityIDUniqueConstraint("https://test.com/saml/metadata")),
|
||||
project.NewProjectRemovedEvent(context.Background(),
|
||||
&project.NewAggregate("project1", "org1").Aggregate,
|
||||
"project",
|
||||
[]*eventstore.UniqueConstraint{
|
||||
project.NewRemoveSAMLConfigEntityIDUniqueConstraint("https://test.com/saml/metadata"),
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
},
|
||||
@@ -1069,22 +1029,15 @@ func TestCommandSide_RemoveProject(t *testing.T) {
|
||||
),
|
||||
),
|
||||
expectPush(
|
||||
[]*repository.Event{
|
||||
eventFromEventPusher(
|
||||
project.NewProjectRemovedEvent(context.Background(),
|
||||
&project.NewAggregate("project1", "org1").Aggregate,
|
||||
"project",
|
||||
[]*eventstore.EventUniqueConstraint{
|
||||
project.NewRemoveSAMLConfigEntityIDUniqueConstraint("https://test1.com/saml/metadata"),
|
||||
project.NewRemoveSAMLConfigEntityIDUniqueConstraint("https://test2.com/saml/metadata"),
|
||||
project.NewRemoveSAMLConfigEntityIDUniqueConstraint("https://test3.com/saml/metadata"),
|
||||
}),
|
||||
),
|
||||
},
|
||||
uniqueConstraintsFromEventConstraint(project.NewRemoveProjectNameUniqueConstraint("project", "org1")),
|
||||
uniqueConstraintsFromEventConstraint(project.NewRemoveSAMLConfigEntityIDUniqueConstraint("https://test1.com/saml/metadata")),
|
||||
uniqueConstraintsFromEventConstraint(project.NewRemoveSAMLConfigEntityIDUniqueConstraint("https://test2.com/saml/metadata")),
|
||||
uniqueConstraintsFromEventConstraint(project.NewRemoveSAMLConfigEntityIDUniqueConstraint("https://test3.com/saml/metadata")),
|
||||
project.NewProjectRemovedEvent(context.Background(),
|
||||
&project.NewAggregate("project1", "org1").Aggregate,
|
||||
"project",
|
||||
[]*eventstore.UniqueConstraint{
|
||||
project.NewRemoveSAMLConfigEntityIDUniqueConstraint("https://test1.com/saml/metadata"),
|
||||
project.NewRemoveSAMLConfigEntityIDUniqueConstraint("https://test2.com/saml/metadata"),
|
||||
project.NewRemoveSAMLConfigEntityIDUniqueConstraint("https://test3.com/saml/metadata"),
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
},
|
||||
@@ -1219,103 +1172,3 @@ func TestAddProject(t *testing.T) {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// func TestExistsProject(t *testing.T) {
|
||||
// type args struct {
|
||||
// filter preparation.FilterToQueryReducer
|
||||
// id string
|
||||
// resourceOwner string
|
||||
// }
|
||||
// tests := []struct {
|
||||
// name string
|
||||
// args args
|
||||
// wantExists bool
|
||||
// wantErr bool
|
||||
// }{
|
||||
// {
|
||||
// name: "no events",
|
||||
// args: args{
|
||||
// filter: func(_ context.Context, _ *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) {
|
||||
// return []eventstore.Event{}, nil
|
||||
// },
|
||||
// id: "id",
|
||||
// resourceOwner: "ro",
|
||||
// },
|
||||
// wantExists: false,
|
||||
// wantErr: false,
|
||||
// },
|
||||
// {
|
||||
// name: "project added",
|
||||
// args: args{
|
||||
// filter: func(_ context.Context, _ *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) {
|
||||
// return []eventstore.Event{
|
||||
// project.NewProjectAddedEvent(
|
||||
// context.Background(),
|
||||
// &project.NewAggregate("id", "ro").Aggregate,
|
||||
// "name",
|
||||
// false,
|
||||
// false,
|
||||
// false,
|
||||
// domain.PrivateLabelingSettingEnforceProjectResourceOwnerPolicy,
|
||||
// ),
|
||||
// }, nil
|
||||
// },
|
||||
// id: "id",
|
||||
// resourceOwner: "ro",
|
||||
// },
|
||||
// wantExists: true,
|
||||
// wantErr: false,
|
||||
// },
|
||||
// {
|
||||
// name: "project removed",
|
||||
// args: args{
|
||||
// filter: func(_ context.Context, _ *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) {
|
||||
// return []eventstore.Event{
|
||||
// project.NewProjectAddedEvent(
|
||||
// context.Background(),
|
||||
// &project.NewAggregate("id", "ro").Aggregate,
|
||||
// "name",
|
||||
// false,
|
||||
// false,
|
||||
// false,
|
||||
// domain.PrivateLabelingSettingEnforceProjectResourceOwnerPolicy,
|
||||
// ),
|
||||
// project.NewProjectRemovedEvent(
|
||||
// context.Background(),
|
||||
// &project.NewAggregate("id", "ro").Aggregate,
|
||||
// "name",
|
||||
// ),
|
||||
// }, nil
|
||||
// },
|
||||
// id: "id",
|
||||
// resourceOwner: "ro",
|
||||
// },
|
||||
// wantExists: false,
|
||||
// wantErr: false,
|
||||
// },
|
||||
// {
|
||||
// name: "error durring filter",
|
||||
// args: args{
|
||||
// filter: func(_ context.Context, _ *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) {
|
||||
// return nil, errors.ThrowInternal(nil, "PROJE-Op26p", "Errors.Internal")
|
||||
// },
|
||||
// id: "id",
|
||||
// resourceOwner: "ro",
|
||||
// },
|
||||
// wantExists: false,
|
||||
// wantErr: true,
|
||||
// },
|
||||
// }
|
||||
// for _, tt := range tests {
|
||||
// t.Run(tt.name, func(t *testing.T) {
|
||||
// gotExists, err := projectWriteModel(context.Background(), tt.args.filter, tt.args.id, tt.args.resourceOwner)
|
||||
// if (err != nil) != tt.wantErr {
|
||||
// t.Errorf("ExistsUser() error = %v, wantErr %v", err, tt.wantErr)
|
||||
// return
|
||||
// }
|
||||
// if gotExists != tt.wantExists {
|
||||
// t.Errorf("ExistsUser() = %v, want %v", gotExists, tt.wantExists)
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
// }
|
||||
|
Reference in New Issue
Block a user