Fix starvation and busy waiting of ES IndexerBolt

[FelixEngl]

The IndexerBold has the same problems as StatusUpdaterBold.
Basically copy-pasted the StatusUpdaterBold into IndexerBold and changed some status handling code. (see #988)

When the parent PR is accepted this one will only differ in 2 files. (Parent PR: #988)

Best Regards
Felix

Signed-off-by: Felix Engl felix.engl@uni-bamberg.de

Thanks for contributing to StormCrawler, your efforts are appreciated!

Developer Certificate of Origin

By contributing to StormCrawler, you accept and agree to the following terms and conditions (the Developer Certificate of Origin) for your present and future contributions submitted to StormCrawler.
Please refer to the Developer Certificate of Origin section in CONTRIBUTING.md for details.

Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

Before opening a PR, please check that:

• You've squashed your commits into a single one
• You've described what the PR does or at least point to a related issue
• You've signed-ff your commits with 'git commit -s'
• The code is properly formatted with 'mvn git-code-format:format-code -Dgcf.globPattern=**/*'

Thanks!

[jnioche]

can you please rebase this PR against the main branch? It will be easier to review

[jnioche]

Thanks @FelixEngl

[FelixEngl]

Please review the following lines (328 - 344), in the original code we processed all BulkResponseItems. Here we abbreviate that and only process the first fail or the last ack.
Does this comply with the wanted behaviour or do we want to process all?
We could also just increase the counts like we are processing all of them but in the end we only process it once. (By increasing the counts and the the reports by the length of bulkItemsWithFailedFlag in line 329)

[jnioche]

I missed this bit. we need to process all BulkResponseItems as in the original

[FelixEngl]

Reopen this PR oder making a new one fixing this mistake?

[FelixEngl]

@jnioche
I forgot to submit my review request. 🤦
This came to me early in the morning and I forgot to submit it.

Sorry for that. (I don't think It'll mess up any logic except counting acks and failures, so there won't be any problem with the crawling itself.)

[jnioche]

A new one would be easier

…

On Tue, 12 Jul 2022, 16:08 Felix Engl, ***@***.***> wrote: ***@***.**** commented on this pull request. ------------------------------ In external/elasticsearch/src/main/java/com/digitalpebble/stormcrawler/elasticsearch/bolt/IndexerBolt.java <#989 (comment)> : > + waitAckLock.unlock(); + } + + int ackCount = 0; + int failureCount = 0; + + for (var entry : presentTuples.entrySet()) { + final var id = entry.getKey(); + final var associatedTuple = entry.getValue(); + final var bulkItemsWithFailedFlag = idsToBulkItemsWithFailedFlag.get(id); + + BulkItemResponseToFailedFlag selected; + + if (bulkItemsWithFailedFlag.size() == 1) { + selected = bulkItemsWithFailedFlag.get(0); + } else { Reopen this PR oder making a new one fixing this mistake? — Reply to this email directly, view it on GitHub <#989 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AABVJTYID36E5WJSX6LXUKLVTWC5NANCNFSM53AVWESQ> . You are receiving this because you were mentioned.Message ID: ***@***.***>