Skip to content

Commit

Permalink
Review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
kegsay committed Sep 14, 2023
1 parent e4cedaa commit 806639a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.20
go-version: "1.20"

- name: Build
run: go build ./cmd/syncv3
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.20
go-version: "1.20"

- name: Build
run: go build ./cmd/syncv3
Expand Down Expand Up @@ -260,7 +260,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.20
go-version: "1.20"

# E2E tests with ${{env.PREV_VERSION}}
- uses: actions/checkout@v3
Expand Down
2 changes: 2 additions & 0 deletions state/accumulator.go
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ func (a *Accumulator) Initialise(roomID string, state []json.RawMessage) (Initia
Str("room_id", roomID).
Int("len_state", len(events)).
Msg(errMsg)
// the HS gave us bad data so there's no point retrying => return DataError
return internal.NewDataError(errMsg)
}

Expand Down Expand Up @@ -389,6 +390,7 @@ func (a *Accumulator) Accumulate(txn *sqlx.Tx, userID, roomID string, prevBatch
})
sentry.CaptureMessage(msg)
})
// the HS gave us bad data so there's no point retrying
// by not returning an error, we are telling the poller it is fine to not retry this request.
return 0, nil, nil
}
Expand Down

0 comments on commit 806639a

Please sign in to comment.