Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/config/configuration.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,11 @@ var (
defaultOBBufferSize int64 = 10485760

// defaultOBCollectorCntPercent
defaultOBCollectorCntPercent = 1000
defaultOBCollectorCntPercent = 10
// defaultOBGeneratorCntPercent
defaultOBGeneratorCntPercent = 1000
defaultOBGeneratorCntPercent = 20
// defaultOBExporterCntPercent
defaultOBExporterCntPercent = 1000
defaultOBExporterCntPercent = 80

// defaultPrintDebugInterval default: 30 minutes
defaultPrintDebugInterval = 30
Expand Down
13 changes: 0 additions & 13 deletions pkg/util/export/batch_processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -442,8 +442,6 @@ func NewMOCollector(
return c
}

const maxPercentValue = 1000

// calculateDefaultWorker
// totalNum = int( #cpu * 0.1 + 0.5 )
// default collectorCntP : generatorCntP : exporterCntP = 10 : 20 : 80.
Expand Down Expand Up @@ -483,17 +481,6 @@ func (c *MOCollector) calculateDefaultWorker(numCpu int) {
if c.exporterCnt > numCpu {
c.exporterCnt = numCpu
}

// last check: disable calculation
if c.collectorCnt >= maxPercentValue {
c.collectorCnt = numCpu
}
if c.generatorCntP >= maxPercentValue {
c.generatorCnt = numCpu
}
if c.exporterCnt >= maxPercentValue {
c.generatorCnt = numCpu
}
}

func WithCollectorCntP(p int) MOCollectorOption {
Expand Down
6 changes: 3 additions & 3 deletions pkg/util/export/batch_processor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -370,9 +370,9 @@ func Test_newBufferHolder_AddAfterStop(t *testing.T) {
func getDummyOBCollectorConfig() *config.OBCollectorConfig {
cfg := &config.OBCollectorConfig{}
cfg.SetDefaultValues()
cfg.ExporterCntPercent = maxPercentValue
cfg.GeneratorCntPercent = maxPercentValue
cfg.CollectorCntPercent = maxPercentValue
cfg.ExporterCntPercent = 100
cfg.GeneratorCntPercent = 100
cfg.CollectorCntPercent = 100
return cfg
}

Expand Down
Loading