Merge pull request #1702 from martinsumner/develop-2.9

Develop 2.9
basho · Jun 21, 2019 · eeeb143 · eeeb143
2 parents 1c725b3 + 41df89c
commit eeeb143
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/rebar.config b/rebar.config
@@ -35,8 +35,8 @@
         {riak_pipe, ".*", {git, "git://github.com/basho/riak_pipe.git", {tag, "riak_kv-2.9.0"}}},
         {riak_dt, ".*", {git, "git://github.com/basho/riak_dt.git", {tag, "2.1.3-225"}}},
         {eunit_formatters, ".*", {git, "git://github.com/seancribbs/eunit_formatters", {tag, "0.1.2"}}},
-        {leveled, ".*", {git, "https://github.com/martinsumner/leveled.git", {tag, "0.9.15"}}},
-	{kv_index_tictactree, ".*", {git, "https://github.com/martinsumner/kv_index_tictactree.git", {tag, "0.9.6"}}},
+        {leveled, ".*", {git, "https://github.com/martinsumner/leveled.git", {tag, "0.9.16"}}},
+	{kv_index_tictactree, ".*", {git, "https://github.com/martinsumner/kv_index_tictactree.git", {tag, "0.9.7"}}},
         {riak_core, ".*", {git, "https://github.com/basho/riak_core.git", {tag, "riak_kv-2.9.0"}}},
         {riak_api, ".*", {git, "git://github.com/basho/riak_api.git", {tag, "riak_kv-2.9.0"}}},
         {hyper, ".*", {git, "git://github.com/basho/hyper", {tag, "1.0.1"}}}

diff --git a/src/riak_kv_leveled_backend.erl b/src/riak_kv_leveled_backend.erl
@@ -123,6 +123,10 @@ start(Partition, Config) ->
 
     case get_data_dir(DataRoot, integer_to_list(Partition)) of
         {ok, DataDir} ->
+            {ok, CHBin} = riak_core_ring_manager:get_chash_bin(),
+            PartitionCount = chashbin:num_partitions(CHBin),
+            RingIndexInc = chash:ring_increment(PartitionCount),
+            DBid = Partition div RingIndexInc,
             StartOpts = [{root_path, DataDir},
                             {max_journalsize, MJS},
                             {cache_size, BCS},
@@ -132,6 +136,7 @@ start(Partition, Config) ->
                             {compression_point, CMP},
                             {log_level, LOL},
                             {max_run_length, MRL},
+                            {database_id, DBid},
                             {maxrunlength_compactionpercentage, MCP},
                             {singlefile_compactionpercentage, SCP},
                             {snapshot_timeout_short, TOS},