fix: fix to datanode datahome args (#168)

* fix: fix to datanode datahome args

* refactor: delete datahome args

* chore: change image version

* refactor: change create table sql

Author: daviderli614

pkg/deployer/baremetal/component/datanode.go

@@ -60,7 +60,7 @@ func (d *datanode) Start(ctx context.Context, binary string) error {
 	for i := 0; i < d.config.Replicas; i++ {
 		dirName := fmt.Sprintf("%s.%d", d.Name(), i)
 
-		dataHomeDir := path.Join(d.workingDirs.DataDir, config.DataHomeDir)
+		dataHomeDir := path.Join(d.workingDirs.DataDir, dirName, config.DataHomeDir)
 		if err := fileutils.EnsureDir(dataHomeDir); err != nil {
 			return err
 		}
@@ -121,7 +121,7 @@ func (d *datanode) BuildArgs(ctx context.Context, params ...interface{}) []strin
 		logLevel = config.DefaultLogLevel
 	}
 
-	nodeID_, walDir, dataHomeDir := params[0], params[1], params[2]
+	nodeID_, _, dataHomeDir := params[0], params[1], params[2]
 	nodeID := nodeID_.(int)
 
 	args := []string{
@@ -132,7 +132,6 @@ func (d *datanode) BuildArgs(ctx context.Context, params ...interface{}) []strin
 		fmt.Sprintf("--rpc-addr=%s", generateDatanodeAddr(d.config.RPCAddr, nodeID)),
 		fmt.Sprintf("--http-addr=%s", generateDatanodeAddr(d.config.HTTPAddr, nodeID)),
 		fmt.Sprintf("--data-home=%s", dataHomeDir),
-		fmt.Sprintf("--wal-dir=%s", walDir),
 	}
 
 	if len(d.config.Config) > 0 {

pkg/helm/testdata/db-manifests.yaml

@@ -8,7 +8,7 @@ metadata:
 spec:
   base:
     main:
-      image: 'registry.cn-hangzhou.aliyuncs.com/greptime/greptimedb:0.3.2'
+      image: 'registry.cn-hangzhou.aliyuncs.com/greptime/greptimedb:v0.4.0'
       resources:
         limits:
           cpu: 500m
@@ -34,6 +34,6 @@ spec:
   postgresServicePort: 4003
   openTSDBServicePort: 4242
   initializer:
-    image: 'registry.cn-hangzhou.aliyuncs.com/greptime/greptimedb-initializer:0.1.0-alpha.14'
+    image: 'registry.cn-hangzhou.aliyuncs.com/greptime/greptimedb-initializer:0.1.0-alpha.16'
   storage:
     {}

tests/e2e/greptimedbcluster_test.go

@@ -34,14 +34,14 @@ const (
                         ts TIMESTAMP DEFAULT current_timestamp(),
                         n INT,
     					row_id INT,
-                        TIME INDEX (ts)
+                        TIME INDEX (ts),
+                        PRIMARY KEY(n)
                      )
                      PARTITION BY RANGE COLUMNS (n) (
     				 	PARTITION r0 VALUES LESS THAN (5),
     					PARTITION r1 VALUES LESS THAN (9),
     					PARTITION r2 VALUES LESS THAN (MAXVALUE),
-					)
-					engine=mito`
+					)`
 
 	insertDataSQLStr = "INSERT INTO dist_table(n, row_id) VALUES (%d, %d)"