Skip to content

Commit

Permalink
2417 dedicated rabbitmq for query results
Browse files Browse the repository at this point in the history
  • Loading branch information
Christopher Gross cogross committed Jul 9, 2024
1 parent f5ac4ef commit b798922
Show file tree
Hide file tree
Showing 11 changed files with 54 additions and 4 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.2/${dist.accumulo}</url.accumulo>
<url.hadoop>https://dlcdn.apache.org/hadoop/common/hadoop-3.3.6/${dist.hadoop}</url.hadoop>
Expand Down
Empty file modified docker/config/application-federation.yml
100644 → 100755
Empty file.
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}
query-results-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
query-results-rabbitmq:
host: ${MESSAGING_SERVER_HOSTNAME:localhost}
port: 5673
publisher-confirm-type: simple
publisher-confirms: true
publisher-returns: true
cloud:
consul:
enabled: false
Expand Down
20 changes: 20 additions & 0 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,22 @@ services:
consul:
condition: service_started

query-results-rabbitmq:
image: rabbitmq:3.12.4-alpine
volumes:
- ${RABBITMQ_CONFIG_DIR:-./query-results-rabbitmq-config}:/etc/rabbitmq
- ./logs:/logs
environment:
- TCP_PORTS=15673, 5673
- RABBITMQ_ERLANG_COOKIE="mycookie"
ports:
- "15673:15673"
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:
image: docker.io/bitnami/kafka:3.2
Expand Down Expand Up @@ -144,6 +160,8 @@ services:
depends_on:
rabbitmq:
condition: service_started
query-results-rabbitmq:
condition: service_started

cache:
image: datawave/hazelcast-service
Expand Down Expand Up @@ -523,6 +541,8 @@ services:
depends_on:
rabbitmq:
condition: service_started
query-results-rabbitmq:
condition: service_started
authorization:
condition: service_healthy
metrics:
Expand Down
1 change: 1 addition & 0 deletions docker/query-results-rabbitmq-config/enabled_plugins
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[rabbitmq_management,rabbitmq_peer_discovery_consul].
20 changes: 20 additions & 0 deletions docker/query-results-rabbitmq-config/rabbitmq.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
cluster_formation.peer_discovery_backend = rabbit_peer_discovery_consul

# change default port
listeners.tcp.default = 5673
management.listener.port = 15673

# Consul host (hostname or IP address). Default value is localhost
cluster_formation.consul.host = consul
# do compute service address
cluster_formation.consul.svc_addr_auto = true
# compute service address using node name
cluster_formation.consul.svc_addr_use_nodename = true
# health check interval (node TTL) in seconds
cluster_formation.consul.svc_ttl = 30
# how soon should nodes that fail their health checks be unregistered by Consul?
# this value is in seconds and must not be lower than 60 (a Consul requirement)
cluster_formation.consul.deregister_after = 90
cluster_partition_handling = autoheal
# Enable the guest user
loopback_users.guest = false
2 changes: 1 addition & 1 deletion microservices/services/config
2 changes: 1 addition & 1 deletion microservices/services/query
2 changes: 1 addition & 1 deletion microservices/starters/query

0 comments on commit b798922

Please sign in to comment.