config(ticdc): disable pull based sink (#7844)

close #7849
pingcap · Dec 8, 2022 · 075dab2 · 075dab2
1 parent f506323
commit 075dab2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 17 deletions.
diff --git a/pkg/cmd/server/server_test.go b/pkg/cmd/server/server_test.go
@@ -179,9 +179,8 @@ func TestParseCfg(t *testing.T) {
 			TableActor: &config.TableActorConfig{
 				EventBatchSize: 32,
 			},
-			EnableDBSorter:      true,
-			EnableNewScheduler:  true,
-			EnablePullBasedSink: true,
+			EnableDBSorter:     true,
+			EnableNewScheduler: true,
 			DB: &config.DBConfig{
 				Count:                       8,
 				Concurrency:                 128,
@@ -255,7 +254,6 @@ region-retry-duration = "3s"
 
 [debug]
 enable-db-sorter = true
-enable-pull-based-sink = true
 [debug.db]
 count = 5
 concurrency = 6
@@ -336,9 +334,8 @@ check-balance-interval = "10s"
 			TableActor: &config.TableActorConfig{
 				EventBatchSize: 32,
 			},
-			EnableDBSorter:      true,
-			EnablePullBasedSink: true,
-			EnableNewScheduler:  true,
+			EnableDBSorter:     true,
+			EnableNewScheduler: true,
 			DB: &config.DBConfig{
 				Count:                       5,
 				Concurrency:                 6,
@@ -483,9 +480,8 @@ cert-allowed-cn = ["dd","ee"]
 			TableActor: &config.TableActorConfig{
 				EventBatchSize: 32,
 			},
-			EnableDBSorter:      true,
-			EnableNewScheduler:  true,
-			EnablePullBasedSink: true,
+			EnableDBSorter:     true,
+			EnableNewScheduler: true,
 			DB: &config.DBConfig{
 				Count:                       8,
 				Concurrency:                 128,
@@ -548,9 +544,8 @@ unknown3 = 3
 		TableActor: &config.TableActorConfig{
 			EventBatchSize: 32,
 		},
-		EnableDBSorter:      true,
-		EnableNewScheduler:  true,
-		EnablePullBasedSink: true,
+		EnableDBSorter:     true,
+		EnableNewScheduler: true,
 		DB: &config.DBConfig{
 			Count:                       8,
 			Concurrency:                 128,

diff --git a/pkg/config/config_test_data.go b/pkg/config/config_test_data.go
@@ -106,7 +106,7 @@ const (
     "table-actor": {
       "event-batch-size": 32
     },
-    "enable-pull-based-sink": true,
+    "enable-pull-based-sink": false,
     "enable-db-sorter": true,
     "db": {
       "count": 8,

diff --git a/pkg/config/debug.go b/pkg/config/debug.go
@@ -22,7 +22,7 @@ import (
 type DebugConfig struct {
 	TableActor *TableActorConfig `toml:"table-actor" json:"table-actor"`
 
-	// EnablePullBasedSink enables pull-based sink, true by default.
+	// EnablePullBasedSink enables pull-based sink, false by default.
 	//
 	// NOTE: currently it can only be enabled with EnableDBSorter, because unified
 	// sorter hasn't been transformed into the new interface.

diff --git a/pkg/config/server_config.go b/pkg/config/server_config.go
@@ -151,7 +151,7 @@ var defaultServerConfig = &ServerConfig{
 
 		Scheduler:           NewDefaultSchedulerConfig(),
 		EnableNewSink:       true,
-		EnablePullBasedSink: true,
+		EnablePullBasedSink: false,
 	},
 	ClusterID: "default",
 }

diff --git a/tests/integration_tests/processor_err_chan/run.sh b/tests/integration_tests/processor_err_chan/run.sh
@@ -27,7 +27,7 @@ function run() {
 		run_sql "CREATE table processor_err_chan.t$i (id int primary key auto_increment)" ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT}
 	done
 
-	export GO_FAILPOINTS='github.com/pingcap/tiflow/cdc/processor/sourcemanager/puller/ProcessorAddTableError=1*return(true)'
+	export GO_FAILPOINTS='github.com/pingcap/tiflow/cdc/processor/pipeline/ProcessorAddTableError=1*return(true)'
 	run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --addr "127.0.0.1:8300" --pd $pd_addr
 
 	changefeed_id=$(cdc cli changefeed create --pd=$pd_addr --sink-uri="$SINK_URI" 2>&1 | tail -n2 | head -n1 | awk '{print $2}')