From 71a1a31134fe505ad69b559e28eb912aa5a4c58b Mon Sep 17 00:00:00 2001 From: Lathish Date: Thu, 30 Jan 2020 14:02:29 +0000 Subject: [PATCH] Fixed the Dmaap publisher issue Issue-ID: NONRTRIC-107 Change-Id: Ic9e9a88e29221e8b810fcebc0680fc45de37f3c8 Signed-off-by: Lathish --- .../configuration/ApplicationConfigParser.java | 10 ++--- .../dmaap/DmaapMessageConsumerImpl.java | 23 ++--------- .../policyagent/dmaap/DmaapMessageHandler.java | 46 +++++++++++----------- 3 files changed, 31 insertions(+), 48 deletions(-) diff --git a/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfigParser.java b/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfigParser.java index 102d5c49..1ffe9c8e 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfigParser.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfigParser.java @@ -25,18 +25,14 @@ import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; - import java.net.MalformedURLException; import java.net.URL; import java.util.Map.Entry; import java.util.Properties; import java.util.Set; import java.util.Vector; - import javax.validation.constraints.NotNull; - import lombok.Getter; - import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants; import org.oransc.policyagent.exceptions.ServiceException; import org.springframework.http.MediaType; @@ -126,7 +122,11 @@ public class ApplicationConfigParser { dmaapProps.put("id", path.consumerId); dmaapProps.put("TransportType", ProtocolTypeConstants.HTTPNOAUTH.toString()); dmaapProps.put("timeout", 15000); - dmaapProps.put("limit", 1000); + dmaapProps.put("limit", 100); + dmaapProps.put("maxBatchSize", "10"); + dmaapProps.put("maxAgeMs", "10000"); + dmaapProps.put("compress", true); + dmaapProps.put("MessageSentThreadOccurance", "2"); } catch (MalformedURLException e) { throw new ServiceException("Could not parse the URL", e); } diff --git a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumerImpl.java b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumerImpl.java index a6a912d5..db4956ab 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumerImpl.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumerImpl.java @@ -21,12 +21,8 @@ package org.oransc.policyagent.dmaap; import com.google.common.collect.Iterables; - import java.io.IOException; import java.util.Properties; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - import org.onap.dmaap.mr.client.MRBatchingPublisher; import org.onap.dmaap.mr.client.MRClientFactory; import org.onap.dmaap.mr.client.MRConsumer; @@ -51,9 +47,6 @@ public class DmaapMessageConsumerImpl implements DmaapMessageConsumer { private final ApplicationConfig applicationConfig; protected MRConsumer consumer; private MRBatchingPublisher producer; - private final long FETCHTIMEOUT = 30000; - - private CountDownLatch sleep = new CountDownLatch(1); @Value("${server.port}") private int localServerPort; @@ -63,7 +56,7 @@ public class DmaapMessageConsumerImpl implements DmaapMessageConsumer { this.applicationConfig = applicationConfig; } - @Scheduled(fixedRate = 1000 * 10) + @Scheduled(fixedRate = 1000 * 40) @Override public void run() { if (!alive) { @@ -93,7 +86,6 @@ public class DmaapMessageConsumerImpl implements DmaapMessageConsumer { } if (response == null || !"200".equals(response.getResponseCode())) { logger.warn("{}: DMaaP NULL response received", this); - sleepAfterFailure(); } else { logger.debug("DMaaP consumer received {} : {}", response.getResponseCode(), response.getResponseMessage()); } @@ -106,7 +98,7 @@ public class DmaapMessageConsumerImpl implements DmaapMessageConsumer { Properties dmaapPublisherProperties = applicationConfig.getDmaapPublisherConfig(); // No need to start if there is no configuration. if (dmaapConsumerProperties == null || dmaapPublisherProperties == null || dmaapConsumerProperties.size() == 0 - || dmaapPublisherProperties.size() == 0) { + || dmaapPublisherProperties.size() == 0) { logger.error("DMaaP properties Failed to Load"); return; } @@ -115,7 +107,7 @@ public class DmaapMessageConsumerImpl implements DmaapMessageConsumer { logger.debug("dmaapConsumerProperties---> {}", dmaapConsumerProperties.getProperty("topic")); logger.debug("dmaapPublisherProperties---> {}", dmaapPublisherProperties.getProperty("topic")); consumer = MRClientFactory.createConsumer(dmaapConsumerProperties); - producer = MRClientFactory.createBatchingPublisher(dmaapConsumerProperties); + producer = MRClientFactory.createBatchingPublisher(dmaapPublisherProperties); this.alive = true; } catch (IOException e) { logger.error("Exception occurred while creating Dmaap Consumer", e); @@ -138,13 +130,4 @@ public class DmaapMessageConsumerImpl implements DmaapMessageConsumer { public boolean isAlive() { return alive; } - - private void sleepAfterFailure() { - logger.warn("DMAAP message Consumer is put to Sleep for {} milliseconds", FETCHTIMEOUT); - try { - sleep.await(FETCHTIMEOUT, TimeUnit.MILLISECONDS); - } catch (InterruptedException e) { - logger.error("Failed to put the thread to sleep: {}", e); - } - } } diff --git a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageHandler.java b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageHandler.java index a158b400..2d963c35 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageHandler.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageHandler.java @@ -22,9 +22,7 @@ package org.oransc.policyagent.dmaap; import com.google.gson.Gson; import com.google.gson.GsonBuilder; - import java.io.IOException; - import org.onap.dmaap.mr.client.MRBatchingPublisher; import org.oransc.policyagent.clients.AsyncRestClient; import org.oransc.policyagent.configuration.ApplicationConfig; @@ -39,14 +37,14 @@ public class DmaapMessageHandler { private static final Logger logger = LoggerFactory.getLogger(DmaapMessageHandler.class); private static Gson gson = new GsonBuilder() // - .serializeNulls() // - .create(); // + .serializeNulls() // + .create(); // private final MRBatchingPublisher dmaapClient; private final AsyncRestClient agentClient; public DmaapMessageHandler(MRBatchingPublisher dmaapClient, ApplicationConfig applicationConfig, - AsyncRestClient agentClient) { + AsyncRestClient agentClient) { this.agentClient = agentClient; this.dmaapClient = dmaapClient; } @@ -54,9 +52,9 @@ public class DmaapMessageHandler { public void handleDmaapMsg(String msg) { try { this.createTask(msg) // - .subscribe(x -> logger.debug("handleDmaapMsg: " + x), // - throwable -> logger.warn("handleDmaapMsg failure ", throwable), // - () -> logger.debug("handleDmaapMsg complete")); + .subscribe(x -> logger.debug("handleDmaapMsg: " + x), // + throwable -> logger.warn("handleDmaapMsg failure ", throwable), // + () -> logger.debug("handleDmaapMsg complete")); } catch (Exception e) { logger.warn("Received unparsable message from DMAAP: {}", msg); } @@ -67,8 +65,8 @@ public class DmaapMessageHandler { DmaapRequestMessage dmaapRequestMessage = gson.fromJson(msg, ImmutableDmaapRequestMessage.class); return this.invokePolicyAgent(dmaapRequestMessage) // - .onErrorResume(t -> handleAgentCallError(t, dmaapRequestMessage)) // - .flatMap(response -> sendDmaapResponse(response, dmaapRequestMessage, HttpStatus.OK)); + .onErrorResume(t -> handleAgentCallError(t, dmaapRequestMessage)) // + .flatMap(response -> sendDmaapResponse(response, dmaapRequestMessage, HttpStatus.OK)); } catch (Exception e) { logger.warn("Received unparsable message from DMAAP: {}", msg); @@ -79,7 +77,7 @@ public class DmaapMessageHandler { private Mono handleAgentCallError(Throwable t, DmaapRequestMessage dmaapRequestMessage) { logger.debug("Agent call failed: " + t.getMessage()); return sendDmaapResponse(t.toString(), dmaapRequestMessage, HttpStatus.NOT_FOUND) // - .flatMap(s -> Mono.empty()); + .flatMap(s -> Mono.empty()); } private Mono invokePolicyAgent(DmaapRequestMessage dmaapRequestMessage) { @@ -101,15 +99,17 @@ public class DmaapMessageHandler { } private Mono sendDmaapResponse(String response, DmaapRequestMessage dmaapRequestMessage, - HttpStatus status) { + HttpStatus status) { return getDmaapResponseMessage(dmaapRequestMessage, response, status) // - .flatMap(body -> sendToDmaap(body)) // - .onErrorResume(t -> handleResponseCallError(t, dmaapRequestMessage)); + .flatMap(body -> sendToDmaap(body)) // + .onErrorResume(t -> handleResponseCallError(t, dmaapRequestMessage)); } private Mono sendToDmaap(String body) { try { + logger.debug("sendToDmaap: {} ", body); dmaapClient.send(body); + dmaapClient.sendBatchWithResponse(); return Mono.just("OK"); } catch (IOException e) { return Mono.error(e); @@ -122,16 +122,16 @@ public class DmaapMessageHandler { } private Mono getDmaapResponseMessage(DmaapRequestMessage dmaapRequestMessage, String response, - HttpStatus status) { + HttpStatus status) { DmaapResponseMessage dmaapResponseMessage = ImmutableDmaapResponseMessage.builder() // - .status(status.toString()) // - .message(response) // - .type("response") // - .correlationId(dmaapRequestMessage.correlationId()) // - .originatorId(dmaapRequestMessage.originatorId()) // - .requestId(dmaapRequestMessage.requestId()) // - .timestamp(dmaapRequestMessage.timestamp()) // - .build(); + .status(status.toString()) // + .message(response) // + .type("response") // + .correlationId(dmaapRequestMessage.correlationId()) // + .originatorId(dmaapRequestMessage.originatorId()) // + .requestId(dmaapRequestMessage.requestId()) // + .timestamp(dmaapRequestMessage.timestamp()) // + .build(); String str = gson.toJson(dmaapResponseMessage); return Mono.just(str); -- 2.16.6