dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix EntityNameQueryProcessor

Browse Source
This commit is contained in:
ViacheslavKlimov 2025-05-27 18:05:37 +03:00
parent eaab758c20
commit acae24e960
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/edqs/src/main/java/org/thingsboard/server/edqs/processor/EdqsProcessor.java
View File

@ -55,6 +55,7 @@ import org.thingsboard.server.queue.TbQueueHandler;
import org.thingsboard.server.queue.common.PartitionedQueueResponseTemplate; import org.thingsboard.server.queue.common.PartitionedQueueResponseTemplate;
import org.thingsboard.server.queue.common.TbProtoQueueMsg; import org.thingsboard.server.queue.common.TbProtoQueueMsg;
import org.thingsboard.server.queue.common.consumer.PartitionedQueueConsumerManager; import org.thingsboard.server.queue.common.consumer.PartitionedQueueConsumerManager;
import org.thingsboard.server.queue.discovery.DiscoveryService;
import org.thingsboard.server.queue.discovery.QueueKey; import org.thingsboard.server.queue.discovery.QueueKey;
import org.thingsboard.server.queue.discovery.TopicService; import org.thingsboard.server.queue.discovery.TopicService;
import org.thingsboard.server.queue.discovery.event.PartitionChangeEvent; import org.thingsboard.server.queue.discovery.event.PartitionChangeEvent;
@ -87,6 +88,7 @@ public class EdqsProcessor implements TbQueueHandler<TbProtoQueueMsg<ToEdqsMsg>,
private final EdqsConfig config; private final EdqsConfig config;
private final EdqsExecutors edqsExecutors; private final EdqsExecutors edqsExecutors;
private final EdqsPartitionService partitionService; private final EdqsPartitionService partitionService;
private final DiscoveryService discoveryService;
private final TopicService topicService; private final TopicService topicService;
private final ConfigurableApplicationContext applicationContext; private final ConfigurableApplicationContext applicationContext;
private final EdqsStateService stateService; private final EdqsStateService stateService;
@ -106,6 +108,7 @@ public class EdqsProcessor implements TbQueueHandler<TbProtoQueueMsg<ToEdqsMsg>,
if (error instanceof OutOfMemoryError) { if (error instanceof OutOfMemoryError) {
log.error("OOM detected, shutting down"); log.error("OOM detected, shutting down");
repository.clear(); repository.clear();
discoveryService.setReady(false);
Executors.newSingleThreadExecutor(ThingsBoardThreadFactory.forName("edqs-shutdown")) Executors.newSingleThreadExecutor(ThingsBoardThreadFactory.forName("edqs-shutdown"))
.execute(applicationContext::close); .execute(applicationContext::close);
} }

2
common/edqs/src/main/java/org/thingsboard/server/edqs/query/processor/EntityNameQueryProcessor.java
View File

@ -35,7 +35,7 @@ public class EntityNameQueryProcessor extends AbstractSimpleQueryProcessor<Entit
@Override @Override
protected boolean matches(EntityData ed) { protected boolean matches(EntityData ed) {
return ed.getFields() != null && (pattern == null || pattern.matcher(ed.getFields().getName()).matches()); return super.matches(ed) && (pattern == null || pattern.matcher(ed.getFields().getName()).matches());
} }
} }