Develop 3.0 riak stat

Makefile

@@ -81,6 +81,9 @@ test : test-deps
 rel: locked-deps compile
 	$(REBAR) as rel release
 
+rel-rpm: locked-deps compile
+	$(REBAR) as rel,rpm release
+
 relclean:
 	rm -rf $(REL_DIR)
 	rm -rf rel/riak
@@ -256,11 +259,7 @@ get_dist_deps = mkdir distdir && \
 #   This enables the toplevel repository package to change names
 #   when underlying dependencies change.
 NAME_HASH = $(shell git hash-object distdir/$(CLONEDIR)/$(MANIFEST_FILE) 2>/dev/null | cut -c 1-8)
-ifeq ($(REVISION), $(MAJOR_VERSION))
 PKG_ID := $(REPO_TAG)
-else
-PKG_ID = $(REPO)-$(MAJOR_VERSION)-$(NAME_HASH)
-endif
 
 # To ensure a clean build, copy the CLONEDIR at a specific tag to a new directory
 #  which will be the basis of the src tar file (and packages)
@@ -305,9 +304,13 @@ pkgclean: ballclean
 # which differs from $REVISION that is repo-<commitcount>-<commitsha>
 PKG_VERSION = $(shell echo $(PKG_ID) | sed -e 's/^$(REPO)-//')
 
