diff options
author | George Goldberg <george@gberg.me> | 2017-08-17 15:05:17 +0100 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-08-17 10:05:17 -0400 |
commit | 22459ee17a3ba0b4487f975b6ebe630cab2d9feb (patch) | |
tree | 275d8b68561d1c5046416d04264efc35806b8342 /jobs/workers.go | |
parent | 4e92d1801733410c47bdde29c4bda4d52210d4e7 (diff) | |
download | chat-22459ee17a3ba0b4487f975b6ebe630cab2d9feb.tar.gz chat-22459ee17a3ba0b4487f975b6ebe630cab2d9feb.tar.bz2 chat-22459ee17a3ba0b4487f975b6ebe630cab2d9feb.zip |
PLT-7302: Aggregate Elasticsearch indexes over a certain age. (#7224)
* PLT-7302: Aggregate Elasticsearch indexes over a certain age.
This is done by a scheduled daily job, in order to keep the shard count
to a sensible level in Elasticsearch.
* Use map[string]string instead of StringMap
Diffstat (limited to 'jobs/workers.go')
-rw-r--r-- | jobs/workers.go | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/jobs/workers.go b/jobs/workers.go index 592c001fb..fe38641e7 100644 --- a/jobs/workers.go +++ b/jobs/workers.go @@ -16,16 +16,15 @@ type Workers struct { startOnce sync.Once watcher *Watcher - DataRetention model.Worker - ElasticsearchIndexing model.Worker + DataRetention model.Worker + ElasticsearchIndexing model.Worker + ElasticsearchAggregation model.Worker listenerId string } func InitWorkers() *Workers { - workers := &Workers{ - // SearchIndexing: MakeTestJob(s, "SearchIndexing"), - } + workers := &Workers{} workers.watcher = MakeWatcher(workers) if dataRetentionInterface := ejobs.GetDataRetentionInterface(); dataRetentionInterface != nil { @@ -36,6 +35,10 @@ func InitWorkers() *Workers { workers.ElasticsearchIndexing = elasticsearchIndexerInterface.MakeWorker() } + if elasticsearchAggregatorInterface := ejobs.GetElasticsearchAggregatorInterface(); elasticsearchAggregatorInterface != nil { + workers.ElasticsearchAggregation = elasticsearchAggregatorInterface.MakeWorker() + } + return workers } @@ -51,6 +54,10 @@ func (workers *Workers) Start() *Workers { go workers.ElasticsearchIndexing.Run() } + if workers.ElasticsearchAggregation != nil && *utils.Cfg.ElasticsearchSettings.EnableIndexing { + go workers.ElasticsearchAggregation.Run() + } + go workers.watcher.Start() }) @@ -75,6 +82,14 @@ func (workers *Workers) handleConfigChange(oldConfig *model.Config, newConfig *m workers.ElasticsearchIndexing.Stop() } } + + if workers.ElasticsearchAggregation != nil { + if !*oldConfig.ElasticsearchSettings.EnableIndexing && *newConfig.ElasticsearchSettings.EnableIndexing { + go workers.ElasticsearchAggregation.Run() + } else if *oldConfig.ElasticsearchSettings.EnableIndexing && !*newConfig.ElasticsearchSettings.EnableIndexing { + workers.ElasticsearchAggregation.Stop() + } + } } func (workers *Workers) Stop() *Workers { @@ -90,6 +105,10 @@ func (workers *Workers) Stop() *Workers { workers.ElasticsearchIndexing.Stop() } + if workers.ElasticsearchAggregation != nil && *utils.Cfg.ElasticsearchSettings.EnableIndexing { + workers.ElasticsearchAggregation.Stop() + } + l4g.Info("Stopped workers") return workers |