Merge remote-tracking branch 'origin/riak_ts-develop' into bch-merge-ts-1.6-to-develop

Author: Brett Hazen

basho_builds.yml

@@ -0,0 +1,19 @@
+docker_rt_riak_test_config:
+  - version: current
+    product_version: current
+    product: "riak_ts{% if ee == 'true' %}_ee{% endif %}"
+  - version: previous
+    product_version: 1.5.2
+    product: "riak_ts{% if ee == 'true' %}_ee{% endif %}"
+  - version: legacy
+    product_version: 1.4.1
+    product: "riak_ts{% if ee == 'true' %}_ee{% endif %}"
+  - version: 2.0.2
+    product_version: 2.0.2
+    product: "riak{% if ee == 'true' %}_ee{% endif %}"
+  - version: 2.0.4
+    product_version: 2.0.4
+    product: "riak{% if ee == 'true' %}_ee{% endif %}"
+  - version: 2.0.5
+    product_version: 2.0.5
+    product: "riak{% if ee == 'true' %}_ee{% endif %}"

bin/rtdev-install.sh

@@ -46,15 +46,17 @@ cd $RT_DEST_DIR
 
 echo " - Reinitializing git state"
 
-## Some versions of git and/or OS require these fields
-HAS_LOCAL=$(git config --local 2>&1 | grep unknown)
-if [ -z "$HAS_LOCAL" ]; then
-    git config --local user.name "Riak Test"
-    git config --local user.email "dev@basho.com"
-    git config --local core.autocrlf input
-    git config --local core.safecrlf false
-    git config --local core.filemode true
-fi
+# Set the path to the root of the working tree. This prevents git to
+# ascend the directory tree (and possibly mess with other
+# repositories). That is, changes we are going to make with `git
+# config` will only affect the rt repo we have just created.
+GIT_WORK_TREE="$RT_DEST_DIR"
+git config user.name "Riak Test"
+git config user.email "dev@basho.com"
+git config core.autocrlf input
+git config core.safecrlf false
+git config core.filemode true
+
 
 git add --all --force .
 git commit -a -m "riak_test init" --amend > /dev/null

bin/rtdev-setup-releases.sh

@@ -35,24 +35,24 @@ else
     echo "No devdirs found. Not copying any releases."
 fi
 
-cd $RT_DEST_DIR
-git init 
-
-## Some versions of git and/or OS require these fields
-HAS_LOCAL=$(git config --local 2>&1 | grep unknown)
-if [ -z "$HAS_LOCAL" ]; then
-    git config --local user.name "Riak Test"
-    git config --local user.email "dev@basho.com"
-    git config --local core.autocrlf input
-    git config --local core.safecrlf false
-    git config --local core.filemode true
-fi
+cd "$RT_DEST_DIR"
+git init
+
+# Set the path to the root of the working tree. This prevents git to
+# ascend the directory tree (and possibly mess with other
+# repositories). That is, changes we are going to make with `git
+# config` will only affect the rt repo we have just created.
+GIT_WORK_TREE="$RT_DEST_DIR"
+git config user.name "Riak Test"
+git config user.email "dev@basho.com"
+git config core.autocrlf input
+git config core.safecrlf false
+git config core.filemode true
 
 ## this prevents priv/*.so files from being deleted by git clean -fd
 ## (the latter is executed in rtdev-current.sh):
 echo "priv/" >.gitignore
 
 git add --all --force .
 git commit -a -m "riak_test init" > /dev/null
-
 echo " - Successfully completed initial git commit of $RT_DEST_DIR"

intercepts/riak_kv_qry_buffers_intercepts.erl

@@ -1,6 +1,6 @@
 %% -------------------------------------------------------------------
 %%
-%% Copyright (c) 2016 Basho Technologies, Inc.
+%% Copyright (c) 2016, 2017 Basho Technologies, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file

tests/bucket_types.erl

@@ -8,6 +8,10 @@
 confirm() ->
     application:start(inets),
     lager:info("Deploy some nodes"),
