From 65ad3706a3c830b7dc47c7ae83bfa9586671a126 Mon Sep 17 00:00:00 2001 From: Alex Moore Date: Wed, 15 Apr 2015 09:24:36 -0400 Subject: [PATCH 1/6] Different config for the PHP client --- devrel/riak-cluster-config | 20 ++++++++++---------- devrel/setup-dev-cluster | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/devrel/riak-cluster-config b/devrel/riak-cluster-config index 4679289..8354f19 100755 --- a/devrel/riak-cluster-config +++ b/devrel/riak-cluster-config @@ -7,20 +7,20 @@ declare -r use_security="${4:-false}" $riak_admin bucket-type create plain '{"props":{}}' $riak_admin bucket-type create search_type '{"props":{}}' -$riak_admin bucket-type create maps '{"props":{"datatype":"map"}}' -$riak_admin bucket-type create sets '{"props":{"datatype":"set"}}' -$riak_admin bucket-type create counters '{"props":{"datatype":"counter"}}' -$riak_admin bucket-type create yokozuna '{"props":{}}' -$riak_admin bucket-type create leveldb_type '{"props":{"backend":"leveldb_backend"}}' +$riak_admin bucket-type create phptest_maps '{"props":{"datatype":"map"}}' +$riak_admin bucket-type create phptest_sets '{"props":{"datatype":"set"}}' +$riak_admin bucket-type create phptest_counters '{"props":{"datatype":"counter"}}' +$riak_admin bucket-type create phptest_search '{"props":{}}' +$riak_admin bucket-type create phptest_leveldb '{"props":{"backend":"leveldb_backend"}}' $riak_admin bucket-type create memory_type '{"props":{"backend":"mem_backend"}}' $riak_admin bucket-type activate search_type $riak_admin bucket-type activate plain -$riak_admin bucket-type activate maps -$riak_admin bucket-type activate sets -$riak_admin bucket-type activate counters -$riak_admin bucket-type activate yokozuna -$riak_admin bucket-type activate leveldb_type +$riak_admin bucket-type activate phptest_maps +$riak_admin bucket-type activate phptest_sets +$riak_admin bucket-type activate phptest_counters +$riak_admin bucket-type activate phptest_search +$riak_admin bucket-type activate phptest_leveldb $riak_admin bucket-type activate memory_type if [[ $strong_consistency == 'true' ]] diff --git a/devrel/setup-dev-cluster b/devrel/setup-dev-cluster index a968181..4010dde 100755 --- a/devrel/setup-dev-cluster +++ b/devrel/setup-dev-cluster @@ -185,9 +185,9 @@ do done set -o errexit -declare -i pb_port=10017 -declare -i http_port=10018 -declare -i https_port=10418 +declare -i pb_port=8087 +declare -i http_port=8098 +declare -i https_port=10011 pinfo "Configuring riak.conf" From b1bdeec426874804becaa54355f61156138d0ec5 Mon Sep 17 00:00:00 2001 From: Alex Moore Date: Wed, 27 May 2015 11:01:12 -0400 Subject: [PATCH 2/6] What do we want? Tombstones! When do we want them? Eventually! --- devrel/gen-adv-conf | 3 --- 1 file changed, 3 deletions(-) diff --git a/devrel/gen-adv-conf b/devrel/gen-adv-conf index 464586c..09a9d66 100755 --- a/devrel/gen-adv-conf +++ b/devrel/gen-adv-conf @@ -4,9 +4,6 @@ out_file=$1 cat > $out_file <<'EOT' [ - {riak_kv, [ - {delete_mode, immediate} - ]}, {riak_core, [ {target_n_val, 5} ]} From 7a44af59742aec96b41afc14185a7b8190f74d47 Mon Sep 17 00:00:00 2001 From: Alex Moore Date: Tue, 9 Jun 2015 17:31:07 -0400 Subject: [PATCH 3/6] Fix merge. --- devrel/setup-dev-cluster | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devrel/setup-dev-cluster b/devrel/setup-dev-cluster index af3c0bb..b5441b1 100755 --- a/devrel/setup-dev-cluster +++ b/devrel/setup-dev-cluster @@ -196,9 +196,9 @@ if [[ $opt_cleanup_only == 'true' ]]; then exit 0; fi -declare -i pb_port=10017 -declare -i http_port=10018 -declare -i https_port=10418 +declare -i pb_port=8087 +declare -i http_port=8098 +declare -i https_port=10011 pinfo "Configuring riak.conf" From cbe894b6f81684e3a50397bb753a9fa3ad79999b Mon Sep 17 00:00:00 2001 From: Luke Bakken Date: Wed, 11 May 2016 10:50:01 -0700 Subject: [PATCH 4/6] add required PHP table --- devrel/riak-cluster-config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/devrel/riak-cluster-config b/devrel/riak-cluster-config index 10e19c2..b8b7888 100755 --- a/devrel/riak-cluster-config +++ b/devrel/riak-cluster-config @@ -16,6 +16,9 @@ $riak_admin bucket-type activate phptest_counters $riak_admin bucket-type activate phptest_search $riak_admin bucket-type activate phptest_leveldb +$riak_admin bucket-type create WeatherByRegion '{"props": {"n_val": 3, "table_def": "CREATE TABLE WeatherByRegion (region varchar not null, state varchar not null, time timestamp not null, weather varchar not null, temperature double, uv_index sint64, observed boolean not null, PRIMARY KEY((region, state, quantum(time, 15, 'm')), region, state, time))"}}' +$riak_admin bucket-type activate WeatherByRegion + $riak_admin bucket-type create plain $riak_admin bucket-type create search_type $riak_admin bucket-type create mr @@ -29,6 +32,7 @@ $riak_admin bucket-type create write_once '{"props":{"write_once":true}}' $riak_admin bucket-type create GeoCheckin '{"props": {"n_val": 3, "table_def": "CREATE TABLE GeoCheckin (geohash varchar not null, user varchar not null, time timestamp not null, weather varchar not null, temperature double, PRIMARY KEY((geohash, user, quantum(time, 15, m)), geohash, user, time))"}}' $riak_admin bucket-type create GeoCheckin_Wide '{"props": {"n_val": 3, "table_def": "CREATE TABLE GeoCheckin_Wide (geohash varchar not null, user varchar not null, time timestamp not null, weather varchar not null, temperature double, uv_index sint64, observed boolean not null, PRIMARY KEY((geohash, user, quantum(time, 15, 'm')), geohash, user, time))"}}' + $riak_admin bucket-type activate plain $riak_admin bucket-type activate search_type $riak_admin bucket-type activate mr From b54711198637f9ae7def43b038a12a0aa72a057c Mon Sep 17 00:00:00 2001 From: Luke Bakken Date: Thu, 22 Sep 2016 11:39:23 -0700 Subject: [PATCH 5/6] Add script to install and configure Riak on Travis CI --- travis-ci/riak-setup | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100755 travis-ci/riak-setup diff --git a/travis-ci/riak-setup b/travis-ci/riak-setup new file mode 100755 index 0000000..a8f48a6 --- /dev/null +++ b/travis-ci/riak-setup @@ -0,0 +1,37 @@ +#!/bin/sh + +# NB: nothing bash-specific in this file + +curl -s https://packagecloud.io/install/repositories/basho/riak/script.deb.sh | sudo bash +sudo apt-get install riak + +echo 'search = on' | sudo tee -a /etc/riak/riak.conf +echo 'nodename = riak@127.0.0.1' | sudo tee -a /etc/riak/riak.conf +echo 'storage_backend = multi' | sudo tee -a /etc/riak/riak.conf +echo 'multi_backend.default = leveldb_backend' | sudo tee -a /etc/riak/riak.conf +echo 'multi_backend.bitcask_backend.storage_backend = bitcask' | sudo tee -a /etc/riak/riak.conf +echo 'multi_backend.bitcask_backend.bitcask.data_root = $(platform_data_dir)/bitcask' | sudo tee -a /etc/riak/riak.conf +echo 'multi_backend.bitcask_backend.bitcask.io_mode = erlang' | sudo tee -a /etc/riak/riak.conf +echo 'multi_backend.leveldb_backend.storage_backend = leveldb' | sudo tee -a /etc/riak/riak.conf +echo 'multi_backend.leveldb_backend.leveldb.data_root = $(platform_data_dir)/leveldb' | sudo tee -a /etc/riak/riak.conf +echo 'multi_backend.leveldb_backend.leveldb.maximum_memory.percent = 30' | sudo tee -a /etc/riak/riak.conf +echo 'multi_backend.mem_backend.storage_backend = memory' | sudo tee -a /etc/riak/riak.conf +echo 'multi_backend.mem_backend.memory_backend.ttl = 10s' | sudo tee -a /etc/riak/riak.conf +echo 'multi_backend.mem_backend.memory_backend.max_memory_per_vnode = 4MB' | sudo tee -a /etc/riak/riak.conf + +sudo riak start +sudo riak-admin wait-for-service riak_kv + +sudo riak-admin bucket-type create phptest_counters '{"props":{"datatype":"counter"}}' +sudo riak-admin bucket-type create phptest_maps '{"props":{"datatype":"map"}}' +sudo riak-admin bucket-type create phptest_sets '{"props":{"datatype":"set"}}' +sudo riak-admin bucket-type create phptest_search '{"props":{}}' +sudo riak-admin bucket-type create phptest_leveldb '{"props":{"backend":"leveldb_backend"}}' +sudo riak-admin bucket-type create hlls '{"props":{"datatype":"hll"}}' + +sudo riak-admin bucket-type activate phptest_counters +sudo riak-admin bucket-type activate phptest_maps +sudo riak-admin bucket-type activate phptest_sets +sudo riak-admin bucket-type activate phptest_search +sudo riak-admin bucket-type activate phptest_leveldb +sudo riak-admin bucket-type activate hlls From 5091327b0d76b8cc894de5376c65848a1c8c77ce Mon Sep 17 00:00:00 2001 From: Luke Bakken Date: Thu, 22 Sep 2016 11:46:18 -0700 Subject: [PATCH 6/6] Ensure exit 0 --- travis-ci/riak-setup | 3 +++ 1 file changed, 3 insertions(+) diff --git a/travis-ci/riak-setup b/travis-ci/riak-setup index a8f48a6..0bcae79 100755 --- a/travis-ci/riak-setup +++ b/travis-ci/riak-setup @@ -35,3 +35,6 @@ sudo riak-admin bucket-type activate phptest_sets sudo riak-admin bucket-type activate phptest_search sudo riak-admin bucket-type activate phptest_leveldb sudo riak-admin bucket-type activate hlls + +# NB: must exit 0 so we don't use the last exit val +exit 0