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

Backport riak-cs-debug update from 2.1 #1266

Merged
merged 11 commits into from Oct 13, 2015
Merged

Conversation

ksauzz
Copy link
Contributor

@ksauzz ksauzz commented Oct 9, 2015

Main purpose is to support a Riak CS deployment such as using app.config and vm.args only.

  • gh1236 is needed to gather vm.args
  • gh1263 is needed to work with app.config and vm.args only

The difference between this branch and 2.1 is only riak-cs-admin status.

% git diff bugfix/gh1236-and-gh1263-backport 2.1 rel/files/riak-cs-debug
diff --git a/rel/files/riak-cs-debug b/rel/files/riak-cs-debug
index c491ca4..8af20aa 100755
--- a/rel/files/riak-cs-debug
+++ b/rel/files/riak-cs-debug
@@ -471,6 +471,7 @@ if [ 1 -eq $get_riakcmds ]; then

     dump riak_cs_ping "$cs_bin_dir"/riak-cs ping
     dump riak_cs_version "$cs_bin_dir"/riak-cs version
+    dump riak_cs_status "$cs_bin_dir"/riak-cs-admin status
     dump riak_cs_gc_status "$cs_bin_dir"/riak-cs-admin gc status
     dump riak_cs_storage_status "$cs_bin_dir"/riak-cs-admin storage status
     if [ -f "$cs_bin_dir/riak-cs-multibag" ]; then

@shino
Copy link
Contributor

shino commented Oct 13, 2015

Work as advertised. Perfect!

@shino shino added this to the 2.0.2 milestone Oct 13, 2015
@shino shino added the Bug label Oct 13, 2015
borshop added a commit that referenced this pull request Oct 13, 2015
Backport riak-cs-debug update from 2.1

Reviewed-by: shino
@shino
Copy link
Contributor

shino commented Oct 13, 2015

@borshop merge

@shino
Copy link
Contributor

shino commented Oct 13, 2015

For cross ref: #1236 (RCS-284) #1263

@borshop borshop merged commit 7a21239 into 2.0 Oct 13, 2015
@shino
Copy link
Contributor

shino commented Oct 13, 2015

For release note: Add several operator friendly features, fine grained information gathering options, user defined filtering for configuration files and verbose output for failed commands. Also fixed a bug when cuttlefish style riak-cs.conf does not exist.

@shino shino deleted the bugfix/gh1236-and-gh1263-backport branch October 13, 2015 03:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants