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

Add cassandra Docker config to main repo. #2849

Merged
merged 2 commits into from
Oct 16, 2019

Conversation

anuraaga
Copy link
Contributor

Starting with just Cassandra for now as it's the most complicated build. Verified it works with ITCassandraStorage

Changes from docker-zipkin

  • Removes custom config loader - it was for using a stripped down JRE without java.beans but our Java 8 image has had it since migrating from Azul to OpenJDK. And our Java 11 image has it too since spring, so no real worries of it going away

  • Merges in our custom configuration (enable user defined functions, docker IP) using sed, similar to how official cassandra docker image works.

@codefromthecrypt
Copy link
Member

fyi @openzipkin/cassandra cassandra test image is being re-homed

@@ -25,6 +25,15 @@ for tag in ${TAGS[@]:1}; do
docker tag "openzipkin/zipkin-ui:${TAGS[0]}" "openzipkin/zipkin-ui:$tag"
done

# We also build storage images to correspond with the server version to keep schemas up to date
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we also need to build the one-off one: kafka


WORKDIR /cassandra

ADD zipkin-storage/cassandra/src/main/resources/*.cql /zipkin-schemas/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

easier! soon ideally we can generate an elasticsearch one using the main class, also cc @basvanbeek

ADD docker/storage/cassandra/run.sh /usr/local/bin/run.sh
CMD ["/usr/local/bin/run.sh"]

EXPOSE 9160 7000 7001 9042 7199
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sgtm though not sure how many of these we actually need cc @michaelsembwever ... fine for now.

sed -i '/-XX:NumberOfGCLogFiles=10/c\#-XX:NumberOfGCLogFiles=10' /cassandra/conf/jvm.options
sed -i '/-XX:GCLogFileSize=10M/c\#-XX:GCLogFileSize=10M' /cassandra/conf/jvm.options

# TODO: Add native snappy lib. Native loader stacktraces in the cassandra log as a results, which is distracting.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good comment

Copy link
Member

@codefromthecrypt codefromthecrypt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks so much! nice to have this local

@anuraaga anuraaga merged commit 257bd34 into openzipkin:master Oct 16, 2019
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