Remove SASI indices #1328

black-adder · 2019-02-11T19:09:37Z

Signed-off-by: Won Jun Jang [email protected]

A lot of Copy Pasta from #793. Resolves #790.

Migration Path:

Run v001tov002part1.sh which will copy dependencies into a csv, update the dependency UDT, create a new dependenciesv2 table, and write dependencies from the csv into the dependenciesv2 table.
Run the collector and query services with the cassandra flag dependency-sasi-disabled=true which will update jaeger to read from the new dependenciesv2 table.
Update spark job to write to the new dependenciesv2 table (this is a TODO).
Run v001tov002part2.sh which will delete the old dependency table and the SASI index.

Users who wish to continue to use the SASI indices don't have to do anything as the cassandra flag dependency-sasi-disabled will default to false. Ideally, users will migrate on their own timeline and we can remove support for the old table in a major version release.

Fix crossdock
Actually test

vprithvi · 2019-02-11T19:27:30Z

plugin/storage/cassandra/dependencystore/storage.go

-	query := s.session.Query(depsSelectStmt, endTs.Add(-1*lookback), endTs)
+	startTs := endTs.Add(-1 * lookback)
+	var query cassandra.Query
+	switch s.indexMode {


Would GetDependencies be simplified by omitting this switch? Instead we might read from SASIDisabled first, and if that fails we can read from SASIEnabled?
When migrating, this would mean that users don't need to redeploy query after moving over the dependency table

I'm not a fan of adding the extra roundtrip time. Additionally, if the user has opted in to migrating to the new table, redeploying the query service will not be the most strenuous thing.

vprithvi · 2019-02-11T22:36:49Z

pkg/cassandra/config/config.go

+	Port                   int           `yaml:"port"`
+	Authenticator          Authenticator `yaml:"authenticator"`
+	DisableAutoDiscovery   bool          `yaml:"disable_auto_discovery"`
+	DependencySASIDisabled bool          `yaml:"dependency_sasi_disabled"`


Could this be simplified to SASI disabled?

i'd rather it be more explicit but I can simplify

vprithvi · 2019-02-11T22:46:39Z

plugin/storage/cassandra/dependencystore/storage.go

 			Parent:    d.Parent,
 			Child:     d.Child,
 			CallCount: int64(d.CallCount),
 		}
