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

Jump to bottom

fixed infinit tell failure #10111

Merged
merged 2 commits into from Feb 6, 2024
Merged

fixed infinit tell failure #10111

merged 2 commits into from Feb 6, 2024

Conversation

YevhenBondarenko
Copy link
Contributor

@YevhenBondarenko YevhenBondarenko commented Feb 1, 2024 •
edited

Pull Request description

Fixed infinite reprocessing in External Nodes if enqueueForTellFailure is used.
https://thingsboard-portal.atlassian.net/browse/PROD-3070

General checklist

  • You have reviewed the guidelines document.
  • Labels that classify your pull request have been added.
  • The milestone is specified and corresponds to fix version.
  • Description references specific issue.
  • Description contains human-readable scope of changes.
  • Description contains brief notes about what needs to be added to the documentation.
  • No merge conflicts, commented blocks of code, code formatting issues.
  • Changes are backward compatible or upgrade script is provided.
  • Similar PR is opened for PE version to simplify merge. Crosslinks between PRs added. Required for internal contributors only.

Front-End feature checklist

  • Screenshots with affected component(s) are added. The best option is to provide 2 screens: before and after changes;
  • If you change the widget or other API, ensure it is backward-compatible or upgrade script is present.
  • Ensure new API is documented here

Back-End feature checklist

  • Added corresponding unit and/or integration test(s). Provide written explanation in the PR description if you have failed to add tests.
  • If new dependency was added: the dependency tree is checked for conflicts.
  • If new service was added: the service is marked with corresponding @TbCoreComponent, @TbRuleEngineComponent, @TbTransportComponent, etc.
  • If new REST API was added: the RestClient.java was updated, issue for Python REST client is created.
  • If new yml property was added: make sure a description is added (above or near the property).

@YevhenBondarenko YevhenBondarenko added this to the 3.6.3 milestone Feb 1, 2024
smatvienko-tb
smatvienko-tb requested changes Feb 1, 2024
View reviewed changes
Copy link
Contributor

@smatvienko-tb smatvienko-tb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice to have proof in the form of a unit test.

...java/org/thingsboard/server/service/queue/processing/AbstractTbRuleEngineSubmitStrategy.java Outdated
newOrderedMsgList.add(pair);
var oldValue = pair.getMsg().getValue();
if (StringUtils.isNotEmpty(oldValue.getFailureMessage())) {
var newValue = TransportProtos.ToRuleEngineMsg.newBuilder()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

var newValue = TransportProtos.ToRuleEngineMsg.newBuilder(oldValue).clearFailureMessage().build();

...java/org/thingsboard/server/service/queue/processing/AbstractTbRuleEngineSubmitStrategy.java Outdated
@@ -51,7 +52,18 @@ public void update(ConcurrentMap<UUID, TbProtoQueueMsg<TransportProtos.ToRuleEng
List<IdMsgPair<TransportProtos.ToRuleEngineMsg>> newOrderedMsgList = new ArrayList<>(reprocessMap.size());
for (IdMsgPair<TransportProtos.ToRuleEngineMsg> pair : orderedMsgList) {
if (reprocessMap.containsKey(pair.uuid)) {
newOrderedMsgList.add(pair);
var oldValue = pair.getMsg().getValue();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oldValue needs to sound better to me. All around are values. I would like to have a descriptive variable name.

like oldRuleEngineMsg or any similar

smatvienko-tb
smatvienko-tb approved these changes Feb 2, 2024
View reviewed changes
Copy link
Contributor

@smatvienko-tb smatvienko-tb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Please consult with @ashvayka on the side effects possible.

...java/org/thingsboard/server/service/queue/processing/AbstractTbRuleEngineSubmitStrategy.java
if (StringUtils.isNotEmpty(pair.getMsg().getValue().getFailureMessage())) {
var toRuleEngineMsg = TransportProtos.ToRuleEngineMsg.newBuilder(pair.getMsg().getValue())
.clearFailureMessage()
.clearRelationTypes()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TY. That is much more descriptive than before! failures and relations will be cleared.

@YevhenBondarenko YevhenBondarenko added the Core Changes to Core label Feb 6, 2024
@ashvayka ashvayka merged commit 94b51e2 into thingsboard:hotfix/3.6.2 Feb 6, 2024
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@smatvienko-tb smatvienko-tb smatvienko-tb approved these changes

Assignees
No one assigned
Labels
bug Core Changes to Core
Projects
None yet
Milestone
3.6.3
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@YevhenBondarenko @smatvienko-tb @ashvayka