-package: distdir/$(PKG_ID).tar.gz
-	ln -s distdir package
-	$(MAKE) -C package -f $(PKG_ID)/deps/node_package/Makefile
+package:
+	git archive --format=tar HEAD | gzip >rel/pkg/out/riak-$(PKG_ID).tar.gz
+	$(MAKE) -C rel/pkg/ -f Makefile
+
+packageclean:
+	rm -rf rel/pkg/out/*
+
 
 .PHONY: package
 export PKG_VERSION PKG_ID PKG_BUILD BASE_DIR ERLANG_BIN REBAR OVERLAY_VARS RELEASE

apps/riak/src/riak.app.src

@@ -17,9 +17,12 @@
        runtime_tools,
        lager_syslog,
        cluster_info,
-       riak_kv,
+       cluster_metadata,
+%%	exometer_core,
+	stats,
+	riak_kv,
        riak_repl,
        riak_auth_mods
-       ]},
+   ]},
    {env, []}
   ]}.

rebar.config

@@ -13,14 +13,15 @@
 {deps, [
         {lager_syslog, {git, "git://github.com/basho/lager_syslog.git", {branch, "develop-3.0"}}},
         {cluster_info, {git, "git://github.com/basho/cluster_info.git", {branch, "develop-3.0"}}},
-        {riak_kv, {git, "git://github.com/basho/riak_kv.git", {branch, "develop-3.0"}}},
+        {riak_kv, {git, "git://github.com/basho/riak_kv.git", {branch, "develop-3.0-riak_stat"}}},
         {riak_auth_mods, {git, "git://github.com/basho/riak_auth_mods.git", {branch, "develop-3.0"}}},
-        {riak_repl, {git, "git://github.com/basho/riak_repl.git", {branch, "develop-3.0"}}},
-        {yokozuna, {git, "git://github.com/basho/yokozuna.git", {branch, "develop-3.0"}}}
-      ]}.
+        {riak_repl, {git, "git://github.com/basho/riak_repl.git", {branch, "develop-3.0-riak_stat"}}},
+        {yokozuna, {git, "git://github.com/basho/yokozuna.git", {branch, "develop-3.0-stats-work"}}}
+
+]}.
 
 {project_plugins, [
-    {rebar3_cuttlefish, {git, "https://github.com/martincox/rebar3_cuttlefish", {branch, "fix/output-dir-awareness"}}}
+    {rebar3_cuttlefish, {git, "https://github.com/martincox/rebar3_cuttlefish", {branch, "fix/runner_dirs"}}}
 ]}.
 
 {cuttlefish, [
@@ -60,20 +61,23 @@
      basho_stats,
      bitcask,
      clique,
+     cluster_metadata,
+     stats,
      riak_core,
      riak_pipe,
      riak_kv,
      riak_api,
      riak_repl,
      cluster_info,
-     yokozuna,
+   %  yokozuna,
      riak_auth_mods]},
 
     {dev_mode, false},
     {include_erts, true},
 
     {overlay, [
-         {mkdir, "lib/riak-patches"},
+         {mkdir, "lib/patches"},
+         {mkdir, "data/ring"},
 
          {template, "rel/files/advanced.config", "etc/advanced.config"},
 
@@ -82,6 +86,7 @@
          {template, "rel/files/riak-debug",        "bin/riak-debug"},
          {template, "rel/files/riak-chkconfig",    "bin/riak-chkconfig"},
          {template, "rel/files/riak-repl",         "bin/riak-repl"},
+         {template, "_checkouts/stats/rel/files/stats","bin/riak-stat"},
 
          {copy, "rel/files/check_ulimit", "bin/hooks/check_ulimit"},
          {copy, "rel/files/riak_not_running", "bin/hooks/riak_not_running"}
@@ -91,6 +96,7 @@
     {generate_start_script, true},
     {extended_start_script, true},
     {extended_start_script_extensions, [
+        {stat, "riak-stat"},
         {admin, "riak-admin"},
         {debug, "riak-debug"},
         {repl, "riak-repl"},
@@ -113,12 +119,25 @@
 {profiles, [
     {rel, [
         {relx, [
-            {overlay_vars, "rel/vars.config"}
+          {overlay_vars, "rel/vars.config"}
         ]}
     ]},
     {dev, [
         {relx, [
-            {dev_mode, true}
+                {dev_mode, true}
+        ]}
+    ]},
+    {rpm, [
+        {relx, [
+            {overlay_vars, "rpm.vars.config"},
+            {overlay, [
+                {template, "rel/pkg/rpm/riak", "usr/bin/riak"}
+            ]}
+        ]}
+    ]},
+    {deb, [
+        {relx, [
+            {overlay_vars, "deb.vars.config"}
         ]}
     ]}
 ]}.

rebar.lock

@@ -6,7 +6,7 @@
  {<<"bear">>,{pkg,<<"bear">>,<<"0.8.7">>},4},
  {<<"bitcask">>,
   {git,"git://github.com/basho/bitcask.git",
-       {ref,"9184f763b135f9ff5061fa3ce1892cefa54cfe3a"}},
+       {ref,"1bb4c98d0285fe6caa76b89d51c50f4e504d2554"}},
   1},
  {<<"canola">>,
   {git,"git://github.com/basho/canola.git",
@@ -20,10 +20,18 @@
   {git,"git://github.com/basho/cluster_info.git",
        {ref,"18ed572102055626c1597339015d6501989df287"}},
   0},
+ {<<"cluster_metadata">>,
+  {git,"https://github.com/bet365/cluster_metadata.git",
+       {ref,"5c09cc24bc727f57c985c96cebe602bd61f0b56d"}},
+  2},
  {<<"cuttlefish">>,
   {git,"https://github.com/basho/cuttlefish.git",
        {ref,"1b4381e5f682d88a2f20ddb8511ff35098c40ea5"}},
   3},
+ {<<"dvvset">>,
+  {git,"git://github.com/ricardobcl/dotted-version-vectors.git",
+       {ref,"27fd1225c10a7dc4890e5e55abddf6db2392f6cc"}},
+  3},
  {<<"ebloom">>,
   {git,"git://github.com/basho/ebloom.git",
        {ref,"3c25f9ef61a73d5f1d2c2601da464dd03975721d"}},
@@ -32,8 +40,11 @@
   {git,"git://github.com/basho/eleveldb.git",
        {ref,"5ca7491c947d24c764eb0a359370e83dcc0bb021"}},
   2},
- {<<"exometer_core">>,{pkg,<<"exometer_core">>,<<"1.5.7">>},2},
- {<<"folsom">>,{pkg,<<"folsom">>,<<"0.8.7">>},3},
+ {<<"eunit_formatters">>,
+  {git,"git://github.com/seancribbs/eunit_formatters",
+       {ref,"473e0cd89bf5608e97886a3bdf9047a16edc88f0"}},
+  1},
+ {<<"folsom">>,{pkg,<<"folsom">>,<<"0.8.8">>},3},
  {<<"fuse">>,
   {git,"https://github.com/jlouis/fuse.git",
        {ref,"21c6e52ced3af294f2fe636039106068da12eeeb"}},
@@ -44,18 +55,22 @@
        {ref,"880030ff0cbecb73ba75a78a7aa0cc1dcb7fe331"}},
   4},
  {<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},2},
- {<<"hut">>,{pkg,<<"hut">>,<<"1.2.1">>},3},
+ {<<"hashtree">>,
+  {git,"git://github.com/martincox/hashtree.git",
+       {ref,"267974bc81e7bcb0287038cd9accc61d4079d108"}},
+  3},
+ {<<"hut">>,{pkg,<<"hut">>,<<"1.3.0">>},3},
  {<<"hyper">>,
   {git,"git://github.com/basho/hyper",
        {ref,"d0bf3d67fd17b8ed2610b266aebd54b1027ea916"}},
   1},
  {<<"ibrowse">>,
-  {git,"git://github.com/basho/ibrowse.git",
-       {ref,"893864e25573b4ccd31a82b9412639751733ba40"}},
+  {git,"git://github.com/cmullaparthi/ibrowse.git",
+       {ref,"7529807170cf3c8f6a8c5c95526e670420ff591b"}},
   1},
  {<<"kv_index_tictactree">>,
   {git,"https://github.com/martinsumner/kv_index_tictactree.git",
-       {ref,"b2423eaf11493eb51fc8089a843f8c24d951404b"}},
+       {ref,"9c667cf656856877da9d9b84da120490d8196ae7"}},
   1},
  {<<"kvc">>,
   {git,"git://github.com/etrepum/kvc.git",
@@ -71,7 +86,7 @@
   0},
  {<<"leveled">>,
   {git,"https://github.com/martinsumner/leveled.git",
-       {ref,"432fe71bf09987f52fc407a776c23e8eca802451"}},
+       {ref,"4d550ef2a1a2b7ff6f6dd2dc28e3b1aed44cf21d"}},
   1},
  {<<"lz4">>,
   {git,"https://github.com/szktty/erlang-lz4",
@@ -102,18 +117,10 @@
   {git,"https://github.com/massemanet/redbug",
        {ref,"c583d4567d1e2b8a540593ad0512559798d42565"}},
   1},
- {<<"riak_api">>,
-  {git,"git://github.com/basho/riak_api.git",
-       {ref,"ada7e27a43ef3e98790df7b607f6dd0f0e4f13df"}},
-  1},
  {<<"riak_auth_mods">>,
   {git,"git://github.com/basho/riak_auth_mods.git",
        {ref,"a991fd05929237413a641b60fc826412f98e099e"}},
   0},
- {<<"riak_core">>,
-  {git,"git://github.com/basho/riak_core.git",
-       {ref,"b726b0b4c5bbef1a20b95d551d3e32f6dc8741b5"}},
-  1},
  {<<"riak_dt">>,
   {git,"git://github.com/basho/riak_dt.git",
        {ref,"cdf8cbf3009b7ecb4d659c1576a466cbefe47f55"}},
@@ -122,26 +129,18 @@
   {git,"https://github.com/basho/riak_ensemble",
        {ref,"495833f7a79bb43e288a2a36c9acddfd27e8d90f"}},
   2},
- {<<"riak_kv">>,
-  {git,"git://github.com/basho/riak_kv.git",
-       {ref,"56cb3a1737c373fe4b09ca03681f36e56928a034"}},
-  0},
  {<<"riak_pb">>,
   {git,"git://github.com/basho/riak_pb.git",
        {ref,"55fab3a2642edf2293228d5a43748a0fc3c8e554"}},
   1},
- {<<"riak_pipe">>,
-  {git,"git://github.com/basho/riak_pipe.git",
-       {ref,"98944cb1b83fa83ab6011e3958252061f48e2172"}},
+ {<<"riak_repl_pb_api">>,
+  {git,"git://github.com/basho/riak_repl_pb_api.git",
+       {ref,"6c9ce4abd1170ea77c2267addc18e0c5ad72bb1e"}},
   1},
- {<<"riak_repl">>,
-  {git,"git://github.com/basho/riak_repl.git",
-       {ref,"8fcc415e89e867ee85a79949869b2497172360a4"}},
-  0},
  {<<"riak_sysmon">>,{pkg,<<"riak_sysmon">>,<<"2.1.7">>},2},
  {<<"riakc">>,
   {git,"git://github.com/basho/riak-erlang-client",
-       {ref,"28b1349d2b9e0cf855baf8142a44815c116f39ad"}},
+       {ref,"302974b5e442ba6f01a89f81e6b393809200e5e4"}},
   1},
  {<<"setup">>,{pkg,<<"setup">>,<<"2.0.2">>},3},
  {<<"sext">>,
@@ -162,16 +161,15 @@
   2},
  {<<"yokozuna">>,
   {git,"git://github.com/basho/yokozuna.git",
-       {ref,"328265b5beff5e65f5353cd708e3b6b4cc8363cd"}},
+       {ref,"02d09d260f74eaa3c86256e822633509dcdfc1ee"}},
   0}]}.
 [
 {pkg_hash,[
  {<<"bear">>, <<"16264309AE5D005D03718A5C82641FCC259C9E8F09ADEB6FD79CA4271168656F">>},
- {<<"exometer_core">>, <<"AB97E34A5D69AB14E6AE161DB4CCA5B5E655E635B842F830EE6AB2CBFCFDC30A">>},
- {<<"folsom">>, <<"A885F0AEEE4C84270954C88A55A5A473D6B2C7493E32FFDC5765412DD555A951">>},
+ {<<"folsom">>, <<"9A2B02010F6727CB1948EF34E21CB66F3554B63355C3A31E8BCB10FB172C3170">>},
  {<<"gen_fsm_compat">>, <<"5903549F67D595F58A7101154CBE0FDD46955FBFBE40813F1E53C23A970FF5F4">>},
  {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
- {<<"hut">>, <<"08D46679523043424870723923971889E8A34D63B2F946A35B46CF921D1236E7">>},
+ {<<"hut">>, <<"71F2F054E657C03F959CF1ACC43F436EA87580696528CA2A55C8AFB1B06C85E7">>},
  {<<"parse_trans">>, <<"09765507A3C7590A784615CFD421D101AEC25098D50B89D7AA1D66646BC571C1">>},
  {<<"riak_sysmon">>, <<"AF420DF0F7569E1F12BCD465745164CB6189EB93F118D5CDB3F90FEB3F8BF47D">>},
  {<<"setup">>, <<"1203F4CDA11306C2E34434244576DED0A7BBFB0908D9A572356C809BD0CDF085">>}]}