(VOL-4959) kafka retry parameters for voltha-go,openonu-adapter,openolt-adapter
Change-Id: I96455e14d007681f4db6e8657be60c06fd234460
Signed-off-by: Akash Reddy Kankanala <akash.kankanala@radisys.com>
diff --git a/VERSION b/VERSION
index 240bba9..5cdb444 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.7.0
\ No newline at end of file
+3.7.1
\ No newline at end of file
diff --git a/voltha-adapter-openolt/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index abff3ae..03a3017 100644
--- a/voltha-adapter-openolt/Chart.yaml
+++ b/voltha-adapter-openolt/Chart.yaml
@@ -17,7 +17,7 @@
## Chart version for package 'voltha-adapter-openolt'
## Increment when Chart.yaml changes
-version: "2.15.0"
+version: "2.15.1"
description: "A Helm chart for Voltha OpenOLT Adapter"
keywords:
- "onf"
@@ -35,6 +35,6 @@
url: "https://www.opennetworking.org"
# appVersion refers to release version of voltha-openolt-adapter
-appVersion: "4.5.16"
+appVersion: "4.5.19"
# [EOF]
diff --git a/voltha-adapter-openolt/templates/openolt-deploy.yaml b/voltha-adapter-openolt/templates/openolt-deploy.yaml
index e645316..71719b1 100644
--- a/voltha-adapter-openolt/templates/openolt-deploy.yaml
+++ b/voltha-adapter-openolt/templates/openolt-deploy.yaml
@@ -140,6 +140,8 @@
- "--max_grpc_client_retry={{ tpl .Values.adapter_open_olt.rpc_retry . }}"
- "--per_rpc_retry_timeout={{ tpl .Values.adapter_open_olt.per_rpc_retry_timeout . }}"
- "--force_onu_disc_processing={{ tpl .Values.adapter_open_olt.force_onu_disc_processing . }}"
+ - "--producer_retry_max={{ tpl .Values.adapter_open_olt.producer_retry_max . }}"
+ - "--metadata_retry_max={{ tpl .Values.adapter_open_olt.metadata_retry_max . }}"
{{- if .Values.securityContext.enabled }}
securityContext:
allowPrivilegeEscalation: false
diff --git a/voltha-adapter-openolt/values.yaml b/voltha-adapter-openolt/values.yaml
index 2d0ad80..d0cf273 100644
--- a/voltha-adapter-openolt/values.yaml
+++ b/voltha-adapter-openolt/values.yaml
@@ -34,6 +34,8 @@
check_onu_exist_on_discovery: false
per_rpc_retry_timeout : "5s"
rpc_retry: "4"
+ producer_retry_max: "10"
+ metadata_retry_max: "15"
force_onu_disc_processing: false
# enable OMCC encryption
omcc_encryption: false
@@ -108,6 +110,8 @@
rpc_retry: '{{ .Values.global.adapter_open_olt.rpc_retry }}'
per_rpc_retry_timeout : '{{ .Values.global.adapter_open_olt.per_rpc_retry_timeout }}'
force_onu_disc_processing: '{{ .Values.global.adapter_open_olt.force_onu_disc_processing }}'
+ producer_retry_max : '{{ .Values.global.adapter_open_olt.producer_retry_max }}'
+ metadata_retry_max : '{{ .Values.global.adapter_open_olt.metadata_retry_max }}'
endpoints:
# core_endpoint: '{{ .Values.global.adapter_open_olt.core_endpoint }}'
# adapter_endpoint: '{{ template "fullname" . }}-api:55560'
diff --git a/voltha-adapter-openonu/Chart.yaml b/voltha-adapter-openonu/Chart.yaml
index af6d0e4..0877a1c 100644
--- a/voltha-adapter-openonu/Chart.yaml
+++ b/voltha-adapter-openonu/Chart.yaml
@@ -14,7 +14,7 @@
---
apiVersion: "v1"
name: "voltha-adapter-openonu"
-version: "2.15.0"
+version: "2.15.1"
description: "A Helm chart for Voltha OpenONU Adapter"
keywords:
- "onf"
@@ -32,6 +32,6 @@
url: "https://www.opennetworking.org"
# appVersion refers to release version of voltha-openonu-adapter-go
-appVersion: "2.12.25"
+appVersion: "2.12.31"
# [EOF]
diff --git a/voltha-adapter-openonu/templates/openonu-go-deploy.yaml b/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
index 5fcd5b1..fc087b8 100644
--- a/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
+++ b/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
@@ -107,6 +107,8 @@
- "--uni_port_mask={{ .Values.adapter_open_onu.uni_port_mask }}"
- "--skip_onu_config_enabled={{ .Values.global.skip_onu_config.enabled }}"
- "--check_device_tech_prof_on_reboot_enabled={{ .Values.global.check_device_tech_prof_on_reboot.enabled }}"
+ - "--producer_retry_max={{ tpl .Values.adapter_open_onu.producer_retry_max . }}"
+ - "--metadata_retry_max={{ tpl .Values.adapter_open_onu.metadata_retry_max . }}"
{{- if .Values.securityContext.enabled }}
securityContext:
allowPrivilegeEscalation: false
diff --git a/voltha-adapter-openonu/values.yaml b/voltha-adapter-openonu/values.yaml
index db9935d..692c554 100644
--- a/voltha-adapter-openonu/values.yaml
+++ b/voltha-adapter-openonu/values.yaml
@@ -36,6 +36,10 @@
omci_timeout: "3s"
# timeout for RPC request
rpc_timeout: "10s"
+ # kafka producer max retry
+ producer_retry_max: "10"
+ # kafka metadata max retries
+ metadata_retry_max: "15"
# kv store timeout
adapter_open_onu:
timeout: "5s"
@@ -138,6 +142,8 @@
kv_store_timeout: '{{ .Values.global.adapter_open_onu.timeout }}'
kv_store_data_prefix: 'service/{{ .Values.global.stack_name }}_voltha'
alarm_audit_interval: '{{ .Values.global.alarm_audit.interval }}'
+ producer_retry_max : '{{ .Values.global.producer_retry_max }}'
+ metadata_retry_max : '{{ .Values.global.metadata_retry_max }}'
uni_port_mask: "0x0001"
endpoints:
address: '{{ template "fullname" . }}-api'
diff --git a/voltha-stack/Chart.yaml b/voltha-stack/Chart.yaml
index 1dfe257..fcf87a6 100644
--- a/voltha-stack/Chart.yaml
+++ b/voltha-stack/Chart.yaml
@@ -34,7 +34,7 @@
## Chart version for package voltha-stack
## Increment when Chart.yaml changes
-version : "2.15.0"
+version : "2.15.1"
# -----------------------------------------------------------------------
# NOTE: Dependencies are chart versions not component/repository version
@@ -43,15 +43,15 @@
dependencies:
- name : voltha
repository : file://../voltha
- version : "2.15.0"
+ version : "2.15.1"
condition : voltha.enabled
- name : "voltha-adapter-openonu"
repository : "file://../voltha-adapter-openonu"
- version : "2.15.0"
+ version : "2.15.1"
condition : "voltha-adapter-openonu.enabled"
- name : voltha-adapter-openolt
repository : file://../voltha-adapter-openolt
- version : "2.15.0"
+ version : "2.15.1"
condition : voltha-adapter-openolt.enabled
- name : voltha-go-controller
repository : file://../voltha-go-controller
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 31ab105..1b99825 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -17,7 +17,7 @@
## Chart version for package 'voltha'
## Increment when Chart.yaml changes
-version: "2.15.0"
+version: "2.15.1"
description: "A Helm chart for Voltha based on K8S resources in Voltha project"
keywords:
@@ -36,6 +36,6 @@
url: "https://www.opennetworking.org"
# appVersion refers to release version of voltha-go
-appVersion: "3.6.17"
+appVersion: "3.6.20"
# [EOF]
diff --git a/voltha/templates/core-deploy.yaml b/voltha/templates/core-deploy.yaml
index 12afcdd..1fb5e03 100644
--- a/voltha/templates/core-deploy.yaml
+++ b/voltha/templates/core-deploy.yaml
@@ -105,6 +105,8 @@
- "--backoff_retry_initial_interval={{ .Values.rw_core.backoff_initial_interval }}"
- "--backoff_retry_max_interval={{ .Values.rw_core.backoff_max_interval }}"
- "--backoff_retry_max_elapsed_time={{ .Values.rw_core.backoff_max_elapsed_time }}"
+ - "--producer_retry_max={{ tpl .Values.rw_core.producer_retry_max . }}"
+ - "--metadata_retry_max={{ tpl .Values.rw_core.metadata_retry_max . }}"
ports:
- containerPort: 50057
name: nbi-grpc
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 8712f7e..4d7ab25 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -30,6 +30,8 @@
rpc_timeout: "30s"
flow_timeout: "30s"
internal_timeout: "30s"
+ producer_retry_max: "10"
+ metadata_retry_max: "15"
# Configure Log Correlation
log_correlation:
enabled: true
@@ -95,6 +97,8 @@
internal_timeout: '{{ .Values.global.rw_core.internal_timeout }}'
kv_store_data_prefix: 'service/{{ .Values.global.stack_name }}_voltha'
stack_id: "{{ .Values.global.stack_name }}"
+ producer_retry_max : '{{ .Values.global.rw_core.producer_retry_max }}'
+ metadata_retry_max : '{{ .Values.global.rw_core.metadata_retry_max }}'
topics:
event_topic: "voltha.events"
backoff_initial_interval: 500ms
@@ -119,7 +123,7 @@
rw_core:
registry: '{{ .Values.global.image_registry }}'
repository: '{{ .Values.global.image_org }}voltha-rw-core'
- tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}3.4.8{{- end }}{{- else }}3.4.8{{- end }}'
+ tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.rw_core.image_tag }}{{- else }}{{ .Chart.AppVersion }}{{- end }}{{- else }}{{ .Chart.AppVersion }}{{- end }}'
pullPolicy: '{{ .Values.global.image_pullPolicy }}'
ingress: