Skip to content

make cassandra service_name_index inserts idempotent #587

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

Merged
yurishkuro merged 2 commits into from
Dec 6, 2017
Merged

make cassandra service_name_index inserts idempotent #587

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9fa47b
make cassandra service_name_index inserts idempotent
Dec 6, 2017
87eba97
fix typos
Dec 6, 2017
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
4 changes: 1 addition & 3 deletions plugin/storage/cassandra/spanstore/writer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ package spanstore
import (
"encoding/json"
"strings"
"sync/atomic"
"time"
"unicode/utf8"

Expand Down Expand Up @@ -85,7 +84,6 @@ type SpanWriter struct {
writerMetrics spanWriterMetrics
logger *zap.Logger
tagIndexSkipped metrics.Counter
bucketCounter uint32
tagFilter dbmodel.TagFilter
}

Expand Down Expand Up @@ -200,7 +198,7 @@ func (s *SpanWriter) indexByDuration(span *dbmodel.Span, startTime time.Time) er
}

func (s *SpanWriter) indexBySerice(traceID model.TraceID, span *dbmodel.Span) error {
Copy link
Copy Markdown
Contributor

@black-adder black-adder Dec 6, 2017

Choose a reason for hiding this comment

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

while you're here, do you mind doing s/indexBySerice/indexByService :D

bucketNo := atomic.AddUint32(&s.bucketCounter, 1) % defaultNumBuckets
bucketNo := span.SpanHash % defaultNumBuckets
Copy link
Copy Markdown
Member

@yurishkuro yurishkuro Dec 6, 2017

Choose a reason for hiding this comment

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

good call

query := s.session.Query(serviceNameIndex)
q := query.Bind(span.Process.ServiceName, bucketNo, span.StartTime, span.TraceID)
return s.writerMetrics.serviceNameIndex.Exec(q, s.logger)
Expand Down