You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2022/09/02 10:43:36 UTC

[GitHub] [pulsar] codelipenghui commented on a diff in pull request #17228: [fix][ml] refresh the ledgers map when the offload complete failed

codelipenghui commented on code in PR #17228:
URL: https://github.com/apache/pulsar/pull/17228#discussion_r961533475


##########
managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java:
##########
@@ -2377,41 +2409,51 @@ private void maybeOffload(CompletableFuture<PositionImpl> finalPromise) {
                     && config.getLedgerOffloader().getOffloadPolicies() != null
                     && config.getLedgerOffloader().getOffloadPolicies().getManagedLedgerOffloadThresholdInBytes()
                     != null) {
-                long threshold = config.getLedgerOffloader().getOffloadPolicies()
-                        .getManagedLedgerOffloadThresholdInBytes();
-
-                long sizeSummed = 0;
-                long alreadyOffloadedSize = 0;
-                long toOffloadSize = 0;
-
                 ConcurrentLinkedDeque<LedgerInfo> toOffload = new ConcurrentLinkedDeque<>();
-
-                // go through ledger list from newest to oldest and build a list to offload in oldest to newest order
-                for (Map.Entry<Long, LedgerInfo> e : ledgers.descendingMap().entrySet()) {
-                    long size = e.getValue().getSize();
-                    sizeSummed += size;
-                    boolean alreadyOffloaded = e.getValue().hasOffloadContext()
+                CompletableFuture<Void> refreshFuture = new CompletableFuture<>();
+                if (lastOffloadCompleteFailed && !refreshedIfOffloadCompleteFailed) {
+                    refreshFuture = refreshLedgersInfo();
+                } else {
+                    refreshFuture.complete(null);
+                }
+                refreshFuture.whenComplete((unused, throwable) -> {
+                    if (throwable != null) {
+                        log.error("Failed to refresh the ledger info list", throwable);
+                        unlockingPromise.completeExceptionally(throwable);

Review Comment:
   Should add return here?



##########
managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java:
##########
@@ -3189,15 +3247,32 @@ private CompletableFuture<Void> completeLedgerInfoForOffloaded(long ledgerId, UU
                                        }
                                    })
             .whenComplete((result, exception) -> {
-                    if (exception == null) {
+                if (injection != null) {
+                    lastOffloadCompleteFailed = true;
+                    refreshedIfOffloadCompleteFailed = false;
+                    injection.throwException(ledgerId);
+                }
+                if (exception == null) {
                         log.info("[{}] End Offload. ledger={}, uuid={}", name, ledgerId, uuid);
                     } else {
+                        lastOffloadCompleteFailed = true;
+                        refreshedIfOffloadCompleteFailed = false;

Review Comment:
   Please check the code style.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@pulsar.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org