TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 03:57:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(eventstore): increase parallel write capabilities (#5940)

Browse Source 
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:
Silvan
2023-10-19 12:19:10 +02:00
committed by GitHub
parent 259faba3f0
commit b5564572bc
791 changed files with 30326 additions and 43202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/project/repository/eventsourcing/model/oidc_config.go
View File

@@ -8,7 +8,6 @@ import (
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models"
"github.com/zitadel/zitadel/internal/repository/project"
)
@@ -75,7 +74,7 @@ func (key *ClientKey) AppendEvents(events ...*es_models.Event) error {
func (key *ClientKey) AppendEvent(event *es_models.Event) (err error) {
key.ObjectRoot.AppendEvent(event)
switch eventstore.EventType(event.Type) {
switch event.Type() {
case project.ApplicationKeyAddedEventType:
err = json.Unmarshal(event.Data, key)
if err != nil {

24
internal/project/repository/eventsourcing/model/project.go
View File

@@ -1,8 +1,6 @@
package model
import (
"encoding/json"
"github.com/zitadel/logging"
"github.com/zitadel/zitadel/internal/eventstore"
@@ -41,7 +39,7 @@ func ProjectToModel(project *Project) *model.Project {
}
}
func ProjectFromEvents(project *Project, events ...*es_models.Event) (*Project, error) {
func ProjectFromEvents(project *Project, events ...eventstore.Event) (*Project, error) {
if project == nil {
project = &Project{}
}
@@ -49,7 +47,7 @@ func ProjectFromEvents(project *Project, events ...*es_models.Event) (*Project,
return project, project.AppendEvents(events...)
}
func (p *Project) AppendEvents(events ...*es_models.Event) error {
func (p *Project) AppendEvents(events ...eventstore.Event) error {
for _, event := range events {
if err := p.AppendEvent(event); err != nil {
return err
@@ -58,10 +56,10 @@ func (p *Project) AppendEvents(events ...*es_models.Event) error {
return nil
}
func (p *Project) AppendEvent(event *es_models.Event) error {
func (p *Project) AppendEvent(event eventstore.Event) error {
p.ObjectRoot.AppendEvent(event)
switch eventstore.EventType(event.Type) {
switch event.Type() {
case project.ProjectAddedType, project.ProjectChangedType:
return p.AppendAddProjectEvent(event)
case project.ProjectDeactivatedType:
@@ -78,7 +76,7 @@ func (p *Project) AppendEvent(event *es_models.Event) error {
return nil
}
func (p *Project) AppendAddProjectEvent(event *es_models.Event) error {
func (p *Project) AppendAddProjectEvent(event eventstore.Event) error {
p.SetData(event)
p.State = int32(model.ProjectStateActive)
return nil
@@ -99,18 +97,18 @@ func (p *Project) appendRemovedEvent() error {
return nil
}
func (p *Project) appendOIDCConfig(event *es_models.Event) error {
func (p *Project) appendOIDCConfig(event eventstore.Event) error {
appEvent := new(oidcApp)
if err := json.Unmarshal(event.Data, appEvent); err != nil {
if err := event.Unmarshal(p); err != nil {
return err
}
p.OIDCApplications = append(p.OIDCApplications, appEvent)
return nil
}
func (p *Project) appendApplicationRemoved(event *es_models.Event) error {
func (p *Project) appendApplicationRemoved(event eventstore.Event) error {
appEvent := new(oidcApp)
if err := json.Unmarshal(event.Data, appEvent); err != nil {
if err := event.Unmarshal(appEvent); err != nil {
return err
}
for i := len(p.OIDCApplications) - 1; i >= 0; i-- {
@@ -124,8 +122,8 @@ func (p *Project) appendApplicationRemoved(event *es_models.Event) error {
return nil
}
func (p *Project) SetData(event *es_models.Event) error {
if err := json.Unmarshal(event.Data, p); err != nil {
func (p *Project) SetData(event eventstore.Event) error {
if err := event.Unmarshal(p); err != nil {
logging.Log("EVEN-lo9sr").WithError(err).Error("could not unmarshal event data")
return err
}

21
internal/project/repository/eventsourcing/model/project_test.go
View File

@@ -4,6 +4,7 @@ import (
"encoding/json"
"testing"
"github.com/zitadel/zitadel/internal/eventstore"
es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models"
"github.com/zitadel/zitadel/internal/project/model"
"github.com/zitadel/zitadel/internal/repository/project"
@@ -11,7 +12,7 @@ import (
func TestProjectFromEvents(t *testing.T) {
type args struct {
event []*es_models.Event
event []eventstore.Event
project *Project
}
tests := []struct {
@@ -22,8 +23,8 @@ func TestProjectFromEvents(t *testing.T) {
{
name: "project from events, ok",
args: args{
event: []*es_models.Event{
{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.ProjectAddedType)},
event: []eventstore.Event{
&es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.ProjectAddedType},
},
project: &Project{Name: "ProjectName"},
},
@@ -32,8 +33,8 @@ func TestProjectFromEvents(t *testing.T) {
{
name: "project from events, nil project",
args: args{
event: []*es_models.Event{
{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.ProjectAddedType)},
event: []eventstore.Event{
&es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.ProjectAddedType},
},
project: nil,
},
@@ -44,7 +45,7 @@ func TestProjectFromEvents(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
if tt.args.project != nil {
data, _ := json.Marshal(tt.args.project)
tt.args.event[0].Data = data
tt.args.event[0].(*es_models.Event).Data = data
}
result, _ := ProjectFromEvents(tt.args.project, tt.args.event...)
if result.Name != tt.result.Name {
@@ -67,7 +68,7 @@ func TestAppendEvent(t *testing.T) {
{
name: "append added event",
args: args{
event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.ProjectAddedType)},
event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.ProjectAddedType},
project: &Project{Name: "ProjectName"},
},
result: &Project{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"}, State: int32(model.ProjectStateActive), Name: "ProjectName"},
@@ -75,7 +76,7 @@ func TestAppendEvent(t *testing.T) {
{
name: "append change event",
args: args{
event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.ProjectChangedType)},
event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.ProjectChangedType},
project: &Project{Name: "ProjectName"},
},
result: &Project{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"}, State: int32(model.ProjectStateActive), Name: "ProjectName"},
@@ -83,14 +84,14 @@ func TestAppendEvent(t *testing.T) {
{
name: "append deactivate event",
args: args{
event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.ProjectDeactivatedType)},
event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.ProjectDeactivatedType},
},
result: &Project{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"}, State: int32(model.ProjectStateInactive)},
},
{
name: "append reactivate event",
args: args{
event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.ProjectReactivatedType)},
event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.ProjectReactivatedType},
},
result: &Project{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"}, State: int32(model.ProjectStateActive)},
},