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

Allow Cassandra schema builder to use credentials #1635

Merged
merged 3 commits into from
Jun 27, 2019

Conversation

EGHornbostel
Copy link
Contributor

Currently the Cassandra schema builder job only works on open Cassandra installations. This PR fixes this by modifying the script so that two environmental variables, CASSANDRA_USER and CASSANDRA_PASSWORD, could be passed in to supply these credentials.

Signed-off-by: E.G. Hornbostel eg.hornbostel@pricespider.com

Which problem is this PR solving?

  • Currently the Cassandra schema builder job only works on open Cassandra installations. This PR fixes this by modifying the script so that two environmental variables, CASSANDRA_USER and CASSANDRA_PASSWORD, could be passed in to supply these credentials.

Short description of the changes

  • Modify docker.sh script to allow for credentials to be assed in to cqlsh

Currently the Cassandra schema builder job only works on open Cassandra installations. This PR fixes this by modifying the script so that two environmental variables, CASSANDRA_USER and CASSANDRA_PASSWORD, could be passed in to supply these credentials.

Signed-off-by: E.G. Hornbostel <eg.hornbostel@pricespider.com>
@codecov
Copy link

codecov bot commented Jun 26, 2019

Codecov Report

Merging #1635 into master will increase coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1635      +/-   ##
==========================================
+ Coverage   98.72%   98.74%   +0.02%     
==========================================
  Files         191      191              
  Lines        9182     9182              
==========================================
+ Hits         9065     9067       +2     
+ Misses         91       89       -2     
  Partials       26       26
Impacted Files Coverage Δ
...lugin/sampling/strategystore/adaptive/processor.go 100% <0%> (+0.78%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5b52726...8ad25e8. Read the comment docs.

@yurishkuro
Copy link
Member

build failed

Generating the schema for the keyspace jaeger_v1_dc1 and datacenter dc1
/cassandra-schema/docker.sh: line 39: syntax error near unexpected token `else'
/cassandra-schema/docker.sh: line 39: `else'
The command "if [ "$CASSANDRA_INTEGRATION_TEST" == true ]; then bash ./scripts/travis/cassandra-integration-test.sh ; else echo 'skipping cassandra integration test'; fi" exited with 2.

@@ -31,4 +33,9 @@ done

echo "Generating the schema for the keyspace ${KEYSPACE} and datacenter ${DATACENTER}"

MODE="${MODE}" DATACENTER="${DATACENTER}" KEYSPACE="${KEYSPACE}" /cassandra-schema/create.sh "${TEMPLATE}" | ${CQLSH} ${CQLSH_SSL} ${CQLSH_HOST}

if [ -z "$PASSWORD" ] then
Copy link
Member

Choose a reason for hiding this comment

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

missing semicolon before then

Copy link
Contributor Author

Choose a reason for hiding this comment

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

pushed fix

Signed-off-by: E.G. Hornbostel <eg.hornbostel@pricespider.com>
@pavolloffay pavolloffay merged commit 3588002 into jaegertracing:master Jun 27, 2019
@pavolloffay
Copy link
Member

thanks @PS-EGHornbostel

@EGHornbostel EGHornbostel deleted the ingester-fix branch June 27, 2019 15:31
MiLk added a commit to MiLk/jaeger that referenced this pull request Jul 5, 2019
MiLk added a commit to MiLk/jaeger that referenced this pull request Jul 5, 2019
This follows jaegertracing#1635 in order to solve jaegertracing/jaeger-operator#469

Signed-off-by: Emilien Kenler <emilien@cryptact.com>
yurishkuro pushed a commit that referenced this pull request Jul 5, 2019
…#1655)

This follows #1635 in order to solve jaegertracing/jaeger-operator#469

Signed-off-by: Emilien Kenler <emilien@cryptact.com>
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.

3 participants