Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix: Default echange consume failed, when broker restart. #597

Merged
merged 1 commit into from
Oct 17, 2022
Merged

bugfix: Default echange consume failed, when broker restart. #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions amqp-impl/src/main/java/io/streamnative/pulsar/handlers/amqp/AbstractAmqpExchange.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,17 @@ public void addQueue(AmqpQueue queue) {
queues.add(queue);
}

@Override
public AmqpQueue getQueue(String queueName) {
AmqpQueue queue = null;
for (AmqpQueue q : queues) {
if (q.getName().equals(queueName)) {
queue = q;
}
}
return queue;
}

@Override
public void removeQueue(AmqpQueue queue) {
queues.remove(queue);
Expand Down
3 changes: 2 additions & 1 deletion amqp-impl/src/main/java/io/streamnative/pulsar/handlers/amqp/AmqpChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ public void receiveBasicPublish(AMQShortString exchange, AMQShortString routingK
return;
} else {
// bind to default exchange.
if (amqpQueue.getRouter(AbstractAmqpExchange.DEFAULT_EXCHANGE_DURABLE) == null) {
if (amqpQueue.getRouter(AbstractAmqpExchange.DEFAULT_EXCHANGE_DURABLE) == null
|| amqpExchange.getQueue(queueName) == null) {
amqpQueue.bindExchange(amqpExchange,
AbstractAmqpMessageRouter.generateRouter(AmqpExchange.Type.Direct),
routingKey.toString(), null);
Expand Down
7 changes: 7 additions & 0 deletions amqp-impl/src/main/java/io/streamnative/pulsar/handlers/amqp/AmqpExchange.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,13 @@ public static Type value(String type) {
*/
void addQueue(AmqpQueue queue);

/**
* Get a queue {@link AmqpQueue} with queue name.
* @param queueName AMQP queue name.
* @return AMQP queue.
*/
AmqpQueue getQueue(String queueName);

/**
* Remove a queue {@link AmqpQueue} from the exchange.
* @param queue AMQP queue.
Expand Down