feat(remote-wal): integrate kafka remote wal (#146)

* feat(remote-wal): integrate kafka remote wal * fix: e2e error for upstream breaking change
GreptimeTeam · Apr 12, 2024 · 718e5a6 · 718e5a6
1 parent 2924637
commit 718e5a6
Show file tree

Hide file tree

Showing 17 changed files with 227 additions and 128 deletions.
diff --git a/apis/v1alpha1/common.go b/apis/v1alpha1/common.go
@@ -304,6 +304,18 @@ type StorageSpec struct {
 	DataHome string `json:"dataHome,omitempty"`
 }
 
+// RemoteWalProvider defines the remote wal provider for the cluster.
+type RemoteWalProvider struct {
+	// +optional
+	KafkaRemoteWal *KafkaRemoteWal `json:"kafka,omitempty"`
+}
+
+// KafkaRemoteWal is the specification for remote WAL that uses Kafka.
+type KafkaRemoteWal struct {
+	// +optional
+	BrokerEndpoints []string `json:"brokerEndpoints,omitempty"`
+}
+
 type ServiceSpec struct {
 	// type determines how the Service is exposed.
 	// +optional

diff --git a/apis/v1alpha1/defaulting.go b/apis/v1alpha1/defaulting.go
@@ -87,14 +87,13 @@ func (in *GreptimeDBCluster) SetDefaults() error {
 				},
 			},
 		},
-		Initializer:           &InitializerSpec{Image: defaultInitializer},
-		HTTPServicePort:       int32(defaultHTTPServicePort),
-		GRPCServicePort:       int32(defaultGRPCServicePort),
-		MySQLServicePort:      int32(defaultMySQLServicePort),
-		PostgresServicePort:   int32(defaultPostgresServicePort),
-		PrometheusServicePort: int32(defaultPrometheusServicePort),
-		OpenTSDBServicePort:   int32(defaultOpenTSDBServicePort),
-		Version:               defaultVersion,
+		Initializer:         &InitializerSpec{Image: defaultInitializer},
+		HTTPServicePort:     int32(defaultHTTPServicePort),
+		GRPCServicePort:     int32(defaultGRPCServicePort),
+		MySQLServicePort:    int32(defaultMySQLServicePort),
+		PostgresServicePort: int32(defaultPostgresServicePort),
+		OpenTSDBServicePort: int32(defaultOpenTSDBServicePort),
+		Version:             defaultVersion,
 	}
 
 	if in.Spec.Version == "" &&
@@ -206,13 +205,12 @@ func (in *GreptimeDBStandalone) SetDefaults() error {
 				},
 			},
 		},
-		HTTPServicePort:       int32(defaultHTTPServicePort),
-		GRPCServicePort:       int32(defaultGRPCServicePort),
-		MySQLServicePort:      int32(defaultMySQLServicePort),
-		PostgresServicePort:   int32(defaultPostgresServicePort),
-		PrometheusServicePort: int32(defaultPrometheusServicePort),
-		OpenTSDBServicePort:   int32(defaultOpenTSDBServicePort),
-		Version:               defaultVersion,
+		HTTPServicePort:     int32(defaultHTTPServicePort),
+		GRPCServicePort:     int32(defaultGRPCServicePort),
+		MySQLServicePort:    int32(defaultMySQLServicePort),
+		PostgresServicePort: int32(defaultPostgresServicePort),
+		OpenTSDBServicePort: int32(defaultOpenTSDBServicePort),
+		Version:             defaultVersion,
 		LocalStorage: &StorageSpec{
 			Name:                defaultStandaloneStorageName,
 			StorageSize:         defaultDataNodeStorageSize,

diff --git a/apis/v1alpha1/defaulting_test.go b/apis/v1alpha1/defaulting_test.go
@@ -177,13 +177,12 @@ func TestSetDefaults(t *testing.T) {
 							DataHome:            defaultDataNodeStorageMountPath,
 						},
 					},
