[fix][ml][PIP-327] fix recover from ledger when ledgerForceRecovery is true

[summeriiii]

Fixes #23425

Motivation

This issue was introduced by PIP-327(#21759). when we set config ledgerForceRecovery true, the following judgment in method ManagedCursorImpl#recoverFromLedger is always true, which leads to skipping the correct logic behind it.

           if (isBkErrorNotRecoverable(rc) || ledgerForceRecovery) {
               log.error("[{}] Error opening metadata ledger {} for cursor {}: {}", ledger.getName(), ledgerId, name,
                       BKException.getMessage(rc));
               // Rewind to oldest entry available
               initialize(getRollbackPosition(info), Collections.emptyMap(), cursorProperties, callback);
               return;
           } 

Modifications

• change the condition to rc != BKException.Code.OK && ledgerForceRecovery

          if (isBkErrorNotRecoverable(rc) || (rc != BKException.Code.OK && ledgerForceRecovery)) {
               log.error("[{}] Error opening metadata ledger {} for cursor {}: {}", ledger.getName(), ledgerId, name,
                       BKException.getMessage(rc));
               // Rewind to oldest entry available
               initialize(getRollbackPosition(info), Collections.emptyMap(), cursorProperties, callback);
               return;
           }

Documentation

• doc
• doc-required
• doc-not-needed
• doc-complete

Matching PR in forked repository

PR in forked repository:

[lhotari]

LGTM. Good work @summeriiii!

[codecov-commenter]

Codecov Report

Attention: Patch coverage is 0% with 2 lines in your changes missing coverage. Please review.

Project coverage is 74.30%. Comparing base (bbc6224) to head (79321b4).
Report is 650 commits behind head on master.

Files with missing lines	Patch %	Lines
...che/bookkeeper/mledger/impl/ManagedCursorImpl.java	0.00%	0 Missing and 2 partials ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##             master   #23426      +/-   ##
============================================
+ Coverage     73.57%   74.30%   +0.72%     
- Complexity    32624    34354    +1730     
============================================
  Files          1877     1949      +72     
  Lines        139502   146867    +7365     
  Branches      15299    16168     +869     
============================================
+ Hits         102638   109124    +6486     
- Misses        28908    29335     +427     
- Partials       7956     8408     +452     

Flag	Coverage Δ
inttests	27.72% <0.00%> (+3.14%)	⬆️
systests	24.36% <0.00%> (+0.04%)	⬆️
unittests	73.66% <0.00%> (+0.81%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines	Coverage Δ
...che/bookkeeper/mledger/impl/ManagedCursorImpl.java	79.64% <0.00%> (+0.34%)	⬆️

... and 630 files with indirect coverage changes