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.

Sign up for GitHub

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

Do not skip service/operation indexing for firehose spans + a couple fixes #2090

Merged
merged 6 commits into from
Feb 27, 2020
Merged

Do not skip service/operation indexing for firehose spans + a couple fixes #2090

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
65788ff
Do not skip service/operation indexing for firehose
Feb 26, 2020
19369d0
review
Feb 27, 2020
597bcb2
log commands
Feb 27, 2020
f8978c5
Use unqualified path to cqlsh, as the old path does not seem valid an…
Feb 27, 2020
b89a791
different path
Feb 27, 2020
1e1cbd5
fix flaky test
Feb 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use unqualified path to cqlsh, as the old path does not seem valid an… 
…ymore.

which cqlsh prints /opt/cassandra/bin/cqlsh

Signed-off-by: Yuri Shkuro <ys@uber.com>
  • Loading branch information
Yuri Shkuro committed Feb 27, 2020
commit f8978c508a0aeabf4c9663b0a8c3188645e3c464
2 changes: 1 addition & 1 deletion plugin/storage/cassandra/schema/docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=${CQLSH:-"/usr/bin/cqlsh"}
CQLSH=${CQLSH:-"cqlsh"}
CQLSH_HOST=${CQLSH_HOST:-"cassandra"}
CQLSH_SSL=${CQLSH_SSL:-""}
CASSANDRA_WAIT_TIMEOUT=${CASSANDRA_WAIT_TIMEOUT:-"60"}
Expand Down