[VOL-4210] Extending compute timeout of the pending subscribers map to avoid getting stuck checking if a subscriber is pending during installation of already pending ones when meter is created
Change-Id: I6748a56e8746301277b28286c0f5e7ee397ba845
diff --git a/web/src/main/java/org/opencord/olt/rest/OltWebResource.java b/web/src/main/java/org/opencord/olt/rest/OltWebResource.java
index 54af4ac..7b19b18 100644
--- a/web/src/main/java/org/opencord/olt/rest/OltWebResource.java
+++ b/web/src/main/java/org/opencord/olt/rest/OltWebResource.java
@@ -22,6 +22,7 @@
import org.onosproject.rest.AbstractWebResource;
import org.opencord.olt.AccessDeviceService;
import org.opencord.olt.AccessSubscriberId;
+import org.slf4j.Logger;
import java.util.Optional;
import javax.ws.rs.Consumes;
@@ -34,6 +35,7 @@
import javax.ws.rs.core.Response;
import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
+import static org.slf4j.LoggerFactory.getLogger;
/**
* OLT REST APIs.
@@ -42,6 +44,9 @@
@Path("oltapp")
public class OltWebResource extends AbstractWebResource {
+ private final Logger log = getLogger(getClass());
+
+
/**
* Provision a subscriber.
*
@@ -62,7 +67,8 @@
try {
service.provisionSubscriber(connectPoint);
} catch (Exception e) {
- return Response.status(INTERNAL_SERVER_ERROR).build();
+ log.error("Can't provision subscriber {} due to exception", connectPoint, e);
+ return Response.status(INTERNAL_SERVER_ERROR).entity(e.getMessage()).build();
}
return ok("").build();
}
@@ -83,7 +89,12 @@
DeviceId deviceId = DeviceId.deviceId(device);
PortNumber portNumber = PortNumber.portNumber(port);
ConnectPoint connectPoint = new ConnectPoint(deviceId, portNumber);
- service.removeSubscriber(connectPoint);
+ try {
+ service.removeSubscriber(connectPoint);
+ } catch (Exception e) {
+ log.error("Can't remove subscriber {} due to exception", connectPoint, e);
+ return Response.status(INTERNAL_SERVER_ERROR).entity(e.getMessage()).build();
+ }
return Response.noContent().build();
}