-					HTTPServicePort:       int32(defaultHTTPServicePort),
-					GRPCServicePort:       int32(defaultGRPCServicePort),
-					MySQLServicePort:      int32(defaultMySQLServicePort),
-					PostgresServicePort:   int32(defaultPostgresServicePort),
-					PrometheusServicePort: int32(defaultPrometheusServicePort),
-					OpenTSDBServicePort:   int32(defaultOpenTSDBServicePort),
-					Version:               "latest",
+					HTTPServicePort:     int32(defaultHTTPServicePort),
+					GRPCServicePort:     int32(defaultGRPCServicePort),
+					MySQLServicePort:    int32(defaultMySQLServicePort),
+					PostgresServicePort: int32(defaultPostgresServicePort),
+					OpenTSDBServicePort: int32(defaultOpenTSDBServicePort),
+					Version:             "latest",
 				},
 			},
 		},
@@ -381,13 +380,12 @@ func TestSetDefaults(t *testing.T) {
 						},
 					},
 
-					HTTPServicePort:       int32(defaultHTTPServicePort),
-					GRPCServicePort:       int32(defaultGRPCServicePort),
-					MySQLServicePort:      int32(defaultMySQLServicePort),
-					PostgresServicePort:   int32(defaultPostgresServicePort),
-					PrometheusServicePort: int32(defaultPrometheusServicePort),
-					OpenTSDBServicePort:   int32(defaultOpenTSDBServicePort),
-					Version:               "latest",
+					HTTPServicePort:     int32(defaultHTTPServicePort),
+					GRPCServicePort:     int32(defaultGRPCServicePort),
+					MySQLServicePort:    int32(defaultMySQLServicePort),
+					PostgresServicePort: int32(defaultPostgresServicePort),
+					OpenTSDBServicePort: int32(defaultOpenTSDBServicePort),
+					Version:             "latest",
 				},
 			},
 		},
@@ -551,13 +549,12 @@ func TestSetDefaults(t *testing.T) {
 						},
 					},
 
-					HTTPServicePort:       int32(defaultHTTPServicePort),
-					GRPCServicePort:       int32(defaultGRPCServicePort),
-					MySQLServicePort:      int32(defaultMySQLServicePort),
-					PostgresServicePort:   int32(defaultPostgresServicePort),
-					PrometheusServicePort: int32(defaultPrometheusServicePort),
-					OpenTSDBServicePort:   int32(defaultOpenTSDBServicePort),
-					Version:               "latest",
+					HTTPServicePort:     int32(defaultHTTPServicePort),
+					GRPCServicePort:     int32(defaultGRPCServicePort),
+					MySQLServicePort:    int32(defaultMySQLServicePort),
+					PostgresServicePort: int32(defaultPostgresServicePort),
+					OpenTSDBServicePort: int32(defaultOpenTSDBServicePort),
+					Version:             "latest",
 				},
 			},
 		},

