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

Switched the Cassandra Schema image to use the official image as base image #278

Merged
merged 1 commit into from
Jul 19, 2017
Merged

Switched the Cassandra Schema image to use the official image as base image #278

merged 1 commit into from
Jul 19, 2017

Conversation

jpkrohling
Copy link
Contributor

No description provided.

@jpkrohling
Copy link
Contributor Author

This is the first step required to move the templates to use the official Cassandra image from DockerHub.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 100.0% when pulling 4f6d8a4 on jpkrohling:JPK-ChangeCassandraSchemaBaseImage into 3bd1686 on uber:master.

@yurishkuro
Copy link
Member

I previously ran into an issue #244 where the image for schema creation did not work. Do you know if this change fixes it? Do we currently test that?

@jpkrohling
Copy link
Contributor Author

Yes, I ran into the same issue when deploying a Cassandra 3.11 and running the existing image for the schema.

@jpkrohling
Copy link
Contributor Author

As for testing: the image is tested as part of the (still manual?) tests on the deployment templates (Kubernetes/OpenShift).

@@ -3,7 +3,7 @@
# This script is used in the Docker image jaegertracing/jaeger-cassandra-schema
# that allows installing Jaeger keyspace and schema without installing cqlsh.

CQLSH=/opt/apache-cassandra-3.0.12/bin/cqlsh
CQLSH=/usr/bin/cqlsh
Copy link
Member

Choose a reason for hiding this comment

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

Could we make this configurable? And leave other env variables to be set to default values in create.sh?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is very specific to the base image that is being used. This script is not meant to be used anywhere else, so, I see little value in making this configurable.

Copy link
Member

Choose a reason for hiding this comment

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

Could be this change avoided if it was configurable? I think yes.

Copy link
Member

Choose a reason for hiding this comment

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

Maybe what @pavolloffay means is that the script could use an env var that would be set inside the Dockerfile, where it's more closely related to the actual image being used.

Copy link
Member

Choose a reason for hiding this comment

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

Exactly, this script is just a wrapper for cqlsh. I don't know why it even sets env vars like DATACENCER, MODE, I think it should delegate most of the stuff to create.sh

Copy link
Member

Choose a reason for hiding this comment

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

I would also propose renaming it. docker.sh is vague. What it does actually with docker? I could use this script with ccm like CQLSH="ccm node1 cqlsh" docker.sh

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't think making the env var would have been a great time saver for a change like this. But in any case, I'll make it use an env var, defaulting to /usr/bin/cqlsh

About the other proposed changes, they are not the scope of this change. Perhaps this could be done in a follow up PR, but the script was done to work strictly within a Docker image, and I have not tested it in any other situation.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

CQLSH changed

@pavolloffay
Copy link
Member

k8s deployments use travis for both prod and all-in-one template.

@@ -1,5 +1,4 @@
# TODO: replace this by the final Cassandra image
FROM jpkroehling/cassandra
FROM cassandra:3.11
Copy link
Member

Choose a reason for hiding this comment

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

@yurishkuro is this version fine? Shouldn't we use the same version as xdock (3.9) ?

Copy link
Member

Choose a reason for hiding this comment

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

Don't have a strong opinion either way. I think generally later versions of cqlsh work fine with older versions of Cassandra, but not vice versa.

@jpkrohling
Copy link
Contributor Author

PR updated to let CQLSH be set as env var.

@yurishkuro
Copy link
Member

Something odd with the build / Travis, but I am going to merge this anyway.

@yurishkuro yurishkuro merged commit 9e9e948 into jaegertracing:master Jul 19, 2017
ideepika pushed a commit to ideepika/jaeger that referenced this pull request Oct 22, 2017
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.

4 participants