Skip to content

Commit ea698fa

Browse files
yycpttyycptt
authored
Remove old queue processing logic (#3716)
1 parent 7a147f6 commit ea698fa

26 files changed

+230
-6377
lines changed

‎common/dynamicconfig/constants.go

-27
Original file line numberDiff line numberDiff line change
@@ -387,18 +387,8 @@ const (
387387

388388
// TimerTaskBatchSize is batch size for timer processor to process tasks
389389
TimerTaskBatchSize = "history.timerTaskBatchSize"
390-
// TimerTaskWorkerCount is number of task workers for timer processor
391-
TimerTaskWorkerCount = "history.timerTaskWorkerCount"
392390
// TimerTaskMaxRetryCount is max retry count for timer processor
393391
TimerTaskMaxRetryCount = "history.timerTaskMaxRetryCount"
394-
// TimerProcessorEnableSingleProcessor indicates if only one timer processor should be started for both active and standby tasks
395-
// NOTE: this is an experimental flag for guarantee task execution and will be deprecated after multicursor solution is ready
396-
TimerProcessorEnableSingleProcessor = "history.timerProcessorEnableSingleProcessor"
397-
// TimerProcessorEnableMultiCursor indicates if the new single processor multi-cursor timer processor implementation should be used
398-
// NOTE: this flag only takes effect when history.timerProcessorEnablePriorityTaskScheduler is enabled.
399-
TimerProcessorEnableMultiCursor = "history.timerProcessorEnableMultiCursor"
400-
// TimerProcessorEnablePriorityTaskScheduler indicates whether host level priority task scheduler should be used for timer processor
401-
TimerProcessorEnablePriorityTaskScheduler = "history.timerProcessorEnablePriorityTaskScheduler"
402392
// TimerProcessorSchedulerWorkerCount is the number of workers in the host level task scheduler for timer processor
403393
TimerProcessorSchedulerWorkerCount = "history.timerProcessorSchedulerWorkerCount"
404394
// TimerProcessorSchedulerActiveRoundRobinWeights is the priority round robin weights used by timer task scheduler for active namespaces
@@ -442,18 +432,8 @@ const (
442432
TransferProcessorMaxPollRPS = "history.transferProcessorMaxPollRPS"
443433
// TransferProcessorMaxPollHostRPS is max poll rate per second for all transferQueueProcessor on a host
444434
TransferProcessorMaxPollHostRPS = "history.transferProcessorMaxPollHostRPS"
445-
// TransferTaskWorkerCount is number of worker for transferQueueProcessor
446-
TransferTaskWorkerCount = "history.transferTaskWorkerCount"
447435
// TransferTaskMaxRetryCount is max times of retry for transferQueueProcessor
448436
TransferTaskMaxRetryCount = "history.transferTaskMaxRetryCount"
449-
// TransferProcessorEnableSingleProcessor indicates if only one transfer processor should be started for both active and standby tasks
450-
// NOTE: this is an experimental flag for guarantee task execution and will be deprecated after multicursor solution is ready
451-
TransferProcessorEnableSingleProcessor = "history.transferProcessorEnableSingleProcessor"
452-
// TransferProcessorEnableMultiCursor indicates if the new single processor multi-cursor transfer processor implementation should be used
453-
// NOTE: this flag only takes effect when history.transferProcessorEnablePriorityTaskScheduler is enabled.
454-
TransferProcessorEnableMultiCursor = "history.transferProcessorEnableMultiCursor"
455-
// TransferProcessorEnablePriorityTaskScheduler indicates whether host level priority task scheduler should be used for transferQueueProcessor
456-
TransferProcessorEnablePriorityTaskScheduler = "history.transferProcessorEnablePriorityTaskScheduler"
457437
// TransferProcessorSchedulerWorkerCount is the number of workers in the host level task scheduler for transferQueueProcessor
458438
TransferProcessorSchedulerWorkerCount = "history.transferProcessorSchedulerWorkerCount"
459439
// TransferProcessorSchedulerActiveRoundRobinWeights is the priority round robin weights used by transfer task scheduler for active namespaces
@@ -487,15 +467,8 @@ const (
487467
VisibilityProcessorMaxPollRPS = "history.visibilityProcessorMaxPollRPS"
488468
// VisibilityProcessorMaxPollHostRPS is max poll rate per second for all visibilityQueueProcessor on a host
489469
VisibilityProcessorMaxPollHostRPS = "history.visibilityProcessorMaxPollHostRPS"
490-
// VisibilityTaskWorkerCount is number of worker for visibilityQueueProcessor
491-
VisibilityTaskWorkerCount = "history.visibilityTaskWorkerCount"
492470
// VisibilityTaskMaxRetryCount is max times of retry for visibilityQueueProcessor
493471
VisibilityTaskMaxRetryCount = "history.visibilityTaskMaxRetryCount"
494-
// VisibilityProcessorEnableMultiCursor indicates if the new single processor multi-cursor visibility processor implementation should be used
495-
// NOTE: this flag only takes effect when history.visibilityProcessorEnablePriorityTaskScheduler is enabled.
496-
VisibilityProcessorEnableMultiCursor = "history.visibilityProcessorEnableMultiCursor"
497-
// VisibilityProcessorEnablePriorityTaskScheduler indicates whether host level priority task scheduler should be used for visibilityQueueProcessor
498-
VisibilityProcessorEnablePriorityTaskScheduler = "history.visibilityProcessorEnablePriorityTaskScheduler"
499472
// VisibilityProcessorSchedulerWorkerCount is the number of workers in the host level task scheduler for visibilityQueueProcessor
500473
VisibilityProcessorSchedulerWorkerCount = "history.visibilityProcessorSchedulerWorkerCount"
501474
// VisibilityProcessorSchedulerActiveRoundRobinWeights is the priority round robin weights by visibility task scheduler for active namespaces

‎service/history/configs/config.go

-22
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,7 @@ type Config struct {
9898
// TimerQueueProcessor settings
9999
TimerTaskHighPriorityRPS dynamicconfig.IntPropertyFnWithNamespaceFilter
100100
TimerTaskBatchSize dynamicconfig.IntPropertyFn
101-
TimerTaskWorkerCount dynamicconfig.IntPropertyFn
102101
TimerTaskMaxRetryCount dynamicconfig.IntPropertyFn
103-
TimerProcessorEnableSingleProcessor dynamicconfig.BoolPropertyFn
104-
TimerProcessorEnableMultiCursor dynamicconfig.BoolPropertyFn
105-
TimerProcessorEnablePriorityTaskScheduler dynamicconfig.BoolPropertyFn
106102
TimerProcessorSchedulerWorkerCount dynamicconfig.IntPropertyFn
107103
TimerProcessorSchedulerActiveRoundRobinWeights dynamicconfig.MapPropertyFnWithNamespaceFilter
108104
TimerProcessorSchedulerStandbyRoundRobinWeights dynamicconfig.MapPropertyFnWithNamespaceFilter
@@ -124,11 +120,7 @@ type Config struct {
124120
// TransferQueueProcessor settings
125121
TransferTaskHighPriorityRPS dynamicconfig.IntPropertyFnWithNamespaceFilter
126122
TransferTaskBatchSize dynamicconfig.IntPropertyFn
127-
TransferTaskWorkerCount dynamicconfig.IntPropertyFn
128123
TransferTaskMaxRetryCount dynamicconfig.IntPropertyFn
129-
TransferProcessorEnableSingleProcessor dynamicconfig.BoolPropertyFn
130-
TransferProcessorEnableMultiCursor dynamicconfig.BoolPropertyFn
131-
TransferProcessorEnablePriorityTaskScheduler dynamicconfig.BoolPropertyFn
132124
TransferProcessorSchedulerWorkerCount dynamicconfig.IntPropertyFn
133125
TransferProcessorSchedulerActiveRoundRobinWeights dynamicconfig.MapPropertyFnWithNamespaceFilter
134126
TransferProcessorSchedulerStandbyRoundRobinWeights dynamicconfig.MapPropertyFnWithNamespaceFilter
@@ -260,10 +252,7 @@ type Config struct {
260252
// VisibilityQueueProcessor settings
261253
VisibilityTaskHighPriorityRPS dynamicconfig.IntPropertyFnWithNamespaceFilter
262254
VisibilityTaskBatchSize dynamicconfig.IntPropertyFn
263-
VisibilityTaskWorkerCount dynamicconfig.IntPropertyFn
264255
VisibilityTaskMaxRetryCount dynamicconfig.IntPropertyFn
265-
VisibilityProcessorEnableMultiCursor dynamicconfig.BoolPropertyFn
266-
VisibilityProcessorEnablePriorityTaskScheduler dynamicconfig.BoolPropertyFn
267256
VisibilityProcessorSchedulerWorkerCount dynamicconfig.IntPropertyFn
268257
VisibilityProcessorSchedulerActiveRoundRobinWeights dynamicconfig.MapPropertyFnWithNamespaceFilter
269258
VisibilityProcessorSchedulerStandbyRoundRobinWeights dynamicconfig.MapPropertyFnWithNamespaceFilter
@@ -364,11 +353,7 @@ func NewConfig(dc *dynamicconfig.Collection, numberOfShards int32, isAdvancedVis
364353
TaskSchedulerNamespaceMaxQPS: dc.GetIntPropertyFilteredByNamespace(dynamicconfig.TaskSchedulerNamespaceMaxQPS, 0),
365354

366355
TimerTaskBatchSize: dc.GetIntProperty(dynamicconfig.TimerTaskBatchSize, 100),
367-
TimerTaskWorkerCount: dc.GetIntProperty(dynamicconfig.TimerTaskWorkerCount, 10),
368356
TimerTaskMaxRetryCount: dc.GetIntProperty(dynamicconfig.TimerTaskMaxRetryCount, 20),
369-
TimerProcessorEnableSingleProcessor: dc.GetBoolProperty(dynamicconfig.TimerProcessorEnableSingleProcessor, false),
370-
TimerProcessorEnableMultiCursor: dc.GetBoolProperty(dynamicconfig.TimerProcessorEnableMultiCursor, true),
371-
TimerProcessorEnablePriorityTaskScheduler: dc.GetBoolProperty(dynamicconfig.TimerProcessorEnablePriorityTaskScheduler, true),
372357
TimerProcessorSchedulerWorkerCount: dc.GetIntProperty(dynamicconfig.TimerProcessorSchedulerWorkerCount, 512),
373358
TimerProcessorSchedulerActiveRoundRobinWeights: dc.GetMapPropertyFnWithNamespaceFilter(dynamicconfig.TimerProcessorSchedulerActiveRoundRobinWeights, ConvertWeightsToDynamicConfigValue(DefaultActiveTaskPriorityWeight)),
374359
TimerProcessorSchedulerStandbyRoundRobinWeights: dc.GetMapPropertyFnWithNamespaceFilter(dynamicconfig.TimerProcessorSchedulerStandbyRoundRobinWeights, ConvertWeightsToDynamicConfigValue(DefaultStandbyTaskPriorityWeight)),
@@ -388,11 +373,7 @@ func NewConfig(dc *dynamicconfig.Collection, numberOfShards int32, isAdvancedVis
388373
RetentionTimerJitterDuration: dc.GetDurationProperty(dynamicconfig.RetentionTimerJitterDuration, 30*time.Minute),
389374

390375
TransferTaskBatchSize: dc.GetIntProperty(dynamicconfig.TransferTaskBatchSize, 100),
391-
TransferTaskWorkerCount: dc.GetIntProperty(dynamicconfig.TransferTaskWorkerCount, 10),
392376
TransferTaskMaxRetryCount: dc.GetIntProperty(dynamicconfig.TransferTaskMaxRetryCount, 20),
393-
TransferProcessorEnableSingleProcessor: dc.GetBoolProperty(dynamicconfig.TransferProcessorEnableSingleProcessor, false),
394-
TransferProcessorEnableMultiCursor: dc.GetBoolProperty(dynamicconfig.TransferProcessorEnableMultiCursor, true),
395-
TransferProcessorEnablePriorityTaskScheduler: dc.GetBoolProperty(dynamicconfig.TransferProcessorEnablePriorityTaskScheduler, true),
396377
TransferProcessorSchedulerWorkerCount: dc.GetIntProperty(dynamicconfig.TransferProcessorSchedulerWorkerCount, 512),
397378
TransferProcessorSchedulerActiveRoundRobinWeights: dc.GetMapPropertyFnWithNamespaceFilter(dynamicconfig.TransferProcessorSchedulerActiveRoundRobinWeights, ConvertWeightsToDynamicConfigValue(DefaultActiveTaskPriorityWeight)),
398379
TransferProcessorSchedulerStandbyRoundRobinWeights: dc.GetMapPropertyFnWithNamespaceFilter(dynamicconfig.TransferProcessorSchedulerStandbyRoundRobinWeights, ConvertWeightsToDynamicConfigValue(DefaultStandbyTaskPriorityWeight)),
@@ -497,10 +478,7 @@ func NewConfig(dc *dynamicconfig.Collection, numberOfShards int32, isAdvancedVis
497478
VisibilityTaskBatchSize: dc.GetIntProperty(dynamicconfig.VisibilityTaskBatchSize, 100),
498479
VisibilityProcessorMaxPollRPS: dc.GetIntProperty(dynamicconfig.VisibilityProcessorMaxPollRPS, 20),
499480
VisibilityProcessorMaxPollHostRPS: dc.GetIntProperty(dynamicconfig.VisibilityProcessorMaxPollHostRPS, 0),
500-
VisibilityTaskWorkerCount: dc.GetIntProperty(dynamicconfig.VisibilityTaskWorkerCount, 10),
501481
VisibilityTaskMaxRetryCount: dc.GetIntProperty(dynamicconfig.VisibilityTaskMaxRetryCount, 20),
502-
VisibilityProcessorEnableMultiCursor: dc.GetBoolProperty(dynamicconfig.VisibilityProcessorEnableMultiCursor, true),
503-
VisibilityProcessorEnablePriorityTaskScheduler: dc.GetBoolProperty(dynamicconfig.VisibilityProcessorEnablePriorityTaskScheduler, true),
504482
VisibilityProcessorSchedulerWorkerCount: dc.GetIntProperty(dynamicconfig.VisibilityProcessorSchedulerWorkerCount, 512),
505483
VisibilityProcessorSchedulerActiveRoundRobinWeights: dc.GetMapPropertyFnWithNamespaceFilter(dynamicconfig.VisibilityProcessorSchedulerActiveRoundRobinWeights, ConvertWeightsToDynamicConfigValue(DefaultActiveTaskPriorityWeight)),
506484
VisibilityProcessorSchedulerStandbyRoundRobinWeights: dc.GetMapPropertyFnWithNamespaceFilter(dynamicconfig.VisibilityProcessorSchedulerStandbyRoundRobinWeights, ConvertWeightsToDynamicConfigValue(DefaultStandbyTaskPriorityWeight)),

‎service/history/historyEngineInterfaces.go

-82
This file was deleted.

0 commit comments

Comments
 (0)