You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@bookkeeper.apache.org by GitBox <gi...@apache.org> on 2018/12/21 23:44:38 UTC
[GitHub] sijie closed pull request #1890: Revert
maxLedgerMetadataFormatVersion changes in layout
sijie closed pull request #1890: Revert maxLedgerMetadataFormatVersion changes in layout
URL: https://github.com/apache/bookkeeper/pull/1890
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java
index 083a66159c..32e288b7e3 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java
@@ -1164,7 +1164,7 @@ Options getOptions() {
void printLedgerMetadata(long ledgerId, LedgerMetadata md, boolean printMeta) {
System.out.println("ledgerID: " + ledgerIdFormatter.formatLedgerId(ledgerId));
if (printMeta) {
- System.out.println(md.toString());
+ System.out.println(new String(new LedgerMetadataSerDe().serialize(md), UTF_8));
}
}
@@ -1173,10 +1173,7 @@ void printLedgerMetadata(long ledgerId, LedgerMetadata md, boolean printMeta) {
*/
class LedgerMetadataCmd extends MyCommand {
Options lOpts = new Options();
- // the max version won't actually take effect as this tool
- // never creates new metadata (there'll already be a format version in the existing metadata)
- LedgerMetadataSerDe serDe = new LedgerMetadataSerDe(
- LedgerMetadataSerDe.CURRENT_METADATA_FORMAT_VERSION);
+ LedgerMetadataSerDe serDe = new LedgerMetadataSerDe();
LedgerMetadataCmd() {
super(CMD_LEDGERMETADATA);
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractHierarchicalLedgerManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractHierarchicalLedgerManager.java
index 1a0ce2eb5f..1aa8e151d2 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractHierarchicalLedgerManager.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractHierarchicalLedgerManager.java
@@ -49,9 +49,8 @@
* @param zk
* ZooKeeper Client Handle
*/
- public AbstractHierarchicalLedgerManager(AbstractConfiguration conf, ZooKeeper zk,
- int maxLedgerMetadataFormatVersion) {
- super(conf, zk, maxLedgerMetadataFormatVersion);
+ public AbstractHierarchicalLedgerManager(AbstractConfiguration conf, ZooKeeper zk) {
+ super(conf, zk);
}
/**
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManager.java
index 1c901542c3..5dbdd06791 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManager.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManager.java
@@ -159,9 +159,8 @@ private void handleMetadata(Versioned<LedgerMetadata> result, Throwable exceptio
* @param zk
* ZooKeeper Client Handle
*/
- protected AbstractZkLedgerManager(AbstractConfiguration conf, ZooKeeper zk,
- int maxLedgerMetadataFormatVersion) {
- this.serDe = new LedgerMetadataSerDe(maxLedgerMetadataFormatVersion);
+ protected AbstractZkLedgerManager(AbstractConfiguration conf, ZooKeeper zk) {
+ this.serDe = new LedgerMetadataSerDe();
this.conf = conf;
this.zk = zk;
this.ledgerRootPath = ZKMetadataDriverBase.resolveZkLedgersRootPath(conf);
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManagerFactory.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManagerFactory.java
index be95a53886..72bc3e841e 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManagerFactory.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManagerFactory.java
@@ -160,8 +160,8 @@ public static LedgerManagerFactory newLedgerManagerFactory(
// if layoutManager is null, return the default ledger manager
if (layoutManager == null) {
- return new FlatLedgerManagerFactory().initialize(conf, null,
- FlatLedgerManagerFactory.CUR_VERSION, LedgerMetadataSerDe.CURRENT_METADATA_FORMAT_VERSION);
+ return new FlatLedgerManagerFactory()
+ .initialize(conf, null, FlatLedgerManagerFactory.CUR_VERSION);
}
LedgerManagerFactory lmFactory;
@@ -172,9 +172,8 @@ public static LedgerManagerFactory newLedgerManagerFactory(
if (layout == null) { // no existing layout
lmFactory = createNewLMFactory(conf, layoutManager, factoryClass);
- return lmFactory.initialize(conf, layoutManager,
- lmFactory.getCurrentVersion(),
- LedgerMetadataSerDe.CURRENT_METADATA_FORMAT_VERSION);
+ return lmFactory
+ .initialize(conf, layoutManager, lmFactory.getCurrentVersion());
}
if (log.isDebugEnabled()) {
log.debug("read ledger layout {}", layout);
@@ -198,8 +197,7 @@ public static LedgerManagerFactory newLedgerManagerFactory(
} else {
throw new IOException("Unknown ledger manager type: " + lmType);
}
- return lmFactory.initialize(conf, layoutManager, layout.getManagerVersion(),
- layout.getMaxLedgerMetadataFormatVersion());
+ return lmFactory.initialize(conf, layoutManager, layout.getManagerVersion());
}
// handle V2 layout case
@@ -229,8 +227,7 @@ public static LedgerManagerFactory newLedgerManagerFactory(
}
// instantiate a factory
lmFactory = ReflectionUtils.newInstance(factoryClass);
- return lmFactory.initialize(conf, layoutManager, layout.getManagerVersion(),
- layout.getMaxLedgerMetadataFormatVersion());
+ return lmFactory.initialize(conf, layoutManager, layout.getManagerVersion());
}
private static String normalizedLedgerManagerFactoryClassName(String factoryClass,
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/FlatLedgerManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/FlatLedgerManager.java
index 115ffe3f8c..7ee2e2289e 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/FlatLedgerManager.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/FlatLedgerManager.java
@@ -55,9 +55,8 @@
* ZooKeeper Client Handle
* @throws IOException when version is not compatible
*/
- public FlatLedgerManager(AbstractConfiguration conf, ZooKeeper zk,
- int maxLedgerMetadataFormatVersion) {
- super(conf, zk, maxLedgerMetadataFormatVersion);
+ public FlatLedgerManager(AbstractConfiguration conf, ZooKeeper zk) {
+ super(conf, zk);
ledgerPrefix = ledgerRootPath + "/" + StringUtils.LEDGER_NODE_PREFIX;
}
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/FlatLedgerManagerFactory.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/FlatLedgerManagerFactory.java
index 5c92ba12d9..19ac418eea 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/FlatLedgerManagerFactory.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/FlatLedgerManagerFactory.java
@@ -41,7 +41,6 @@
public static final int CUR_VERSION = 1;
AbstractConfiguration conf;
- private int maxLedgerMetadataFormatVersion;
@Override
public int getCurrentVersion() {
@@ -51,8 +50,7 @@ public int getCurrentVersion() {
@Override
public LedgerManagerFactory initialize(final AbstractConfiguration conf,
final LayoutManager layoutManager,
- final int factoryVersion,
- int maxLedgerMetadataFormatVersion)
+ final int factoryVersion)
throws IOException {
checkArgument(layoutManager == null || layoutManager instanceof ZkLayoutManager);
@@ -63,7 +61,6 @@ public LedgerManagerFactory initialize(final AbstractConfiguration conf,
this.conf = conf;
this.zk = layoutManager == null ? null : ((ZkLayoutManager) layoutManager).getZk();
- this.maxLedgerMetadataFormatVersion = maxLedgerMetadataFormatVersion;
return this;
}
@@ -82,7 +79,7 @@ public LedgerIdGenerator newLedgerIdGenerator() {
@Override
public LedgerManager newLedgerManager() {
- return new FlatLedgerManager(conf, zk, maxLedgerMetadataFormatVersion);
+ return new FlatLedgerManager(conf, zk);
}
@Override
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManager.java
index c4f211a1ab..946ed2a5d3 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManager.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManager.java
@@ -46,11 +46,10 @@
LegacyHierarchicalLedgerManager legacyLM;
LongHierarchicalLedgerManager longLM;
- public HierarchicalLedgerManager(AbstractConfiguration conf, ZooKeeper zk,
- int maxLedgerMetadataFormatVersion) {
- super(conf, zk, maxLedgerMetadataFormatVersion);
- legacyLM = new LegacyHierarchicalLedgerManager(conf, zk, maxLedgerMetadataFormatVersion);
- longLM = new LongHierarchicalLedgerManager (conf, zk, maxLedgerMetadataFormatVersion);
+ public HierarchicalLedgerManager(AbstractConfiguration conf, ZooKeeper zk) {
+ super(conf, zk);
+ legacyLM = new LegacyHierarchicalLedgerManager(conf, zk);
+ longLM = new LongHierarchicalLedgerManager (conf, zk);
}
@Override
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManagerFactory.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManagerFactory.java
index c4f0f4f4d6..4a9d6cfbf6 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManagerFactory.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManagerFactory.java
@@ -42,6 +42,6 @@ public LedgerIdGenerator newLedgerIdGenerator() {
@Override
public LedgerManager newLedgerManager() {
- return new HierarchicalLedgerManager(conf, zk, maxLedgerMetadataFormatVersion);
+ return new HierarchicalLedgerManager(conf, zk);
}
}
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerLayout.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerLayout.java
index c39e6b6fea..eb5b705c16 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerLayout.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerLayout.java
@@ -39,14 +39,8 @@
// version of ledger layout metadata
public static final int LAYOUT_FORMAT_VERSION = 2;
- private static final String FIELD_SPLITTER = ":";
- private static final String LINE_SPLITTER = "\n";
-
- // For version 2 and below, max ledger metadata format wasn't stored in the layout
- // so assume 2 if it is missing.
- private static final int DEFAULT_MAX_LEDGER_METADATA_FORMAT_VERSION = 2;
- private static final String MAX_LEDGER_METADATA_FORMAT_VERSION_FIELD =
- "MAX_LEDGER_METADATA_FORMAT_VERSION";
+ private static final String splitter = ":";
+ private static final String lSplitter = "\n";
// ledger manager factory class
private final String managerFactoryClass;
@@ -56,9 +50,6 @@
// layout version of how to store layout information
private final int layoutFormatVersion;
- // maximum format version that can be used for storing ledger metadata
- private final int maxLedgerMetadataFormatVersion;
-
/**
* Ledger Layout Constructor.
*
@@ -68,17 +59,13 @@
* Ledger Manager Version
*/
public LedgerLayout(String managerFactoryCls, int managerVersion) {
- this(managerFactoryCls, managerVersion,
- LedgerMetadataSerDe.CURRENT_METADATA_FORMAT_VERSION,
- LAYOUT_FORMAT_VERSION);
+ this(managerFactoryCls, managerVersion, LAYOUT_FORMAT_VERSION);
}
LedgerLayout(String managerFactoryCls, int managerVersion,
- int maxLedgerMetadataFormatVersion,
int layoutVersion) {
this.managerFactoryClass = managerFactoryCls;
this.managerVersion = managerVersion;
- this.maxLedgerMetadataFormatVersion = maxLedgerMetadataFormatVersion;
this.layoutFormatVersion = layoutVersion;
}
@@ -89,11 +76,8 @@ public LedgerLayout(String managerFactoryCls, int managerVersion) {
*/
public byte[] serialize() throws IOException {
String s =
- new StringBuilder().append(layoutFormatVersion).append(LINE_SPLITTER)
- .append(managerFactoryClass).append(FIELD_SPLITTER).append(managerVersion).append(LINE_SPLITTER)
- .append(MAX_LEDGER_METADATA_FORMAT_VERSION_FIELD).append(FIELD_SPLITTER)
- .append(maxLedgerMetadataFormatVersion)
- .toString();
+ new StringBuilder().append(layoutFormatVersion).append(lSplitter)
+ .append(managerFactoryClass).append(splitter).append(managerVersion).toString();
if (log.isDebugEnabled()) {
log.debug("Serialized layout info: {}", s);
@@ -116,7 +100,7 @@ public static LedgerLayout parseLayout(byte[] bytes) throws IOException {
log.debug("Parsing Layout: {}", layout);
}
- String lines[] = layout.split(LINE_SPLITTER);
+ String lines[] = layout.split(lSplitter);
try {
int layoutFormatVersion = Integer.parseInt(lines[0]);
@@ -129,7 +113,7 @@ public static LedgerLayout parseLayout(byte[] bytes) throws IOException {
throw new IOException("Ledger manager and its version absent from layout: " + layout);
}
- String[] parts = lines[1].split(FIELD_SPLITTER);
+ String[] parts = lines[1].split(splitter);
if (parts.length != 2) {
throw new IOException("Invalid Ledger Manager defined in layout : " + layout);
}
@@ -137,18 +121,7 @@ public static LedgerLayout parseLayout(byte[] bytes) throws IOException {
String managerFactoryCls = parts[0];
// ledger manager version
int managerVersion = Integer.parseInt(parts[1]);
-
- int maxLedgerMetadataFormatVersion = DEFAULT_MAX_LEDGER_METADATA_FORMAT_VERSION;
- if (lines.length >= 3) {
- String[] metadataFormatParts = lines[2].split(FIELD_SPLITTER);
- if (metadataFormatParts.length != 2
- || !metadataFormatParts[0].equals(MAX_LEDGER_METADATA_FORMAT_VERSION_FIELD)) {
- throw new IOException("Invalid field for max ledger metadata format:" + lines[2]);
- }
- maxLedgerMetadataFormatVersion = Integer.parseInt(metadataFormatParts[1]);
- }
- return new LedgerLayout(managerFactoryCls, managerVersion,
- maxLedgerMetadataFormatVersion, layoutFormatVersion);
+ return new LedgerLayout(managerFactoryCls, managerVersion, layoutFormatVersion);
} catch (NumberFormatException e) {
throw new IOException("Could not parse layout '" + layout + "'", e);
}
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerManagerFactory.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerManagerFactory.java
index eb4e0f446a..80d3a6526f 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerManagerFactory.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerManagerFactory.java
@@ -43,15 +43,12 @@
* Layout manager used for initialize ledger manager factory
* @param factoryVersion
* What version used to initialize factory.
- * @param maxLedgerMetadataFormatVersion
- * Maximum format version for ledger metadata.
* @return ledger manager factory instance
* @throws IOException when fail to initialize the factory.
*/
LedgerManagerFactory initialize(AbstractConfiguration conf,
LayoutManager layoutManager,
- int factoryVersion,
- int maxLedgerMetadataFormatVersion)
+ int factoryVersion)
throws IOException;
/**
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerMetadataSerDe.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerMetadataSerDe.java
index 4653af4f30..6020a3bf4f 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerMetadataSerDe.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerMetadataSerDe.java
@@ -63,12 +63,6 @@
private static final String V1_CLOSED_TAG = "CLOSED";
private static final int V1_IN_RECOVERY_ENTRY_ID = -102;
- private final int maxLedgerMetadataFormatVersion;
-
- public LedgerMetadataSerDe(int maxLedgerMetadataFormatVersion) {
- this.maxLedgerMetadataFormatVersion = maxLedgerMetadataFormatVersion;
- }
-
public byte[] serialize(LedgerMetadata metadata) {
if (metadata.getMetadataFormatVersion() == 1) {
return serializeVersion1(metadata);
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LegacyHierarchicalLedgerManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LegacyHierarchicalLedgerManager.java
index b5065a872a..76ecc9d68d 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LegacyHierarchicalLedgerManager.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LegacyHierarchicalLedgerManager.java
@@ -69,9 +69,8 @@ protected StringBuilder initialValue() {
* @param zk
* ZooKeeper Client Handle
*/
- public LegacyHierarchicalLedgerManager(AbstractConfiguration conf, ZooKeeper zk,
- int maxLedgerMetadataFormatVersion) {
- super(conf, zk, maxLedgerMetadataFormatVersion);
+ public LegacyHierarchicalLedgerManager(AbstractConfiguration conf, ZooKeeper zk) {
+ super(conf, zk);
}
@Override
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LegacyHierarchicalLedgerManagerFactory.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LegacyHierarchicalLedgerManagerFactory.java
index bd5c57927c..91579735b0 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LegacyHierarchicalLedgerManagerFactory.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LegacyHierarchicalLedgerManagerFactory.java
@@ -38,7 +38,6 @@
public static final int CUR_VERSION = 1;
AbstractConfiguration conf;
- int maxLedgerMetadataFormatVersion;
@Override
public int getCurrentVersion() {
@@ -48,8 +47,7 @@ public int getCurrentVersion() {
@Override
public LedgerManagerFactory initialize(final AbstractConfiguration conf,
final LayoutManager lm,
- final int factoryVersion,
- int maxLedgerMetadataFormatVersion)
+ final int factoryVersion)
throws IOException {
checkArgument(lm instanceof ZkLayoutManager);
@@ -60,7 +58,6 @@ public LedgerManagerFactory initialize(final AbstractConfiguration conf,
+ factoryVersion);
}
this.conf = conf;
- this.maxLedgerMetadataFormatVersion = maxLedgerMetadataFormatVersion;
this.zk = zkLayoutManager.getZk();
return this;
}
@@ -83,7 +80,7 @@ public LedgerIdGenerator newLedgerIdGenerator() {
@Override
public LedgerManager newLedgerManager() {
- return new LegacyHierarchicalLedgerManager(conf, zk, maxLedgerMetadataFormatVersion);
+ return new LegacyHierarchicalLedgerManager(conf, zk);
}
@Override
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LongHierarchicalLedgerManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LongHierarchicalLedgerManager.java
index e464ed04a1..2e69e90a5c 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LongHierarchicalLedgerManager.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LongHierarchicalLedgerManager.java
@@ -70,9 +70,8 @@
* @param zk
* ZooKeeper Client Handle
*/
- public LongHierarchicalLedgerManager(AbstractConfiguration conf, ZooKeeper zk,
- int maxLedgerMetadataFormatVersion) {
- super(conf, zk, maxLedgerMetadataFormatVersion);
+ public LongHierarchicalLedgerManager(AbstractConfiguration conf, ZooKeeper zk) {
+ super(conf, zk);
}
@Override
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LongHierarchicalLedgerManagerFactory.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LongHierarchicalLedgerManagerFactory.java
index 4c06cc4826..93ad9ddc68 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LongHierarchicalLedgerManagerFactory.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LongHierarchicalLedgerManagerFactory.java
@@ -26,7 +26,7 @@
@Override
public LedgerManager newLedgerManager() {
- return new LongHierarchicalLedgerManager(conf, zk, maxLedgerMetadataFormatVersion);
+ return new LongHierarchicalLedgerManager(conf, zk);
}
}
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/MSLedgerManagerFactory.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/MSLedgerManagerFactory.java
index e10f2743c6..fc87632445 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/MSLedgerManagerFactory.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/MSLedgerManagerFactory.java
@@ -96,7 +96,6 @@
public static final String META_FIELD = ".META";
AbstractConfiguration conf;
- private int maxLedgerMetadataFormatVersion;
MetaStore metastore;
@Override
@@ -107,8 +106,7 @@ public int getCurrentVersion() {
@Override
public LedgerManagerFactory initialize(final AbstractConfiguration conf,
final LayoutManager layoutManager,
- final int factoryVersion,
- int maxLedgerMetadataFormatVersion) throws IOException {
+ final int factoryVersion) throws IOException {
checkArgument(layoutManager instanceof ZkLayoutManager);
ZkLayoutManager zkLayoutManager = (ZkLayoutManager) layoutManager;
@@ -117,7 +115,6 @@ public LedgerManagerFactory initialize(final AbstractConfiguration conf,
}
this.conf = conf;
this.zk = zkLayoutManager.getZk();
- this.maxLedgerMetadataFormatVersion = maxLedgerMetadataFormatVersion;
// load metadata store
String msName = conf.getMetastoreImplClass();
@@ -283,12 +280,11 @@ private void handleMetadata(Versioned<LedgerMetadata> metadata, Throwable except
}
}
- MsLedgerManager(final AbstractConfiguration conf, final ZooKeeper zk, final MetaStore metastore,
- int maxLedgerMetadataFormatVersion) {
+ MsLedgerManager(final AbstractConfiguration conf, final ZooKeeper zk, final MetaStore metastore) {
this.conf = conf;
this.zk = zk;
this.metastore = metastore;
- this.serDe = new LedgerMetadataSerDe(maxLedgerMetadataFormatVersion);
+ this.serDe = new LedgerMetadataSerDe();
try {
ledgerTable = metastore.createScannableTable(TABLE_NAME);
@@ -655,7 +651,7 @@ public static boolean isSpecialZnode(String znode) {
@Override
public LedgerManager newLedgerManager() {
- return new MsLedgerManager(conf, zk, metastore, maxLedgerMetadataFormatVersion);
+ return new MsLedgerManager(conf, zk, metastore);
}
@Override
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/GetLedgerMetaService.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/GetLedgerMetaService.java
index 537b50ce46..7fcaeda810 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/GetLedgerMetaService.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/GetLedgerMetaService.java
@@ -53,7 +53,7 @@ public GetLedgerMetaService(ServerConfiguration conf, BookieServer bookieServer)
checkNotNull(conf);
this.conf = conf;
this.bookieServer = bookieServer;
- this.serDe = new LedgerMetadataSerDe(LedgerMetadataSerDe.CURRENT_METADATA_FORMAT_VERSION);
+ this.serDe = new LedgerMetadataSerDe();
}
@Override
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/ListLedgerService.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/ListLedgerService.java
index 13022e4f2d..f553b6431b 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/ListLedgerService.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/ListLedgerService.java
@@ -58,7 +58,7 @@ public ListLedgerService(ServerConfiguration conf, BookieServer bookieServer) {
checkNotNull(conf);
this.conf = conf;
this.bookieServer = bookieServer;
- this.serDe = new LedgerMetadataSerDe(LedgerMetadataSerDe.CURRENT_METADATA_FORMAT_VERSION);
+ this.serDe = new LedgerMetadataSerDe();
}
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerMetadataTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerMetadataTest.java
index d9141e6461..a9ffc2d422 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerMetadataTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerMetadataTest.java
@@ -80,8 +80,7 @@ public void testStoreSystemtimeAsLedgerCtimeEnabled()
.withCreationTime(System.currentTimeMillis())
.storingCreationTime(true)
.build();
- LedgerMetadataFormat format = new LedgerMetadataSerDe(LedgerMetadataSerDe.CURRENT_METADATA_FORMAT_VERSION)
- .buildProtoFormat(lm);
+ LedgerMetadataFormat format = new LedgerMetadataSerDe().buildProtoFormat(lm);
assertTrue(format.hasCtime());
}
@@ -95,8 +94,7 @@ public void testStoreSystemtimeAsLedgerCtimeDisabled()
LedgerMetadata lm = LedgerMetadataBuilder.create()
.newEnsembleEntry(0L, ensemble).build();
- LedgerMetadataFormat format = new LedgerMetadataSerDe(LedgerMetadataSerDe.CURRENT_METADATA_FORMAT_VERSION)
- .buildProtoFormat(lm);
+ LedgerMetadataFormat format = new LedgerMetadataSerDe().buildProtoFormat(lm);
assertFalse(format.hasCtime());
}
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/ParallelLedgerRecoveryTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/ParallelLedgerRecoveryTest.java
index 1f9656b94d..ab966fb4ae 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/ParallelLedgerRecoveryTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/ParallelLedgerRecoveryTest.java
@@ -50,7 +50,6 @@
import org.apache.bookkeeper.meta.HierarchicalLedgerManagerFactory;
import org.apache.bookkeeper.meta.LedgerManager;
import org.apache.bookkeeper.meta.LedgerManagerFactory;
-import org.apache.bookkeeper.meta.LedgerMetadataSerDe;
import org.apache.bookkeeper.meta.MetadataDrivers;
import org.apache.bookkeeper.meta.exceptions.Code;
import org.apache.bookkeeper.meta.exceptions.MetadataException;
@@ -185,8 +184,7 @@ public synchronized LedgerManagerFactory getLedgerManagerFactory() throws Metada
if (null == lmFactory) {
try {
lmFactory = new TestLedgerManagerFactory()
- .initialize(conf, layoutManager, TestLedgerManagerFactory.CUR_VERSION,
- LedgerMetadataSerDe.CURRENT_METADATA_FORMAT_VERSION);
+ .initialize(conf, layoutManager, TestLedgerManagerFactory.CUR_VERSION);
} catch (IOException e) {
throw new MetadataException(Code.METADATA_SERVICE_ERROR, e);
}
@@ -202,8 +200,7 @@ public synchronized LedgerManagerFactory getLedgerManagerFactory() throws Metada
if (null == lmFactory) {
try {
lmFactory = new TestLedgerManagerFactory()
- .initialize(conf, layoutManager, TestLedgerManagerFactory.CUR_VERSION,
- LedgerMetadataSerDe.CURRENT_METADATA_FORMAT_VERSION);
+ .initialize(conf, layoutManager, TestLedgerManagerFactory.CUR_VERSION);
} catch (IOException e) {
throw new MetadataException(Code.METADATA_SERVICE_ERROR, e);
}
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/AbstractZkLedgerManagerTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/AbstractZkLedgerManagerTest.java
index 620c3b2e00..37f55b3e6e 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/AbstractZkLedgerManagerTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/AbstractZkLedgerManagerTest.java
@@ -110,9 +110,9 @@ public void setup() throws Exception {
this.conf = new ClientConfiguration();
this.ledgerManager = mock(
- AbstractZkLedgerManager.class,
- withSettings()
- .useConstructor(conf, mockZk, LedgerMetadataSerDe.CURRENT_METADATA_FORMAT_VERSION)
+ AbstractZkLedgerManager.class,
+ withSettings()
+ .useConstructor(conf, mockZk)
.defaultAnswer(CALLS_REAL_METHODS));
List<BookieSocketAddress> ensemble = Lists.newArrayList(
new BookieSocketAddress("192.0.2.1", 3181),
@@ -142,7 +142,7 @@ public void setup() throws Exception {
assertSame(conf, ledgerManager.conf);
assertSame(scheduler, ledgerManager.scheduler);
- this.serDe = new LedgerMetadataSerDe(LedgerMetadataSerDe.CURRENT_METADATA_FORMAT_VERSION);
+ this.serDe = new LedgerMetadataSerDe();
}
@After
@@ -303,15 +303,13 @@ public void testRemoveLedgerMetadataException() throws Exception {
@Test
public void testRemoveLedgerMetadataHierarchical() throws Exception {
- HierarchicalLedgerManager hlm = new HierarchicalLedgerManager(conf, mockZk,
- LedgerMetadataSerDe.CURRENT_METADATA_FORMAT_VERSION);
+ HierarchicalLedgerManager hlm = new HierarchicalLedgerManager(conf, mockZk);
testRemoveLedgerMetadataHierarchicalLedgerManager(hlm);
}
@Test
public void testRemoveLedgerMetadataLongHierarchical() throws Exception {
- LongHierarchicalLedgerManager hlm = new LongHierarchicalLedgerManager(conf, mockZk,
- LedgerMetadataSerDe.CURRENT_METADATA_FORMAT_VERSION);
+ LongHierarchicalLedgerManager hlm = new LongHierarchicalLedgerManager(conf, mockZk);
testRemoveLedgerMetadataHierarchicalLedgerManager(hlm);
}
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/MockLedgerManager.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/MockLedgerManager.java
index a73adeb4ee..398bb07d71 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/MockLedgerManager.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/MockLedgerManager.java
@@ -72,7 +72,7 @@ private MockLedgerManager(Map<Long, Pair<LongVersion, byte[]>> metadataMap,
this.metadataMap = metadataMap;
this.executor = executor;
this.ownsExecutor = ownsExecutor;
- this.serDe = new LedgerMetadataSerDe(LedgerMetadataSerDe.CURRENT_METADATA_FORMAT_VERSION);
+ this.serDe = new LedgerMetadataSerDe();
}
public MockLedgerManager newClient() {
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/TestLedgerLayout.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/TestLedgerLayout.java
index 16b30bdf07..62315fe2e8 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/TestLedgerLayout.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/TestLedgerLayout.java
@@ -18,12 +18,8 @@
*/
package org.apache.bookkeeper.meta;
-import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
import org.junit.Test;
@@ -67,43 +63,4 @@ public void testGetters() {
hierarchical1.getLayoutFormatVersion());
}
- @Test
- public void testParseNoMaxLedgerMetadataFormatVersion() throws Exception {
- LedgerLayout layout = LedgerLayout.parseLayout("1\nblahblahLM:3".getBytes(UTF_8));
-
- assertEquals(layout.getMaxLedgerMetadataFormatVersion(), 2);
- }
-
- @Test
- public void testParseWithMaxLedgerMetadataFormatVersion() throws Exception {
- LedgerLayout layout = LedgerLayout.parseLayout(
- "1\nblahblahLM:3\nMAX_LEDGER_METADATA_FORMAT_VERSION:123".getBytes(UTF_8));
-
- assertEquals(layout.getMaxLedgerMetadataFormatVersion(), 123);
- }
-
- @Test
- public void testCorruptMaxLedgerLayout() throws Exception {
- try {
- LedgerLayout.parseLayout("1\nblahblahLM:3\nMAXXX_LEDGER_METADATA_FORMAT_VERSION:123".getBytes(UTF_8));
- fail("Shouldn't have been able to parse");
- } catch (IOException ioe) {
- // expected
- }
-
- try {
- LedgerLayout.parseLayout("1\nblahblahLM:3\nMAXXX_LEDGER_METADATA_FORMAT_VERSION:blah".getBytes(UTF_8));
- fail("Shouldn't have been able to parse");
- } catch (IOException ioe) {
- // expected
- }
- }
-
- @Test
- public void testMoreFieldsAdded() throws Exception {
- LedgerLayout layout = LedgerLayout.parseLayout(
- "1\nblahblahLM:3\nMAX_LEDGER_METADATA_FORMAT_VERSION:123\nFOO:BAR".getBytes(UTF_8));
-
- assertEquals(layout.getMaxLedgerMetadataFormatVersion(), 123);
- }
}
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/TestHttpService.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/TestHttpService.java
index da25d14d5c..3d948c33d1 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/TestHttpService.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/TestHttpService.java
@@ -387,8 +387,7 @@ public void testGetLedgerMetaService() throws Exception {
assertEquals(1, respBody.size());
// verify LedgerMetadata content is equal
assertTrue(respBody.get(ledgerId.toString()).toString()
- .equals(new String(new LedgerMetadataSerDe(LedgerMetadataSerDe.CURRENT_METADATA_FORMAT_VERSION)
- .serialize(lh[0].getLedgerMetadata()))));
+ .equals(new String(new LedgerMetadataSerDe().serialize(lh[0].getLedgerMetadata()))));
}
@Test
diff --git a/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdLedgerManager.java b/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdLedgerManager.java
index ffbbc08df0..d571bf8057 100644
--- a/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdLedgerManager.java
+++ b/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdLedgerManager.java
@@ -64,8 +64,19 @@
@Slf4j
class EtcdLedgerManager implements LedgerManager {
- private final LedgerMetadataSerDe serDe;
- private final Function<ByteSequence, LedgerMetadata> ledgerMetadataFunction;
+ private final LedgerMetadataSerDe serDe = new LedgerMetadataSerDe();
+ private final Function<ByteSequence, LedgerMetadata> ledgerMetadataFunction = bs -> {
+ try {
+ return serDe.parseConfig(
+ bs.getBytes(),
+ Optional.empty()
+ );
+ } catch (IOException ioe) {
+ log.error("Could not parse ledger metadata : {}", bs.toStringUtf8(), ioe);
+ throw new RuntimeException(
+ "Could not parse ledger metadata : " + bs.toStringUtf8(), ioe);
+ }
+ };
private final String scope;
private final Client client;
@@ -79,23 +90,11 @@
private volatile boolean closed = false;
EtcdLedgerManager(Client client,
- String scope,
- int maxLedgerMetadataFormatVersion) {
+ String scope) {
this.client = client;
this.kvClient = client.getKVClient();
this.scope = scope;
this.watchClient = new EtcdWatchClient(client);
- this.serDe = new LedgerMetadataSerDe(maxLedgerMetadataFormatVersion);
-
- this.ledgerMetadataFunction = bs -> {
- try {
- return serDe.parseConfig(bs.getBytes(), Optional.empty());
- } catch (IOException ioe) {
- log.error("Could not parse ledger metadata : {}", bs.toStringUtf8(), ioe);
- throw new RuntimeException(
- "Could not parse ledger metadata : " + bs.toStringUtf8(), ioe);
- }
- };
}
private boolean isClosed() {
diff --git a/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdLedgerManagerFactory.java b/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdLedgerManagerFactory.java
index 0bc16d815c..dc7d1517b2 100644
--- a/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdLedgerManagerFactory.java
+++ b/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdLedgerManagerFactory.java
@@ -42,7 +42,6 @@
private String scope;
private Client client;
- private int maxLedgerMetadataFormatVersion;
@Override
public int getCurrentVersion() {
@@ -52,8 +51,7 @@ public int getCurrentVersion() {
@Override
public LedgerManagerFactory initialize(AbstractConfiguration conf,
LayoutManager layoutManager,
- int factoryVersion,
- int maxLedgerMetadataFormatVersion) throws IOException {
+ int factoryVersion) throws IOException {
checkArgument(layoutManager instanceof EtcdLayoutManager);
EtcdLayoutManager etcdLayoutManager = (EtcdLayoutManager) layoutManager;
@@ -68,7 +66,6 @@ public LedgerManagerFactory initialize(AbstractConfiguration conf,
throw new IOException("Invalid metadata service uri", e);
}
this.client = etcdLayoutManager.getClient();
- this.maxLedgerMetadataFormatVersion = maxLedgerMetadataFormatVersion;
return this;
}
@@ -85,7 +82,7 @@ public LedgerIdGenerator newLedgerIdGenerator() {
@Override
public LedgerManager newLedgerManager() {
- return new EtcdLedgerManager(client, scope, maxLedgerMetadataFormatVersion);
+ return new EtcdLedgerManager(client, scope);
}
@Override
diff --git a/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdMetadataDriverBase.java b/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdMetadataDriverBase.java
index cbd6f32143..47b034c00e 100644
--- a/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdMetadataDriverBase.java
+++ b/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdMetadataDriverBase.java
@@ -27,7 +27,6 @@
import org.apache.bookkeeper.conf.AbstractConfiguration;
import org.apache.bookkeeper.meta.LayoutManager;
import org.apache.bookkeeper.meta.LedgerManagerFactory;
-import org.apache.bookkeeper.meta.LedgerMetadataSerDe;
import org.apache.bookkeeper.meta.exceptions.Code;
import org.apache.bookkeeper.meta.exceptions.MetadataException;
import org.apache.bookkeeper.stats.StatsLogger;
@@ -107,8 +106,7 @@ public synchronized LedgerManagerFactory getLedgerManagerFactory()
if (null == lmFactory) {
try {
lmFactory = new EtcdLedgerManagerFactory();
- lmFactory.initialize(conf, layoutManager, EtcdLedgerManagerFactory.VERSION,
- LedgerMetadataSerDe.CURRENT_METADATA_FORMAT_VERSION);
+ lmFactory.initialize(conf, layoutManager, EtcdLedgerManagerFactory.VERSION);
} catch (IOException ioe) {
throw new MetadataException(
Code.METADATA_SERVICE_ERROR, "Failed to initialize ledger manager factory", ioe);
diff --git a/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/EtcdLedgerManagerTest.java b/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/EtcdLedgerManagerTest.java
index 30877f7d5a..984224c6b8 100644
--- a/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/EtcdLedgerManagerTest.java
+++ b/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/EtcdLedgerManagerTest.java
@@ -55,7 +55,6 @@
import org.apache.bookkeeper.common.concurrent.FutureUtils;
import org.apache.bookkeeper.meta.LedgerManager.LedgerRange;
import org.apache.bookkeeper.meta.LedgerManager.LedgerRangeIterator;
-import org.apache.bookkeeper.meta.LedgerMetadataSerDe;
import org.apache.bookkeeper.metadata.etcd.helpers.ValueStream;
import org.apache.bookkeeper.metadata.etcd.testing.EtcdTestBase;
import org.apache.bookkeeper.net.BookieSocketAddress;
@@ -82,8 +81,7 @@
public void setUp() throws Exception {
super.setUp();
this.scope = RandomStringUtils.randomAlphabetic(8);
- this.lm = new EtcdLedgerManager(etcdClient, scope,
- LedgerMetadataSerDe.CURRENT_METADATA_FORMAT_VERSION);
+ this.lm = new EtcdLedgerManager(etcdClient, scope);
}
@Override
diff --git a/tests/shaded/distributedlog-core-shaded-test/src/test/java/org/apache/bookkeeper/tests/shaded/DistributedLogCoreShadedJarTest.java b/tests/shaded/distributedlog-core-shaded-test/src/test/java/org/apache/bookkeeper/tests/shaded/DistributedLogCoreShadedJarTest.java
index 26230ec7a0..6432c303a2 100644
--- a/tests/shaded/distributedlog-core-shaded-test/src/test/java/org/apache/bookkeeper/tests/shaded/DistributedLogCoreShadedJarTest.java
+++ b/tests/shaded/distributedlog-core-shaded-test/src/test/java/org/apache/bookkeeper/tests/shaded/DistributedLogCoreShadedJarTest.java
@@ -179,7 +179,7 @@ private void testShadeLedgerManagerFactoryAllowed(String factoryClassName,
when(manager.readLedgerLayout()).thenReturn(layout);
LedgerManagerFactory factory = mock(LedgerManagerFactory.class);
- when(factory.initialize(any(AbstractConfiguration.class), same(manager), anyInt(), anyInt()))
+ when(factory.initialize(any(AbstractConfiguration.class), same(manager), anyInt()))
.thenReturn(factory);
PowerMockito.mockStatic(ReflectionUtils.class);
when(ReflectionUtils.newInstance(any(Class.class)))
@@ -191,7 +191,7 @@ private void testShadeLedgerManagerFactoryAllowed(String factoryClassName,
if (allowShaded) {
assertSame(factory, result);
verify(factory, times(1))
- .initialize(any(AbstractConfiguration.class), same(manager), anyInt(), anyInt());
+ .initialize(any(AbstractConfiguration.class), same(manager), anyInt());
} else {
fail("Should fail to instantiate ledger manager factory if allowShaded is false");
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services