(VOL-4955)added max_grpc_client_retry parameter
max_grpc_client_retry is the maximum number of times
the olt adaptor should retry to the core in case the grpc request fails due to request time out or voltha core being unavailable
Change-Id: Ib3e722853c6479d84e1fadca4182f698fa6f61ac
(retrying for pipeline)
diff --git a/VERSION b/VERSION
index d854009..b347b11 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.2.2-dev1
+3.2.3
diff --git a/voltha-adapter-openolt/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index 5dc62eb..0fd266f 100644
--- a/voltha-adapter-openolt/Chart.yaml
+++ b/voltha-adapter-openolt/Chart.yaml
@@ -14,7 +14,7 @@
---
apiVersion: "v1"
name: "voltha-adapter-openolt"
-version: "2.11.5"
+version: "2.12.1"
description: "A Helm chart for Voltha OpenOLT Adapter"
keywords:
- "onf"
@@ -33,4 +33,4 @@
# appVersion refers to multiple components with potentially different
# container image versions.
-appVersion: "4.2.12"
+appVersion: "4.3.2"
diff --git a/voltha-adapter-openolt/templates/openolt-deploy.yaml b/voltha-adapter-openolt/templates/openolt-deploy.yaml
index 18259e8..1203b87 100644
--- a/voltha-adapter-openolt/templates/openolt-deploy.yaml
+++ b/voltha-adapter-openolt/templates/openolt-deploy.yaml
@@ -136,6 +136,8 @@
- "--enable_onu_stats={{ .Values.global.enable_onu_stats }}"
- "--enable_gem_stats={{ .Values.global.enable_gem_stats }}"
- "--check_onu_exist_on_discovery={{ tpl .Values.adapter_open_olt.check_onu_exist_on_discovery . }}"
+ - "--max_grpc_client_retry={{ tpl .Values.adapter_open_olt.rpc_retry . }}"
+ - "--per_rpc_retry_timeout={{ tpl .Values.adapter_open_olt.per_rpc_retry_timeout . }}"
{{- if .Values.securityContext.enabled }}
securityContext:
allowPrivilegeEscalation: false
diff --git a/voltha-adapter-openolt/values.yaml b/voltha-adapter-openolt/values.yaml
index 3a538f7..28d8bfa 100644
--- a/voltha-adapter-openolt/values.yaml
+++ b/voltha-adapter-openolt/values.yaml
@@ -32,7 +32,8 @@
heartbeat_check_interval: "15s"
heartbeat_fail_interval: "31s"
check_onu_exist_on_discovery: false
-
+ per_rpc_retry_timeout : "2s"
+ rpc_retry: "5"
# enable OMCC encryption
omcc_encryption: false
# enable ONU stats
@@ -101,6 +102,8 @@
heartbeat_fail_interval: '{{ .Values.global.adapter_open_olt.heartbeat_fail_interval }}'
check_onu_exist_on_discovery: '{{ .Values.global.adapter_open_olt.check_onu_exist_on_discovery }}'
rpc_timeout: '{{ .Values.global.rpc_timeout }}'
+ rpc_retry: '{{ .Values.global.adapter_open_olt.rpc_retry }}'
+ per_rpc_retry_timeout : '{{ .Values.global.adapter_open_olt.per_rpc_retry_timeout }}'
endpoints:
# core_endpoint: '{{ .Values.global.adapter_open_olt.core_endpoint }}'
# adapter_endpoint: '{{ template "fullname" . }}-api:55560'
diff --git a/voltha-stack/Chart.yaml b/voltha-stack/Chart.yaml
index 5a8e25a..88a7005 100644
--- a/voltha-stack/Chart.yaml
+++ b/voltha-stack/Chart.yaml
@@ -27,11 +27,11 @@
url: "https://www.opennetworking.org"
name: voltha-stack
appVersion: "2.12"
-version: 2.12.0
+version: 2.12.1
dependencies:
- name: voltha
repository: file://../voltha
- version: 2.12.0
+ version: 2.12.2
condition: voltha.enabled
- name: voltha-adapter-openonu
repository: file://../voltha-adapter-openonu
@@ -39,7 +39,7 @@
condition: voltha-adapter-openonu.enabled
- name: voltha-adapter-openolt
repository: file://../voltha-adapter-openolt
- version: 2.11.5
+ version: 2.12.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 6352596..7599a91 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -14,7 +14,7 @@
---
apiVersion: "v1"
name: "voltha"
-version: "2.12.0"
+version: "2.12.2"
description: "A Helm chart for Voltha based on K8S resources in Voltha project"
keywords:
- "onf"