+
+    %% Allow listing of buckets and keys for testing
+    application:set_env(riakc, allow_listing, true),
+
     Nodes = rt:build_cluster(4, [], [
                                      {riak_core, [{default_bucket_props,
                                                    [

tests/http_security.erl

@@ -11,6 +11,9 @@
 -define(assertDenied(Op), ?assertMatch({error, {forbidden, _}}, Op)).
 
 confirm() ->
+    %% Allow listing of buckets and keys for testing
+    application:set_env(riakc, allow_listing, true),
+
     application:start(crypto),
     application:start(asn1),
     application:start(public_key),

tests/overload.erl

@@ -1,6 +1,6 @@
 %% -------------------------------------------------------------------
 %%
-%% Copyright (c) 2013 Basho Technologies, Inc.
+%% Copyright (c) 2013-2017 Basho Technologies, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -81,6 +81,9 @@ default_config(#config{
         {riak_api, [{pb_backlog, 1024}]}].
 
 confirm() ->
+    %% Allow listing of buckets and keys for testing
+    application:set_env(riakc, allow_listing, true),
+
     [Node1 | _] = Nodes = setup(),
 
     ok = create_bucket_type(Nodes, ?NORMAL_TYPE, [{n_val, 3}]),

tests/pb_security.erl

@@ -11,6 +11,9 @@
 -define(assertDenied(Op), ?assertMatch({error, <<"Permission",_/binary>>}, Op)).
 
 confirm() ->
+    %% Allow listing of buckets and keys for testing
+    application:set_env(riakc, allow_listing, true),
+
     application:start(crypto),
     application:start(asn1),
     application:start(public_key),

tests/rolling_capabilities.erl

@@ -1,6 +1,6 @@
 %% -------------------------------------------------------------------
 %%
-%% Copyright (c) 2012 Basho Technologies, Inc.
+%% Copyright (c) 2012-2017 Basho Technologies, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -23,6 +23,9 @@
 -include_lib("eunit/include/eunit.hrl").
 
 confirm() ->
+    %% Allow listing of buckets and keys for testing
+    application:set_env(riakc, allow_listing, true),
+
     TestMetaData = riak_test_runner:metadata(),
     Count = 4,
     OldVsn = proplists:get_value(upgrade_version, TestMetaData, previous),

tests/ts_cluster_capabilities_SUITE.erl

@@ -1,6 +1,6 @@
 %% -------------------------------------------------------------------
 %%
-%% Copyright (c) 2016 Basho Technologies, Inc.
+%% Copyright (c) 2016-2017 Basho Technologies, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -30,19 +30,13 @@
 %%--------------------------------------------------------------------
 
 -define(TS_VERSION_CURRENT, "current").
-
-%% git checkout riak_ts-1.3.1 && make locked-deps
--define(TS_VERSION_1_3, riak_ts_1_3_1).
-
 -define(SQL_SELECT_CAP, {riak_kv, sql_select_version}).
 
 suite() ->
     [{timetrap,{minutes,10}}].
 
 init_per_suite(Config) ->
-    Versions = rt:find_version_by_name(["riak_ts-1.3.1", "riak_ts_ee-1.3.1"]),
-    Vsn131 = maybe_missing_1_3_1(Versions),
-    [{?TS_VERSION_1_3, Vsn131} | Config].
+    Config.
 
 end_per_suite(_Config) ->
     ok.
@@ -143,21 +137,19 @@ capability_not_specified_on_one_node_test(_Ctx) ->
 %% Riak TS Capability Tests
 %%--------------------------------------------------------------------
 
-sql_select_upgrade_a_node_from_1_3_test(Config) ->
-    Vsn131 = ?config(?TS_VERSION_1_3, Config),
+sql_select_upgrade_a_node_from_legacy_test(_Ctx) ->
     [Node_A, Node_B, Node_C] =
-        rt:deploy_nodes([Vsn131, Vsn131, Vsn131]),
+        rt:deploy_nodes([legacy, legacy, legacy]),
     ok = rt:join_cluster([Node_A,Node_B,Node_C]),
     ok = rt:wait_until_ring_converged([Node_A,Node_B,Node_C]),
     ok = rt:upgrade(Node_A, ?TS_VERSION_CURRENT),
     ok = rt:wait_until_ring_converged([Node_A,Node_B,Node_C]),
-    ok = rt:wait_until_capability(Node_A, ?SQL_SELECT_CAP, v1),
+    ok = rt:wait_until_capability(Node_A, ?SQL_SELECT_CAP, v2),
     ok.
 
-sql_select_join_with_all_nodes_upgraded_test(Config) ->
-    Vsn131 = ?config(?TS_VERSION_1_3, Config),
+sql_select_join_with_all_nodes_upgraded_test(_Ctx) ->
     [Node_A, Node_B, Node_C] =
-        rt:deploy_nodes([Vsn131, Vsn131, Vsn131]),
+        rt:deploy_nodes([legacy, legacy, legacy]),
     ok = rt:join_cluster([Node_A,Node_B,Node_C]),
     rt:wait_until_ring_converged([Node_A,Node_B,Node_C]),
     rt:upgrade(Node_A, ?TS_VERSION_CURRENT),
@@ -168,18 +160,14 @@ sql_select_join_with_all_nodes_upgraded_test(Config) ->
     rt:wait_until_capability(Node_C, ?SQL_SELECT_CAP, v3),
     ok.
 
-%% This test passed for 1.4.0, expecting v1 where commented, but fails for 1.5.0 due to code change. We set it to expect
-%% v3 until future changes are made. After 1.5.0 if this test will fail if new code is introduced to handle capability
-%% communication. https://bashoeng.atlassian.net/browse/RTS-1415
-sql_select_downgrade_a_node_test(Config) ->
-    Vsn131 = ?config(?TS_VERSION_1_3, Config),
+sql_select_downgrade_a_node_test(_Ctx) ->
     [Node_A, Node_B, Node_C] =
-        rt:deploy_nodes([Vsn131, ?TS_VERSION_CURRENT, ?TS_VERSION_CURRENT]),
+        rt:deploy_nodes([legacy, ?TS_VERSION_CURRENT, ?TS_VERSION_CURRENT]),
     ok = rt:join_cluster([Node_A,Node_B,Node_C]),
     rt:wait_until_ring_converged([Node_A,Node_B,Node_C]),
     % rt:wait_until_capability(Node_A, ?SQL_SELECT_CAP, v3),
-    rt:wait_until_capability(Node_B, ?SQL_SELECT_CAP, v1),
-    rt:wait_until_capability(Node_C, ?SQL_SELECT_CAP, v1),
+    rt:wait_until_capability(Node_B, ?SQL_SELECT_CAP, v2),
+    rt:wait_until_capability(Node_C, ?SQL_SELECT_CAP, v2),
     rt:upgrade(Node_A, ?TS_VERSION_CURRENT),
     rt:wait_until_ring_converged([Node_A,Node_B,Node_C]),
     rt:wait_until_capability(Node_A, ?SQL_SELECT_CAP, v3),
@@ -189,8 +177,8 @@ sql_select_downgrade_a_node_test(Config) ->
     %% pending changes to how capabilities are communicated around the ring, this
     %% section will expect v2. Once capabilities are changed in a future version of riak
     %% (or if testing 1.4.0 as current)
-    %% the expected version should go back to v1.
-    rt:upgrade(Node_A, Vsn131),
+    %% the expected version should go back to v2.
+    rt:upgrade(Node_A, legacy),
     rt:wait_until_ring_converged([Node_A,Node_B,Node_C]),
     rt:wait_until_capability(Node_B, ?SQL_SELECT_CAP, v3),
     rt:wait_until_capability(Node_C, ?SQL_SELECT_CAP, v3),
@@ -200,10 +188,9 @@ sql_select_downgrade_a_node_test(Config) ->
 %% Perform queries in mixed version cluster
 %%--------------------------------------------------------------------
 
-query_in_mixed_version_cluster_test(Config) ->
-    Vsn131 = ?config(?TS_VERSION_1_3, Config),
+query_in_mixed_version_cluster_test(_Ctx) ->
     [Node_A, Node_B, Node_C] =
-        rt:deploy_nodes([?TS_VERSION_CURRENT, Vsn131, ?TS_VERSION_CURRENT]),
+        rt:deploy_nodes([?TS_VERSION_CURRENT, previous, ?TS_VERSION_CURRENT]),
     ok = rt:join_cluster([Node_A,Node_B,Node_C]),
     rt:wait_until_ring_converged([Node_A,Node_B,Node_C]),
     Table = "grouptab1",
@@ -220,7 +207,7 @@ query_in_mixed_version_cluster_test(Config) ->
         [{1,1,B*C} || B <- lists:seq(1,10), C <- lists:seq(1000,5000,1000)]),
     ExpectedResultSet = [{N} || N <- lists:seq(1000,5000,1000)],
     %%
-    %% Test that the current version can query version 1.3
+    %% Test that the current version can query older version
     %%
     Query =
         "SELECT c FROM grouptab1 "
@@ -232,17 +219,11 @@ query_in_mixed_version_cluster_test(Config) ->
         {ok,{Cols, Rows}}
     ),
     %%
-    %% Test that the 1.3 can query the current version
+    %% Test that the previous can query the current version
     %%
     {ok, {Cols, Rows}} = run_query(rt:pbc(Node_B), Query),
     ts_data:assert_row_sets(
         {rt_ignore_columns, ExpectedResultSet},
         {ok,{Cols, Rows}}
     ).
 
-%% If 1.3.1 is not found, use a meaningful atom to prompt the error message
-%% rtdev:check_version/1
-maybe_missing_1_3_1([]) ->
-    missing_version_ts_1_3_1;
-maybe_missing_1_3_1([Vsn]) ->
-    Vsn.