From 32b1f751b239bc23c79df176dccba8c5e2566134 Mon Sep 17 00:00:00 2001 From: Johnny Graettinger Date: Tue, 3 Dec 2019 15:24:13 -0500 Subject: [PATCH] consumer: add DisableWaitForAck spec field This field allows for toggling behavior re: whether consumer transactions should wait for ACKs of messages read this transaction. Issue #243 --- CHANGELOG.rst | 4 + consumer/protocol/protocol.pb.go | 264 +++++++++++------- consumer/protocol/protocol.proto | 17 ++ consumer/protocol/shard_spec_extensions.go | 11 +- .../protocol/shard_spec_extensions_test.go | 4 + consumer/shardspace/shardspace_test.go | 7 + consumer/transaction.go | 6 +- 7 files changed, 203 insertions(+), 110 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b76c18dd..af216804 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,6 +14,10 @@ v0.85.1 (unreleased) - Reworked almost all documentation into reStructuredText / Sphinx / ReadTheDocs format. - Make-based build system is refactored to make it easier to integrate and reuse in external repositories and consumer application projects. +- Add ``DisableWaitForAck`` ShardSpec field, which toggles the consumer transaction + behavior of waiting for ACKs of read pending messages. Most applications won't want + to set this, but it can be helpful to avoid stalls in applications with cyclic + message flows. v0.84.2 ------- diff --git a/consumer/protocol/protocol.pb.go b/consumer/protocol/protocol.pb.go index 194d2a5a..1a288dea 100644 --- a/consumer/protocol/protocol.pb.go +++ b/consumer/protocol/protocol.pb.go @@ -206,6 +206,20 @@ type ShardSpec struct { // User-defined Labels of this ShardSpec. The label "id" is reserved and may // not be used with a ShardSpec's labels. protocol.LabelSet `protobuf:"bytes,10,opt,name=labels,proto3,embedded=labels" json:"labels" yaml:",omitempty,inline"` + // Disable waiting for acknowledgements of pending message(s). + // + // If a consumer transaction reads uncommitted messages, it will by default + // remain open (subject to the max duration) awaiting an acknowledgement of + // those messages, in the hope that that acknowledgement will be quickly + // forthcoming and, by remaining open, we can process all messages in this + // transaction. Effectively we're trading a small amount of increased local + // latency for a global reduction in end-to-end latency. + // + // This works well for acyclic message flows, but can introduce unnecessary + // stalls if there are message cycles between shards. In the simplest case, + // a transaction could block awaiting an ACK of a message that it itself + // produced -- an ACK which can't arrive until the transaction closes. + DisableWaitForAck bool `protobuf:"varint,11,opt,name=disable_wait_for_ack,json=disableWaitForAck,proto3" json:"disable_wait_for_ack,omitempty" yaml:"disable_wait_for_ack,omitempty"` } func (m *ShardSpec) Reset() { *m = ShardSpec{} } @@ -1019,114 +1033,117 @@ func init() { func init() { proto.RegisterFile("consumer/protocol/protocol.proto", fileDescriptor_6491fb50a1cefedd) } var fileDescriptor_6491fb50a1cefedd = []byte{ - // 1709 bytes of a gzipped FileDescriptorProto + // 1747 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x4f, 0x6f, 0x23, 0x49, - 0x15, 0x4f, 0xdb, 0x4e, 0x3b, 0x79, 0xed, 0x64, 0x3c, 0x35, 0xff, 0x3c, 0x3d, 0xbb, 0x76, 0x62, - 0x66, 0x16, 0x6b, 0x76, 0xb7, 0xb3, 0x64, 0x59, 0x69, 0x18, 0xed, 0x22, 0xdc, 0xf6, 0xcc, 0x4e, - 0xd8, 0x4c, 0x12, 0xda, 0x41, 0xb0, 0x48, 0xa8, 0x69, 0x77, 0xd7, 0x38, 0x8d, 0xdb, 0x5d, 0x4d, - 0x77, 0x39, 0x8a, 0x39, 0x22, 0x71, 0x59, 0x09, 0x69, 0x6f, 0x70, 0x44, 0x70, 0x01, 0x89, 0x0f, - 0xb0, 0x17, 0x0e, 0x1c, 0x90, 0xe6, 0x38, 0xe2, 0x84, 0x38, 0x78, 0xc4, 0x0e, 0xe2, 0x03, 0xe4, - 0x38, 0x27, 0xd4, 0x55, 0xd5, 0xed, 0xb6, 0xd3, 0x59, 0x08, 0x68, 0xd8, 0x5b, 0xf9, 0xbd, 0xdf, - 0xfb, 0xbd, 0x7a, 0xaf, 0xde, 0x7b, 0x55, 0x6d, 0xd8, 0xb0, 0x89, 0x1f, 0x8d, 0x47, 0x38, 0xdc, - 0x0a, 0x42, 0x42, 0x89, 0x4d, 0xbc, 0x74, 0xa1, 0xb1, 0x05, 0x5a, 0x49, 0x10, 0x6a, 0xbd, 0x1f, - 0x92, 0xe1, 0xf9, 0x48, 0xf5, 0x8d, 0x94, 0x2b, 0xc4, 0x36, 0x39, 0xc6, 0xe1, 0xc4, 0x23, 0x03, - 0xb6, 0x0e, 0x1d, 0xec, 0x98, 0x24, 0x10, 0xb8, 0x7a, 0x40, 0x27, 0x01, 0x8e, 0xb6, 0x9c, 0x71, - 0x68, 0x51, 0x97, 0xf8, 0xe9, 0x42, 0xe8, 0xaf, 0x0e, 0xc8, 0x80, 0xb0, 0xe5, 0x56, 0xbc, 0xe2, - 0xd2, 0xe6, 0x3f, 0xcb, 0xb0, 0xda, 0x3b, 0xb2, 0x42, 0xa7, 0x17, 0x60, 0x1b, 0xbd, 0x03, 0x05, - 0xd7, 0xa9, 0x49, 0x1b, 0x52, 0x6b, 0x55, 0xdf, 0x38, 0x9d, 0x36, 0x2e, 0x4f, 0xac, 0x91, 0x77, - 0xbf, 0xf9, 0x16, 0x19, 0xb9, 0x14, 0x8f, 0x02, 0x3a, 0x69, 0xbe, 0x9c, 0x36, 0xca, 0x0c, 0xbf, - 0xd3, 0x35, 0x0a, 0xae, 0x83, 0xf6, 0xa1, 0x1c, 0x91, 0x71, 0x68, 0xe3, 0xa8, 0x56, 0xd8, 0x28, - 0xb6, 0x94, 0x6d, 0x55, 0x4b, 0xf6, 0xab, 0xa5, 0xbc, 0x5a, 0x8f, 0x41, 0xf4, 0x9b, 0x4f, 0xa7, - 0x8d, 0xa5, 0x5c, 0x5a, 0x23, 0x61, 0x41, 0xdf, 0x87, 0x2b, 0x49, 0x9c, 0xa6, 0x47, 0x06, 0x66, - 0x10, 0xe2, 0x27, 0xee, 0x49, 0xad, 0xc8, 0xf6, 0xd4, 0x3a, 0x9d, 0x36, 0x6e, 0x73, 0xe3, 0x1c, - 0x50, 0x96, 0xef, 0x72, 0xa2, 0xdf, 0x25, 0x83, 0x03, 0xa6, 0x45, 0x6d, 0x50, 0x8e, 0x5c, 0x9f, - 0x26, 0x8c, 0xa5, 0x34, 0xca, 0xd7, 0x38, 0x63, 0x46, 0x99, 0x65, 0x82, 0x58, 0x2e, 0x28, 0xba, - 0x50, 0x61, 0xa8, 0xbe, 0x65, 0x0f, 0xc7, 0x41, 0x54, 0x5b, 0xde, 0x90, 0x5a, 0xcb, 0xfa, 0xe6, - 0xe9, 0xb4, 0xf1, 0x7a, 0x86, 0x43, 0x68, 0xb3, 0x24, 0xcc, 0xb3, 0xce, 0xe5, 0x28, 0x84, 0xea, - 0xc8, 0x3a, 0x31, 0xe9, 0x89, 0x6f, 0x26, 0x67, 0x54, 0x93, 0x37, 0xa4, 0x96, 0xb2, 0x7d, 0x53, - 0x1b, 0x10, 0x32, 0xf0, 0x30, 0x3f, 0x9c, 0xfe, 0xf8, 0x89, 0xd6, 0x15, 0x00, 0xfd, 0x6d, 0x91, - 0xbb, 0x4d, 0xee, 0x68, 0x91, 0x20, 0xe3, 0xec, 0x57, 0xcf, 0x1b, 0x92, 0xb1, 0x3e, 0xb2, 0x4e, - 0x0e, 0x4f, 0xfc, 0xc4, 0x9c, 0xf9, 0x74, 0xfd, 0x79, 0x9f, 0xe5, 0x8b, 0xfa, 0x5c, 0x20, 0x38, - 0xeb, 0xd3, 0xf5, 0xb3, 0x3e, 0xb7, 0xa0, 0xec, 0xb8, 0x91, 0xd5, 0xf7, 0x70, 0x6d, 0x65, 0x43, - 0x6a, 0xad, 0xe8, 0xd7, 0xce, 0x39, 0x7b, 0x81, 0x62, 0xe9, 0x25, 0xd4, 0x8c, 0xa8, 0xe5, 0x3b, - 0xfd, 0x49, 0x54, 0x5b, 0xdd, 0x90, 0x5a, 0x6b, 0x73, 0xe9, 0xcd, 0x68, 0xe7, 0xd3, 0x4b, 0x68, - 0x4f, 0xc8, 0xd1, 0x01, 0xc8, 0x9e, 0xd5, 0xc7, 0x5e, 0x54, 0x03, 0x16, 0x20, 0xd2, 0xd2, 0x8e, - 0xda, 0x8d, 0xe5, 0x3d, 0x4c, 0xf5, 0xdb, 0x71, 0x64, 0xcf, 0xa6, 0x0d, 0xe9, 0x74, 0xda, 0xa8, - 0x2d, 0xee, 0xe8, 0x2d, 0xd7, 0xf7, 0x5c, 0x1f, 0x37, 0x0d, 0xc1, 0xa3, 0xfe, 0x49, 0x02, 0x99, - 0x97, 0x30, 0xda, 0x81, 0xf2, 0x8f, 0xc9, 0x38, 0xf4, 0x2d, 0x4f, 0xb4, 0xc9, 0xd6, 0xcb, 0x69, - 0xe3, 0xcd, 0x01, 0xd1, 0x06, 0xd6, 0x4f, 0x31, 0xa5, 0x58, 0x73, 0xf0, 0xf1, 0x96, 0x4d, 0x42, - 0xbc, 0xb5, 0xd0, 0xd6, 0xda, 0xb7, 0xb9, 0x99, 0x91, 0xd8, 0x23, 0x0f, 0x20, 0xce, 0x28, 0x79, - 0xf2, 0x24, 0xc2, 0x94, 0x15, 0x78, 0x51, 0x7f, 0x7c, 0x3a, 0x6d, 0xdc, 0x9a, 0x65, 0x9b, 0xeb, - 0xe6, 0xdb, 0xef, 0xee, 0x7f, 0xe2, 0x6c, 0x9f, 0x19, 0x1a, 0xab, 0x23, 0xd7, 0xe7, 0xcb, 0xe6, - 0xcf, 0x25, 0xa8, 0x74, 0x44, 0x67, 0xb2, 0x5e, 0x3f, 0x84, 0x4a, 0x10, 0x12, 0x1b, 0x47, 0x91, - 0x19, 0x05, 0xd8, 0x66, 0xe1, 0x28, 0xdb, 0xd7, 0x66, 0xc9, 0x3a, 0xe0, 0xda, 0x18, 0xac, 0xab, - 0x99, 0x7c, 0xad, 0x8b, 0x7c, 0x25, 0x59, 0x52, 0x82, 0x19, 0x10, 0x35, 0x40, 0x89, 0xe2, 0xb6, - 0x37, 0x3d, 0x77, 0xe4, 0xd2, 0x5a, 0x21, 0x3e, 0x41, 0x03, 0x98, 0x68, 0x37, 0x96, 0x34, 0x7f, - 0x23, 0xc1, 0x9a, 0x81, 0x03, 0xcf, 0xb5, 0xad, 0x1e, 0xb5, 0xe8, 0x38, 0x42, 0xef, 0x40, 0xc9, - 0x26, 0x0e, 0x66, 0x1b, 0x58, 0xdf, 0x7e, 0x6d, 0x36, 0x3f, 0xe6, 0x60, 0x5a, 0x87, 0x38, 0xd8, - 0x60, 0x48, 0x74, 0x1d, 0x64, 0x1c, 0x86, 0x24, 0xe4, 0x33, 0x67, 0xd5, 0x10, 0xbf, 0x9a, 0x1f, - 0x42, 0x29, 0x46, 0xa1, 0x15, 0x28, 0xed, 0x74, 0x77, 0x1f, 0x54, 0x97, 0x50, 0x05, 0x56, 0xf4, - 0x76, 0xe7, 0xa3, 0x87, 0x3b, 0xbb, 0xbb, 0x55, 0x07, 0x55, 0xa0, 0xdc, 0x3b, 0x6c, 0xef, 0x75, - 0xf5, 0x8f, 0xab, 0x4f, 0xa5, 0xf8, 0xd7, 0x81, 0xb1, 0xf3, 0xb8, 0x6d, 0x7c, 0x5c, 0xfd, 0x43, - 0x01, 0x29, 0x20, 0x3f, 0x6c, 0xef, 0xec, 0x3e, 0xe8, 0x56, 0x3f, 0x2d, 0x36, 0x3f, 0x93, 0x01, - 0x3a, 0x47, 0xd8, 0x1e, 0x06, 0xc4, 0xf5, 0x29, 0x0a, 0x66, 0x43, 0x4e, 0x62, 0x43, 0x6e, 0x73, - 0xb6, 0xc9, 0x19, 0x4c, 0x4c, 0xb9, 0xe8, 0x81, 0x4f, 0xc3, 0x89, 0xfe, 0x6e, 0x9c, 0xb1, 0x9f, - 0x3d, 0xbf, 0x60, 0x6d, 0x24, 0x53, 0xf0, 0x18, 0x14, 0xcb, 0x1e, 0x9a, 0xae, 0x4f, 0xb1, 0x4f, - 0x93, 0xd1, 0x7a, 0x3b, 0xd7, 0x6b, 0xdb, 0x1e, 0xee, 0x70, 0x18, 0x77, 0xbc, 0x75, 0x51, 0xa7, - 0x60, 0xa5, 0x0c, 0xea, 0x2f, 0x0a, 0x69, 0xa5, 0x7f, 0x07, 0x2a, 0x21, 0xb6, 0x1c, 0x93, 0x1e, - 0x85, 0x64, 0x3c, 0x38, 0x62, 0xc7, 0x53, 0xd4, 0xb5, 0x0b, 0x56, 0xa0, 0x12, 0x73, 0x1c, 0x72, - 0x0a, 0xb4, 0x07, 0xab, 0x41, 0x48, 0x9c, 0xb1, 0x8d, 0xc3, 0x24, 0xa6, 0xbb, 0x5f, 0x90, 0xc9, - 0xb8, 0x02, 0x39, 0x98, 0x47, 0x56, 0x8a, 0x53, 0x6a, 0xcc, 0x28, 0xd4, 0x1f, 0xc1, 0xfa, 0x3c, - 0x04, 0x55, 0xa1, 0x38, 0xc4, 0x13, 0xde, 0x9a, 0x46, 0xbc, 0x44, 0xf7, 0x60, 0xf9, 0xd8, 0xf2, - 0xc6, 0x98, 0x95, 0xa2, 0xb2, 0xdd, 0xcc, 0xf5, 0x97, 0xb0, 0xc4, 0xa5, 0x86, 0x0d, 0x6e, 0x70, - 0xbf, 0x70, 0x4f, 0x52, 0x7f, 0x29, 0xc1, 0xda, 0x9c, 0x12, 0x7d, 0x0b, 0x56, 0x3c, 0x2b, 0xa2, - 0xa6, 0x65, 0x0f, 0x99, 0x1b, 0x59, 0xbf, 0xf3, 0x72, 0xda, 0xd8, 0xcc, 0x4b, 0xc9, 0x08, 0x47, - 0x91, 0x35, 0xc0, 0x5a, 0xc7, 0x23, 0xf6, 0xd0, 0x28, 0xc7, 0x66, 0x6d, 0x7b, 0x88, 0xba, 0xb0, - 0xdc, 0xc7, 0x03, 0xd7, 0x67, 0x3b, 0xba, 0x78, 0x46, 0xb9, 0xb1, 0xfa, 0x3d, 0xa8, 0x64, 0xeb, - 0x2d, 0x27, 0xf2, 0xaf, 0xcd, 0x47, 0x7e, 0xeb, 0x0b, 0x32, 0x9d, 0x0d, 0xf9, 0x03, 0xb8, 0xb4, - 0x50, 0x52, 0x39, 0xdc, 0x57, 0xb3, 0xdc, 0x95, 0x8c, 0x79, 0xf3, 0x11, 0x28, 0xbb, 0x6e, 0x44, - 0x0d, 0xfc, 0x93, 0x31, 0x8e, 0x28, 0xfa, 0x06, 0xac, 0x44, 0xd8, 0xc3, 0x36, 0x25, 0xa1, 0x98, - 0x30, 0x37, 0xce, 0x8c, 0x63, 0xae, 0x16, 0xc7, 0x9b, 0xc2, 0x9b, 0xff, 0x28, 0x40, 0x85, 0x53, - 0x45, 0x01, 0xf1, 0x23, 0x8c, 0x5a, 0x20, 0x47, 0x6c, 0x16, 0x88, 0x51, 0x51, 0xcd, 0x3c, 0x35, - 0x98, 0xdc, 0x10, 0x7a, 0xa4, 0x81, 0x7c, 0x84, 0x2d, 0x07, 0x87, 0x22, 0xf6, 0xea, 0xcc, 0xe7, - 0x23, 0x26, 0x17, 0xce, 0x04, 0x0a, 0xdd, 0x07, 0x99, 0x8d, 0xa8, 0xa8, 0x56, 0x64, 0x55, 0x99, - 0x19, 0x42, 0xd9, 0x1d, 0xf0, 0x17, 0x4d, 0x62, 0xcb, 0x2d, 0xd4, 0x3f, 0x4a, 0xb0, 0xcc, 0xe4, - 0xe8, 0x6d, 0x28, 0x65, 0x26, 0xe9, 0x95, 0x9c, 0x87, 0x90, 0x30, 0x65, 0x30, 0xb4, 0x09, 0x95, - 0x11, 0x71, 0xcc, 0x10, 0x1f, 0xbb, 0x51, 0x7c, 0x1d, 0xb3, 0x72, 0x30, 0x94, 0x11, 0x71, 0x0c, - 0x21, 0x42, 0x6f, 0xc2, 0x72, 0x48, 0xc6, 0x14, 0xb3, 0xdb, 0x41, 0xd9, 0xbe, 0x34, 0x0b, 0xc3, - 0x88, 0xc5, 0x82, 0x8e, 0x63, 0xd0, 0x7b, 0x69, 0x7a, 0x4a, 0x2c, 0x88, 0x1b, 0xe7, 0x4c, 0xd2, - 0x74, 0xff, 0xec, 0x57, 0xf3, 0x6f, 0x12, 0x54, 0xda, 0x41, 0xe0, 0x4d, 0x92, 0x23, 0xfb, 0x00, - 0xca, 0xf6, 0x91, 0xe5, 0x0f, 0xd2, 0x69, 0xf7, 0xfa, 0x8c, 0x28, 0x0b, 0xd4, 0x3a, 0x0c, 0x25, - 0xe8, 0x12, 0x1b, 0xf5, 0x13, 0x09, 0x64, 0xae, 0x41, 0x1a, 0x5c, 0xc1, 0x27, 0x01, 0xb6, 0xa9, - 0x39, 0x17, 0x28, 0x9b, 0x24, 0xc6, 0x65, 0xae, 0x7a, 0x3c, 0x17, 0xae, 0x3c, 0x0e, 0x22, 0x1c, - 0x52, 0x71, 0x6c, 0x79, 0x29, 0x34, 0x04, 0x04, 0x7d, 0x05, 0x64, 0x07, 0x7b, 0x58, 0x24, 0x67, - 0x55, 0x57, 0xb2, 0x4f, 0x53, 0xa1, 0x6a, 0xba, 0xb0, 0x26, 0xb6, 0xfc, 0xaa, 0x6b, 0xa8, 0xf9, - 0xe7, 0x02, 0x28, 0x31, 0x45, 0x92, 0xc6, 0x56, 0x6a, 0x2f, 0xe5, 0xdb, 0xa7, 0xd5, 0xb7, 0x09, - 0xcb, 0xac, 0x96, 0x98, 0xa3, 0x85, 0x40, 0xb8, 0x06, 0xfd, 0x4e, 0x5a, 0x98, 0xc6, 0xbc, 0x4e, - 0xdf, 0x98, 0xdf, 0x7d, 0x72, 0x30, 0xc6, 0x6c, 0xe6, 0xf2, 0xc9, 0xf9, 0xc3, 0x0b, 0xde, 0x09, - 0x9f, 0x3c, 0xff, 0xaf, 0x87, 0xbc, 0xfa, 0x4d, 0xa8, 0x2e, 0xfa, 0xff, 0x77, 0x03, 0xa4, 0x98, - 0x1d, 0x20, 0x9f, 0x95, 0xa0, 0xc2, 0x83, 0x79, 0xe5, 0x6d, 0xff, 0xfb, 0xfc, 0xac, 0x7e, 0x75, - 0x31, 0xab, 0xa2, 0xfb, 0xbf, 0xcc, 0xb4, 0xa2, 0xdf, 0x4a, 0x00, 0xc1, 0xb8, 0xef, 0xb9, 0xd1, - 0x91, 0x69, 0x51, 0xd1, 0xe2, 0x77, 0xce, 0xd9, 0xe9, 0x01, 0x07, 0xb6, 0xe9, 0xff, 0x65, 0x9f, - 0xab, 0x41, 0xe2, 0xee, 0x7f, 0x3d, 0x7c, 0xf5, 0x7d, 0x58, 0x9f, 0xdf, 0xfb, 0x85, 0x4a, 0xe7, - 0xeb, 0x70, 0xe9, 0x43, 0x4c, 0x1f, 0xb9, 0x3e, 0x8d, 0x92, 0x2e, 0x4c, 0x7b, 0x4b, 0x3a, 0xaf, - 0xb7, 0x9a, 0x7f, 0x29, 0x40, 0x75, 0x66, 0xf6, 0xca, 0x8b, 0xae, 0x07, 0x6b, 0x41, 0xe8, 0x8e, - 0xac, 0x70, 0x62, 0xc6, 0x1f, 0x85, 0x91, 0x98, 0xed, 0xad, 0x99, 0x83, 0xc5, 0xcd, 0x68, 0xc9, - 0x82, 0x49, 0x05, 0x5d, 0x45, 0x90, 0x30, 0x59, 0xfc, 0x58, 0xe3, 0x5f, 0x9d, 0x82, 0x93, 0x97, - 0xc7, 0x45, 0x39, 0x15, 0xce, 0xc1, 0x44, 0xea, 0xfb, 0xf1, 0x3b, 0x3d, 0x83, 0x89, 0x2f, 0x23, - 0x4e, 0x9e, 0x7c, 0x29, 0x64, 0xfe, 0x8f, 0xd0, 0x1e, 0xf6, 0x1e, 0x73, 0x7e, 0x8e, 0xb9, 0x4b, - 0x40, 0x16, 0xcf, 0x7b, 0x19, 0x0a, 0xfb, 0x1f, 0x55, 0x97, 0xd0, 0x15, 0xb8, 0xd4, 0x7b, 0xd4, - 0x36, 0xba, 0xe6, 0xde, 0xfe, 0xa1, 0xf9, 0x70, 0xff, 0xbb, 0x7b, 0xdd, 0xaa, 0x84, 0xae, 0x42, - 0x75, 0x6f, 0xdf, 0xe4, 0xf2, 0xe4, 0x31, 0x5e, 0x40, 0xd7, 0xe0, 0x72, 0x0c, 0x9a, 0x17, 0x17, - 0xd1, 0x2d, 0xb8, 0xf1, 0xe0, 0xb0, 0xd3, 0x35, 0x0f, 0x8d, 0xf6, 0x5e, 0xaf, 0xdd, 0x39, 0xdc, - 0xd9, 0xdf, 0x33, 0xc5, 0x9b, 0xbd, 0xb4, 0x7d, 0x9a, 0x5e, 0xc3, 0xef, 0x41, 0x29, 0x76, 0x8d, - 0xae, 0xe5, 0x0e, 0x47, 0xf5, 0x7a, 0x7e, 0xcf, 0xc4, 0x66, 0xf1, 0x5d, 0x9f, 0x35, 0xcb, 0x3c, - 0x64, 0xb2, 0x66, 0x73, 0x8f, 0x92, 0x7b, 0xb0, 0xcc, 0x6e, 0x18, 0x74, 0x3d, 0xff, 0x96, 0x54, - 0x6f, 0x9c, 0x91, 0x0b, 0xcb, 0x36, 0xac, 0x24, 0xa7, 0x82, 0x6e, 0xe6, 0x9d, 0x14, 0xb7, 0x57, - 0xcf, 0x3f, 0x44, 0xbd, 0xf3, 0xf4, 0xef, 0xf5, 0xa5, 0xa7, 0x9f, 0xd7, 0xa5, 0x67, 0x9f, 0xd7, - 0xa5, 0x4f, 0x5f, 0xd4, 0x97, 0x7e, 0xfd, 0xa2, 0x2e, 0x3d, 0x7b, 0x51, 0x5f, 0xfa, 0xeb, 0x8b, - 0xfa, 0xd2, 0x0f, 0xee, 0xe4, 0xf5, 0xf0, 0x99, 0x7f, 0xa6, 0xfa, 0x32, 0x5b, 0xbd, 0xfb, 0xaf, - 0x00, 0x00, 0x00, 0xff, 0xff, 0x90, 0x08, 0x89, 0x23, 0xb5, 0x12, 0x00, 0x00, + 0x15, 0x4f, 0xdb, 0x8e, 0xe3, 0xbc, 0x76, 0x32, 0x9e, 0x9a, 0x7f, 0x9e, 0x9e, 0x5d, 0x3b, 0x31, + 0x33, 0x8b, 0x99, 0xdd, 0xed, 0x2c, 0x59, 0x56, 0x1a, 0x46, 0xbb, 0x08, 0xb7, 0x3d, 0xd9, 0x09, + 0x9b, 0x49, 0x42, 0x3b, 0x68, 0xd9, 0x95, 0x50, 0xd3, 0xee, 0xae, 0x38, 0x8d, 0xdb, 0x5d, 0x4d, + 0x77, 0x39, 0xc4, 0x1c, 0x91, 0xb8, 0xac, 0x84, 0xb4, 0x37, 0x38, 0x22, 0xb8, 0x80, 0xc4, 0x07, + 0xd8, 0x0b, 0x07, 0x90, 0x90, 0xe6, 0x38, 0xe2, 0x84, 0x38, 0x78, 0xc4, 0x0e, 0x9f, 0x20, 0xc7, + 0x39, 0xa1, 0xae, 0xaa, 0x6e, 0xb7, 0x3d, 0x9d, 0x05, 0x83, 0x86, 0xbd, 0x95, 0x5f, 0xfd, 0xde, + 0xef, 0xd5, 0xfb, 0x5b, 0xd5, 0x86, 0x0d, 0x8b, 0x78, 0xe1, 0x68, 0x88, 0x83, 0x2d, 0x3f, 0x20, + 0x94, 0x58, 0xc4, 0x4d, 0x16, 0x2a, 0x5b, 0xa0, 0x52, 0x8c, 0x50, 0x6a, 0xbd, 0x80, 0x0c, 0x2e, + 0x46, 0x2a, 0xaf, 0x25, 0x5c, 0x01, 0xb6, 0xc8, 0x29, 0x0e, 0xc6, 0x2e, 0xe9, 0xb3, 0x75, 0x60, + 0x63, 0xdb, 0x20, 0xbe, 0xc0, 0xd5, 0x7c, 0x3a, 0xf6, 0x71, 0xb8, 0x65, 0x8f, 0x02, 0x93, 0x3a, + 0xc4, 0x4b, 0x16, 0x62, 0xff, 0x6a, 0x9f, 0xf4, 0x09, 0x5b, 0x6e, 0x45, 0x2b, 0x2e, 0x6d, 0xfc, + 0xb9, 0x04, 0xab, 0xdd, 0x13, 0x33, 0xb0, 0xbb, 0x3e, 0xb6, 0xd0, 0x5b, 0x90, 0x73, 0xec, 0xaa, + 0xb4, 0x21, 0x35, 0x57, 0xb5, 0x8d, 0xf3, 0x49, 0xfd, 0xf2, 0xd8, 0x1c, 0xba, 0xf7, 0x1b, 0x6f, + 0x90, 0xa1, 0x43, 0xf1, 0xd0, 0xa7, 0xe3, 0xc6, 0xf3, 0x49, 0x7d, 0x85, 0xe1, 0x77, 0x3b, 0x7a, + 0xce, 0xb1, 0xd1, 0x01, 0xac, 0x84, 0x64, 0x14, 0x58, 0x38, 0xac, 0xe6, 0x36, 0xf2, 0x4d, 0x79, + 0x5b, 0x51, 0xe3, 0xf3, 0xaa, 0x09, 0xaf, 0xda, 0x65, 0x10, 0xed, 0xe6, 0xe3, 0x49, 0x7d, 0x29, + 0x93, 0x56, 0x8f, 0x59, 0xd0, 0xf7, 0xe1, 0x4a, 0xec, 0xa7, 0xe1, 0x92, 0xbe, 0xe1, 0x07, 0xf8, + 0xd8, 0x39, 0xab, 0xe6, 0xd9, 0x99, 0x9a, 0xe7, 0x93, 0xfa, 0x6d, 0xae, 0x9c, 0x01, 0x4a, 0xf3, + 0x5d, 0x8e, 0xf7, 0xf7, 0x48, 0xff, 0x90, 0xed, 0xa2, 0x16, 0xc8, 0x27, 0x8e, 0x47, 0x63, 0xc6, + 0x42, 0xe2, 0xe5, 0x2b, 0x9c, 0x31, 0xb5, 0x99, 0x66, 0x82, 0x48, 0x2e, 0x28, 0x3a, 0x50, 0x66, + 0xa8, 0x9e, 0x69, 0x0d, 0x46, 0x7e, 0x58, 0x5d, 0xde, 0x90, 0x9a, 0xcb, 0xda, 0xe6, 0xf9, 0xa4, + 0xfe, 0x6a, 0x8a, 0x43, 0xec, 0xa6, 0x49, 0x98, 0x65, 0x8d, 0xcb, 0x51, 0x00, 0x95, 0xa1, 0x79, + 0x66, 0xd0, 0x33, 0xcf, 0x88, 0x73, 0x54, 0x2d, 0x6e, 0x48, 0x4d, 0x79, 0xfb, 0xa6, 0xda, 0x27, + 0xa4, 0xef, 0x62, 0x9e, 0x9c, 0xde, 0xe8, 0x58, 0xed, 0x08, 0x80, 0xf6, 0xa6, 0x88, 0xdd, 0x26, + 0x37, 0x34, 0x4f, 0x90, 0x32, 0xf6, 0xab, 0xa7, 0x75, 0x49, 0x5f, 0x1f, 0x9a, 0x67, 0x47, 0x67, + 0x5e, 0xac, 0xce, 0x6c, 0x3a, 0xde, 0xac, 0xcd, 0x95, 0x45, 0x6d, 0xce, 0x11, 0xbc, 0x68, 0xd3, + 0xf1, 0xd2, 0x36, 0xb7, 0x60, 0xc5, 0x76, 0x42, 0xb3, 0xe7, 0xe2, 0x6a, 0x69, 0x43, 0x6a, 0x96, + 0xb4, 0x6b, 0x17, 0xe4, 0x5e, 0xa0, 0x58, 0x78, 0x09, 0x35, 0x42, 0x6a, 0x7a, 0x76, 0x6f, 0x1c, + 0x56, 0x57, 0x37, 0xa4, 0xe6, 0xda, 0x4c, 0x78, 0x53, 0xbb, 0xb3, 0xe1, 0x25, 0xb4, 0x2b, 0xe4, + 0xe8, 0x10, 0x8a, 0xae, 0xd9, 0xc3, 0x6e, 0x58, 0x05, 0xe6, 0x20, 0x52, 0x93, 0x8e, 0xda, 0x8b, + 0xe4, 0x5d, 0x4c, 0xb5, 0xdb, 0x91, 0x67, 0x4f, 0x26, 0x75, 0xe9, 0x7c, 0x52, 0xaf, 0xce, 0x9f, + 0xe8, 0x0d, 0xc7, 0x73, 0x1d, 0x0f, 0x37, 0x74, 0xc1, 0x83, 0x3e, 0x86, 0xab, 0xe2, 0x88, 0xc6, + 0x4f, 0x4c, 0x87, 0x1a, 0xc7, 0x24, 0x30, 0x4c, 0x6b, 0x50, 0x95, 0x99, 0x57, 0x5f, 0x3b, 0x9f, + 0xd4, 0xef, 0x70, 0x8e, 0x2c, 0xd4, 0x4c, 0x55, 0x0a, 0xc0, 0x87, 0xa6, 0x43, 0x77, 0x48, 0xd0, + 0xb2, 0x06, 0xca, 0x9f, 0x24, 0x28, 0xf2, 0xf6, 0x40, 0xbb, 0xb0, 0xf2, 0x23, 0x32, 0x0a, 0x3c, + 0xd3, 0x15, 0x2d, 0xb8, 0xf5, 0x7c, 0x52, 0x7f, 0xbd, 0x4f, 0xd4, 0xbe, 0xf9, 0x53, 0x4c, 0x29, + 0x56, 0x6d, 0x7c, 0xba, 0x65, 0x91, 0x00, 0x6f, 0xcd, 0x8d, 0x0c, 0xf5, 0x3b, 0x5c, 0x4d, 0x8f, + 0xf5, 0x91, 0x0b, 0x10, 0x65, 0x8b, 0x1c, 0x1f, 0x87, 0x98, 0xb2, 0xe6, 0xc9, 0x6b, 0x8f, 0xce, + 0x27, 0xf5, 0x5b, 0xd3, 0x4c, 0xf2, 0xbd, 0xd9, 0xd6, 0xbe, 0xfb, 0x9f, 0x18, 0x3b, 0x60, 0x8a, + 0xfa, 0xea, 0xd0, 0xf1, 0xf8, 0xb2, 0xf1, 0x73, 0x09, 0xca, 0x6d, 0xd1, 0xf5, 0x6c, 0x8e, 0x1c, + 0x41, 0xd9, 0x0f, 0x88, 0x85, 0xc3, 0xd0, 0x08, 0x7d, 0x6c, 0x31, 0x77, 0xe4, 0xed, 0x6b, 0xd3, + 0x44, 0x1c, 0xf2, 0xdd, 0x08, 0xac, 0x29, 0xa9, 0x5c, 0xac, 0x8b, 0x5c, 0xc4, 0x19, 0x90, 0xfd, + 0x29, 0x10, 0xd5, 0x41, 0x0e, 0xa3, 0x91, 0x62, 0xb8, 0xce, 0xd0, 0xa1, 0xd5, 0x5c, 0x54, 0x1d, + 0x3a, 0x30, 0xd1, 0x5e, 0x24, 0x69, 0xfc, 0x46, 0x82, 0x35, 0x1d, 0xfb, 0xae, 0x63, 0x99, 0x5d, + 0x6a, 0xd2, 0x51, 0x88, 0xde, 0x82, 0x82, 0x45, 0x6c, 0xcc, 0x0e, 0xb0, 0xbe, 0xfd, 0xca, 0x74, + 0x36, 0xcd, 0xc0, 0xd4, 0x36, 0xb1, 0xb1, 0xce, 0x90, 0xe8, 0x3a, 0x14, 0x71, 0x10, 0x90, 0x80, + 0xcf, 0xb3, 0x55, 0x5d, 0xfc, 0x6a, 0xbc, 0x0f, 0x85, 0x08, 0x85, 0x4a, 0x50, 0xd8, 0xed, 0xec, + 0x3d, 0xa8, 0x2c, 0xa1, 0x32, 0x94, 0xb4, 0x56, 0xfb, 0x83, 0x9d, 0xdd, 0xbd, 0xbd, 0x8a, 0x8d, + 0xca, 0xb0, 0xd2, 0x3d, 0x6a, 0xed, 0x77, 0xb4, 0x8f, 0x2a, 0x8f, 0xa5, 0xe8, 0xd7, 0xa1, 0xbe, + 0xfb, 0xa8, 0xa5, 0x7f, 0x54, 0xf9, 0x43, 0x0e, 0xc9, 0x50, 0xdc, 0x69, 0xed, 0xee, 0x3d, 0xe8, + 0x54, 0x3e, 0xcd, 0x37, 0x3e, 0x2b, 0x02, 0xb4, 0x4f, 0xb0, 0x35, 0xf0, 0x89, 0xe3, 0x51, 0xe4, + 0x4f, 0x07, 0xa8, 0xc4, 0x06, 0xe8, 0xe6, 0xf4, 0x90, 0x53, 0x98, 0x98, 0xa0, 0xe1, 0x03, 0x8f, + 0x06, 0x63, 0xed, 0xed, 0x28, 0x62, 0x3f, 0x7b, 0xba, 0x60, 0x6d, 0xc4, 0x13, 0xf6, 0x14, 0x64, + 0xd3, 0x1a, 0x18, 0x8e, 0x47, 0xb1, 0x47, 0xe3, 0xb1, 0x7d, 0x3b, 0xd3, 0x6a, 0xcb, 0x1a, 0xec, + 0x72, 0x18, 0x37, 0xbc, 0xb5, 0xa8, 0x51, 0x30, 0x13, 0x06, 0xe5, 0x17, 0xb9, 0xa4, 0xd2, 0xbf, + 0x0b, 0xe5, 0x00, 0x9b, 0xb6, 0x41, 0x4f, 0x02, 0x32, 0xea, 0x9f, 0xb0, 0xf4, 0xe4, 0x35, 0x75, + 0xc1, 0x0a, 0x94, 0x23, 0x8e, 0x23, 0x4e, 0x81, 0xf6, 0x61, 0xd5, 0x0f, 0x88, 0x3d, 0xb2, 0x70, + 0x10, 0xfb, 0x74, 0xf7, 0x0b, 0x22, 0x19, 0x55, 0x20, 0x07, 0x73, 0xcf, 0x0a, 0x51, 0x48, 0xf5, + 0x29, 0x85, 0xf2, 0x43, 0x58, 0x9f, 0x85, 0xa0, 0x0a, 0xe4, 0x07, 0x78, 0xcc, 0x5b, 0x53, 0x8f, + 0x96, 0xe8, 0x1e, 0x2c, 0x9f, 0x9a, 0xee, 0x08, 0xb3, 0x52, 0x94, 0xb7, 0x1b, 0x99, 0xf6, 0x62, + 0x96, 0xa8, 0xd4, 0xb0, 0xce, 0x15, 0xee, 0xe7, 0xee, 0x49, 0xca, 0x2f, 0x25, 0x58, 0x9b, 0xd9, + 0x44, 0xdf, 0x86, 0x92, 0x6b, 0x86, 0x94, 0xcd, 0x96, 0xc8, 0x4c, 0x51, 0xbb, 0xf3, 0x7c, 0x52, + 0xdf, 0xcc, 0x0a, 0xc9, 0x10, 0x87, 0xa1, 0xd9, 0xc7, 0x6a, 0xdb, 0x25, 0xd6, 0x40, 0x5f, 0x89, + 0xd4, 0x5a, 0xd6, 0x00, 0x75, 0x60, 0xb9, 0x87, 0xfb, 0x8e, 0xc7, 0x4e, 0xb4, 0x78, 0x44, 0xb9, + 0xb2, 0xf2, 0x21, 0x94, 0xd3, 0xf5, 0x96, 0xe1, 0xf9, 0xd7, 0x67, 0x3d, 0xbf, 0xf5, 0x05, 0x91, + 0x4e, 0xbb, 0xfc, 0x1e, 0x5c, 0x9a, 0x2b, 0xa9, 0x0c, 0xee, 0xab, 0x69, 0xee, 0x72, 0x4a, 0xbd, + 0xf1, 0x10, 0xe4, 0x3d, 0x27, 0xa4, 0x3a, 0xfe, 0xf1, 0x08, 0x87, 0x14, 0x7d, 0x13, 0x4a, 0x21, + 0x76, 0xb1, 0x45, 0x49, 0x20, 0x26, 0xcc, 0x8d, 0x17, 0x46, 0x3d, 0xdf, 0x16, 0xe9, 0x4d, 0xe0, + 0x8d, 0x7f, 0xe6, 0xa0, 0xcc, 0xa9, 0x42, 0x9f, 0x78, 0x21, 0x46, 0x4d, 0x28, 0x86, 0x6c, 0x16, + 0x88, 0x51, 0x51, 0x49, 0x3d, 0x63, 0x98, 0x5c, 0x17, 0xfb, 0x48, 0x85, 0xe2, 0x09, 0x36, 0x6d, + 0x1c, 0x08, 0xdf, 0x2b, 0x53, 0x9b, 0x0f, 0x99, 0x5c, 0x18, 0x13, 0x28, 0x74, 0x1f, 0x8a, 0x6c, + 0x44, 0x85, 0xd5, 0x3c, 0xab, 0xca, 0xd4, 0x10, 0x4a, 0x9f, 0x80, 0xbf, 0x96, 0x62, 0x5d, 0xae, + 0xa1, 0xfc, 0x51, 0x82, 0x65, 0x26, 0x47, 0x6f, 0x42, 0x21, 0x35, 0x49, 0xaf, 0x64, 0x3c, 0xb2, + 0x84, 0x2a, 0x83, 0xa1, 0x4d, 0x28, 0x0f, 0x89, 0x6d, 0x04, 0xf8, 0xd4, 0x09, 0xa3, 0xab, 0x9e, + 0x95, 0x83, 0x2e, 0x0f, 0x89, 0xad, 0x0b, 0x11, 0x7a, 0x1d, 0x96, 0x03, 0x32, 0xa2, 0x98, 0xdd, + 0x0e, 0xf2, 0xf6, 0xa5, 0xa9, 0x1b, 0x7a, 0x24, 0x16, 0x74, 0x1c, 0x83, 0xde, 0x49, 0xc2, 0x53, + 0x60, 0x4e, 0xdc, 0xb8, 0x60, 0x92, 0x26, 0xe7, 0x67, 0xbf, 0x1a, 0x7f, 0x97, 0xa0, 0xdc, 0xf2, + 0x7d, 0x77, 0x1c, 0xa7, 0xec, 0x3d, 0x58, 0xb1, 0x4e, 0x4c, 0xaf, 0x9f, 0x4c, 0xbb, 0x57, 0xa7, + 0x44, 0x69, 0xa0, 0xda, 0x66, 0x28, 0x41, 0x17, 0xeb, 0x28, 0x9f, 0x48, 0x50, 0xe4, 0x3b, 0x48, + 0x85, 0x2b, 0xf8, 0xcc, 0xc7, 0x16, 0x35, 0x66, 0x1c, 0x65, 0x93, 0x44, 0xbf, 0xcc, 0xb7, 0x1e, + 0xcd, 0xb8, 0x5b, 0x1c, 0xf9, 0x21, 0x0e, 0xa8, 0x48, 0x5b, 0x56, 0x08, 0x75, 0x01, 0x41, 0x5f, + 0x81, 0xa2, 0x8d, 0x5d, 0x2c, 0x82, 0xb3, 0xaa, 0xc9, 0xe9, 0x67, 0xaf, 0xd8, 0x6a, 0x38, 0xb0, + 0x26, 0x8e, 0xfc, 0xb2, 0x6b, 0xa8, 0xf1, 0x97, 0x1c, 0xc8, 0x11, 0x45, 0x1c, 0xc6, 0x66, 0xa2, + 0x2f, 0x65, 0xeb, 0x27, 0xd5, 0xb7, 0x09, 0xcb, 0xac, 0x96, 0x98, 0xa1, 0x39, 0x47, 0xf8, 0x0e, + 0xfa, 0x9d, 0x34, 0x37, 0x8d, 0x79, 0x9d, 0xbe, 0x36, 0x7b, 0xfa, 0x38, 0x31, 0xfa, 0x74, 0xe6, + 0xf2, 0xc9, 0xf9, 0x83, 0x05, 0xef, 0x84, 0x4f, 0x9e, 0xfe, 0xd7, 0x43, 0x5e, 0xf9, 0x16, 0x54, + 0xe6, 0xed, 0xff, 0xbb, 0x01, 0x92, 0x4f, 0x0f, 0x90, 0xcf, 0x0a, 0x50, 0xe6, 0xce, 0xbc, 0xf4, + 0xb6, 0xff, 0x7d, 0x76, 0x54, 0xbf, 0x3a, 0x1f, 0x55, 0xd1, 0xfd, 0x5f, 0x66, 0x58, 0xd1, 0x6f, + 0x25, 0x00, 0x7f, 0xd4, 0x73, 0x9d, 0xf0, 0xc4, 0x30, 0xa9, 0x68, 0xf1, 0x3b, 0x17, 0x9c, 0xf4, + 0x90, 0x03, 0x5b, 0xf4, 0xff, 0x72, 0xce, 0x55, 0x3f, 0x36, 0xf7, 0xbf, 0x26, 0x5f, 0x79, 0x17, + 0xd6, 0x67, 0xcf, 0xbe, 0x50, 0xe9, 0x7c, 0x03, 0x2e, 0xbd, 0x8f, 0xe9, 0x43, 0xc7, 0xa3, 0x61, + 0xdc, 0x85, 0x49, 0x6f, 0x49, 0x17, 0xf5, 0x56, 0xe3, 0xaf, 0x39, 0xa8, 0x4c, 0xd5, 0x5e, 0x7a, + 0xd1, 0x75, 0x61, 0xcd, 0x0f, 0x9c, 0xa1, 0x19, 0x8c, 0x8d, 0xe8, 0x83, 0x33, 0x14, 0xb3, 0xbd, + 0x39, 0x35, 0x30, 0x7f, 0x18, 0x35, 0x5e, 0x30, 0xa9, 0xa0, 0x2b, 0x0b, 0x12, 0x26, 0x8b, 0x1e, + 0x6b, 0xfc, 0x8b, 0x56, 0x70, 0xf2, 0xf2, 0x58, 0x94, 0x53, 0xe6, 0x1c, 0x4c, 0xa4, 0xbc, 0x1b, + 0xbd, 0xd3, 0x53, 0x98, 0xe8, 0x32, 0xe2, 0xe4, 0xf1, 0x97, 0x42, 0xea, 0xbf, 0x0e, 0x75, 0xa7, + 0xfb, 0x88, 0xf3, 0x73, 0xcc, 0x5d, 0x02, 0x45, 0xf1, 0xbc, 0x2f, 0x42, 0xee, 0xe0, 0x83, 0xca, + 0x12, 0xba, 0x02, 0x97, 0xba, 0x0f, 0x5b, 0x7a, 0xc7, 0xd8, 0x3f, 0x38, 0x32, 0x76, 0x0e, 0xbe, + 0xb7, 0xdf, 0xa9, 0x48, 0xe8, 0x2a, 0x54, 0xf6, 0x0f, 0x0c, 0x2e, 0x8f, 0x1f, 0xe3, 0x39, 0x74, + 0x0d, 0x2e, 0x47, 0xa0, 0x59, 0x71, 0x1e, 0xdd, 0x82, 0x1b, 0x0f, 0x8e, 0xda, 0x1d, 0xe3, 0x48, + 0x6f, 0xed, 0x77, 0x5b, 0xed, 0xa3, 0xdd, 0x83, 0x7d, 0x43, 0xbc, 0xd9, 0x0b, 0xdb, 0xe7, 0xc9, + 0x35, 0xfc, 0x0e, 0x14, 0x22, 0xd3, 0xe8, 0x5a, 0xe6, 0x70, 0x54, 0xae, 0x67, 0xf7, 0x4c, 0xa4, + 0x16, 0xdd, 0xf5, 0x69, 0xb5, 0xd4, 0x43, 0x26, 0xad, 0x36, 0xf3, 0x28, 0xb9, 0x07, 0xcb, 0xec, + 0x86, 0x41, 0xd7, 0xb3, 0x6f, 0x49, 0xe5, 0xc6, 0x0b, 0x72, 0xa1, 0xd9, 0x82, 0x52, 0x9c, 0x15, + 0x74, 0x33, 0x2b, 0x53, 0x5c, 0x5f, 0xb9, 0x38, 0x89, 0x5a, 0xfb, 0xf1, 0x3f, 0x6a, 0x4b, 0x8f, + 0x3f, 0xaf, 0x49, 0x4f, 0x3e, 0xaf, 0x49, 0x9f, 0x3e, 0xab, 0x2d, 0xfd, 0xfa, 0x59, 0x4d, 0x7a, + 0xf2, 0xac, 0xb6, 0xf4, 0xb7, 0x67, 0xb5, 0xa5, 0x8f, 0xef, 0x64, 0xf5, 0xf0, 0x0b, 0xff, 0x7a, + 0xf5, 0x8a, 0x6c, 0xf5, 0xf6, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x6d, 0xd7, 0x9a, 0x96, 0x11, + 0x13, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1397,6 +1414,16 @@ func (m *ShardSpec) MarshalTo(dAtA []byte) (int, error) { return 0, err } i += n3 + if m.DisableWaitForAck { + dAtA[i] = 0x58 + i++ + if m.DisableWaitForAck { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i++ + } return i, nil } @@ -2127,6 +2154,9 @@ func (m *ShardSpec) ProtoSize() (n int) { } l = m.LabelSet.ProtoSize() n += 1 + l + sovProtocol(uint64(l)) + if m.DisableWaitForAck { + n += 2 + } return n } @@ -2778,6 +2808,26 @@ func (m *ShardSpec) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 11: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field DisableWaitForAck", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProtocol + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.DisableWaitForAck = bool(v != 0) default: iNdEx = preIndex skippy, err := skipProtocol(dAtA[iNdEx:]) diff --git a/consumer/protocol/protocol.proto b/consumer/protocol/protocol.proto index 55fc0b70..07ee6f94 100644 --- a/consumer/protocol/protocol.proto +++ b/consumer/protocol/protocol.proto @@ -148,6 +148,7 @@ message ShardSpec { // Disable processing of the shard. bool disable = 8 [(gogoproto.moretags) = "yaml:\",omitempty\""]; + // Hot standbys is the desired number of consumer processes which should be // replicating the primary consumer's recovery log. Standbys are allocated in // a separate availability zone of the current primary, and tail the live log @@ -169,6 +170,22 @@ message ShardSpec { (gogoproto.nullable) = false, (gogoproto.embed) = true, (gogoproto.moretags) = "yaml:\",omitempty,inline\""]; + + // Disable waiting for acknowledgements of pending message(s). + // + // If a consumer transaction reads uncommitted messages, it will by default + // remain open (subject to the max duration) awaiting an acknowledgement of + // those messages, in the hope that that acknowledgement will be quickly + // forthcoming and, by remaining open, we can process all messages in this + // transaction. Effectively we're trading a small amount of increased local + // latency for a global reduction in end-to-end latency. + // + // This works well for acyclic message flows, but can introduce unnecessary + // stalls if there are message cycles between shards. In the simplest case, + // a transaction could block awaiting an ACK of a message that it itself + // produced -- an ACK which can't arrive until the transaction closes. + bool disable_wait_for_ack = 11 [ + (gogoproto.moretags) = "yaml:\"disable_wait_for_ack,omitempty\""]; } // ConsumerSpec describes a Consumer process instance and its configuration. diff --git a/consumer/protocol/shard_spec_extensions.go b/consumer/protocol/shard_spec_extensions.go index 54945d31..cb42b1f3 100644 --- a/consumer/protocol/shard_spec_extensions.go +++ b/consumer/protocol/shard_spec_extensions.go @@ -72,7 +72,7 @@ func (m *ShardSpec) Validate() error { } } - // Disable and HotStandbys require no extra validation. + // HotStandbys, Disable, and DisableWaitForAck require no extra validation. return nil } @@ -181,6 +181,9 @@ func UnionShardSpecs(a, b ShardSpec) ShardSpec { } a.LabelSet = pb.UnionLabelSets(a.LabelSet, b.LabelSet, pb.LabelSet{}) + if a.DisableWaitForAck == false { + a.DisableWaitForAck = b.DisableWaitForAck + } return a } @@ -213,6 +216,9 @@ func IntersectShardSpecs(a, b ShardSpec) ShardSpec { } a.LabelSet = pb.IntersectLabelSets(a.LabelSet, b.LabelSet, pb.LabelSet{}) + if a.DisableWaitForAck != b.DisableWaitForAck { + a.DisableWaitForAck = false + } return a } @@ -245,6 +251,9 @@ func SubtractShardSpecs(a, b ShardSpec) ShardSpec { } a.LabelSet = pb.SubtractLabelSet(a.LabelSet, b.LabelSet, pb.LabelSet{}) + if a.DisableWaitForAck == b.DisableWaitForAck { + a.DisableWaitForAck = false + } return a } diff --git a/consumer/protocol/shard_spec_extensions_test.go b/consumer/protocol/shard_spec_extensions_test.go index 0cda6c0c..7a720bb0 100644 --- a/consumer/protocol/shard_spec_extensions_test.go +++ b/consumer/protocol/shard_spec_extensions_test.go @@ -147,6 +147,7 @@ func (s *SpecSuite) TestSetOperations(c *gc.C) { {Name: "ccc", Value: "val"}, }, }, + DisableWaitForAck: true, } var other = ShardSpec{ Sources: []ShardSpec_Source{ @@ -166,14 +167,17 @@ func (s *SpecSuite) TestSetOperations(c *gc.C) { {Name: "ccc", Value: "other"}, }, }, + DisableWaitForAck: false, } c.Check(UnionShardSpecs(ShardSpec{}, model), gc.DeepEquals, model) c.Check(UnionShardSpecs(model, ShardSpec{}), gc.DeepEquals, model) other.Disable = true // Disable == true dominates in union operation. + other.DisableWaitForAck = true c.Check(UnionShardSpecs(other, model), gc.DeepEquals, other) other.Disable = false + other.DisableWaitForAck = false c.Check(UnionShardSpecs(model, other), gc.DeepEquals, model) c.Check(IntersectShardSpecs(model, model), gc.DeepEquals, model) diff --git a/consumer/shardspace/shardspace_test.go b/consumer/shardspace/shardspace_test.go index 36eb3040..a50af906 100644 --- a/consumer/shardspace/shardspace_test.go +++ b/consumer/shardspace/shardspace_test.go @@ -29,6 +29,7 @@ func (s *SetSuite) TestRoundTripHoistAndPushDown(c *gc.C) { MinTxnDuration: time.Millisecond, HotStandbys: 1, LabelSet: pb.MustLabelSet("name-1", "val-1"), + DisableWaitForAck: true, }, Shards: []Shard{ { @@ -45,6 +46,7 @@ func (s *SetSuite) TestRoundTripHoistAndPushDown(c *gc.C) { Spec: pc.ShardSpec{ Id: "shard-B", Sources: []pc.ShardSpec_Source{{Journal: "journal/B"}}, + Disable: true, LabelSet: pb.MustLabelSet("name-3", "val-3"), }, Revision: 456, @@ -116,6 +118,7 @@ common: labels: - name: name-1 value: val-1 + disable_wait_for_ack: true shards: - comment: This is a comment delete: true @@ -129,6 +132,7 @@ shards: - id: shard-B sources: - journal: journal/B + disable: true labels: - name: name-3 value: val-3 @@ -168,6 +172,7 @@ func buildFlatFixture() Set { MinTxnDuration: time.Millisecond, HotStandbys: 1, LabelSet: pb.MustLabelSet("name-1", "val-1", "name-2", "val-2"), + DisableWaitForAck: true, }, Revision: 123, Delete: &boxedTrue, @@ -182,8 +187,10 @@ func buildFlatFixture() Set { HintBackups: 2, MaxTxnDuration: time.Second, MinTxnDuration: time.Millisecond, + Disable: true, HotStandbys: 1, LabelSet: pb.MustLabelSet("name-1", "val-1", "name-3", "val-3"), + DisableWaitForAck: true, }, Revision: 456, }, diff --git a/consumer/transaction.go b/consumer/transaction.go index b1fd15ee..0dc9dff8 100644 --- a/consumer/transaction.go +++ b/consumer/transaction.go @@ -65,6 +65,7 @@ func runTransactions(s *shard, cp pc.Checkpoint, readCh <-chan readMessage, hint // transaction models a single consumer shard transaction. type transaction struct { minDur, maxDur time.Duration // Min/max processing durations. Set to -1 when elapsed. + waitForAck bool // Wait for ACKs of pending messages read this txn? barrierCh <-chan struct{} // Next barrier of previous transaction to resolve. readCh <-chan readMessage // Message source. Nil'd upon reaching |maxDur|. readThrough pb.Offsets // Offsets read through this transaction. @@ -92,6 +93,7 @@ func txnInit(s *shard, txn, prev *transaction, readCh <-chan readMessage, timer timer: timer, minDur: spec.MinTxnDuration, maxDur: spec.MaxTxnDuration, + waitForAck: !spec.DisableWaitForAck, barrierCh: prev.commitBarrier.Done(), } for j, o := range prev.readThrough { @@ -124,8 +126,8 @@ func txnBlocks(s *shard, txn, prev *transaction) bool { // Or if the prior transaction hasn't completed. txn.barrierCh != nil || // Or if the maximum batching duration hasn't elapsed, and a sequence - // started this transaction awaits an ACK which will hopefully come. - (txn.maxDur != -1 && s.sequencer.HasPending(prev.readThrough)) + // started this transaction awaits an ACK which we want to wait for. + (txn.waitForAck && txn.maxDur != -1 && s.sequencer.HasPending(prev.readThrough)) } // txnStep steps the transaction one time, and returns true iff it has started to commit.