Merge lp://staging/~mbruzek/charms/precise/cassandra/ppc64le into lp://staging/charms/cassandra

Proposed by Matt Bruzek
Status: Merged
Merged at revision: 34
Proposed branch: lp://staging/~mbruzek/charms/precise/cassandra/ppc64le
Merge into: lp://staging/charms/cassandra
Diff against target: 115 lines (+48/-18)
3 files modified
config.yaml (+5/-1)
hooks/cassandra-common (+40/-17)
tests/01-test (+3/-0)
To merge this branch: bzr merge lp://staging/~mbruzek/charms/precise/cassandra/ppc64le
Reviewer Review Type Date Requested Status
Charles Butler (community) Approve
Review via email: mp+226291@code.staging.launchpad.net

Description of the change

These are the changes needed to make cassandra run on power PC.

The charm should check if the deb package exists and use that to install.

There is a configuration value that have to be updated for ppc64le only.
There is a configuration value that needs to change for openjdk.

To post a comment you must log in.
Revision history for this message
Tim Van Steenburgh (tvansteenburgh) wrote :

Matt,

Can you list the two configuration values that need to be changed?

Thanks,
Tim

Revision history for this message
Matt Bruzek (mbruzek) wrote :

Sorry I was not clear. The charm code had to be changed that edits the Cassandra configuration file cassandra-env.sh to get the charm to deploy.

For reference those values are:
UseCondCardMark (had to be removed the OpenJDK does not recognize this value)
-Xss (had to be increased to 1664k which is 10x the original value in the file)

Revision history for this message
Tim Van Steenburgh (tvansteenburgh) wrote :

Hey Matt, good stuff! Nice to see the Cassandra charm being updated to run on ppc64le! Here's what I found:

PPC64LE
-------
The changes for ppc64le worked great. I tested on ppc64le with a bundled cassandra .deb [1], and on x86_64 with and without a bundled .deb. The charm started up just fine in all scenarios.

Charm Proof
-----------
W: config.yaml: option datacenter does not have the keys: default
W: config.yaml: option dc_suffix does not have the keys: default
W: config.yaml: option rack does not have the keys: default

These warnings were not caused by your change, but it would be nice to go ahead and get them cleaned up.

Tests
-----
There are tests in the charm that can be executed like so:

cd charms/trusty/cassandra/tests && make

I have two comments on the tests:

1. They fail. They fail on the current store revision also, so the failure is not a result of this change, but it would be nice to get them fixed, although not necessarily in this merge.
2. The tests are not detected by bundletester [2], so they will not be run by our automated testing infrastructure. The easiest way to fix it in this case is to:

cd charms/trusty/cassandra/tests
echo -e '#!/bin/bash\nmake' > 01-test && chmod +x 01-test

You can then run the tests by executing `bundletester -F` from within the charm dir. (By default, bundletester looks for executable files, in a tests/ dir, that match the "[0-9]*" glob pattern.)

Again, I'm not suggesting that these tests must be fixed in this merge, merely documenting the findings of my review. IMO it would be acceptable to fix the tests in a separate merge.

[1] http://www.apache.org/dist/cassandra/debian/pool/main/c/cassandra/cassandra_2.1.0~rc6_all.deb
[2]* lp:~tvansteenburgh/charmtester/bundletester

* This is not the official bundletester repo, but has some fixes that haven't been merged yet.

35. By Matt Bruzek

Improving charm proof errors and adding a test that can be run from the automated framework.

Revision history for this message
Matt Bruzek (mbruzek) wrote :

Thanks for the review Tim.

I have improved the charm proof status with the default keys and added a 01-test as you described to allow the Makefile to be called from the automated tester.

Revision history for this message
amir sanjar (asanjar) wrote :

Matt it looks good. The only recommendation would be to install JAVA SDK package as default for performance and java life cycle management tools (i.e jps).
example: jps | awk '{print $2}'

Revision history for this message
Charles Butler (lazypower) wrote :

Awesome merge MBruzek!

Thank you for your continued effort on this. +1 on the merge, but I'd like to see additional info on the offline installer in the readme. theres no notation of placing a 'fat packed' offline-able install mode by simply placing a cassandra_*.deb in files.

I'll merge this tentatively with a follow up MP to update the readme.

Thanks again for the effort!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: