Merge pull request #927 from basho/mcx/add-riak-repl-dependency

Add repl dependency

RELEASE-NOTES.md

@@ -1,3 +1,6 @@
+#Riak KV 2.2.4 Release Notes
+Including riak_repl as a dep of open-source Riak. No changes other than the inclusion of the dependency and updating the release config.
+
 #Riak KV 2.2.3 Release Notes
 http://docs.basho.com/riak/kv/2.2.3/release-notes/
 

pkg.vars.config

@@ -9,7 +9,7 @@
 {package_install_user, "riak"}.
 {package_install_group, "riak"}.
 {package_install_user_desc, "Riak user"}.
-{package_commands, {list, [[{name, "riak"}], [{name, "riak-admin"}], [{name, "search-cmd"}], [{name, "riak-debug"}]]}}.
+{package_commands, {list, [[{name, "riak"}], [{name, "riak-admin"}], [{name, "search-cmd"}], [{name, "riak-repl"}], [{name, "riak-debug"}]]}}.
 {package_shortdesc, "Riak is a distributed data store"}.
 {package_desc, "Riak is a distributed data store"}.
 {bin_or_sbin, "sbin"}.

rebar.config

@@ -20,8 +20,9 @@
         {riak_kv, ".*", {git, "git://github.com/basho/riak_kv.git", {tag, "2.1.7"}}},
         {riak_search, ".*", {git, "git://github.com/basho/riak_search.git", {tag, "2.1.6"}}},
         {riak_control, ".*", {git, "git://github.com/basho/riak_control.git", {tag, "2.1.6"}}},
+        {riak_repl, ".*", {git, "git://github.com/basho/riak_repl.git", {tag, "2.1.8"}}},
         {riaknostic, ".*", {git, "git://github.com/basho/riaknostic.git", {tag, "2.1.7"}}},
-        {yokozuna, ".*", {git, "git://github.com/basho/yokozuna.git", {branch, "develop-2.2"}}},
+        {yokozuna, ".*", {git, "git://github.com/basho/yokozuna.git", {tag, "2.1.10"}}},
         {riak_auth_mods, ".*", {git, "git://github.com/basho/riak_auth_mods.git", {tag, "2.1.0"}}},
         {rebar_lock_deps_plugin, ".*", {git, "https://github.com/basho/rebar_lock_deps_plugin.git", {tag, "3.1.0p1"}}}
        ]}.

rebar.config.lock

@@ -145,6 +145,18 @@
        {riak_control,".*",
                      {git,"git://github.com/basho/riak_control.git",
                           "cbf605a9eb476b8539c87e2f5c36f9d76c352b4a"}},
+       {ranch,".*",
+              {git,"git://github.com/basho/ranch.git",
+                   "3f70e09efe992bbe1989d40812eded936cd2a0e1"}},
+       {ebloom,".*",
+               {git,"git://github.com/basho/ebloom.git",
+                    "0b615927ecc04b3de0e4e35389431aed64498acb"}},
+       {riak_repl_pb_api,".*",
+                         {git,"git://github.com/basho/riak_repl_pb_api.git",
+                              "8b729ac46c059c3a3451090dd8fa3c0e67509010"}},
+       {riak_repl,".*",
+                  {git,"git://github.com/basho/riak_repl.git",
+                       "a41ac02182c993c662f316015224c4f615a5156b"}},
        {riaknostic,".*",
                    {git,"git://github.com/basho/riaknostic.git",
                         "dad8939d0ef32fbf435d13697720223293195282"}},

rel/files/advanced.config

