Skip to content

Commit

Permalink
2417 - qr dedicated rabbitmq
Browse files Browse the repository at this point in the history
  • Loading branch information
Christopher Gross cogross committed Aug 29, 2024
1 parent 2222de6 commit 574bea8
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 2 deletions.
1 change: 1 addition & 0 deletions contrib/datawave-quickstart/docker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<dist.maven>apache-maven-3.8.8-bin.tar.gz</dist.maven>
<dist.wildfly>wildfly-17.0.1.Final.tar.gz</dist.wildfly>
<dist.zookeeper>apache-zookeeper-3.7.2-bin.tar.gz</dist.zookeeper>
<docker.image.prefix />
<skipIngest>false</skipIngest>
<url.accumulo>https://dlcdn.apache.org/accumulo/2.1.3/${dist.accumulo}</url.accumulo>
<url.hadoop>https://dlcdn.apache.org/hadoop/common/hadoop-3.3.6/${dist.hadoop}</url.hadoop>
Expand Down
1 change: 1 addition & 0 deletions docker/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ echo

# Ensure that permissions are set correctly for the config files
chmod -R 755 config pki rabbitmq-config
chmod -R 755 config pki qr-rabbitmq-config

DW_HOSTNAME=$(hostname)
DW_HOSTNAME=${DW_HOSTNAME%%.*}
Expand Down
2 changes: 2 additions & 0 deletions docker/config/application-querymessaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,7 @@ datawave:
backend: ${messaging.backend}
rabbitmq:
maxMessageSizeBytes: ${messaging.maxMessageSizeBytes}
qr-rabbitmq:
maxMessageSizeBytes: ${messaging.maxMessageSizeBytes}
kafka:
partitions: 2
6 changes: 6 additions & 0 deletions docker/config/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ spring:
publisher-confirm-type: simple
publisher-confirms: true
publisher-returns: true
qr-rabbitmq:
host: ${MESSAGING_SERVER_HOSTNAME:localhost}
port: 5673
publisher-confirm-type: simple
publisher-confirms: true
publisher-returns: true
cloud:
consul:
enabled: false
Expand Down
18 changes: 18 additions & 0 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,24 @@ services:
consul:
condition: service_started

qr-rabbitmq:
image: docker.io/rabbitmq:3.12.4
volumes:
- ${RABBITMQ_CONFIG_DIR:-./rabbitmq-config}:/etc/rabbitmq
- ./logs:/logs
environment:
- TCP_PORTS=25672, 15672, 5672
- RABBITMQ_ERLANG_COOKIE="mycookie"
ports:
- "5673:5672"
- "15673:15672"
- "25673:25672"
networks:
- demo
depends_on:
consul:
condition: service_started

# When auto.create.topics.enable is true, this causes deleted topics to be recreated at random. So, leave it disabled.
kafka:
profiles:
Expand Down
2 changes: 1 addition & 1 deletion docker/rabbitmq-config/rabbitmq.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ cluster_formation.consul.svc_ttl = 30
cluster_formation.consul.deregister_after = 90
cluster_partition_handling = autoheal
# Enable the guest user
loopback_users.guest = false
loopback_users.guest = false
2 changes: 1 addition & 1 deletion microservices/services/config

0 comments on commit 574bea8

Please sign in to comment.