WT-2381 Rewrite LSM metadata to fix dump / load.

Include all of the WT_SESSION::create config in the ordinary LSM
metadata so it is merged correctly into the dump header.  Provide
an upgrade path for LSM metadata in the old format.

** Backwards bracking change for LSM: ** once metadata is upgraded
to the new format, LSM trees cannot be opened with older versions of
WiredTiger.

1 files changed, 18 insertions, 5 deletions

diff --git a/dist/api_data.py b/dist/api_data.py
index 0eee515e851..e57146fc4a5 100644
--- a/dist/api_data.py
+++ b/dist/api_data.py
@@ -76,12 +76,12 @@ lsm_config = [
         Config('bloom', 'true', r'''
             create bloom filters on LSM tree chunks as they are merged''',
             type='boolean'),
-        Config('bloom_config', '', r'''
-            config string used when creating Bloom filter files, passed
-            to WT_SESSION::create'''),
         Config('bloom_bit_count', '16', r'''
             the number of bits used per item for LSM bloom filters''',
             min='2', max='1000'),
+        Config('bloom_config', '', r'''
+            config string used when creating Bloom filter files, passed
+            to WT_SESSION::create'''),
         Config('bloom_hash_count', '8', r'''
             the number of hash values per item used for LSM bloom
             filters''',
@@ -299,6 +299,15 @@ file_meta = file_config + [
         the file version'''),
 ]
 
+lsm_meta = file_config + lsm_config + [
+    Config('last', '', r'''
+        the last allocated chunk ID'''),
+    Config('chunks', '', r'''
+        active chunks in the LSM tree'''),
+    Config('old_chunks', '', r'''
+        obsolete chunks in the LSM tree'''),
+]
+
 table_only_config = [
     Config('colgroups', '', r'''
         comma-separated list of names of column groups.  Each column
@@ -737,12 +746,16 @@ cursor_runtime_config = [
 ]
 
 methods = {
-'file.meta' : Method(file_meta),
-
 'colgroup.meta' : Method(colgroup_meta),
 
+'file.config' : Method(file_config),
+
+'file.meta' : Method(file_meta),
+
 'index.meta' : Method(index_meta),
 
+'lsm.meta' : Method(lsm_meta),
+
 'table.meta' : Method(table_meta),
 
 'WT_CURSOR.close' : Method([]),