@@ -1,6 +1,86 @@
-%% Config file used to set advanced configuration options
+[
+ {riak_core,
+  [
+   %% The cluster manager will listen for connections from remote
+   %% clusters on this ip and port. Every node runs one cluster
+   %% manager, but only the cluster manager running on the
+   %% cluster_leader will service requests. This can change as nodes
+   %% enter and leave the cluster.
+   {cluster_mgr, {"{{cluster_manager_ip}}", {{cluster_manager_port}} } }
+  ]},
 
-[{lager,
+ {riak_repl,
+  [
+   %% Path (relative or absolute) to the working directory for the
+   %% replication process
+   {data_root, "{{repl_data_root}}"},
+
+   %% The hard limit of fullsync workers that will be running on the
+   %% source side of a cluster across all nodes on that cluster for a
+   %% fullsync to a sink cluster. This means if one has configured
+   %% fullsync for two different clusters, both with a
+   %% max_fssource_cluster of 5, 10 fullsync workers can be in
+   %% progress. Only affects nodes on the source cluster on which this
+   %% parameter is defined via the configuration file or command line.
+   {max_fssource_cluster, 5},
+
+   %% Limits the number of fullsync workers that will be running on
+   %% each individual node in a source cluster. This is a hard limit for
+   %% all fullsyncs enabled; additional fullsync configurations will not
+   %% increase the number of fullsync workers allowed to run on any node.
+   %% Only affects nodes on the source cluster on which this parameter is
+   %% defined via the configuration file or command line.
+   {max_fssource_node, 1},
+
+   %% Limits the number of fullsync workers allowed to run on each
+   %% individual node in a sink cluster. This is a hard limit for all
+   %% fullsync sources interacting with the sink cluster. Thus, multiple
+   %% simultaneous source connections to the sink cluster will have to
+   %% share the sink node's number of maximum connections. Only affects
+   %% nodes on the sink cluster on which this parameter is defined via
+   %% the configuration file or command line.
+   {max_fssink_node, 1},
+
+   %% Whether to initiate a fullsync on initial connection from the
+   %% sink cluster.
+   {fullsync_on_connect, true},
+
+   %% A single integer value representing the duration to wait in
+   %% minutes between fullsyncs, or a list of {clustername,
+   %% time_in_minutes} pairs for each sink participating in fullsync
+   %% replication.
+   {fullsync_interval, 30},
+
+   %% The maximum size the realtime replication queue can grow to
+   %% before new objects are dropped. Defaults to 100MB. Dropped
+   %% objects will need to be replication with a fullsync.
+   {rtq_max_bytes, 104857600},
+
+   %% Enable Riak CS proxy_get and block filter.
+   {proxy_get, disabled},
+
+   %% A heartbeat message is sent from the source to the sink every
+   %% heartbeat_interval. Setting heartbeat_interval to undefined
+   %% disables the realtime heartbeat. This feature is only available in
+   %% Riak Enterprise 1.3.2+.
+   {rt_heartbeat_interval, 15},
+
+   %% If a heartbeat response is not received in rt_heartbeat_timeout
+   %% seconds, then the source connection exits and will be
+   %% re-established. This feature is only available in Riak
+   %% Enterprise 1.3.2+.
+   {rt_heartbeat_timeout, 15},
+
+   %% By default, fullsync replication will try to coordinate with
+   %% other riak subsystems that may be contending for the same
+   %% resources. This will help to prevent system response degradation
+   %% under times of heavy load from multiple background tasks. To
+   %% disable background coordination, set this parameter to false.
+   %% Enterprise 2.0+.
+   {fullsync_use_background_manager, true}
+  ]},
+
+  {lager,
    [
       {extra_sinks,
            [
@@ -19,4 +99,5 @@
             ]
       }
     ]
-}].
+}
+].

rel/files/riak-debug

@@ -481,6 +481,9 @@ if [ 1 -eq $get_riakcmds ]; then
     dump riak_search_aae_status "$riak_bin_dir"/riak-admin search aae-status
     dump riak_diag "$riak_bin_dir"/riak-admin diag
     dump riak_repl_status "$riak_bin_dir"/riak-repl status
+    dump riak_repl_connections "$riak_bin_dir"/riak-repl connections
+    dump riak_repl_clusterstats "$riak_bin_dir"/riak-repl clusterstats
+    dump riak_repl_modes "$riak_bin_dir"/riak-repl modes
 
     # Make a flat, easily searchable version of the app.config settings
     riak_epaths=`make_app_epaths "${riak_app_config}"`