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.

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

FR: QOS Ack Implementation #93

Merged
merged 5 commits into from
Jul 19, 2022
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
15 changes: 15 additions & 0 deletions messages.go
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,21 @@ func (msg *Message) TransactionKey() string {
return msg.TransactionUUID
}

// IsQOSAckPart determines whether or not a message can QOS ack.
func (msg *Message) IsQOSAckPart() bool {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added this to provide a quick way to check whether msgs are able to qos ack.

if !msg.Type.SupportsQOSAck() {
return false
}

// https://xmidt.io/docs/wrp/basics/#qos-description-qos
switch msg.QualityOfService.Level() {
case QOSMedium, QOSHigh, QOSCritical:
return true
default:
return false
}
}

func (msg *Message) Response(newSource string, requestDeliveryResponse int64) Routable {
response := *msg
response.Destination = msg.Source
Expand Down
111 changes: 111 additions & 0 deletions messages_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,117 @@ func testSimpleEventEncode(t *testing.T, f Format, original SimpleEvent) {
assert.Equal(original, decoded)
}

func TestIsQOSAckPart(t *testing.T) {
tests := []struct {
description string
msg Message
ack bool
}{
// Ack case
{
description: "SimpleEventMessageType QOSMediumValue ack",
msg: Message{Type: SimpleEventMessageType, QualityOfService: QOSMediumValue},
ack: true,
},
{
description: "SimpleEventMessageType QOSHighValue ack",
msg: Message{Type: SimpleEventMessageType, QualityOfService: QOSHighValue},
ack: true,
},
{
description: "SimpleEventMessageType QOSCriticalValue ack",
msg: Message{Type: SimpleEventMessageType, QualityOfService: QOSCriticalValue},
ack: true,
},
{
description: "SimpleEventMessageType above QOS range ack",
msg: Message{Type: SimpleEventMessageType, QualityOfService: QOSCriticalValue + 1},
ack: true,
},
// No ack case
{
description: "SimpleEventMessageType below QOS range no ack",
msg: Message{Type: SimpleEventMessageType, QualityOfService: QOSLowValue - 1},
},
{
description: "SimpleEventMessageType QOSLowValue no ack",
msg: Message{Type: SimpleEventMessageType, QualityOfService: QOSLowValue},
},
{
description: "Invalid0MessageType no ack",
msg: Message{Type: Invalid0MessageType, QualityOfService: QOSCriticalValue},
},
{
description: "SimpleRequestResponseMessageType no ack",
msg: Message{Type: SimpleRequestResponseMessageType, QualityOfService: QOSCriticalValue},
},
{
description: "CreateMessageType no ack",
msg: Message{Type: CreateMessageType, QualityOfService: QOSCriticalValue},
},
{
description: "RetrieveMessageType no ack",
msg: Message{Type: RetrieveMessageType, QualityOfService: QOSCriticalValue},
},
{
description: "UpdateMessageType no ack",
msg: Message{Type: UpdateMessageType, QualityOfService: QOSCriticalValue},
},
{
description: "DeleteMessageType no ack",
msg: Message{Type: DeleteMessageType, QualityOfService: QOSCriticalValue},
},
{
description: "ServiceRegistrationMessageType no ack",
msg: Message{Type: ServiceRegistrationMessageType, QualityOfService: QOSCriticalValue},
},
{
description: "ServiceAliveMessageType no ack",
msg: Message{Type: ServiceAliveMessageType, QualityOfService: QOSCriticalValue},
},
{
description: "UnknownMessageType no ack",
msg: Message{Type: UnknownMessageType, QualityOfService: QOSCriticalValue},
},
{
description: "AuthorizationMessageType no ack",
msg: Message{Type: AuthorizationMessageType, QualityOfService: QOSCriticalValue},
},
{
description: "Invalid0MessageType no ack",
msg: Message{Type: Invalid0MessageType, QualityOfService: QOSCriticalValue},
},
{
description: "Invalid1MessageType no ack",
msg: Message{Type: Invalid1MessageType, QualityOfService: QOSCriticalValue},
},
{
description: "lastMessageType no ack",
msg: Message{Type: lastMessageType, QualityOfService: QOSCriticalValue},
},
{
description: "Nonexistent negative MessageType no ack",
msg: Message{Type: -10, QualityOfService: QOSCriticalValue},
},
{
description: "Nonexistent positive MessageType no ack",
msg: Message{Type: lastMessageType + 1, QualityOfService: QOSCriticalValue},
},
}

for _, tc := range tests {
t.Run(tc.description, func(t *testing.T) {
assert := assert.New(t)
if tc.ack {
assert.True(tc.msg.IsQOSAckPart())
return
}

assert.False(tc.msg.IsQOSAckPart())
})
}
}

func TestSimpleEvent(t *testing.T) {
var messages = []SimpleEvent{
{},
Expand Down
28 changes: 14 additions & 14 deletions messagetype.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,22 +49,22 @@ const (
// where applicable).
func (mt MessageType) SupportsTransaction() bool {
switch mt {
case Invalid0MessageType:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was looking to see how we did similar things as SupportsTransaction but then I noticed we can simplify it and improve readability

return false
case Invalid1MessageType:
return false
case AuthorizationMessageType:
case SimpleRequestResponseMessageType, CreateMessageType, RetrieveMessageType, UpdateMessageType, DeleteMessageType:
return true
default:
return false
}
}

// SupportsQOSAck tests if messages of this type are allowed to participate in QOS Ack
// as specified in https://xmidt.io/docs/wrp/basics/#qos-description-qos .
// If this method returns false, QOS Ack is foregone.
func (mt MessageType) SupportsQOSAck() bool {
switch mt {
case SimpleEventMessageType:
return false
case ServiceRegistrationMessageType:
return false
case ServiceAliveMessageType:
return false
case UnknownMessageType:
return false
default:
return true
default:
return false
}
}

Expand Down Expand Up @@ -114,7 +114,7 @@ func init() {
func StringToMessageType(value string) (MessageType, error) {
mt, ok := stringToMessageType[value]
if !ok {
return MessageType(-1), fmt.Errorf("Invalid message type: %s", value)
return MessageType(-1), fmt.Errorf("invalid message type: %s", value)
}

return mt, nil
Expand Down
28 changes: 28 additions & 0 deletions messagetype_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ func TestMessageTypeSupportsTransaction(t *testing.T) {
ServiceRegistrationMessageType: false,
ServiceAliveMessageType: false,
UnknownMessageType: false,
lastMessageType: false,
lastMessageType + 1: false,
}
)

Expand All @@ -81,6 +83,32 @@ func TestMessageTypeSupportsTransaction(t *testing.T) {
}
}

func TestMessageTypeSupportsQOSAck(t *testing.T) {
var (
assert = assert.New(t)
expectedSupportsQOSAck = map[MessageType]bool{
Invalid0MessageType: false,
Invalid1MessageType: false,
AuthorizationMessageType: false,
SimpleRequestResponseMessageType: false,
SimpleEventMessageType: true,
CreateMessageType: false,
RetrieveMessageType: false,
UpdateMessageType: false,
DeleteMessageType: false,
ServiceRegistrationMessageType: false,
ServiceAliveMessageType: false,
UnknownMessageType: false,
lastMessageType: false,
lastMessageType + 1: false,
}
)

for messageType, expected := range expectedSupportsQOSAck {
assert.Equal(expected, messageType.SupportsQOSAck())
}
}

func testStringToMessageTypeValid(t *testing.T, expected MessageType) {
var (
assert = assert.New(t)
Expand Down
7 changes: 7 additions & 0 deletions qos.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ const (
// type determine what QOSLevel a message has.
type QOSValue int

const (
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I found myself wanting a quick default values for the talaria qos implementation and I can imagine other users will too.

QOSLowValue QOSValue = iota * 25
QOSMediumValue
QOSHighValue
QOSCriticalValue
)

// Level determines the QOSLevel for this value. Negative values are assumed
// to be QOSLow. Values higher than the highest value (99) are assumed to
// be QOSCritical.
Expand Down
16 changes: 16 additions & 0 deletions qos_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,22 @@ func TestQOSValue(t *testing.T) {
value QOSValue
expected QOSLevel
}{
{
value: QOSLowValue,
expected: QOSLow,
},
{
value: QOSMediumValue,
expected: QOSMedium,
},
{
value: QOSHighValue,
expected: QOSHigh,
},
{
value: QOSCriticalValue,
expected: QOSCritical,
},
{
value: -1,
expected: QOSLow,
Expand Down