From 1d58e986baa1b7b181288f0984d591e28ab74657 Mon Sep 17 00:00:00 2001 From: zhangjianweibj Date: Mon, 1 Jul 2019 09:40:38 +0800 Subject: [PATCH] Support kafka num_processors option Support kafka num_processors option in docker env. Change-Id: I2e4135c928c50c6b3b331e385fccd0e0758fbf76 --- docker/Dockerfile | 2 ++ docker/README.rst | 2 ++ docker/monasca-persister.conf.j2 | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 563962ba..13ee7144 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -23,8 +23,10 @@ ENV \ ZOOKEEPER_URI=zookeeper:2181 \ KAFKA_URI=kafka:9092 \ KAFKA_ALARM_HISTORY_BATCH_SIZE=1000 \ + KAFKA_ALARM_HISTORY_PROCESSORS=1 \ KAFKA_ALARM_HISTORY_WAIT_TIME=15 \ KAFKA_METRICS_BATCH_SIZE=1000 \ + KAFKA_METRICS_PROCESSORS=1 \ KAFKA_METRICS_WAIT_TIME=15 \ KAFKA_WAIT_FOR_TOPICS=alarm-state-transitions,metrics \ DATABASE_BACKEND=influxdb \ diff --git a/docker/README.rst b/docker/README.rst index 3709eef6..14112459 100644 --- a/docker/README.rst +++ b/docker/README.rst @@ -29,8 +29,10 @@ VERBOSE true If true, enable info logging ZOOKEEPER_URI zookeeper:2181 The host and port for zookeeper KAFKA_URI kafka:9092 The host and port for kafka KAFKA_ALARM_HISTORY_BATCH_SIZE 1000 Kafka consumer takes messages in a batch +KAFKA_ALARM_HISTORY_PROCESSORS 1 Number of processes for alarm history topic KAFKA_ALARM_HISTORY_WAIT_TIME 15 Seconds to wait if the batch size is not reached KAFKA_METRICS_BATCH_SIZE 1000 Kafka consumer takes messages in a batch +KAFKA_METRICS_PROCESSORS 1 Number of processes for metrics topic KAFKA_METRICS_WAIT_TIME 15 Seconds to wait if the batch size is not reached DATABASE_BACKEND influxdb Select for backend database INFLUX_HOST influxdb The host for influxdb diff --git a/docker/monasca-persister.conf.j2 b/docker/monasca-persister.conf.j2 index cf160014..ab5ed28f 100644 --- a/docker/monasca-persister.conf.j2 +++ b/docker/monasca-persister.conf.j2 @@ -46,7 +46,7 @@ buffer_size = 4096 max_buffer_size = 32768 # Path in zookeeper for kafka consumer group partitioning algo zookeeper_path = /persister_partitions/alarm-state-transitions -num_processors = 1 +num_processors = {{ KAFKA_ALARM_HISTORY_PROCESSORS | default(1) }} [kafka_metrics] # Comma separated list of Kafka broker host:port @@ -64,7 +64,7 @@ buffer_size = 4096 max_buffer_size = 32768 # Path in zookeeper for kafka consumer group partitioning algo zookeeper_path = /persister_partitions/metrics -num_processors = 1 +num_processors = {{ KAFKA_METRICS_PROCESSORS | default(1) }} {% if DATABASE_BACKEND | lower == 'cassandra' %} [cassandra]