This is an automated email from the ASF dual-hosted git repository.
zixuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new eee3694f00e [fix][storage] ReadonlyManagedLedger initialization does
not fill in the properties (#22630)
eee3694f00e is described below
commit eee3694f00e269eef0f75d791521d0d35d8ff411
Author: Gvan Yao <[email protected]>
AuthorDate: Sat May 4 18:35:25 2024 +0800
[fix][storage] ReadonlyManagedLedger initialization does not fill in the
properties (#22630)
---
.../mledger/impl/ReadOnlyManagedLedgerImpl.java | 8 ++
.../impl/ReadOnlyManagedLedgerImplTest.java | 103 +++++++++++++++++++++
2 files changed, 111 insertions(+)
diff --git
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ReadOnlyManagedLedgerImpl.java
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ReadOnlyManagedLedgerImpl.java
index 1fdf6939506..707b71c9d9f 100644
---
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ReadOnlyManagedLedgerImpl.java
+++
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ReadOnlyManagedLedgerImpl.java
@@ -32,6 +32,7 @@ import
org.apache.bookkeeper.mledger.ManagedLedgerException.MetaStoreException;
import
org.apache.bookkeeper.mledger.ManagedLedgerException.MetadataNotFoundException;
import org.apache.bookkeeper.mledger.ReadOnlyCursor;
import org.apache.bookkeeper.mledger.impl.MetaStore.MetaStoreCallback;
+import org.apache.bookkeeper.mledger.proto.MLDataFormats;
import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo;
import
org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo.LedgerInfo;
import org.apache.pulsar.metadata.api.Stat;
@@ -58,6 +59,13 @@ public class ReadOnlyManagedLedgerImpl extends
ManagedLedgerImpl {
ledgers.put(ls.getLedgerId(), ls);
}
+ if (mlInfo.getPropertiesCount() > 0) {
+ for (int i = 0; i < mlInfo.getPropertiesCount(); i++) {
+ MLDataFormats.KeyValue property =
mlInfo.getProperties(i);
+ propertiesMap.put(property.getKey(),
property.getValue());
+ }
+ }
+
// Last ledger stat may be zeroed, we must update it
if (ledgers.size() > 0 &&
ledgers.lastEntry().getValue().getEntries() == 0) {
long lastLedgerId = ledgers.lastKey();
diff --git
a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ReadOnlyManagedLedgerImplTest.java
b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ReadOnlyManagedLedgerImplTest.java
new file mode 100644
index 00000000000..028ecad4072
--- /dev/null
+++
b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ReadOnlyManagedLedgerImplTest.java
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.bookkeeper.mledger.impl;
+
+
+import static org.testng.Assert.assertEquals;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import org.apache.bookkeeper.mledger.AsyncCallbacks;
+import org.apache.bookkeeper.mledger.ManagedLedger;
+import org.apache.bookkeeper.mledger.ManagedLedgerConfig;
+import org.apache.bookkeeper.mledger.ManagedLedgerException;
+import org.apache.bookkeeper.test.MockedBookKeeperTestCase;
+import org.testng.annotations.Test;
+
+public class ReadOnlyManagedLedgerImplTest extends MockedBookKeeperTestCase {
+ private static final String MANAGED_LEDGER_NAME_NON_PROPERTIES =
"ml-non-properties";
+ private static final String MANAGED_LEDGER_NAME_ATTACHED_PROPERTIES =
"ml-attached-properties";
+
+
+ @Test
+ public void testReadOnlyManagedLedgerImplAttachProperties()
+ throws ManagedLedgerException, InterruptedException,
ExecutionException, TimeoutException {
+ final ManagedLedger ledger =
factory.open(MANAGED_LEDGER_NAME_ATTACHED_PROPERTIES,
+ new ManagedLedgerConfig().setRetentionTime(1, TimeUnit.HOURS));
+ final String propertiesKey = "test-key";
+ final String propertiesValue = "test-value";
+
+ ledger.setConfig(new ManagedLedgerConfig());
+ ledger.addEntry("entry-0".getBytes());
+ Map<String, String> properties = new HashMap<>();
+ properties.put(propertiesKey, propertiesValue);
+ ledger.setProperties(Collections.unmodifiableMap(properties));
+ CompletableFuture<Void> future = new CompletableFuture<>();
+
factory.asyncOpenReadOnlyManagedLedger(MANAGED_LEDGER_NAME_ATTACHED_PROPERTIES,
+ new AsyncCallbacks.OpenReadOnlyManagedLedgerCallback() {
+ @Override
+ public void
openReadOnlyManagedLedgerComplete(ReadOnlyManagedLedgerImpl managedLedger,
+ Object ctx) {
+ managedLedger.getProperties().forEach((key, value) -> {
+ assertEquals(key, propertiesKey);
+ assertEquals(value, propertiesValue);
+ });
+ future.complete(null);
+ }
+
+ @Override
+ public void
openReadOnlyManagedLedgerFailed(ManagedLedgerException exception, Object ctx) {
+ future.completeExceptionally(exception);
+ }
+ }, new ManagedLedgerConfig(), null);
+
+ future.get(60, TimeUnit.SECONDS);
+ }
+
+ @Test
+ public void testReadOnlyManagedLedgerImplNoProperties()
+ throws ManagedLedgerException, InterruptedException,
ExecutionException, TimeoutException {
+ final ManagedLedger ledger =
factory.open(MANAGED_LEDGER_NAME_NON_PROPERTIES,
+ new ManagedLedgerConfig().setRetentionTime(1, TimeUnit.HOURS));
+ ledger.setConfig(new ManagedLedgerConfig());
+ ledger.addEntry("entry-0".getBytes());
+ CompletableFuture<Void> future = new CompletableFuture<>();
+
factory.asyncOpenReadOnlyManagedLedger(MANAGED_LEDGER_NAME_NON_PROPERTIES,
+ new AsyncCallbacks.OpenReadOnlyManagedLedgerCallback() {
+ @Override
+ public void
openReadOnlyManagedLedgerComplete(ReadOnlyManagedLedgerImpl managedLedger,
+ Object ctx) {
+ assertEquals(managedLedger.getProperties().size(), 0);
+ future.complete(null);
+ }
+
+ @Override
+ public void
openReadOnlyManagedLedgerFailed(ManagedLedgerException exception, Object ctx) {
+ future.completeExceptionally(exception);
+ }
+ }, new ManagedLedgerConfig(), null);
+
+ future.get(60, TimeUnit.SECONDS);
+ }
+
+}
\ No newline at end of file
