VOL-4435 checks for parent device in reconcilation + flow timeout
Change-Id: I6de908454775d9c4ff98cf13682567241dd77ebb
diff --git a/rw_core/core/device/agent_flow.go b/rw_core/core/device/agent_flow.go
index f53cb7d..cb32eff 100644
--- a/rw_core/core/device/agent_flow.go
+++ b/rw_core/core/device/agent_flow.go
@@ -161,7 +161,7 @@
response.Error(err)
return
}
- subCtx, cancel := context.WithTimeout(ctx, agent.rpcTimeout)
+ subCtx, cancel := context.WithTimeout(ctx, agent.flowTimeout)
defer cancel()
if _, err = client.UpdateFlowsBulk(subCtx, &ca.BulkFlows{
@@ -203,7 +203,7 @@
response.Error(err)
return
}
- subCtx, cancel := context.WithTimeout(ctx, agent.rpcTimeout)
+ subCtx, cancel := context.WithTimeout(ctx, agent.flowTimeout)
defer cancel()
if _, err = client.UpdateFlowsIncrementally(subCtx, &ca.IncrementalFlows{
Device: device,
@@ -400,7 +400,7 @@
if err != nil {
return err
}
- if res := coreutils.WaitForNilOrErrorResponses(agent.rpcTimeout, response); res != nil {
+ if res := coreutils.WaitForNilOrErrorResponses(agent.flowTimeout, response); res != nil {
return status.Errorf(codes.Aborted, "errors-%s", res)
}
return nil