VOL-5221 error return if reconcile is done
Change-Id: I1169f55b5fb160562923a9b9ffa8e8bfb7b0ec0a
diff --git a/VERSION b/VERSION
index 497a78c..03b7bd6 100755
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.11.5
+2.11.6
diff --git a/internal/pkg/core/openonu.go b/internal/pkg/core/openonu.go
index 365ed92..28c9a8d 100755
--- a/internal/pkg/core/openonu.go
+++ b/internal/pkg/core/openonu.go
@@ -284,7 +284,8 @@
go handler.adoptOrReconcileDevice(log.WithSpanFromContext(context.Background(), ctx), handler.device)
// reconcilement will be continued after onu-device entry is added
} else {
- return nil, fmt.Errorf(fmt.Sprintf("device-already-reconciled-or-active-%s", device.Id))
+ logger.Warnf(ctx, "device-already-reconciled-or-active", log.Fields{"device-id": device.Id, "parent-id": device.ParentId})
+ return &empty.Empty{}, status.Errorf(codes.AlreadyExists, "handler exists: %s", device.Id)
}
return &empty.Empty{}, nil
}