Skip to content

Refactor fetching of poison message by cg, encapsulate getting #611

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
merged 2 commits into from
Dec 28, 2022
Merged

Refactor fetching of poison message by cg, encapsulate getting #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cac734d
Refactor fetching of poison message by cg, encapsulate getting
OrMemphis Dec 28, 2022
0f6ec2b
Merge remote-tracking branch 'origin/master' into dls-poison-refactor
shay23b Dec 28, 2022
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
82 changes: 10 additions & 72 deletions server/background_tasks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,88 +137,26 @@ func ackPoisonMsgV0(msgId string, cgName string) error {
streamName := fmt.Sprintf(dlsStreamName, sn.Intern())
uid := serv.memphis.nuid.Next()
durableName := "$memphis_fetch_dls_consumer_" + uid
var msgs []StoredMsg
streamInfo, err := serv.memphisStreamInfo(streamName)
if err != nil {
return err
}
filter := GetDlsSubject("poison", sn.Intern(), msgId)
amount := streamInfo.State.Msgs
cc := ConsumerConfig{
DeliverPolicy: DeliverAll,
AckPolicy: AckExplicit,
Durable: durableName,
FilterSubject: filter,
}
err = serv.memphisAddConsumer(streamName, &cc)
if err != nil {
return err
}
responseChan := make(chan StoredMsg)
subject := fmt.Sprintf(JSApiRequestNextT, streamName, durableName)
reply := durableName + "_reply"
req := []byte(strconv.FormatUint(amount, 10))
sub, err := serv.subscribeOnGlobalAcc(reply, reply+"_sid", func(_ *client, subject, reply string, msg []byte) {
go func(respCh chan StoredMsg, subject, reply string, msg []byte) {
// ack
serv.sendInternalAccountMsg(serv.GlobalAccount(), reply, []byte(_EMPTY_))
rawTs := tokenAt(reply, 8)
seq, _, _ := ackReplyInfo(reply)
amount := uint64(1)
filter := GetDlsSubject("poison", sn.Intern(), msgId, cgName)
timeout := 30 * time.Second
msgs, err := serv.memphisGetMessagesByFilter(streamName, filter, 0, amount, timeout)

intTs, err := strconv.Atoi(rawTs)
if err != nil {
serv.Errorf("ackPoisonMsgV0: " + err.Error())
}
if len(msgs) != 1 {
return errors.New("message was not found")
}

respCh <- StoredMsg{
Subject: subject,
Sequence: uint64(seq),
Data: msg,
Time: time.Unix(0, int64(intTs)),
}
}(responseChan, subject, reply, copyBytes(msg))
})
msg := msgs[0]
var dlsMsg models.DlsMessage
err = json.Unmarshal(msg.Data, &dlsMsg)
if err != nil {
return err
}

serv.sendInternalAccountMsgWithReply(serv.GlobalAccount(), subject, reply, nil, req, true)
timeout := 30 * time.Second
timer := time.NewTimer(timeout)
for i := uint64(0); i < amount; i++ {
select {
case <-timer.C:
goto cleanup
case msg := <-responseChan:
msgs = append(msgs, msg)
}
}

cleanup:
timer.Stop()
serv.unsubscribeOnGlobalAcc(sub)
err = serv.memphisRemoveConsumer(streamName, durableName)
if err != nil {
return err
}
for _, msg := range msgs {
splittedSubj := strings.Split(msg.Subject, tsep)
msgType := splittedSubj[1]
var dlsMsg models.DlsMessage
err = json.Unmarshal(msg.Data, &dlsMsg)
if err != nil {
return err
}
if msgType == "poison" {
if dlsMsg.PoisonedCg.CgName == cgName {
_, err = serv.memphisDeleteMsgFromStream(streamName, msg.Sequence)
if err != nil {
return err
}
return nil
}
}
}
return nil
}

Expand Down
Loading