+		if s.indexMode == SASIEnabled {
+			dep.Source = string(d.Source)


Does this assignment need to be conditional? (Also - shouldn't this be set for SASIDisabled?)

yes, if you attempt to add the source field to a schema that doesn't support it, c* will error. And good catch, it should be for disabled

Yes - but that doesn't answer my question; the query string for SASIDisabled doesn't include this field anyways

i'll test it and let you know

vprithvi · 2019-02-11T22:50:42Z

plugin/storage/cassandra/options.go

+	suffixCA                     = ".tls.ca"
+	suffixServerName             = ".tls.server-name"
+	suffixVerifyHost             = ".tls.verify-host"
+	suffixDependencySASIDisabled = ".dependency-sasi-disabled"


Could we use sasi-disabled instead of dependency-sasi-disabled?

vprithvi · 2019-02-12T15:58:01Z

plugin/storage/cassandra/dependencystore/storage.go

 }

 // NewDependencyStore returns a DependencyStore
 func NewDependencyStore(
 	session cassandra.Session,
 	metricsFactory metrics.Factory,
 	logger *zap.Logger,
+	indexMode IndexMode,


Is there anything preventing someone from passing in an undefined IndexMode, like IndexMode(10) for e.g.?

ill validate here

vprithvi · 2019-02-12T16:04:26Z

plugin/storage/cassandra/factory.go

@@ -106,7 +106,14 @@ func (f *Factory) CreateSpanWriter() (spanstore.Writer, error) {

 // CreateDependencyReader implements storage.Factory
 func (f *Factory) CreateDependencyReader() (dependencystore.Reader, error) {
-	return cDepStore.NewDependencyStore(f.primarySession, f.primaryMetricsFactory, f.logger), nil
+	var (
+		sasiDisabled = f.Options.GetPrimary().DependencySASIDisabled


I think the following reads simpler:

indexMode := cDepStore.SASIEnabled if f.Options.GetPrimary().DependencySASIDisabled { indexMode = cDepStore.SASIDisabled }

yurishkuro · 2019-02-12T17:48:05Z

plugin/storage/cassandra/dependencystore/model_test.go

-		Parent:    "goo",
-		Child:     "gle",
+		Parent:    "bi",
+		Child:     "ng",


quit raising entropy

yurishkuro · 2019-02-12T17:49:37Z

plugin/storage/cassandra/dependencystore/storage.go

+	SASIDisabled
+
+	depsInsertStmtSASI = "INSERT INTO dependencies(ts, ts_index, dependencies) VALUES (?, ?, ?)"
+	depsInsertStmt     = "INSERT INTO dependenciesv2(ts, date_bucket, dependencies) VALUES (?, ?, ?)"


can we do dependencies_v2

yurishkuro · 2019-02-12T17:58:54Z

plugin/storage/cassandra/schema/v002.cql.tmpl

+
+-- compaction strategy is intentionally different as compared to other tables due to the size of dependencies data
+CREATE TABLE IF NOT EXISTS jaeger.dependenciesv2 (
+    date_bucket  bigint,


I prefer that we define it as ts_bucket timestamp field. The code can truncate the timestamp to a Day precision, or we can even make it configurable if someone wants finer control (e.g maybe they are going to save deps every minute).

plugin/storage/cassandra/schema/migration/v001tov002part1.sh

codecov · 2019-02-12T19:45:24Z

Codecov Report

Merging #1328 into master will not change coverage.
The diff coverage is 100%.

@@          Coverage Diff           @@
##           master   #1328   +/-   ##
======================================
  Coverage     100%    100%           
======================================
  Files         162     163    +1     
  Lines        7326    7367   +41     
======================================
+ Hits         7326    7367   +41

Impacted Files	Coverage Δ
plugin/storage/cassandra/dependencystore/model.go	`100% <100%> (ø)`	⬆️
plugin/storage/cassandra/options.go	`100% <100%> (ø)`	⬆️
...lugin/storage/cassandra/dependencystore/storage.go	`100% <100%> (ø)`	⬆️
plugin/storage/cassandra/factory.go	`100% <100%> (ø)`	⬆️
model/dependencies.go	`100% <100%> (ø)`

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 7e1ee51...18aa185. Read the comment docs.

yurishkuro · 2019-02-12T19:52:03Z

CHANGELOG.md

@@ -8,6 +8,17 @@ Changes by Version

 ##### Breaking Changes


I am guessing this is technically a non-breaking change. It will become breaking once we start defaulting to _v2

yurishkuro · 2019-02-12T19:54:33Z

plugin/storage/cassandra/dependencystore/storage.go

-	depsInsertStmt = "INSERT INTO dependencies(ts, ts_index, dependencies) VALUES (?, ?, ?)"
-	depsSelectStmt = "SELECT ts, dependencies FROM dependencies WHERE ts_index >= ? AND ts_index < ?"
+	// SASIEnabled is used when the dependency table is SASI indexed.
+	SASIEnabled IndexMode = iota


would it not make sense to simply refer to this as v2 throughout, including constants, variables, the CLI flags? SASI then becomes a side effect that the user doesn't really need to know about.

yurishkuro · 2019-02-12T19:56:59Z

plugin/storage/cassandra/dependencystore/storage.go

 			Parent:    d.Parent,
 			Child:     d.Child,
 			CallCount: int64(d.CallCount),
 		}
+		if s.indexMode == SASIDisabled {


another argument to refer to this change as "dependencies v2" rather than tying to SASI.

yurishkuro

lgtm, just need to confirm the code works with the old schema

yurishkuro · 2019-02-12T22:10:49Z

CHANGELOG.md

+Migration Path:
+
+1. Run `plugin/storage/cassandra/schema/migration/v001tov002part1.sh` which will copy dependencies into a csv, update the `dependency UDT`, create a new `dependencies_v2` table, and write dependencies from the csv into the `dependencies_v2` table.
+2. Run the collector and query services with the cassandra flag `enable-dependencies-v2=true` which will update jaeger to write and read to and from the new `dependencies_v2` table.


cassandra flag enable-dependencies-v2=true

please specify the exact flag name

which will update jaeger to write

which will instruct jaeger to write

yurishkuro · 2019-02-12T22:11:37Z

CHANGELOG.md

+
+1. Run `plugin/storage/cassandra/schema/migration/v001tov002part1.sh` which will copy dependencies into a csv, update the `dependency UDT`, create a new `dependencies_v2` table, and write dependencies from the csv into the `dependencies_v2` table.
+2. Run the collector and query services with the cassandra flag `enable-dependencies-v2=true` which will update jaeger to write and read to and from the new `dependencies_v2` table.
+3. Update [spark job](https://github.com/jaegertracing/spark-dependencies) to write to the new `dependencies_v2` table.


this should rather say "update Spark job to version N"

I'll punt on this until I've actually made the change in spark.

yurishkuro · 2019-02-12T22:24:57Z

plugin/storage/cassandra/dependencystore/model.go

@@ -36,6 +37,8 @@ func (d *Dependency) MarshalUDT(name string, info gocql.TypeInfo) ([]byte, error
 		return gocql.Marshal(info, d.Child)
 	case "call_count":
 		return gocql.Marshal(info, d.CallCount)
+	case "source":


what happens if you run this code against the schema where UDT was not upgraded? Will gocql simply not invoke this function for "source"?

yurishkuro · 2019-02-12T22:27:12Z

model/dependencies.go

+}
+
+// Sanitize sanitizes the DependencyLink.
+func (d DependencyLink) Sanitize() DependencyLink {


ApplyDefaults

plugin/storage/cassandra/schema/migration/v001tov002part1.sh

yurishkuro · 2019-02-12T22:34:27Z

plugin/storage/cassandra/schema/migration/v001tov002part1.sh

+fi
+
+
+while IFS="," read ts dependency; do bucket=`date +"%Y%m%d" -d "$ts"`; echo "$bucket,$ts,$dependency"; done < dependencies.csv > dependencies_datebucket.csv


can you write it in normal multi-line syntax?

yurishkuro · 2019-02-12T22:37:38Z

plugin/storage/cassandra/schema/migration/v001tov002part2.sh

+echo "About to delete $row_count rows."
+confirm
+
+cqlsh -e "DROP INDEX IF EXISTS $keyspace.ts_index"


$keyspace.ts_index

naming 🤦‍♂️

Signed-off-by: Won Jun Jang <[email protected]>

yurishkuro · 2019-02-13T18:15:59Z

plugin/storage/cassandra/dependencystore/storage.go

+
+// IsValid returns true if the Version is a valid one.
+func (i Version) IsValid() bool {
+	return i < end


I would prefer a less confusing name than 'end', e.g. 'versionEnumEnd'

also, Version(-1) is valid according to this function

Signed-off-by: Won Jun Jang <[email protected]>

black-adder requested review from jpkrohling, objectiser, pavolloffay, tiffon, vprithvi and yurishkuro as code owners February 11, 2019 19:09

ghost assigned black-adder Feb 11, 2019

ghost added the review label Feb 11, 2019

vprithvi reviewed Feb 11, 2019

View reviewed changes

vprithvi reviewed Feb 12, 2019

View reviewed changes

yurishkuro reviewed Feb 12, 2019

View reviewed changes

black-adder force-pushed the remove_sasi_indices branch from 23bd58e to efeaa92 Compare February 12, 2019 21:06

yurishkuro reviewed Feb 12, 2019

View reviewed changes

black-adder mentioned this pull request Feb 13, 2019

Add cassandra integration tests #1337

Merged

black-adder added 9 commits February 13, 2019 10:35

Remove SASI indices

11c2cce

Signed-off-by: Won Jun Jang <[email protected]>

address comments

1c24fb5

Signed-off-by: Won Jun Jang <[email protected]>

actually address comments

24da016

Signed-off-by: Won Jun Jang <[email protected]>

update CHANGELOG

5ecb6d5

Signed-off-by: Won Jun Jang <[email protected]>

address comments

98b58fb

Signed-off-by: Won Jun Jang <[email protected]>

fix migration scripts

d9f8b91

Signed-off-by: Won Jun Jang <[email protected]>

first attempt

f39eb35

Signed-off-by: Won Jun Jang <[email protected]>

yay

f3df053

Signed-off-by: Won Jun Jang <[email protected]>

remove space

0dbea68

Signed-off-by: Won Jun Jang <[email protected]>

black-adder force-pushed the remove_sasi_indices branch from 77cd266 to 0dbea68 Compare February 13, 2019 16:47

yurishkuro approved these changes Feb 13, 2019

View reviewed changes

make migrations scripts more usable

fdb18f5

Signed-off-by: Won Jun Jang <[email protected]>

address comments

05a3834

Signed-off-by: Won Jun Jang <[email protected]>

This was referenced Feb 13, 2019

[cassandra] Remove SASI index from dependencies table #793

Closed

Why not use ScyllaDB? #197

Closed

pavolloffay mentioned this pull request Feb 13, 2019

Release 1.10 #1321

Closed

4 tasks

yurishkuro mentioned this pull request Feb 13, 2019

Make dependencies_v2 the default for Cassandra #1344

Closed

3 tasks

Merge branch 'master' into remove_sasi_indices

18aa185

black-adder merged commit 7e51957 into master Feb 14, 2019

ghost removed the review label Feb 14, 2019

black-adder deleted the remove_sasi_indices branch February 14, 2019 20:25

huynguyennovem mentioned this pull request Feb 15, 2019

Fix unsorted imports #1347

Merged

black-adder mentioned this pull request Feb 20, 2019

Dependencies V2 not friendly for new users #1363

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove SASI indices #1328

Remove SASI indices #1328

black-adder commented Feb 11, 2019 •

edited by yurishkuro

Loading

vprithvi Feb 11, 2019

black-adder Feb 11, 2019

vprithvi Feb 11, 2019

black-adder Feb 12, 2019

vprithvi Feb 11, 2019

black-adder Feb 12, 2019

vprithvi Feb 12, 2019

black-adder Feb 12, 2019

vprithvi Feb 11, 2019

vprithvi Feb 12, 2019

black-adder Feb 12, 2019

vprithvi Feb 12, 2019

yurishkuro Feb 12, 2019

yurishkuro Feb 12, 2019

yurishkuro Feb 12, 2019

codecov bot commented Feb 12, 2019 •

edited

Loading

yurishkuro Feb 12, 2019

yurishkuro Feb 12, 2019

yurishkuro Feb 12, 2019

yurishkuro left a comment

yurishkuro Feb 12, 2019

yurishkuro Feb 12, 2019

black-adder Feb 13, 2019

yurishkuro Feb 12, 2019

black-adder Feb 13, 2019

yurishkuro Feb 12, 2019

yurishkuro Feb 12, 2019

yurishkuro Feb 12, 2019

yurishkuro Feb 13, 2019

yurishkuro Feb 13, 2019

		fi


		while IFS="," read ts dependency; do bucket=`date +"%Y%m%d" -d "$ts"`; echo "$bucket,$ts,$dependency"; done < dependencies.csv > dependencies_datebucket.csv

Remove SASI indices #1328

Remove SASI indices #1328

Conversation

black-adder commented Feb 11, 2019 • edited by yurishkuro Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Feb 12, 2019 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yurishkuro left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

black-adder commented Feb 11, 2019 •

edited by yurishkuro

Loading

codecov bot commented Feb 12, 2019 •

edited

Loading