Skip to content

Commit

Permalink
refactor: modify datanode startup setting (#66)
Browse files Browse the repository at this point in the history
* refactor: delete '--http-addr' and '--postgres-addr'

* refactor: update datanode example config file

* refactor: update greptimedb image
  • Loading branch information
zyy17 authored Nov 16, 2022
1 parent 12b1b0c commit b4aac34
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 14 deletions.
2 changes: 1 addition & 1 deletion config/samples/basic/cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
base:
main:
image: greptime/greptimedb:integration-paas-test
image: greptime/greptimedb:0.1.0-alpha-20221116
frontend:
replicas: 1
meta:
Expand Down
2 changes: 0 additions & 2 deletions controllers/greptimedbcluster/deployers/datanode.go
Original file line number Diff line number Diff line change
Expand Up @@ -430,9 +430,7 @@ func (d *DatanodeDeployer) buildDatanodeArgs(cluster *v1alpha1.GreptimeDBCluster
return []string{
"datanode", "start",
"--metasrv-addr", fmt.Sprintf("%s.%s:%d", d.ResourceName(cluster.Name, v1alpha1.MetaComponentKind), cluster.Namespace, cluster.Spec.Meta.ServicePort),
"--http-addr", fmt.Sprintf("0.0.0.0:%d", cluster.Spec.HTTPServicePort),
"--mysql-addr", fmt.Sprintf("0.0.0.0:%d", cluster.Spec.MySQLServicePort),
"--postgres-addr", fmt.Sprintf("0.0.0.0:%d", cluster.Spec.PostgresServicePort),
"--config-file", defaultConfigDir + defaultConfigName,
}
}
15 changes: 5 additions & 10 deletions docker/initializer/configs/datanode.defaults.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,18 @@
# The following default configs from https://github.com/GreptimeTeam/greptimedb/blob/develop/config/datanode.example.toml
node_id = 42
http_addr = '0.0.0.0:3000'
rpc_addr = '0.0.0.0:3001'
mode = 'distributed'
rpc_addr = '127.0.0.1:3001'
wal_dir = '/tmp/greptimedb/wal'
rpc_runtime_size = 8
mode = "standalone"
mysql_addr = '0.0.0.0:3306'
mysql_addr = '127.0.0.1:3306'
mysql_runtime_size = 4

# applied when postgres feature enbaled
postgres_addr = '0.0.0.0:5432'
postgres_runtime_size = 4

[storage]
type = 'File'
data_dir = '/tmp/greptimedb/data/'

[meta_client_opts]
metasrv_addr = "1.1.1.1:3002"
metasrv_addr = '1.1.1.1:3002'
timeout_millis = 3000
connect_timeout_millis = 5000
tcp_nodelay = true
tcp_nodelay = false
2 changes: 1 addition & 1 deletion hack/e2e/setup-e2e-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ CLUSTER=greptimedb-operator-e2e
REGISTRY_NAME=kind-registry
REGISTRY_PORT=5001

TEST_GREPTIMEDB_IMAGE=greptime/greptimedb:integration-paas-test
TEST_GREPTIMEDB_IMAGE=greptime/greptimedb:0.1.0-alpha-20221116
TEST_ETCD_IMAGE=greptime/etcd:v3.5.5

function check_prerequisites() {
Expand Down

0 comments on commit b4aac34

Please sign in to comment.