From 78614dd67b86a21579e2cfb2f6e019c1c643e710 Mon Sep 17 00:00:00 2001 From: john Date: Wed, 20 Sep 2023 23:41:30 +1000 Subject: [PATCH] Refactoring_20/09/2023 Added Kafka check, added synchronized method to wait for KafkaProducer and KafkaConsumer threads --- administrator/version.properties | 4 +- .../AlignmentFIXEngineKafkaConsumer.java | 13 ++++--- .../AlignmentFIXEngineKafkaProducer.java | 6 ++- .../matching/AlignmentInstanceWrapper.java | 39 +++++++++++++++++++ .../AlignmentOrderBookKafkaConsumer.java | 9 ++++- .../AlignmentOrderBookKafkaProducer.java | 6 ++- exchange/version.properties | 4 +- fixclient/version.properties | 4 +- multicastserver/version.properties | 4 +- .../constants/FailureConditionConstants.java | 1 + .../RepresentationSBENotAvailable.java | 33 ---------------- ...terfaceSimpleOpenFramingHeaderMessage.java | 9 ----- sharedlibrary/version.properties | 4 +- 13 files changed, 73 insertions(+), 63 deletions(-) delete mode 100644 sharedlibrary/src/main/java/com/alignmentsystems/library/exceptions/RepresentationSBENotAvailable.java delete mode 100644 sharedlibrary/src/main/java/com/alignmentsystems/library/interfaces/InterfaceSimpleOpenFramingHeaderMessage.java diff --git a/administrator/version.properties b/administrator/version.properties index 6a9cbf9..0ec80cd 100644 --- a/administrator/version.properties +++ b/administrator/version.properties @@ -1,2 +1,2 @@ -#Wed Sep 20 19:01:37 AEST 2023 -VERSION_BUILD=781 +#Wed Sep 20 23:33:32 AEST 2023 +VERSION_BUILD=786 diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaConsumer.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaConsumer.java index f3fca27..ee31d21 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaConsumer.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaConsumer.java @@ -43,12 +43,9 @@ public class AlignmentFIXEngineKafkaConsumer extends InterfaceKafkaAbstractSimpl public AlignmentFIXEngineKafkaConsumer() throws Exception { super(); - // TODO Auto-generated constructor stub } - - /** * * @param kafkaConsumer @@ -66,6 +63,12 @@ public KafkaConsumer getKafkaConsumer() { return kafkaConsumer; } + private synchronized void waiter() throws IllegalArgumentException, InterruptedException , IllegalMonitorStateException { + wait(2000); + } + + + @Override public void run() { AtomicBoolean run = new AtomicBoolean(true); @@ -75,8 +78,8 @@ public void run() { while (run.get()) { try { - wait(2000); - } catch (InterruptedException e) { + waiter(); + } catch (IllegalArgumentException | InterruptedException | IllegalMonitorStateException e) { log.error(e.getMessage() , e ); } } diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaProducer.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaProducer.java index 8003431..8ccd0af 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaProducer.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaProducer.java @@ -53,7 +53,9 @@ protected void send(String topicName, String key, byte[] binaryMessage) { this.kafkaProducerB.send(producerRecord); } - + private synchronized void waiter() throws IllegalArgumentException , InterruptedException , IllegalMonitorStateException { + wait(2000); + } @Override public void run() { @@ -61,7 +63,7 @@ public void run() { while (run.get()) { try { - wait(2000); + waiter(); } catch (IllegalArgumentException | InterruptedException | IllegalMonitorStateException e) { log.error(e.getMessage() , e ); } diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentInstanceWrapper.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentInstanceWrapper.java index 57d48ae..2e379a5 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentInstanceWrapper.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentInstanceWrapper.java @@ -6,9 +6,14 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.Properties; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.kafka.clients.admin.AdminClient; +import org.apache.kafka.clients.admin.KafkaAdminClient; +import org.apache.kafka.clients.admin.ListTopicsResult; + import com.alignmentsystems.fix44.MessageFactory; import com.alignmentsystems.library.AlignmentFunctions; import com.alignmentsystems.library.AlignmentLogEncapsulation; @@ -140,6 +145,40 @@ private Boolean initialiseFIXMessagingInfrastructure(InstanceType instanceType) AlignmentUEH ueh = new AlignmentUEH(debugger); Thread.setDefaultUncaughtExceptionHandler(ueh); + //check - is Kafka running? + Properties props; + try { + props = AlignmentFunctions.getProperties(AlignmentInstanceWrapper.class.getClassLoader() , InstanceType.KAFKA.getProperties()); + } catch (FileNotFoundException | NullPointerException e) { + log.error(e.getMessage(), e); + return false; + } + + try (AdminClient client = KafkaAdminClient.create(props)) + { + ListTopicsResult topics = client.listTopics(); + Set names = topics.names().get(); + if (names.isEmpty()) + { + // case: if no topic found. + log.error("No Topics Found"); + return false; + } + } + catch (Exception e){ + // Kafka is not available + log.error("Kafka is not available".toUpperCase()); + log.error(e.getMessage() , e); + System.err.println(e.getMessage()); + System.exit(FailureConditionConstants.KAFKA_NOT_RUNNING); + } + + + + + + + AlignmentQueueNonSequenced queueNonSequenced = new AlignmentQueueNonSequenced(); Thread threadQueueNonSequenced = new Thread(null, queueNonSequenced, AlignmentQueueNonSequenced.CLASSNAME); diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaConsumer.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaConsumer.java index cee9643..d4811d5 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaConsumer.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaConsumer.java @@ -136,13 +136,18 @@ public void runAlways(String topicName, InterfaceKafkaMessageHandler callback) t } + private synchronized void waiter() throws IllegalArgumentException , InterruptedException , IllegalMonitorStateException { + wait(2000); + } + + @Override public void run() { AtomicBoolean run = new AtomicBoolean(true); while (run.get()) { try { - wait(2000); - } catch (InterruptedException e) { + waiter(); + } catch (IllegalArgumentException | InterruptedException | IllegalMonitorStateException e) { log.error(e.getMessage() , e ); } } diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaProducer.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaProducer.java index 55adb8b..10d8ba0 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaProducer.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaProducer.java @@ -66,7 +66,9 @@ protected void send(String topicName, String key, byte[] binaryMessage) { this.kafkaProducerB.send(producerRecord); } - + private synchronized void waiter() throws IllegalArgumentException , InterruptedException , IllegalMonitorStateException { + wait(2000); + } @Override public void run() { @@ -74,7 +76,7 @@ public void run() { while (run.get()) { while (run.get()) { try { - wait(2000); + waiter(); } catch (IllegalArgumentException | InterruptedException | IllegalMonitorStateException e) { log.error(e.getMessage() , e ); } diff --git a/exchange/version.properties b/exchange/version.properties index 1be8fb0..68ad657 100644 --- a/exchange/version.properties +++ b/exchange/version.properties @@ -1,2 +1,2 @@ -#Wed Sep 20 19:01:38 AEST 2023 -VERSION_BUILD=779 +#Wed Sep 20 23:33:32 AEST 2023 +VERSION_BUILD=784 diff --git a/fixclient/version.properties b/fixclient/version.properties index a805c54..0ec80cd 100644 --- a/fixclient/version.properties +++ b/fixclient/version.properties @@ -1,2 +1,2 @@ -#Wed Sep 20 19:01:38 AEST 2023 -VERSION_BUILD=781 +#Wed Sep 20 23:33:32 AEST 2023 +VERSION_BUILD=786 diff --git a/multicastserver/version.properties b/multicastserver/version.properties index a805c54..44e46bf 100644 --- a/multicastserver/version.properties +++ b/multicastserver/version.properties @@ -1,2 +1,2 @@ -#Wed Sep 20 19:01:38 AEST 2023 -VERSION_BUILD=781 +#Wed Sep 20 23:33:33 AEST 2023 +VERSION_BUILD=786 diff --git a/sharedlibrary/src/main/java/com/alignmentsystems/library/constants/FailureConditionConstants.java b/sharedlibrary/src/main/java/com/alignmentsystems/library/constants/FailureConditionConstants.java index 218ef6c..1478457 100644 --- a/sharedlibrary/src/main/java/com/alignmentsystems/library/constants/FailureConditionConstants.java +++ b/sharedlibrary/src/main/java/com/alignmentsystems/library/constants/FailureConditionConstants.java @@ -26,6 +26,7 @@ public class FailureConditionConstants { private final static int KAFKA_PROPERTIES_BASE_MEMBER = 3666; public final static int KAFKA_ERROR_PROPERTIES_FILE = KAFKA_PROPERTIES_BASE_MEMBER + 1; + public final static int KAFKA_NOT_RUNNING = KAFKA_PROPERTIES_BASE_MEMBER + 2; private final static int INSTANCE_WRAPPER_BASE_MEMBER = 4666; public final static int INSTANCE_WRAPPER_INITIALISATION_ERROR = INSTANCE_WRAPPER_BASE_MEMBER + 1; diff --git a/sharedlibrary/src/main/java/com/alignmentsystems/library/exceptions/RepresentationSBENotAvailable.java b/sharedlibrary/src/main/java/com/alignmentsystems/library/exceptions/RepresentationSBENotAvailable.java deleted file mode 100644 index 8e06cdc..0000000 --- a/sharedlibrary/src/main/java/com/alignmentsystems/library/exceptions/RepresentationSBENotAvailable.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.alignmentsystems.library.exceptions; -/****************************************************************************** - * - * Author : John Greenan - * Contact : sales@alignment-systems.com - * Date : 5th September 2023 - * Copyright : Alignment Systems Ltd 2023 - * Project : Alignment Matching Toy - * Artefact : RepresentationSBENotAvailable - * Description : - *****************************************************************************/ - -/** - * @author John Greenan - * - */ -public class RepresentationSBENotAvailable extends RuntimeException{ - - private static final long serialVersionUID = 1L; - - public RepresentationSBENotAvailable (String message) { - super (message); - } - - public RepresentationSBENotAvailable (Throwable cause) { - super (cause); - } - - public RepresentationSBENotAvailable (String message, Throwable cause) { - super (message, cause); - } - -} diff --git a/sharedlibrary/src/main/java/com/alignmentsystems/library/interfaces/InterfaceSimpleOpenFramingHeaderMessage.java b/sharedlibrary/src/main/java/com/alignmentsystems/library/interfaces/InterfaceSimpleOpenFramingHeaderMessage.java deleted file mode 100644 index f3b9a7a..0000000 --- a/sharedlibrary/src/main/java/com/alignmentsystems/library/interfaces/InterfaceSimpleOpenFramingHeaderMessage.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.alignmentsystems.library.interfaces; -import com.alignmentsystems.library.exceptions.RepresentationSBENotAvailable; -/** - * @author John Greenan - * - */ -public interface InterfaceSimpleOpenFramingHeaderMessage { - public byte[] getSOFHWrappedSBEMessage() throws RepresentationSBENotAvailable; -} diff --git a/sharedlibrary/version.properties b/sharedlibrary/version.properties index 1be8fb0..a0e8241 100644 --- a/sharedlibrary/version.properties +++ b/sharedlibrary/version.properties @@ -1,2 +1,2 @@ -#Wed Sep 20 19:01:38 AEST 2023 -VERSION_BUILD=779 +#Wed Sep 20 23:33:33 AEST 2023 +VERSION_BUILD=784