(pulsar) branch branch-3.2 updated: [fix] [ml] Fix retry mechanism of deleting ledgers to invalidate (#21869)

[mmerli]

This is an automated email from the ASF dual-hosted git repository.

mmerli pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-3.2 by this push:
     new 12794f9093a [fix] [ml] Fix retry mechanism of deleting ledgers to 
invalidate (#21869)
12794f9093a is described below

commit 12794f9093a17453195d22d44c85a12dca720c62
Author: fengyubiao <yubiao.f...@streamnative.io>
AuthorDate: Wed Jan 10 07:31:04 2024 +0800

    [fix] [ml] Fix retry mechanism of deleting ledgers to invalidate (#21869)
---
 .../main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java | 2 +-
 .../main/java/org/apache/bookkeeper/mledger/offload/OffloadUtils.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
 
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
index 8ce2a6924eb..82a3a842454 100644
--- 
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
+++ 
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
@@ -3242,7 +3242,7 @@ public class ManagedLedgerImpl implements ManagedLedger, 
CreateCallback {
                 .thenCompose(readHandle -> 
config.getLedgerOffloader().offload(readHandle, uuid, extraMetadata))
                 .thenCompose((ignore) -> {
                         return 
Retries.run(Backoff.exponentialJittered(TimeUnit.SECONDS.toMillis(1),
-                                                                       
TimeUnit.SECONDS.toHours(1)).limit(10),
+                                                                       
TimeUnit.HOURS.toMillis(1)).limit(10),
                                            FAIL_ON_CONFLICT,
                                            () -> 
completeLedgerInfoForOffloaded(ledgerId, uuid),
                                            scheduledExecutor, name)
diff --git 
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloadUtils.java
 
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloadUtils.java
index 550626f76c0..9c9feb2aa7f 100644
--- 
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloadUtils.java
+++ 
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/offload/OffloadUtils.java
@@ -198,7 +198,7 @@ public final class OffloadUtils {
         metadataMap.put("ManagedLedgerName", name);
 
         return 
Retries.run(Backoff.exponentialJittered(TimeUnit.SECONDS.toMillis(1),
-                        TimeUnit.SECONDS.toHours(1)).limit(10),
+                        TimeUnit.HOURS.toMillis(1)).limit(10),
                 Retries.NonFatalPredicate,
                 () -> mlConfig.getLedgerOffloader().deleteOffloaded(ledgerId, 
uuid, metadataMap),
                 executor, name).whenComplete((ignored, exception) -> {