Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mas hmmr updated d32 #1114

Merged
merged 83 commits into from
Dec 28, 2022
Merged

Mas hmmr updated d32 #1114

merged 83 commits into from
Dec 28, 2022

Conversation

martinsumner
Copy link
Contributor

Base PR to provide support for OTP 22 through to OTP 25, built primarily on the work of @hmmr

The upgrade to OTP 24/25 required significant changes due to updates to rebar3/relx. There is a general tidy-up of some clumsy aspects of scripting that were introduced in the migration to 3.0. There is also an expansion of the tested platforms for build packages to support Alpine Linux.

Significant changes to the riak_test scripts are required to support this release. These can be found in basho/riak_test#1365

Andrei Zavada and others added 30 commits April 14, 2022 17:06
works better for non-standard installations of otp
also, add workarounds for self-induced regressions
with extended_start_script_extensions, to be fixed later.
Specifically, those in eleveldb submodules

# Conflicts:
#	Makefile
* set DEBEMAIL;
* move deb/debian/vars.config to ..;
* add missing build dependency on libpam0g-dev;
* rm /var/lib/riak on purge.
* add gcc-c++ to BuildRequires;
* embrace systemd.
Incidentally, bump riak_kv dep to 3.0.9.2 (does code:load
in schema, just for osx)
The `-` option is there primarily for one side effect: it does`cd` to
riak user's HOME (/var/lib/riak).  Critically, this dir has the
erlang cookie file, which is read from the new node started as part of
some riak-admin commands (e.g., riak-admin test). It, however, creates
a barrier for env vars, which is undesirable.

If we cd manually into riak's HOME before the call to `su`, the piggy
node now can find the cookie in its cwd, and execution of the command
succeeds.
* resuscitate riak-chkconfig;
* make `make rel` relocatable again, fix riak-debug for it;
# Conflicts:
#	rebar.config
# Conflicts:
#	rebar.config
# Conflicts:
#	Makefile
#	rebar.config
martinsumner and others added 11 commits June 7, 2022 15:00
With relx changes to provide consistent ping response
.. not relx_nodetool ping

Update to rebar.lock
Forces the use of relx_nodetool even when erl_call is available, avoiding issues with erl_call and stdout.

Achieved through an updated rebar3 (based on Riak specific branch of relx) and a rebar.config parameter.
Issues with `make package` otherwise?
hmmr and others added 4 commits December 12, 2022 23:01
* have riak-admin grep NODE from riak.conf

* rm config/vm.args as it conflicts with one generated by cuttlefish

* properly repackage terms from riak admin cmdline to rpc

Co-authored-by: Andrei Zavada <andrei.zavada@tiot.jp>
* Temp replace reip with reip_manual

Reip was broken by the missing scripts necessary to generate the config so that erl could be run without the riak node active, but with the config necessary to load riak_core.

Now loading riak_core is not necessary with riak_manual .. but both the path to the ring directory, and the cluster name need to be manually passed in as command params.

* Update rebar.lock

* Update branch
@martinsumner
Copy link
Contributor Author

Full riak_test suite completed for OTP 25.1.2

Some minor test updates required - basho/riak_test@489c427

There are two known issues outstanding, with tests that were already problematic in Riak 3.0.12: verify_counter_converge, verify_2i_handoff.

The verify_2i_handoff issue, as it is understood, should not delay release. Some further investigation required for verify_counter_converge.

@martinsumner
Copy link
Contributor Author

Improvements to verify_counter_converge: basho/riak_test@f79676b

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants