VOL-5219 core should be able to refire the missed reconcile requests
Change-Id: I661e21223a11842478f28349a24a4bb1c35d7c56
diff --git a/rw_core/core/device/agent.go b/rw_core/core/device/agent.go
index bc3eaed..aaef7b1 100755
--- a/rw_core/core/device/agent.go
+++ b/rw_core/core/device/agent.go
@@ -557,7 +557,7 @@
prevAdminState = agent.device.AdminState
if !agent.proceedWithRequest(cloned) {
- err = status.Errorf(codes.FailedPrecondition, "cannot complete operation as device deletion is in progress or reconciling is in progress/failed: %s", agent.deviceID)
+ err = status.Errorf(codes.FailedPrecondition, "cannot complete operation as device deletion is in progress/failed: %s", agent.deviceID)
agent.requestQueue.RequestComplete()
return err
}
@@ -1490,9 +1490,9 @@
return
}
- if !agent.proceedWithRequest(device) {
+ if agent.isDeletionInProgress() {
agent.requestQueue.RequestComplete()
- err := fmt.Errorf("cannot complete operation as device deletion/reconciling is in progress or reconcile failed for device : %s", device.Id)
+ err := fmt.Errorf("cannot complete operation as device deletion is in progress device : %s", device.Id)
logger.Errorw(ctx, "reconcile-failed", log.Fields{"error": err})
agent.logDeviceUpdate(ctx, nil, nil, requestStatus, err, desc)
return