TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-13 18:59:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(spooler): correct workers (#508)

Browse Source 
* one concurrent task

* disable spooler

* fix: improve concurrency in spooler

* fix: dont block lock

* fix: break if lock failed

* fix: check if handler is working

* fix: worker id

* fix: test

* fix: use limit for spoolers configured in startup.yaml

* fix test

* fix: factory

* fix(key): only reduce if not expired

* fix(searchQueryFactory): check for string-slice in aggregateID

* fix(migrations): combine migrations

* fix: allow saving multiple objects in one request

* fix(eventstore): logging

* fix(eventstore): rethink insert i locks table

* fix: ignore failed tests for the moment

* fix: tuubel

* fix: for tests in io

* fix: ignore tests for io

* fix: rename concurrent tasks to workers

* fix: incomment tests and remove some tests

* fix: refert changes for io

* refactor(eventstore): combine types of sql in one file

* refactor(eventstore): logs, TODO's, tests

* fix(eventstore): sql package

* test(eventstore): add tests for search query factory

* chore: logs

* fix(spooler): optimize lock query
chore(migrations): rename locks.object_type to view_name
chore(migrations): refactor migrations

* test: incomment tests

* fix: rename PrepareSaves to PrepareBulkSave

* chore: go dependencies

* fix(migrations): add id in events table

* refactor(lock): less magic numbers

Co-authored-by: Livio Amstutz <livio.a@gmail.com>
This commit is contained in:
Silvan
2020-07-28 09:42:21 +02:00
committed by GitHub
parent 531060ab67
commit 41e1a7cc7b
90 changed files with 2210 additions and 1471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
migrations/cockroach/V1.1__databases.sql → migrations/cockroach/V1.0__databases.sql
View File

@@ -3,46 +3,33 @@ CREATE DATABASE auth;
CREATE DATABASE notification;
CREATE DATABASE adminapi;
CREATE DATABASE authz;
CREATE DATABASE eventstore;
CREATE USER eventstore;
GRANT SELECT, INSERT ON DATABASE eventstore TO eventstore;
CREATE USER management;
GRANT SELECT, INSERT, UPDATE, DELETE ON DATABASE management TO management;
GRANT SELECT, INSERT, UPDATE ON DATABASE eventstore TO management;
GRANT SELECT, INSERT, UPDATE ON TABLE eventstore.* TO management;
GRANT SELECT, INSERT ON DATABASE eventstore TO management;
CREATE USER adminapi;
GRANT SELECT, INSERT, UPDATE, DELETE, DROP ON DATABASE adminapi TO adminapi;
GRANT SELECT, INSERT, UPDATE ON DATABASE eventstore TO adminapi;
GRANT SELECT, INSERT, UPDATE ON TABLE eventstore.* TO adminapi;
GRANT SELECT, INSERT ON DATABASE eventstore TO adminapi;
GRANT SELECT, INSERT, UPDATE, DROP, DELETE ON DATABASE auth TO adminapi;
GRANT SELECT, INSERT, UPDATE, DROP, DELETE ON DATABASE authz TO adminapi;
GRANT SELECT, INSERT, UPDATE, DROP, DELETE ON DATABASE management TO adminapi;
GRANT SELECT, INSERT, UPDATE, DROP, DELETE ON DATABASE notification TO adminapi;
CREATE USER auth;
GRANT SELECT, INSERT, UPDATE, DELETE ON DATABASE auth TO auth;
GRANT SELECT, INSERT, UPDATE ON DATABASE eventstore TO auth;
GRANT SELECT, INSERT, UPDATE ON TABLE eventstore.* TO auth;
GRANT SELECT, INSERT ON DATABASE eventstore TO auth;
CREATE USER notification;
GRANT SELECT, INSERT, UPDATE, DELETE ON DATABASE notification TO notification;
GRANT SELECT, INSERT, UPDATE ON DATABASE eventstore TO notification;
GRANT SELECT, INSERT, UPDATE ON TABLE eventstore.* TO notification;
GRANT SELECT, INSERT ON DATABASE eventstore TO notification;
CREATE USER authz;
GRANT SELECT, INSERT, UPDATE, DELETE ON DATABASE authz TO authz;
GRANT SELECT, INSERT, UPDATE ON DATABASE eventstore TO authz;
GRANT SELECT, INSERT, UPDATE ON TABLE eventstore.* TO authz;
GRANT SELECT, INSERT ON DATABASE eventstore TO authz;
GRANT SELECT, INSERT, UPDATE ON DATABASE auth TO authz;

49
migrations/cockroach/V1.0__eventstore.sql
View File

@@ -1,49 +0,0 @@
BEGIN;
CREATE DATABASE eventstore;
COMMIT;
BEGIN;
CREATE USER eventstore;
GRANT SELECT, INSERT, UPDATE ON DATABASE eventstore TO eventstore;
COMMIT;
BEGIN;
CREATE SEQUENCE eventstore.event_seq;
COMMIT;
BEGIN;
CREATE TABLE eventstore.events (
id UUID DEFAULT gen_random_uuid(),
event_type TEXT,
aggregate_type TEXT NOT NULL,
aggregate_id TEXT NOT NULL,
aggregate_version TEXT NOT NULL,
event_sequence BIGINT NOT NULL DEFAULT nextval('eventstore.event_seq'),
previous_sequence BIGINT UNIQUE,
creation_date TIMESTAMPTZ NOT NULL DEFAULT now(),
event_data JSONB,
editor_user TEXT NOT NULL,
editor_service TEXT NOT NULL,
resource_owner TEXT NOT NULL,
PRIMARY KEY (id)
);
CREATE TABLE eventstore.locks (
aggregate_type TEXT NOT NULL,
aggregate_id TEXT NOT NULL,
until TIMESTAMPTZ,
UNIQUE (aggregate_type, aggregate_id)
);
COMMIT;

28
migrations/cockroach/V1.1__eventstore.sql Normal file
View File

@@ -0,0 +1,28 @@
CREATE SEQUENCE eventstore.event_seq;
GRANT UPDATE ON TABLE eventstore.event_seq TO management;
GRANT UPDATE ON TABLE eventstore.event_seq TO eventstore;
GRANT UPDATE ON TABLE eventstore.event_seq TO adminapi;
GRANT UPDATE ON TABLE eventstore.event_seq TO auth;
GRANT UPDATE ON TABLE eventstore.event_seq TO authz;
GRANT UPDATE ON TABLE eventstore.event_seq TO notification;
CREATE TABLE eventstore.events (
id UUID DEFAULT gen_random_uuid(),
event_type TEXT,
aggregate_type TEXT NOT NULL,
aggregate_id TEXT NOT NULL,
aggregate_version TEXT NOT NULL,
event_sequence BIGINT NOT NULL DEFAULT nextval('eventstore.event_seq'),
previous_sequence BIGINT,
creation_date TIMESTAMPTZ NOT NULL DEFAULT now(),
event_data JSONB,
editor_user TEXT NOT NULL,
editor_service TEXT NOT NULL,
resource_owner TEXT NOT NULL,
CONSTRAINT event_sequence_pk PRIMARY KEY (event_sequence DESC),
INDEX agg_type_agg_id (aggregate_type, aggregate_id),
CONSTRAINT previous_sequence_unique UNIQUE (previous_sequence DESC)
);

106
migrations/cockroach/V1.2__views.sql
View File

@@ -1,17 +1,15 @@
BEGIN;
CREATE TABLE management.locks (
locker_id TEXT,
locked_until TIMESTAMPTZ,
object_type TEXT,
locked_until TIMESTAMPTZ(3),
view_name TEXT,
PRIMARY KEY (object_type)
PRIMARY KEY (view_name)
);
CREATE TABLE management.current_sequences (
view_name TEXT,
current_sequence BIGINT,
timestamp TIMESTAMPTZ,
PRIMARY KEY (view_name)
);
@@ -82,6 +80,7 @@ CREATE TABLE management.project_members (
first_name TEXT,
last_name TEXT,
roles TEXT ARRAY,
display_name TEXT,
sequence BIGINT,
PRIMARY KEY (project_id, user_id)
@@ -100,6 +99,7 @@ CREATE TABLE management.project_grant_members (
first_name TEXT,
last_name TEXT,
roles TEXT ARRAY,
display_name TEXT,
sequence BIGINT,
PRIMARY KEY (grant_id, user_id)
@@ -181,6 +181,7 @@ CREATE TABLE management.user_grants (
last_name TEXT,
email TEXT,
role_keys TEXT Array,
grant_id TEXT,
grant_state SMALLINT,
creation_date TIMESTAMPTZ,
@@ -190,16 +191,30 @@ CREATE TABLE management.user_grants (
PRIMARY KEY (id)
);
CREATE TABLE management.org_domains (
creation_date TIMESTAMPTZ,
change_date TIMESTAMPTZ,
sequence BIGINT,
domain TEXT,
org_id TEXT,
verified BOOLEAN,
primary_domain BOOLEAN,
PRIMARY KEY (org_id, domain)
);
CREATE TABLE auth.locks (
locker_id TEXT,
locked_until TIMESTAMPTZ,
object_type TEXT,
locked_until TIMESTAMPTZ(3),
view_name TEXT,
PRIMARY KEY (object_type)
PRIMARY KEY (view_name)
);
CREATE TABLE auth.current_sequences (
view_name TEXT,
timestamp TIMESTAMPTZ,
current_sequence BIGINT,
@@ -305,14 +320,15 @@ CREATE TABLE auth.tokens (
CREATE TABLE notification.locks (
locker_id TEXT,
locked_until TIMESTAMPTZ,
object_type TEXT,
locked_until TIMESTAMPTZ(3),
view_name TEXT,
PRIMARY KEY (object_type)
PRIMARY KEY (view_name)
);
CREATE TABLE notification.current_sequences (
view_name TEXT,
timestamp TIMESTAMPTZ,
current_sequence BIGINT,
@@ -348,6 +364,8 @@ CREATE TABLE notification.notify_users (
verified_phone TEXT,
sequence BIGINT,
password_set BOOLEAN,
login_names TEXT,
preferred_login_name TEXT,
PRIMARY KEY (id)
);
@@ -378,20 +396,38 @@ CREATE TABLE adminapi.failed_events (
CREATE TABLE adminapi.locks (
locker_id TEXT,
locked_until TIMESTAMPTZ,
object_type TEXT,
locked_until TIMESTAMPTZ(3),
view_name TEXT,
PRIMARY KEY (object_type)
PRIMARY KEY (view_name)
);
CREATE TABLE adminapi.current_sequences (
view_name TEXT,
timestamp TIMESTAMPTZ,
current_sequence BIGINT,
PRIMARY KEY (view_name)
);
CREATE TABLE adminapi.iam_members (
user_id TEXT,
iam_id TEXT,
creation_date TIMESTAMPTZ,
change_date TIMESTAMPTZ,
user_name TEXT,
email_address TEXT,
first_name TEXT,
last_name TEXT,
roles TEXT ARRAY,
display_name TEXT,
sequence BIGINT,
PRIMARY KEY (user_id)
);
CREATE TABLE management.orgs (
id TEXT,
@@ -419,6 +455,7 @@ CREATE TABLE management.org_members (
first_name TEXT,
last_name TEXT,
roles TEXT ARRAY,
display_name TEXT,
sequence BIGINT,
PRIMARY KEY (org_id, user_id)
@@ -479,6 +516,7 @@ CREATE TABLE auth.user_grants (
display_name TEXT,
email TEXT,
role_keys TEXT Array,
grant_id TEXT,
grant_state SMALLINT,
creation_date TIMESTAMPTZ,
@@ -504,14 +542,15 @@ CREATE TABLE auth.orgs (
CREATE TABLE authz.locks (
locker_id TEXT,
locked_until TIMESTAMPTZ,
object_type TEXT,
locked_until TIMESTAMPTZ(3),
view_name TEXT,
PRIMARY KEY (object_type)
PRIMARY KEY (view_name)
);
CREATE TABLE authz.current_sequences (
view_name TEXT,
timestamp TIMESTAMPTZ,
current_sequence BIGINT,
@@ -540,6 +579,7 @@ CREATE TABLE authz.user_grants (
display_name TEXT,
email TEXT,
role_keys TEXT Array,
grant_id TEXT,
grant_state SMALLINT,
creation_date TIMESTAMPTZ,
@@ -573,34 +613,16 @@ CREATE TABLE authz.applications (
PRIMARY KEY (id)
);
CREATE TABLE management.org_domains (
CREATE TABLE authz.orgs (
id TEXT,
creation_date TIMESTAMPTZ,
change_date TIMESTAMPTZ,
resource_owner TEXT,
org_state SMALLINT,
sequence BIGINT,
domain TEXT,
org_id TEXT,
verified BOOLEAN,
primary_domain BOOLEAN,
name TEXT,
PRIMARY KEY (org_id, domain)
PRIMARY KEY (id)
);
CREATE TABLE adminapi.iam_members (
user_id TEXT,
iam_id TEXT,
creation_date TIMESTAMPTZ,
change_date TIMESTAMPTZ,
user_name TEXT,
email_address TEXT,
first_name TEXT,
last_name TEXT,
roles TEXT ARRAY,
sequence BIGINT,
PRIMARY KEY (user_id)
);
COMMIT;

6
migrations/cockroach/V1.3__notification_user_loginnames.sql
View File

@@ -1,6 +0,0 @@
BEGIN;
ALTER TABLE notification.notify_users ADD COLUMN login_names TEXT ARRAY;
ALTER TABLE notification.notify_users ADD COLUMN preferred_login_name TEXT;
COMMIT;

7
migrations/cockroach/V1.4__usergrant_grantid.sql
View File

@@ -1,7 +0,0 @@
BEGIN;
ALTER TABLE management.user_grants ADD COLUMN grant_id TEXT;
ALTER TABLE auth.user_grants ADD COLUMN grant_id TEXT;
ALTER TABLE authz.user_grants ADD COLUMN grant_id TEXT;
COMMIT;

9
migrations/cockroach/V1.5__currents_sequences.sql
View File

@@ -1,9 +0,0 @@
BEGIN;
ALTER TABLE authz.current_sequences ADD COLUMN timestamp TIMESTAMPTZ;
ALTER TABLE auth.current_sequences ADD COLUMN timestamp TIMESTAMPTZ;
ALTER TABLE management.current_sequences ADD COLUMN timestamp TIMESTAMPTZ;
ALTER TABLE notification.current_sequences ADD COLUMN timestamp TIMESTAMPTZ;
ALTER TABLE adminapi.current_sequences ADD COLUMN timestamp TIMESTAMPTZ;
COMMIT;

17
migrations/cockroach/V1.6__authz_orgs.sql
View File

@@ -1,17 +0,0 @@
BEGIN;
CREATE TABLE authz.orgs (
id TEXT,
creation_date TIMESTAMPTZ,
change_date TIMESTAMPTZ,
resource_owner TEXT,
org_state SMALLINT,
sequence BIGINT,
domain TEXT,
name TEXT,
PRIMARY KEY (id)
);
COMMIT;

8
migrations/cockroach/V1.7__member_displayname.sql
View File

@@ -1,8 +0,0 @@
BEGIN;
ALTER TABLE management.project_members ADD COLUMN display_name TEXT;
ALTER TABLE management.project_grant_members ADD COLUMN display_name TEXT;
ALTER TABLE management.org_members ADD COLUMN display_name TEXT;
ALTER TABLE adminapi.iam_members ADD COLUMN display_name TEXT;
COMMIT;