diff --git a/apis/v1alpha1/greptimedbcluster_types.go b/apis/v1alpha1/greptimedbcluster_types.go
@@ -120,9 +120,6 @@ type GreptimeDBClusterSpec struct {
 	// +optional
 	OpenTSDBServicePort int32 `json:"openTSDBServicePort,omitempty"`
 
-	// +optional
-	PrometheusServicePort int32 `json:"prometheusServicePort,omitempty"`
-
 	// +optional
 	EnableInfluxDBProtocol bool `json:"enableInfluxDBProtocol,omitempty"`
 
@@ -139,6 +136,9 @@ type GreptimeDBClusterSpec struct {
 	// +optional
 	ObjectStorageProvider *ObjectStorageProvider `json:"objectStorage,omitempty"`
 
+	// +optional
+	RemoteWalProvider *RemoteWalProvider `json:"remoteWal,omitempty"`
+
 	// More cluster settings can be added here.
 }
 

diff --git a/apis/v1alpha1/greptimedbstandalone_types.go b/apis/v1alpha1/greptimedbstandalone_types.go
@@ -46,9 +46,6 @@ type GreptimeDBStandaloneSpec struct {
 	// +optional
 	OpenTSDBServicePort int32 `json:"openTSDBServicePort,omitempty"`
 
-	// +optional
-	PrometheusServicePort int32 `json:"prometheusServicePort,omitempty"`
-
 	// +optional
 	EnableInfluxDBProtocol bool `json:"enableInfluxDBProtocol,omitempty"`
 
@@ -68,6 +65,9 @@ type GreptimeDBStandaloneSpec struct {
 	// +optional
 	LocalStorage *StorageSpec `json:"localStorage,omitempty"`
 
+	// +optional
+	RemoteWalProvider *RemoteWalProvider `json:"remoteWal,omitempty"`
+
 	// +optional
 	Config string `json:"config,omitempty"`
 }

diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/resources/greptime.io_greptimedbclusters.yaml b/config/crd/resources/greptime.io_greptimedbclusters.yaml
@@ -10743,9 +10743,16 @@ spec:
                       type: string
                     type: object
                 type: object
-              prometheusServicePort:
-                format: int32
-                type: integer
+              remoteWal:
+                properties:
+                  kafka:
+                    properties:
+                      brokerEndpoints:
+                        items:
+                          type: string
+                        type: array
+                    type: object
+                type: object
               version:
                 type: string
             type: object

diff --git a/config/crd/resources/greptime.io_greptimedbstandalones.yaml b/config/crd/resources/greptime.io_greptimedbstandalones.yaml
@@ -2765,9 +2765,16 @@ spec:
                       type: string
                     type: object
                 type: object
-              prometheusServicePort:
-                format: int32
-                type: integer
+              remoteWal:
+                properties:
+                  kafka:
+                    properties:
+                      brokerEndpoints:
+                        items:
+                          type: string
+                        type: array
+                    type: object
+                type: object
               service:
                 properties:
                   annotations:

diff --git a/config/samples/kafka-remote-wal/cluster.yaml b/config/samples/kafka-remote-wal/cluster.yaml
@@ -0,0 +1,21 @@
+apiVersion: greptime.io/v1alpha1
+kind: GreptimeDBCluster
+metadata:
+  name: my-cluster
+  namespace: default
+spec:
+  base:
+    main:
+      image: greptime/greptimedb:latest
+  frontend:
+    replicas: 1
+  meta:
+    replicas: 1
+    etcdEndpoints:
+      - "etcd.default:2379"
+  datanode:
+    replicas: 3
+  remoteWal:
+    kafka:
+      brokerEndpoints:
+        - "my-cluster-kafka-bootstrap.kafka:9092"
diff --git a/manifests/greptimedb-operator-crd.yaml b/manifests/greptimedb-operator-crd.yaml
@@ -10742,9 +10742,16 @@ spec:
                       type: string
                     type: object
                 type: object
-              prometheusServicePort:
-                format: int32
-                type: integer
+              remoteWal:
+                properties:
+                  kafka:
+                    properties:
+                      brokerEndpoints:
+                        items:
+                          type: string
+                        type: array
+                    type: object
+                type: object
               version:
                 type: string
             type: object
@@ -13592,9 +13599,16 @@ spec:
                       type: string
                     type: object
                 type: object
-              prometheusServicePort:
-                format: int32
-                type: integer
+              remoteWal:
+                properties:
+                  kafka:
+                    properties:
+                      brokerEndpoints:
+                        items:
+                          type: string
+                        type: array
+                    type: object
+                type: object
               service:
                 properties:
                   annotations:

diff --git a/manifests/greptimedb-operator-deployment.yaml b/manifests/greptimedb-operator-deployment.yaml
@@ -10749,9 +10749,16 @@ spec:
                       type: string
                     type: object
                 type: object
-              prometheusServicePort:
-                format: int32
-                type: integer
+              remoteWal:
+                properties:
+                  kafka:
+                    properties:
+                      brokerEndpoints:
+                        items:
+                          type: string
+                        type: array
+                    type: object
+                type: object
               version:
                 type: string
             type: object
@@ -13599,9 +13606,16 @@ spec:
                       type: string
                     type: object
                 type: object
-              prometheusServicePort:
-                format: int32
-                type: integer
+              remoteWal:
+                properties:
+                  kafka:
+                    properties:
+                      brokerEndpoints:
+                        items:
+                          type: string
+                        type: array
+                    type: object
+                type: object
               service:
                 properties:
                   annotations: