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;
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);
}
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;
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;
this.applicationConfig = applicationConfig;
}
- @Scheduled(fixedRate = 1000 * 10)
+ @Scheduled(fixedRate = 1000 * 40)
@Override
public void run() {
if (!alive) {
}
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());
}
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;
}
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);
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);
- }
- }
}
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;
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;
}
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);
}
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);
private Mono<String> 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<String> invokePolicyAgent(DmaapRequestMessage dmaapRequestMessage) {
}
private Mono<String> 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<String> sendToDmaap(String body) {
try {
+ logger.debug("sendToDmaap: {} ", body);
dmaapClient.send(body);
+ dmaapClient.sendBatchWithResponse();
return Mono.just("OK");
} catch (IOException e) {
return Mono.error(e);
}
private Mono<String> 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);