Skip to content

Commit b8ed385

Browse files
russelldbrusselldb
committed
Remove riak-search, Makefile changes for test, and deps twiddling (#931)
* Remove vestiges of riak_search * label edges of dep graph by version * Add "special" deps for make test Some deps (riak_ensemble, meck, webmachine) don't work with the previous `make test` command. riak_ensemble requires it's own script that runs each test in it's own vm. webmachine has special test deps that it grabs locally, and meck is meck (it has deps it expects to be in meck/deps at test time.) All these could be addressed by a move to rebar3 I think (in the future.) NOTE: there is a risk/problem around the versions of deps in the riak_ensemble and webmachine deps and those shipped via locked-deps. Care will have to be taken. * Add repl into release config. * Add riak-repl script. * Make rel/devrel use locked-deps add a lock file * Hamcrest is also special * Revert "label edges of dep graph by version" This reverts commit 04b2e64. Bryan already added and merged it, and this is simpler than resolving the conflict * Bump lock for merged 2.2.5->2.2
1 parent c14124c commit b8ed385

File tree

9 files changed

+52
-93
lines changed

9 files changed

+52
-93
lines changed

‎Makefile‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ BASE_DIR = $(shell pwd)
66
ERLANG_BIN = $(shell dirname $(shell which erl 2>/dev/null) 2>/dev/null)
77
REBAR ?= $(BASE_DIR)/rebar
88
OVERLAY_VARS ?=
9+
SPECIAL_DEPS ?= meck hamcrest riak_ensemble webmachine
910

1011
RIAK_CORE_STAT_PREFIX = riak
1112
export RIAK_CORE_STAT_PREFIX
@@ -57,11 +58,15 @@ testclean:
5758
@rm -f $(TEST_LOG_FILE)
5859

5960
# Test each dependency individually in its own VM
60-
test: deps compile testclean
61+
test : deps compile testclean
6162
@$(foreach dep, \
62-
$(wildcard deps/*), \
63-
(cd $(dep) && ../../rebar eunit deps_dir=.. skip_deps=true) \
64-
|| echo "Eunit: $(notdir $(dep)) FAILED" >> $(TEST_LOG_FILE);)
63+
$(filter-out $(SPECIAL_DEPS), $(patsubst deps/%, %, $(wildcard deps/*))), \
64+
(cd deps/$(dep) && REBAR_DEPS_DIR=$(BASE_DIR)/deps/ ../../rebar eunit deps_dir=.. skip_deps=true) \
65+
|| echo "Eunit: $(dep) FAILED" >> $(TEST_LOG_FILE);)
66+
@$(foreach special, \
67+
$(SPECIAL_DEPS), \
68+
(cd deps/$(special) && make test) \
69+
|| echo "Eunit: $(special) FAILED" >> $(TEST_LOG_FILE);)
6570
./rebar eunit skip_deps=true
6671
@if test -s $(TEST_LOG_FILE) ; then \
6772
cat $(TEST_LOG_FILE) && \

‎pkg.vars.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{package_install_user, "riak"}.
1010
{package_install_group, "riak"}.
1111
{package_install_user_desc, "Riak user"}.
12-
{package_commands, {list, [[{name, "riak"}], [{name, "riak-admin"}], [{name, "search-cmd"}], [{name, "riak-repl"}], [{name, "riak-debug"}]]}}.
12+
{package_commands, {list, [[{name, "riak"}], [{name, "riak-admin"}], [{name, "riak-repl"}], [{name, "riak-debug"}]]}}.
1313
{package_shortdesc, "Riak is a distributed data store"}.
1414
{package_desc, "Riak is a distributed data store"}.
1515
{bin_or_sbin, "sbin"}.

‎rebar.config‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,17 @@
1212
{erlydtl_opts, [
1313
{compiler_options, [report, return, debug_info]}
1414
]}.
15-
15+
1616
{deps, [
1717
{node_package, ".*", {git, "https://github.com/basho/node_package.git", {tag, "4.0.2"}}},
1818
{lager_syslog, ".*", {git, "git://github.com/basho/lager_syslog.git", {tag, "3.0.3"}}},
1919
{cluster_info, ".*", {git, "git://github.com/basho/cluster_info.git", {tag, "2.0.5"}}},
20-
{riak_kv, ".*", {git, "git://github.com/basho/riak_kv.git", {tag, "2.1.7"}}},
21-
{riak_search, ".*", {git, "git://github.com/basho/riak_search.git", {tag, "2.1.6"}}},
22-
{riak_control, ".*", {git, "git://github.com/basho/riak_control.git", {tag, "2.1.6"}}},
23-
{riak_repl, ".*", {git, "git://github.com/basho/riak_repl.git", {tag, "2.1.8"}}},
20+
{riak_kv, ".*", {git, "git://github.com/basho/riak_kv.git", {branch, "develop-2.2"}}},
21+
{riak_control, ".*", {git, "git://github.com/basho/riak_control.git", {branch, "develop-2.2"}}},
2422
{riaknostic, ".*", {git, "git://github.com/basho/riaknostic.git", {tag, "2.1.7"}}},
25-
{yokozuna, ".*", {git, "git://github.com/basho/yokozuna.git", {tag, "2.1.10"}}},
23+
{yokozuna, ".*", {git, "git://github.com/basho/yokozuna.git", {branch, "develop-2.2"}}},
2624
{riak_auth_mods, ".*", {git, "git://github.com/basho/riak_auth_mods.git", {tag, "2.1.0"}}},
25+
{riak_repl, ".*", {git, "git://github.com/basho/riak_repl.git", {branch, "develop-2.2"}}},
2726
{rebar_lock_deps_plugin, ".*", {git, "https://github.com/basho/rebar_lock_deps_plugin.git", {tag, "3.1.0p1"}}}
2827
]}.
2928

‎rebar.config.lock‎

Lines changed: 34 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"d61d05534e3eaddff6e53d817d36c1c9f8f04cae"}},
2828
{sidejob,".*",
2929
{git,"git://github.com/basho/sidejob.git",
30-
"8ac680320cd2caa39a02e24b7f59bbe82a64222e"}},
30+
"891f58b17932e7a092115641fce1f677587ce278"}},
3131
{erlang_js,".*",
3232
{git,"git://github.com/basho/erlang_js.git",
3333
"07467d899ab90a2b719ad19ab0be0048c1c8d873"}},
@@ -57,22 +57,22 @@
5757
"846b9cc22456287a572efd4c924203d77778670f"}},
5858
{poolboy,".*",
5959
{git,"git://github.com/basho/poolboy.git",
60-
"8bb45fbc715c5f493642a1cc572ec7017d0d5fa3"}},
60+
"66a70a8df949349371e20b50d3b6bda8e9520ab2"}},
6161
{basho_stats,".*",
6262
{git,"git://github.com/basho/basho_stats.git",
63-
"19c532af235ae675439d491b329c55c2f9b02deb"}},
63+
"2ebff3f5608c05302a0268581f2b20d7fe790134"}},
6464
{riak_sysmon,".*",
6565
{git,"https://github.com/basho/riak_sysmon.git",
6666
"0ab94b3186ff67501b833543f0c3f52be5b7ca7a"}},
6767
{eleveldb,".*",
6868
{git,"git://github.com/basho/eleveldb.git",
69-
"55abc570e72cfce352c852ac7cc57a334e296b09"}},
69+
"c565e46c911f5b73636c925282c353ff76dfe4a0"}},
7070
{riak_ensemble,".*",
7171
{git,"https://github.com/basho/riak_ensemble",
72-
"70fa19abdb322dacfb2dea10b24038626b0f58a7"}},
72+
"3a8c3d1bbe2cbe3df6ec599c19627d7160036873"}},
7373
{pbkdf2,".*",
7474
{git,"git://github.com/basho/erlang-pbkdf2.git",
75-
"7076584f5377e98600a7e2cb81980b2992fb2f71"}},
75+
"7dfc96e4acdc4fba7893db7859130f4650bcec9e"}},
7676
{parse_trans,".*",
7777
{git,"git://github.com/basho/parse_trans.git",
7878
"4517dfc096908995b479d6d9ed8284315e68b076"}},
@@ -87,31 +87,34 @@
8787
"51ee7c9f64d2bbe9dcbb58c278e8fbfd4d0ca5e2"}},
8888
{exometer_core,".*",
8989
{git,"git://github.com/basho/exometer_core.git",
90-
"fcc866272b6e521e42f8cd12428c6c4139a68e9d"}},
90+
"4c43c777266fbf95cb83d2cf50afc555e5e3a7ec"}},
9191
{clique,".*",
9292
{git,"https://github.com/basho/clique.git",
93-
"e7114e92fac54b5f094295cfafc8ff7572d55d4a"}},
93+
"baed0a08165d08e7c6e363996e1fc3e5bef8e0cf"}},
9494
{riak_core,".*",
9595
{git,"git://github.com/basho/riak_core.git",
96-
"b8a11b4ef132d26d8f342b4d3553396c4577a2eb"}},
96+
"9e9e734a77dd352d71644fd92fc8c16b8d3dd89e"}},
9797
{riak_pipe,".*",
9898
{git,"git://github.com/basho/riak_pipe.git",
99-
"8b2c842c8ef88cfc3053ceb9bb388f2a4ae93749"}},
99+
"fa1bc6775d9f302757fa18efcbe9ca91e8900f4c"}},
100100
{riak_dt,".*",
101101
{git,"git://github.com/basho/riak_dt.git",
102-
"9450044a2ef24c8c2aed9efce5f6f011c750cba0"}},
102+
"fa48c459a646eaf29a51642993fff095077782bc"}},
103103
{eunit_formatters,".*",
104104
{git,"git://github.com/seancribbs/eunit_formatters",
105105
"96b6ced4d45ba641cbf2c8a8ae9b350dd300bc10"}},
106106
{protobuffs,".*",
107107
{git,"https://github.com/basho/erlang_protobuffs.git",
108-
"0dde9d3b37b7bec3a4dfb0e87684dd7039e169ab"}},
108+
"cc398f49c233d0031392486c110785502f614e44"}},
109109
{hamcrest,".*",
110110
{git,"https://github.com/basho/hamcrest-erlang.git",
111-
"98bc7aa19ea081478c816824aa05fc5a48acae66"}},
111+
"74f7b02d4122c8bb9166886295c87b7f0195b745"}},
112112
{riak_pb,".*",
113113
{git,"git://github.com/basho/riak_pb.git",
114-
"f5af9ffe04eb27689d483509de26574bdf70343f"}},
114+
"ba892ebf8a8858f064db899a9d2a28b56dec55b2"}},
115+
{ibrowse,".*",
116+
{git,"git://github.com/cmullaparthi/ibrowse.git",
117+
"e8ae353c16d4f0897abb9f80025b52925b974dd1"}},
115118
{mochiweb,".*",
116119
{git,"git://github.com/basho/mochiweb.git",
117120
"4d3882181d0e0e507a05115782a2b091a1db2be4"}},
@@ -120,7 +123,7 @@
120123
"494d14fa951816051732324bd324019b99dbc2e0"}},
121124
{riak_api,".*",
122125
{git,"git://github.com/basho/riak_api.git",
123-
"a678e25b23f0985d95439136e091728c4b9178a2"}},
126+
"82c82006356693e3d4a7539470321fb4271f3216"}},
124127
{proper,".*",
125128
{git,"https://github.com/basho/proper.git",
126129
"f5589897de7d87fedf71e8a8298cdfdebb665832"}},
@@ -132,55 +135,46 @@
132135
"f6ed834cd8799623ec00faaedc9ef2a55876d5d8"}},
133136
{riak_kv,".*",
134137
{git,"git://github.com/basho/riak_kv.git",
135-
"bd8e312f38568456dba28c987617979c30221460"}},
136-
{merge_index,".*",
137-
{git,"git://github.com/basho/merge_index.git",
138-
"c5efac6d3ccf6ee976978e21697016bfbec2265c"}},
139-
{riak_search,".*",
140-
{git,"git://github.com/basho/riak_search.git",
141-
"0d398f214d89b8a4a2c1c42bd6bff82f6a18dc9a"}},
138+
"8f8e93002b5ec50878c7172d207831935dabeadd"}},
142139
{erlydtl,".*",
143140
{git,"git://github.com/erlydtl/erlydtl.git",
144141
"d20b53f04837a1053ed18987f645cb60eae82453"}},
145142
{riak_control,".*",
146143
{git,"git://github.com/basho/riak_control.git",
147144
"cbf605a9eb476b8539c87e2f5c36f9d76c352b4a"}},
148-
{ranch,".*",
149-
{git,"git://github.com/basho/ranch.git",
150-
"3f70e09efe992bbe1989d40812eded936cd2a0e1"}},
151-
{ebloom,".*",
152-
{git,"git://github.com/basho/ebloom.git",
153-
"0b615927ecc04b3de0e4e35389431aed64498acb"}},
154-
{riak_repl_pb_api,".*",
155-
{git,"git://github.com/basho/riak_repl_pb_api.git",
156-
"8b729ac46c059c3a3451090dd8fa3c0e67509010"}},
157-
{riak_repl,".*",
158-
{git,"git://github.com/basho/riak_repl.git",
159-
"a41ac02182c993c662f316015224c4f615a5156b"}},
160145
{riaknostic,".*",
161146
{git,"git://github.com/basho/riaknostic.git",
162147
"dad8939d0ef32fbf435d13697720223293195282"}},
163148
{kvc,".*",
164149
{git,"git://github.com/etrepum/kvc.git",
165150
"5565fe51857747662410cc3c06362ebcf48a2f04"}},
166-
{ibrowse,".*",
167-
{git,"git://github.com/cmullaparthi/ibrowse.git",
168-
"e8ae353c16d4f0897abb9f80025b52925b974dd1"}},
169151
{fuse,".*",
170-
{git,"git://github.com/jlouis/fuse.git",
152+
{git,"https://github.com/jlouis/fuse.git",
171153
"21c6e52ced3af294f2fe636039106068da12eeeb"}},
172154
{riakc,".*",
173155
{git,"git://github.com/basho/riak-erlang-client",
174-
"a5ff1cb07f54245e2d0296ac7bc49ffaf4104440"}},
156+
"9bda9ba96a91ce4898dd14477198fcff9a1393de"}},
175157
{yokozuna,".*",
176158
{git,"git://github.com/basho/yokozuna.git",
177-
"b53d999529626301c36fa3efa22b2b0165217556"}},
159+
"7816990caa6fbf48704476a0108809d22ad36793"}},
178160
{canola,".*",
179161
{git,"git://github.com/basho/canola.git",
180162
"9bdfee88fce20b3a01b7003696b53eb21913d6fb"}},
181163
{riak_auth_mods,".*",
182164
{git,"git://github.com/basho/riak_auth_mods.git",
183165
"31b8b30e6c215418522eaa615264ae9769a87410"}},
166+
{ranch,".*",
167+
{git,"git://github.com/basho/ranch.git",
168+
"3f70e09efe992bbe1989d40812eded936cd2a0e1"}},
169+
{ebloom,".*",
170+
{git,"git://github.com/basho/ebloom.git",
171+
"0b615927ecc04b3de0e4e35389431aed64498acb"}},
172+
{riak_repl_pb_api,".*",
173+
{git,"[email protected]:basho/riak_repl_pb_api.git",
174+
"8b729ac46c059c3a3451090dd8fa3c0e67509010"}},
175+
{riak_repl,".*",
176+
{git,"git://github.com/basho/riak_repl.git",
177+
"a41ac02182c993c662f316015224c4f615a5156b"}},
184178
{rebar_lock_deps_plugin,".*",
185179
{git,"https://github.com/basho/rebar_lock_deps_plugin.git",
186180
"8816f45ff38cd04d5c7741bd39166af58116dd44"}}]}.

‎rel/files/search-cmd‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎rel/gen_dev‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ NAME=$1
99
TEMPLATE=$2
1010
VARFILE=$3
1111

12-
## Allocate 10 ports per node
12+
## Allocate some ports per node
1313
## .
1414
## .7 - http
1515
NODE="$NAME@127.0.0.1"

‎rel/reltool.config‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-
22
%% ex: ft=erlang ts=4 sw=4 et
33
{sys, [
4-
{lib_dirs, ["../deps", "../deps/riak_search/apps"]},
5-
{rel, "riak", "2.2.4",
4+
{lib_dirs, ["../deps"]},
5+
{rel, "riak", "2.2.5",
66
[
77
kernel,
88
stdlib,
@@ -25,7 +25,6 @@
2525
riak_core,
2626
riak_pipe,
2727
riak_kv,
28-
riak_search,
2928
riak_api,
3029
yokozuna,
3130
riak_repl,
@@ -61,7 +60,6 @@
6160
{app, riak_core, [{incl_cond, include}]},
6261
{app, riak_pipe, [{incl_cond, include}]},
6362
{app, riak_kv, [{incl_cond, include}]},
64-
{app, riak_search, [{incl_cond, include}]},
6563
{app, yokozuna, [{incl_cond, include}]},
6664
{app, riak_repl, [{incl_cond, include}]},
6765
{app, eper, [{incl_cond, include}]},
@@ -122,15 +120,13 @@
122120
{template, "../deps/riak_kv/priv/multi_backend.schema", "lib/20-multi_backend.schema"},
123121
{template, "../deps/eleveldb/priv/eleveldb.schema", "lib/21-leveldb.schema"},
124122
{template, "../deps/eleveldb/priv/eleveldb_multi.schema", "lib/22-leveldb_multi.schema"},
125-
{template, "../deps/riak_search/priv/riak_search.schema", "lib/29-riak_search.schema"},
126123
{template, "../deps/yokozuna/priv/yokozuna.schema", "lib/30-yokozuna.schema"},
127124

128125
{template, "files/advanced.config", "etc/advanced.config"},
129126

130127
%% Copy additional bin scripts
131128
{template, "files/riak-admin", "bin/riak-admin"},
132129
{template, "files/riak-debug", "bin/riak-debug"},
133-
{template, "files/search-cmd", "bin/search-cmd"},
134130
{template, "files/riak-repl", "bin/riak-repl"},
135131

136132
{mkdir, "lib/basho-patches"},

‎rel/vars.config‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424
{sasl_log_dir, "{{platform_log_dir}}/sasl"}.
2525
{repl_data_root, "{{platform_data_dir}}/riak_repl/"}.
2626

27-
%% riak_search
28-
{merge_index_data_root, "{{platform_data_dir}}/merge_index"}.
29-
3027
%% lager
3128
{console_log_default, file}.
3229

‎rel/vars/dev_vars.config.src‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
{sasl_log_dir, "{{platform_log_dir}}/sasl"}.
2727
{repl_data_root, "{{platform_data_dir}}/riak_repl/"}.
2828

29-
%% riak_search
30-
{merge_index_data_root, "{{platform_data_dir}}/merge_index"}.
31-
3229
%% lager
3330
{console_log_default, both}.
3431

0 commit comments

Comments
 (0)