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

Jump to bottom

fix: jobsforwarder panics with slice bounds out of range #3414

Merged
merged 1 commit into from
May 29, 2023
Merged

fix: jobsforwarder panics with slice bounds out of range #3414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions schema-forwarder/internal/batcher/batcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (

// A batch of jobs that share the same schema.
type EventSchemaMessageBatch struct {
Index int
Message *proto.EventSchemaMessage
Jobs []*jobsdb.JobT
}
Expand Down Expand Up @@ -59,6 +60,7 @@ func (sb *EventSchemaMessageBatcher) GetMessageBatches() []*EventSchemaMessageBa
batches := make([]*EventSchemaMessageBatch, len(sb.batchOrder))
for i, key := range sb.batchOrder {
batches[i] = sb.batchIndex[key]
batches[i].Index = i
}
return batches
}
Expand Down
8 changes: 6 additions & 2 deletions schema-forwarder/internal/forwarder/jobsforwarder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"github.com/rudderlabs/rudder-server/schema-forwarder/internal/transformer"
"github.com/rudderlabs/rudder-server/utils/bytesize"
"github.com/rudderlabs/rudder-server/utils/misc"
"github.com/samber/lo"
)

// JobsForwarder is a forwarder that transforms and forwards jobs to a pulsar topic
Expand Down Expand Up @@ -129,16 +130,19 @@ func (jf *JobsForwarder) Start() error {
return nil //nolint:nilerr
}
toForward := append([]*batcher.EventSchemaMessageBatch{}, messageBatches...)
for idx, batch := range toForward {
for _, batch := range toForward {
batch := batch // can be used in a goroutine
idx := idx // can be used in a goroutine
msg := batch.Message
orderKey := msg.Key.WriteKey
jf.pulsarProducer.SendMessageAsync(ctx, orderKey, orderKey, msg.MustMarshal(),
func(_ pulsarType.MessageID, _ *pulsarType.ProducerMessage, err error) {
if err == nil { // mark job as succeeded and remove from toRetry
mu.Lock()
defer mu.Unlock()

_, idx, _ := lo.FindIndexOf(messageBatches, func(item *batcher.EventSchemaMessageBatch) bool {
return item.Index == batch.Index
})
messageBatches = slices.Delete(messageBatches, idx, idx+1)
for _, job := range batch.Jobs {
statuses = append(statuses, &jobsdb.JobStatusT{
Expand Down