[VOL-3850] Support configuration of reconciling timeout via helm charts
Change-Id: Ic85e9ae01d87db8045f17ae2d5054bc16c2d0d4e
diff --git a/internal/pkg/onuadaptercore/device_handler.go b/internal/pkg/onuadaptercore/device_handler.go
index c452fe5..0f86675 100644
--- a/internal/pkg/onuadaptercore/device_handler.go
+++ b/internal/pkg/onuadaptercore/device_handler.go
@@ -91,9 +91,6 @@
const (
cOnuActivatedEvent = "ONU_ACTIVATED"
)
-const (
- cReconcilingTimeout = 10 //seconds
-)
type usedOmciConfigFsms int
@@ -2911,15 +2908,16 @@
}
}
+
func (dh *deviceHandler) startReconciling(ctx context.Context) {
- logger.Debugw(ctx, "start reconciling", log.Fields{"device-id": dh.deviceID})
+ logger.Debugw(ctx, "start reconciling", log.Fields{"timeout": dh.pOpenOnuAc.maxTimeoutReconciling, "device-id": dh.deviceID})
if !dh.isReconciling() {
go func() {
select {
case <-dh.chReconcilingFinished:
logger.Debugw(ctx, "reconciling has been finished in time",
log.Fields{"device-id": dh.deviceID})
- case <-time.After(time.Duration(cReconcilingTimeout) * time.Second):
+ case <-time.After(dh.pOpenOnuAc.maxTimeoutReconciling):
logger.Errorw(ctx, "timeout waiting for reconciling to be finished!",
log.Fields{"device-id": dh.deviceID})
}
diff --git a/internal/pkg/onuadaptercore/openonu.go b/internal/pkg/onuadaptercore/openonu.go
index f073282..b77276e 100644
--- a/internal/pkg/onuadaptercore/openonu.go
+++ b/internal/pkg/onuadaptercore/openonu.go
@@ -66,6 +66,7 @@
//GrpcTimeoutInterval time.Duration
pSupportedFsms *OmciDeviceFsms
maxTimeoutInterAdapterComm time.Duration
+ maxTimeoutReconciling time.Duration
pDownloadManager *adapterDownloadManager
metricsEnabled bool
mibAuditInterval time.Duration
@@ -97,6 +98,7 @@
openOnuAc.HeartbeatFailReportInterval = cfg.HeartbeatFailReportInterval
openOnuAc.AcceptIncrementalEvto = cfg.AccIncrEvto
openOnuAc.maxTimeoutInterAdapterComm = cfg.MaxTimeoutInterAdapterComm
+ openOnuAc.maxTimeoutReconciling = cfg.MaxTimeoutReconciling
//openOnuAc.GrpcTimeoutInterval = cfg.GrpcTimeoutInterval
openOnuAc.metricsEnabled = cfg.MetricsEnabled
openOnuAc.mibAuditInterval = cfg.MibAuditInterval