Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fill source id before creating source in compute node #1806

Merged
merged 2 commits into from
Apr 13, 2022
Merged

fix: fill source id before creating source in compute node #1806

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3e2d0b
fix: fill source id before creating source in compute node
hzxa21 Apr 13, 2022
b5feddd
change kafka/zk port in risedev.yml
hzxa21 Apr 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions risedev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,19 @@ risedev:
- use: compute-node
- use: frontend
user-managed: true

full:
- use: minio
- use: etcd
- use: meta-node
- use: compute-node
- use: frontend
- use: prometheus
- use: grafana
- use: zookeeper
persist-data: true
- use: kafka
hzxa21 marked this conversation as resolved.
Show resolved Hide resolved
persist-data: true

#################################
### Configurations used on CI ###
Expand Down
12 changes: 6 additions & 6 deletions scripts/source/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3'

services:
zookeeper:
image: ghcr.io/singularity-data/cp-zookeeper:7.0.1
image: confluentinc/cp-zookeeper:7.0.1
hostname: zookeeper
container_name: zookeeper
ports:
Expand All @@ -12,7 +12,7 @@ services:
ZOOKEEPER_TICK_TIME: 2000

broker:
image: ghcr.io/singularity-data/cp-kafka:7.0.1
image: confluentinc/cp-kafka:7.0.1
hostname: broker
container_name: broker
depends_on:
Expand All @@ -37,7 +37,7 @@ services:
start_period: 10s

kafkacat:
image: ghcr.io/singularity-data/kafkacat:1.6.0
image: confluentinc/cp-kafkacat:7.1.0
container_name: kafkacat
depends_on:
- broker
Expand All @@ -47,7 +47,7 @@ services:
tty: true

mysql:
image: ghcr.io/singularity-data/debezium-example-mysql:1.8.0.Final
image: debezium/example-mysql:1.8.0.Final
hostname: mysql
container_name: mysql
ports:
Expand All @@ -58,7 +58,7 @@ services:
- MYSQL_PASSWORD=mysqlpw

debezium:
image: ghcr.io/singularity-data/debezium-connect:1.8.0.Final
image: debezium/connect:1.8.0.Final
hostname: debezium
container_name: debezium
ports:
Expand All @@ -74,7 +74,7 @@ services:
- STATUS_STORAGE_TOPIC=my_connect_statuses

dbgen:
image: ghcr.io/singularity-data/tpch-dbgen:ubuntu # tabbbb/tpch-dbgen:ubuntu
image: tabbbb/tpch-dbgen:ubuntu # tabbbb/tpch-dbgen:ubuntu
hostname: dbgen
container_name: dbgen
entrypoint: /bin/sh
Expand Down
3 changes: 2 additions & 1 deletion src/meta/src/rpc/service/ddl_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,14 @@ where
.generate::<{ IdCategory::Table }>()
.await
.map_err(tonic_err)? as u32;
source.id = id;

self.catalog_manager
.start_create_source_procedure(&source)
.await
.map_err(tonic_err)?;

// QUESTION(patrick): why do we need to contact compute node on create source
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I think we should get rid of this in the future. Source info should be part of the plan node.

if let Err(e) = self.source_manager.create_source(&source).await {
self.catalog_manager
.cancel_create_source_procedure(&source)
Expand All @@ -185,7 +187,6 @@ where
return Err(e.to_grpc_status());
}

source.id = id;
let version = self
.catalog_manager
.finish_create_source_procedure(&source)
Expand Down