From 58eb984f6c18f92037d8ebc5649871270fa6fb3c Mon Sep 17 00:00:00 2001
From: Rusty Klophaus <rklophaus@gmail.com>
Date: Mon, 1 Aug 2011 16:38:37 -0400
Subject: [PATCH] Update app.config files with alternate merge_index data_root
 setting for 2i.

AZ567
---
 package/rpm/SPECS/riak.spec | 3 ++-
 rel/files/app.config        | 5 ++++-
 rel/vars.config             | 3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/package/rpm/SPECS/riak.spec b/package/rpm/SPECS/riak.spec
index 04b5ca0a9..80b90dceb 100644
--- a/package/rpm/SPECS/riak.spec
+++ b/package/rpm/SPECS/riak.spec
@@ -44,7 +44,8 @@ cat > rel/vars.config <<EOF
 {ring_state_dir,        "%{platform_data_dir}/ring"}.
 {bitcask_data_root,     "%{platform_data_dir}/bitcask"}.
 {leveldb_data_root,     "%{platform_data_dir}/leveldb"}.
-{merge_index_data_root, "%{platform_data_dir}/merge_index"}.
+{merge_index_data_root,    "%{platform_data_dir}/merge_index"}.
+{merge_index_data_root_2i, "%{platform_data_dir}/merge_index_2i"}.
 {sasl_error_log,        "%{platform_log_dir}/sasl-error.log"}.
 {sasl_log_dir,          "%{platform_log_dir}/sasl"}.
 {mapred_queue_dir,      "%{platform_data_dir}/mr_queue"}.
diff --git a/rel/files/app.config b/rel/files/app.config
index 1e1c020ba..7a8768bff 100644
--- a/rel/files/app.config
+++ b/rel/files/app.config
@@ -132,9 +132,12 @@
 
  %% Merge Index Config
  {merge_index, [
-                %% The root dir to store merge_index data
+                %% The root dir to store search merge_index data
                 {data_root, "{{merge_index_data_root}}"},
 
+                %% The root dir to store secondary index merge_index data
+                {data_root_2i, "{{merge_index_data_root_2i}}"},
+
                 %% Size, in bytes, of the in-memory buffer.  When this
                 %% threshold has been reached the data is transformed
                 %% into a segment file which resides on disk.
diff --git a/rel/vars.config b/rel/vars.config
index fc0b031c3..3be32f0e2 100644
--- a/rel/vars.config
+++ b/rel/vars.config
@@ -26,6 +26,9 @@
 %% riak_search
 {merge_index_data_root,  "{{platform_data_dir}}/merge_index"}.
 
+%% secondary indices
+{merge_index_data_root_2i,  "{{platform_data_dir}}/merge_index_2i"}.
+
 %% Javascript VMs
 {map_js_vms,   8}.
 {reduce_js_vms, 6}.