Просмотр исходного кода

functional-tester/rpcpb: add "trigger snapshot" cases for network faults

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
Gyuho Lee 7 лет назад
Родитель
Сommit
190119569a
2 измененных файлов с 205 добавлено и 176 удалено
  1. 186 163
      tools/functional-tester/rpcpb/rpc.pb.go
  2. 19 13
      tools/functional-tester/rpcpb/rpc.proto

+ 186 - 163
tools/functional-tester/rpcpb/rpc.pb.go

@@ -92,63 +92,81 @@ func (Operation) EnumDescriptor() ([]byte, []int) { return fileDescriptorRpc, []
 type FailureCase int32
 
 const (
-	FailureCase_KILL_ONE_FOLLOWER                      FailureCase = 0
-	FailureCase_KILL_LEADER                            FailureCase = 1
-	FailureCase_KILL_ONE_FOLLOWER_FOR_LONG             FailureCase = 2
-	FailureCase_KILL_LEADER_FOR_LONG                   FailureCase = 3
-	FailureCase_KILL_QUORUM                            FailureCase = 4
-	FailureCase_KILL_ALL                               FailureCase = 5
-	FailureCase_BLACKHOLE_PEER_PORT_TX_RX_ONE_FOLLOWER FailureCase = 6
-	FailureCase_BLACKHOLE_PEER_PORT_TX_RX_LEADER       FailureCase = 7
-	FailureCase_BLACKHOLE_PEER_PORT_TX_RX_ALL          FailureCase = 8
-	FailureCase_DELAY_PEER_PORT_TX_RX_ONE_FOLLOWER     FailureCase = 9
-	FailureCase_DELAY_PEER_PORT_TX_RX_LEADER           FailureCase = 10
-	FailureCase_DELAY_PEER_PORT_TX_RX_ALL              FailureCase = 11
+	FailureCase_KILL_ONE_FOLLOWER                                             FailureCase = 0
+	FailureCase_KILL_ONE_FOLLOWER_UNTIL_TRIGGER_SNAPSHOT                      FailureCase = 1
+	FailureCase_KILL_LEADER                                                   FailureCase = 2
+	FailureCase_KILL_LEADER_UNTIL_TRIGGER_SNAPSHOT                            FailureCase = 3
+	FailureCase_KILL_QUORUM                                                   FailureCase = 4
+	FailureCase_KILL_ALL                                                      FailureCase = 5
+	FailureCase_BLACKHOLE_PEER_PORT_TX_RX_ONE_FOLLOWER                        FailureCase = 100
+	FailureCase_BLACKHOLE_PEER_PORT_TX_RX_ONE_FOLLOWER_UNTIL_TRIGGER_SNAPSHOT FailureCase = 101
+	FailureCase_BLACKHOLE_PEER_PORT_TX_RX_LEADER                              FailureCase = 102
+	FailureCase_BLACKHOLE_PEER_PORT_TX_RX_LEADER_UNTIL_TRIGGER_SNAPSHOT       FailureCase = 103
+	FailureCase_BLACKHOLE_PEER_PORT_TX_RX_QUORUM                              FailureCase = 104
+	FailureCase_BLACKHOLE_PEER_PORT_TX_RX_ALL                                 FailureCase = 105
+	FailureCase_DELAY_PEER_PORT_TX_RX_ONE_FOLLOWER                            FailureCase = 200
+	FailureCase_DELAY_PEER_PORT_TX_RX_ONE_FOLLOWER_UNTIL_TRIGGER_SNAPSHOT     FailureCase = 201
+	FailureCase_DELAY_PEER_PORT_TX_RX_LEADER                                  FailureCase = 202
+	FailureCase_DELAY_PEER_PORT_TX_RX_LEADER_UNTIL_TRIGGER_SNAPSHOT           FailureCase = 203
+	FailureCase_DELAY_PEER_PORT_TX_RX_QUORUM                                  FailureCase = 204
+	FailureCase_DELAY_PEER_PORT_TX_RX_ALL                                     FailureCase = 205
 	// NO_FAIL_WITH_STRESS runs no-op failure injection for specified period
 	// while stressers are still sending requests.
-	FailureCase_NO_FAIL_WITH_STRESS FailureCase = 100
+	FailureCase_NO_FAIL_WITH_STRESS FailureCase = 300
 	// NO_FAIL_WITH_NO_STRESS_FOR_LIVENESS runs no-op failure injection
 	// with all stressers stopped.
-	FailureCase_NO_FAIL_WITH_NO_STRESS_FOR_LIVENESS FailureCase = 101
-	FailureCase_FAILPOINTS                          FailureCase = 200
-	FailureCase_EXTERNAL                            FailureCase = 300
+	FailureCase_NO_FAIL_WITH_NO_STRESS_FOR_LIVENESS FailureCase = 301
+	FailureCase_FAILPOINTS                          FailureCase = 400
+	FailureCase_EXTERNAL                            FailureCase = 500
 )
 
 var FailureCase_name = map[int32]string{
 	0:   "KILL_ONE_FOLLOWER",
-	1:   "KILL_LEADER",
-	2:   "KILL_ONE_FOLLOWER_FOR_LONG",
-	3:   "KILL_LEADER_FOR_LONG",
+	1:   "KILL_ONE_FOLLOWER_UNTIL_TRIGGER_SNAPSHOT",
+	2:   "KILL_LEADER",
+	3:   "KILL_LEADER_UNTIL_TRIGGER_SNAPSHOT",
 	4:   "KILL_QUORUM",
 	5:   "KILL_ALL",
-	6:   "BLACKHOLE_PEER_PORT_TX_RX_ONE_FOLLOWER",
-	7:   "BLACKHOLE_PEER_PORT_TX_RX_LEADER",
-	8:   "BLACKHOLE_PEER_PORT_TX_RX_ALL",
-	9:   "DELAY_PEER_PORT_TX_RX_ONE_FOLLOWER",
-	10:  "DELAY_PEER_PORT_TX_RX_LEADER",
-	11:  "DELAY_PEER_PORT_TX_RX_ALL",
-	100: "NO_FAIL_WITH_STRESS",
-	101: "NO_FAIL_WITH_NO_STRESS_FOR_LIVENESS",
-	200: "FAILPOINTS",
-	300: "EXTERNAL",
+	100: "BLACKHOLE_PEER_PORT_TX_RX_ONE_FOLLOWER",
+	101: "BLACKHOLE_PEER_PORT_TX_RX_ONE_FOLLOWER_UNTIL_TRIGGER_SNAPSHOT",
+	102: "BLACKHOLE_PEER_PORT_TX_RX_LEADER",
+	103: "BLACKHOLE_PEER_PORT_TX_RX_LEADER_UNTIL_TRIGGER_SNAPSHOT",
+	104: "BLACKHOLE_PEER_PORT_TX_RX_QUORUM",
+	105: "BLACKHOLE_PEER_PORT_TX_RX_ALL",
+	200: "DELAY_PEER_PORT_TX_RX_ONE_FOLLOWER",
+	201: "DELAY_PEER_PORT_TX_RX_ONE_FOLLOWER_UNTIL_TRIGGER_SNAPSHOT",
+	202: "DELAY_PEER_PORT_TX_RX_LEADER",
+	203: "DELAY_PEER_PORT_TX_RX_LEADER_UNTIL_TRIGGER_SNAPSHOT",
+	204: "DELAY_PEER_PORT_TX_RX_QUORUM",
+	205: "DELAY_PEER_PORT_TX_RX_ALL",
+	300: "NO_FAIL_WITH_STRESS",
+	301: "NO_FAIL_WITH_NO_STRESS_FOR_LIVENESS",
+	400: "FAILPOINTS",
+	500: "EXTERNAL",
 }
 var FailureCase_value = map[string]int32{
-	"KILL_ONE_FOLLOWER":          0,
-	"KILL_LEADER":                1,
-	"KILL_ONE_FOLLOWER_FOR_LONG": 2,
-	"KILL_LEADER_FOR_LONG":       3,
-	"KILL_QUORUM":                4,
-	"KILL_ALL":                   5,
-	"BLACKHOLE_PEER_PORT_TX_RX_ONE_FOLLOWER": 6,
-	"BLACKHOLE_PEER_PORT_TX_RX_LEADER":       7,
-	"BLACKHOLE_PEER_PORT_TX_RX_ALL":          8,
-	"DELAY_PEER_PORT_TX_RX_ONE_FOLLOWER":     9,
-	"DELAY_PEER_PORT_TX_RX_LEADER":           10,
-	"DELAY_PEER_PORT_TX_RX_ALL":              11,
-	"NO_FAIL_WITH_STRESS":                    100,
-	"NO_FAIL_WITH_NO_STRESS_FOR_LIVENESS":    101,
-	"FAILPOINTS":                             200,
-	"EXTERNAL":                               300,
+	"KILL_ONE_FOLLOWER":                        0,
+	"KILL_ONE_FOLLOWER_UNTIL_TRIGGER_SNAPSHOT": 1,
+	"KILL_LEADER":                              2,
+	"KILL_LEADER_UNTIL_TRIGGER_SNAPSHOT":       3,
+	"KILL_QUORUM":                              4,
+	"KILL_ALL":                                 5,
+	"BLACKHOLE_PEER_PORT_TX_RX_ONE_FOLLOWER":                        100,
+	"BLACKHOLE_PEER_PORT_TX_RX_ONE_FOLLOWER_UNTIL_TRIGGER_SNAPSHOT": 101,
+	"BLACKHOLE_PEER_PORT_TX_RX_LEADER":                              102,
+	"BLACKHOLE_PEER_PORT_TX_RX_LEADER_UNTIL_TRIGGER_SNAPSHOT":       103,
+	"BLACKHOLE_PEER_PORT_TX_RX_QUORUM":                              104,
+	"BLACKHOLE_PEER_PORT_TX_RX_ALL":                                 105,
+	"DELAY_PEER_PORT_TX_RX_ONE_FOLLOWER":                            200,
+	"DELAY_PEER_PORT_TX_RX_ONE_FOLLOWER_UNTIL_TRIGGER_SNAPSHOT":     201,
+	"DELAY_PEER_PORT_TX_RX_LEADER":                                  202,
+	"DELAY_PEER_PORT_TX_RX_LEADER_UNTIL_TRIGGER_SNAPSHOT":           203,
+	"DELAY_PEER_PORT_TX_RX_QUORUM":                                  204,
+	"DELAY_PEER_PORT_TX_RX_ALL":                                     205,
+	"NO_FAIL_WITH_STRESS":                                           300,
+	"NO_FAIL_WITH_NO_STRESS_FOR_LIVENESS":                           301,
+	"FAILPOINTS":                                                    400,
+	"EXTERNAL":                                                      500,
 }
 
 func (x FailureCase) String() string {
@@ -2846,122 +2864,127 @@ var (
 func init() { proto.RegisterFile("rpcpb/rpc.proto", fileDescriptorRpc) }
 
 var fileDescriptorRpc = []byte{
-	// 1870 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x58, 0x7f, 0x72, 0xdb, 0xb8,
-	0x15, 0xb6, 0x6c, 0xcb, 0xb6, 0xe0, 0x5f, 0x0c, 0x6c, 0xc7, 0x8c, 0x93, 0x98, 0x5e, 0x6e, 0x37,
-	0x75, 0x3d, 0x43, 0xa7, 0xcd, 0x76, 0x3a, 0xd3, 0x9d, 0xed, 0xa4, 0x92, 0xcc, 0xac, 0x5d, 0x33,
-	0x92, 0x02, 0xc9, 0x49, 0xfa, 0x97, 0x4a, 0x51, 0x90, 0xc4, 0x9a, 0x22, 0x19, 0x00, 0xf2, 0x4a,
-	0x7b, 0x81, 0x4e, 0x6f, 0xd0, 0x43, 0xb4, 0xf7, 0x48, 0xdb, 0x9d, 0x4e, 0x4f, 0xa0, 0xb6, 0xe9,
-	0x0d, 0x74, 0x81, 0x76, 0x00, 0x50, 0x12, 0x28, 0xc9, 0xed, 0x7f, 0xc2, 0x7b, 0xdf, 0xf7, 0xf1,
-	0xe1, 0x01, 0xef, 0x3d, 0xd8, 0x60, 0x97, 0xc4, 0x5e, 0xdc, 0x78, 0x4e, 0x62, 0xef, 0x3c, 0x26,
-	0x11, 0x8b, 0x60, 0x56, 0x18, 0x8e, 0xac, 0xb6, 0xcf, 0x3a, 0xbd, 0xc6, 0xb9, 0x17, 0x75, 0x9f,
-	0xb7, 0xa3, 0x76, 0xf4, 0x5c, 0x78, 0x1b, 0xbd, 0x96, 0x58, 0x89, 0x85, 0xf8, 0x25, 0x59, 0xe6,
-	0xf7, 0xeb, 0x60, 0xd5, 0x66, 0x5e, 0x13, 0x7e, 0x0e, 0x56, 0x4b, 0x6e, 0x17, 0xeb, 0x99, 0x93,
-	0xcc, 0x69, 0xae, 0xb0, 0x3b, 0x1a, 0x1a, 0x9b, 0x03, 0xb7, 0x1b, 0x7c, 0x65, 0x86, 0x6e, 0x17,
-	0x9b, 0x48, 0x38, 0xa1, 0x05, 0xd6, 0x2f, 0x5c, 0xe6, 0x5e, 0xf8, 0x44, 0x5f, 0x16, 0xb8, 0xbd,
-	0xd1, 0xd0, 0xd8, 0x95, 0xb8, 0xa6, 0xcb, 0x5c, 0xab, 0xe9, 0x13, 0x13, 0x8d, 0x31, 0xf0, 0x0c,
-	0xac, 0xbd, 0xcb, 0x3b, 0x1c, 0xbd, 0x22, 0xd0, 0x70, 0x34, 0x34, 0x76, 0x24, 0xfa, 0x5b, 0x37,
-	0x90, 0xe0, 0x04, 0x01, 0xaf, 0x80, 0xe6, 0xf8, 0x94, 0xe1, 0xb0, 0x18, 0xf8, 0x38, 0x64, 0x37,
-	0xc8, 0xa1, 0xfa, 0xea, 0xc9, 0xca, 0x69, 0xae, 0xf0, 0x74, 0x34, 0x34, 0x1e, 0x49, 0x56, 0x20,
-	0x10, 0x96, 0x27, 0x20, 0x56, 0x8f, 0x04, 0xd4, 0x44, 0x73, 0x34, 0x88, 0xc0, 0x5e, 0xbe, 0x79,
-	0x87, 0x09, 0xf3, 0x29, 0x56, 0xd4, 0xb2, 0x42, 0xed, 0x64, 0x34, 0x34, 0x9e, 0x48, 0x35, 0x77,
-	0x0c, 0x4a, 0x0b, 0x2e, 0x22, 0xc3, 0x22, 0xd8, 0x91, 0xdf, 0xa9, 0x60, 0x4c, 0x84, 0xdc, 0x9a,
-	0x90, 0x7b, 0x3c, 0x1a, 0x1a, 0x87, 0xa9, 0xe0, 0x62, 0x8c, 0x49, 0xa2, 0x34, 0x43, 0x81, 0x0d,
-	0xa0, 0x5f, 0x85, 0x3e, 0xf3, 0xdd, 0x60, 0xf2, 0x89, 0x89, 0xdc, 0xba, 0x90, 0x7b, 0x36, 0x1a,
-	0x1a, 0xa6, 0x94, 0xf3, 0x25, 0xd2, 0x9a, 0x46, 0xa9, 0x28, 0xdf, 0xab, 0x03, 0x0b, 0x60, 0x27,
-	0xf1, 0x15, 0x83, 0x1e, 0x65, 0x98, 0xe8, 0x1b, 0x22, 0xf7, 0x47, 0xa3, 0xa1, 0xf1, 0x30, 0xad,
-	0xec, 0x49, 0x80, 0x89, 0x66, 0x18, 0x3c, 0x81, 0x69, 0x4b, 0x95, 0xb9, 0x0c, 0xeb, 0x39, 0x21,
-	0xa4, 0x24, 0x70, 0x46, 0xc8, 0xa2, 0x1c, 0x66, 0xa2, 0x45, 0xe4, 0x79, 0xcd, 0x5a, 0x74, 0x8b,
-	0x43, 0x1d, 0xfc, 0x3f, 0x4d, 0xc6, 0x61, 0x73, 0x9a, 0x82, 0x0c, 0x5f, 0x82, 0xed, 0x6a, 0xe8,
-	0xc6, 0xb4, 0x13, 0xb1, 0x62, 0xd4, 0x0b, 0x99, 0xbe, 0x79, 0x92, 0x39, 0x5d, 0x29, 0x3c, 0x1a,
-	0x0d, 0x8d, 0x03, 0xa9, 0x46, 0x13, 0xb7, 0xe5, 0x71, 0xbf, 0x89, 0xd2, 0x78, 0xe8, 0x80, 0x07,
-	0x6f, 0x7a, 0x11, 0x73, 0x0b, 0xae, 0x77, 0x8b, 0xc3, 0x66, 0x61, 0xc0, 0x30, 0xd5, 0xb7, 0x84,
-	0xc8, 0xf1, 0x68, 0x68, 0x1c, 0x49, 0x91, 0x0f, 0x1c, 0x62, 0x35, 0x24, 0xc6, 0x6a, 0x70, 0x90,
-	0x89, 0xe6, 0x89, 0xbc, 0x3a, 0x2a, 0x04, 0xbf, 0x8d, 0x18, 0xd6, 0xb7, 0x4f, 0x32, 0xa7, 0x1b,
-	0x6a, 0x75, 0xc4, 0x04, 0x5b, 0x77, 0x11, 0xcf, 0xce, 0x18, 0xa3, 0x66, 0x24, 0x22, 0xa4, 0x17,
-	0xb3, 0x62, 0x07, 0x7b, 0xb7, 0xfa, 0x8e, 0xa0, 0x2e, 0xca, 0x88, 0x44, 0x59, 0x1e, 0x87, 0x29,
-	0x19, 0x51, 0xc8, 0xe6, 0xef, 0xb3, 0x60, 0xed, 0x35, 0xee, 0x36, 0x30, 0x81, 0xbf, 0x00, 0x5b,
-	0xbc, 0xb0, 0xed, 0x3e, 0xf6, 0x2a, 0x2e, 0xeb, 0x24, 0x85, 0xad, 0xe4, 0x06, 0x33, 0xaf, 0x69,
-	0xe1, 0x3e, 0xf6, 0xac, 0xd8, 0x65, 0x1d, 0x13, 0xa5, 0xe0, 0xf0, 0x4b, 0x90, 0xcb, 0xb7, 0x71,
-	0xc8, 0xf2, 0xcd, 0x26, 0x11, 0x79, 0xcd, 0x15, 0x0e, 0x46, 0x43, 0xe3, 0x41, 0x52, 0x3a, 0xdc,
-	0x65, 0xb9, 0xcd, 0x26, 0x31, 0xd1, 0x14, 0xc7, 0xf3, 0xf9, 0xca, 0xf5, 0x83, 0x38, 0xf2, 0x43,
-	0x76, 0x59, 0xab, 0x55, 0x04, 0x79, 0x4b, 0x90, 0x95, 0x7c, 0xb6, 0xc6, 0x10, 0xab, 0xc3, 0x58,
-	0x9c, 0xa8, 0xcc, 0x13, 0x79, 0x3e, 0x0b, 0x2e, 0xc5, 0xbc, 0x7f, 0xe0, 0xd9, 0x6e, 0xd3, 0x70,
-	0x29, 0x4e, 0xba, 0x4d, 0x82, 0x81, 0x5f, 0x81, 0x4d, 0xbe, 0x03, 0x27, 0x6a, 0x8b, 0xfd, 0xb6,
-	0x04, 0x45, 0x1f, 0x0d, 0x8d, 0x7d, 0x65, 0xbf, 0x41, 0xd4, 0x4e, 0xb6, 0xab, 0x82, 0x61, 0x1e,
-	0x6c, 0xf3, 0xa5, 0x2c, 0xf8, 0x9a, 0x53, 0xd5, 0xff, 0x9c, 0x11, 0xc7, 0xa0, 0x54, 0x8d, 0xa0,
-	0x27, 0x8d, 0x82, 0xf1, 0x1a, 0x4c, 0x33, 0xe0, 0x37, 0x60, 0x77, 0x6a, 0xa8, 0x90, 0xa8, 0x3f,
-	0xd0, 0xff, 0x22, 0x45, 0x9e, 0x8c, 0x86, 0x86, 0x3e, 0x2f, 0x12, 0x73, 0x8c, 0x89, 0x66, 0x59,
-	0xe3, 0x58, 0x78, 0x45, 0x4b, 0x99, 0xbf, 0x2e, 0x8e, 0x45, 0xb4, 0x83, 0x44, 0x24, 0xcd, 0x80,
-	0x15, 0x00, 0xa7, 0xaa, 0x76, 0xd8, 0x14, 0x79, 0xd5, 0xbf, 0x97, 0x57, 0xc0, 0x18, 0x0d, 0x8d,
-	0xc7, 0xf3, 0xe1, 0xe0, 0x04, 0x66, 0xa2, 0x05, 0x5c, 0xf8, 0x13, 0x39, 0x26, 0xf4, 0x3f, 0xf1,
-	0xbe, 0xbf, 0xf9, 0x62, 0xf3, 0x5c, 0x4c, 0x9b, 0x73, 0x6e, 0x53, 0x87, 0x05, 0x17, 0x34, 0x91,
-	0x80, 0x9a, 0xff, 0xd9, 0x04, 0x6b, 0x35, 0x2c, 0x1a, 0xca, 0x4b, 0xb0, 0x2d, 0x7f, 0x95, 0x30,
-	0xfb, 0x36, 0x22, 0xb7, 0xf3, 0x97, 0x91, 0x09, 0xb7, 0x15, 0x4a, 0xbf, 0x89, 0xd2, 0x78, 0xf8,
-	0x33, 0x00, 0xa4, 0x41, 0xdc, 0x28, 0x39, 0x7b, 0x1e, 0x8e, 0x86, 0x06, 0x4c, 0xb1, 0xe5, 0x4d,
-	0x52, 0x90, 0xbc, 0x6d, 0x5f, 0xe0, 0xc0, 0x1d, 0x38, 0x2e, 0xc3, 0xa1, 0x37, 0x78, 0x4d, 0xc5,
-	0x55, 0xde, 0x56, 0xdb, 0x76, 0x93, 0xfb, 0xad, 0x40, 0x02, 0xac, 0x2e, 0x6f, 0xdb, 0x69, 0x0a,
-	0xfc, 0x15, 0xd0, 0xd2, 0x16, 0x74, 0x27, 0x2e, 0xf5, 0xb6, 0x7a, 0xa9, 0x67, 0x65, 0x2c, 0x72,
-	0x67, 0xa2, 0x39, 0x1e, 0xdf, 0x08, 0x8a, 0x7a, 0x61, 0xd3, 0xf1, 0xbb, 0x3e, 0xd3, 0x0f, 0x4e,
-	0x32, 0xa7, 0x59, 0x75, 0x23, 0x84, 0xfb, 0xac, 0x80, 0x3b, 0x4d, 0xa4, 0x20, 0xe1, 0x2f, 0xc1,
-	0xb6, 0xdd, 0xf7, 0x59, 0x39, 0xe4, 0x65, 0xd2, 0x23, 0x58, 0x7f, 0x38, 0x77, 0x27, 0xfa, 0x3e,
-	0xb3, 0xa2, 0xd0, 0x6a, 0x49, 0x00, 0xbf, 0x13, 0x2a, 0x01, 0x5e, 0x02, 0xad, 0x18, 0x85, 0x54,
-	0x4c, 0x24, 0x6f, 0x20, 0x7b, 0xcd, 0xe1, 0xec, 0xfd, 0xf4, 0xa6, 0x88, 0x71, 0x9f, 0x99, 0x63,
-	0xc1, 0x9f, 0x83, 0x4d, 0x3b, 0x74, 0x1b, 0x01, 0xae, 0xc4, 0x24, 0x6a, 0xe9, 0xba, 0x10, 0x39,
-	0x1c, 0x0d, 0x8d, 0xbd, 0x24, 0x12, 0xe1, 0xb4, 0x62, 0xee, 0xe5, 0x75, 0x36, 0xc5, 0xc2, 0xaf,
-	0xc1, 0x56, 0x12, 0x4f, 0xd1, 0xa5, 0x98, 0xea, 0x86, 0x98, 0x7a, 0x4a, 0x91, 0x26, 0xd1, 0x5b,
-	0x1e, 0x77, 0x9b, 0x28, 0x85, 0xe6, 0xa7, 0x99, 0xac, 0x45, 0x5e, 0x5f, 0x53, 0xfd, 0x64, 0xf6,
-	0x34, 0xc7, 0x7c, 0x79, 0x1c, 0xe2, 0x34, 0xd3, 0x14, 0x3e, 0x20, 0x13, 0x4b, 0xb5, 0xd3, 0x6b,
-	0xb5, 0x02, 0xac, 0x7f, 0x36, 0x9b, 0xca, 0xb1, 0x08, 0x95, 0x80, 0xa9, 0x46, 0xc2, 0x80, 0xd7,
-	0x4a, 0x9f, 0x2b, 0x46, 0xdd, 0xae, 0x1b, 0x36, 0xa9, 0x6e, 0xce, 0xbe, 0x56, 0xa6, 0x7d, 0xce,
-	0x4b, 0x30, 0x6a, 0x9b, 0x1b, 0xf3, 0xf8, 0xae, 0x50, 0x2f, 0x0c, 0x31, 0x99, 0xb4, 0xea, 0x1f,
-	0x89, 0xfb, 0xad, 0xec, 0x8a, 0x08, 0xbf, 0xda, 0xac, 0x67, 0x28, 0xfc, 0xf9, 0x64, 0xf7, 0x19,
-	0x26, 0xa1, 0x1b, 0x4c, 0x64, 0xce, 0x84, 0x8c, 0x12, 0x10, 0x4e, 0x10, 0xaa, 0xd0, 0x1c, 0x8d,
-	0x1f, 0x6f, 0x95, 0x11, 0x4c, 0x69, 0x6d, 0x10, 0x63, 0xaa, 0x63, 0xb1, 0x2d, 0xe5, 0x78, 0xa9,
-	0x70, 0x5a, 0x8c, 0x7b, 0x4d, 0xa4, 0x62, 0xf9, 0x2d, 0x95, 0xcb, 0x6b, 0x3c, 0xa8, 0xfa, 0xdf,
-	0x61, 0xd1, 0x84, 0xb3, 0x6a, 0x6a, 0x13, 0xf2, 0x2d, 0x1e, 0x58, 0xd4, 0xff, 0x8e, 0xdf, 0xd2,
-	0x14, 0x81, 0x77, 0xae, 0x94, 0xc1, 0x71, 0x49, 0x1b, 0xeb, 0x6d, 0x21, 0xa3, 0xcc, 0xc4, 0x19,
-	0x19, 0x2b, 0xe0, 0x30, 0x13, 0x2d, 0xe0, 0xc2, 0xb7, 0x60, 0x7f, 0x6a, 0xed, 0xb5, 0x5a, 0x7e,
-	0x1f, 0xb9, 0x61, 0x1b, 0xeb, 0x1d, 0xa1, 0x69, 0x8e, 0x86, 0xc6, 0xf1, 0xbc, 0xa6, 0xc0, 0x59,
-	0x84, 0x03, 0x4d, 0xb4, 0x90, 0x0f, 0x7f, 0x03, 0x0e, 0x17, 0xd9, 0x6b, 0xfd, 0x50, 0xf7, 0x85,
-	0xb4, 0xf2, 0x96, 0xbb, 0x47, 0xda, 0x62, 0xfd, 0xd0, 0x44, 0xf7, 0xc9, 0xf0, 0x89, 0x32, 0x71,
-	0xd5, 0xfa, 0x61, 0x39, 0xa6, 0xfa, 0x6f, 0x85, 0xb2, 0x72, 0xa4, 0x8a, 0x32, 0xeb, 0x87, 0x56,
-	0x14, 0x53, 0x13, 0xcd, 0xb2, 0xa6, 0xc7, 0x22, 0x9b, 0x3a, 0x95, 0xd3, 0x2d, 0x9b, 0x7a, 0x28,
-	0x49, 0x1d, 0x39, 0x0b, 0xe8, 0xe4, 0x58, 0x12, 0x02, 0xfc, 0x29, 0xc8, 0x49, 0xc3, 0x9b, 0x4a,
-	0x55, 0x8e, 0xb5, 0xac, 0xfa, 0x1c, 0x48, 0xd8, 0x1f, 0xf8, 0xd7, 0xa7, 0x40, 0xf3, 0x77, 0x19,
-	0xb0, 0x8e, 0xf0, 0x87, 0x1e, 0xa6, 0x0c, 0x9e, 0x83, 0x5c, 0x39, 0xc6, 0xc4, 0x65, 0x7e, 0x14,
-	0x8a, 0xf6, 0xbf, 0xf3, 0x42, 0x4b, 0x86, 0xc8, 0xc4, 0x8e, 0xa6, 0x10, 0xf8, 0xc5, 0xf8, 0x21,
-	0xa3, 0xcb, 0x89, 0xb3, 0x9d, 0x80, 0xa5, 0x11, 0x8d, 0x5f, 0x39, 0x5f, 0x8c, 0x67, 0x8c, 0xf8,
-	0x13, 0x63, 0x0a, 0x93, 0x46, 0x94, 0x38, 0xcd, 0xaf, 0xc1, 0x06, 0xc2, 0x34, 0x8e, 0x42, 0x8a,
-	0xa1, 0x0e, 0xd6, 0xab, 0x3d, 0xcf, 0xc3, 0x94, 0x8a, 0x38, 0x36, 0xd0, 0x78, 0x09, 0x1f, 0x82,
-	0x35, 0xfe, 0x58, 0xed, 0x51, 0x39, 0x61, 0x50, 0xb2, 0x3a, 0xfb, 0x47, 0x46, 0x09, 0x1e, 0xee,
-	0x00, 0x50, 0x8a, 0x58, 0x95, 0xb9, 0x84, 0xe1, 0xa6, 0xb6, 0x04, 0xf7, 0x81, 0x96, 0x3c, 0xc5,
-	0x84, 0x8d, 0xcf, 0x3e, 0x2d, 0x03, 0x77, 0xc1, 0x26, 0xc2, 0x74, 0x62, 0x58, 0x86, 0x5b, 0x60,
-	0xe3, 0xda, 0x0f, 0x02, 0xb1, 0x5a, 0xe1, 0x6e, 0xde, 0x09, 0xf2, 0xc4, 0xeb, 0xf8, 0x77, 0x58,
-	0x5b, 0xe5, 0x2a, 0x17, 0x98, 0x32, 0x12, 0x0d, 0x38, 0x42, 0x3c, 0xa9, 0xb4, 0x2c, 0x7c, 0x04,
-	0x0e, 0x0a, 0x81, 0xeb, 0xdd, 0x76, 0xa2, 0x40, 0x3c, 0xf1, 0x2b, 0x11, 0x61, 0xb5, 0x3e, 0xea,
-	0x6b, 0x4d, 0xf8, 0x18, 0x1c, 0xde, 0x84, 0x8d, 0x85, 0x4e, 0x0c, 0x0f, 0xc0, 0x03, 0xd1, 0xef,
-	0x52, 0xe6, 0x16, 0x3c, 0x04, 0x7b, 0x37, 0x61, 0x73, 0xce, 0xd1, 0x3e, 0xfb, 0xdb, 0x8a, 0x8c,
-	0x27, 0x69, 0xb5, 0x9c, 0x7f, 0x7d, 0xe5, 0x38, 0xf5, 0x72, 0xc9, 0xae, 0xbf, 0x2a, 0x3b, 0x4e,
-	0xf9, 0x9d, 0x8d, 0xb4, 0x25, 0x1e, 0xb5, 0x30, 0x3b, 0x76, 0xfe, 0xc2, 0x46, 0x5a, 0x06, 0x1e,
-	0x83, 0xa3, 0x39, 0x5c, 0xfd, 0x55, 0x19, 0xd5, 0x9d, 0x72, 0xe9, 0x1b, 0x6d, 0x19, 0xea, 0x60,
-	0x5f, 0x21, 0x4c, 0x3d, 0x2b, 0x13, 0xa9, 0x37, 0x37, 0x65, 0x74, 0xf3, 0x5a, 0x5b, 0x15, 0xf9,
-	0xe1, 0x86, 0xbc, 0xe3, 0x68, 0x59, 0x78, 0x06, 0x9e, 0x15, 0x9c, 0x7c, 0xf1, 0xfa, 0xb2, 0xec,
-	0xd8, 0xf5, 0x8a, 0x6d, 0xa3, 0x7a, 0xa5, 0x8c, 0x6a, 0xf5, 0xda, 0xfb, 0x3a, 0x7a, 0x9f, 0x8e,
-	0x6a, 0x0d, 0xfe, 0x00, 0x9c, 0xdc, 0x8f, 0x4d, 0x42, 0x5d, 0x87, 0x9f, 0x81, 0xa7, 0xf7, 0xa3,
-	0xf8, 0x47, 0x37, 0xe0, 0x33, 0x60, 0x5e, 0xd8, 0x4e, 0xfe, 0xd7, 0xff, 0xfb, 0x83, 0x39, 0x78,
-	0x02, 0x9e, 0x2c, 0xc6, 0x25, 0x1f, 0x03, 0xf0, 0x29, 0x78, 0xb4, 0x18, 0xc1, 0x3f, 0xb4, 0xc9,
-	0xcf, 0xa1, 0x54, 0xae, 0xbf, 0xca, 0x5f, 0x39, 0xf5, 0x77, 0x57, 0xb5, 0xcb, 0x7a, 0xb5, 0x86,
-	0xec, 0x6a, 0x55, 0x6b, 0xc2, 0x1f, 0x82, 0xcf, 0x53, 0x8e, 0x52, 0x39, 0xf1, 0xc9, 0xd4, 0x5d,
-	0xbd, 0xb5, 0x4b, 0x1c, 0x88, 0xe1, 0x2e, 0x00, 0x1c, 0x55, 0x29, 0x5f, 0x95, 0x6a, 0x55, 0xed,
-	0x63, 0x06, 0x6e, 0x83, 0x0d, 0xfb, 0x7d, 0xcd, 0x46, 0xa5, 0xbc, 0xa3, 0xfd, 0x71, 0xf9, 0x2c,
-	0x02, 0x60, 0xda, 0x98, 0xe1, 0x1a, 0x58, 0xbe, 0x7e, 0xab, 0x2d, 0xc1, 0x1c, 0xc8, 0x3a, 0x76,
-	0xbe, 0x6a, 0x6b, 0x19, 0xb8, 0x07, 0x76, 0x6d, 0xc7, 0x2e, 0xd6, 0xae, 0xca, 0xa5, 0x3a, 0xba,
-	0x29, 0x95, 0x6c, 0xa4, 0x2d, 0x43, 0x0d, 0x6c, 0xbd, 0xcb, 0xd7, 0x8a, 0x97, 0x63, 0xcb, 0x0a,
-	0xbf, 0x08, 0x4e, 0xb9, 0x78, 0x5d, 0x47, 0xf9, 0xa2, 0x8d, 0xc6, 0xe6, 0x55, 0x0e, 0x14, 0x42,
-	0x63, 0x4b, 0xf6, 0xc5, 0x4b, 0x90, 0xab, 0x11, 0x37, 0xa4, 0x71, 0x44, 0x18, 0x7c, 0xa1, 0x2e,
-	0x76, 0x92, 0x92, 0x4c, 0x3a, 0xc1, 0xd1, 0xee, 0x64, 0x2d, 0x0b, 0xd2, 0x5c, 0x3a, 0xcd, 0xfc,
-	0x38, 0x53, 0xd8, 0xff, 0xf8, 0xaf, 0xe3, 0xa5, 0x8f, 0x9f, 0x8e, 0x33, 0x7f, 0xff, 0x74, 0x9c,
-	0xf9, 0xe7, 0xa7, 0xe3, 0xcc, 0x1f, 0xfe, 0x7d, 0xbc, 0xd4, 0x58, 0x13, 0xff, 0xa6, 0xf8, 0xf2,
-	0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x33, 0x62, 0x54, 0x24, 0xef, 0x10, 0x00, 0x00,
+	// 1946 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x58, 0x6d, 0x77, 0xdb, 0x48,
+	0x15, 0x8e, 0x92, 0x38, 0x4d, 0x26, 0x6f, 0xea, 0xa4, 0x69, 0xd4, 0x97, 0x8d, 0x53, 0x2d, 0x5b,
+	0x42, 0x0e, 0x4a, 0xa1, 0xe5, 0x00, 0xbb, 0xec, 0x52, 0x6c, 0x47, 0x6d, 0x4c, 0x54, 0xdb, 0x1d,
+	0x2b, 0x6d, 0xf9, 0x64, 0x64, 0x79, 0x6c, 0x8b, 0x28, 0x92, 0x2a, 0x8d, 0xb3, 0xf6, 0xfe, 0x01,
+	0x0e, 0xdf, 0xf8, 0xc8, 0x8f, 0x60, 0xbf, 0xf0, 0x2b, 0xba, 0xbb, 0xe5, 0x1c, 0x7e, 0x81, 0x81,
+	0xf2, 0x0f, 0x7c, 0xf8, 0x0e, 0x67, 0x5e, 0x6c, 0x8f, 0xfc, 0xd2, 0xee, 0x37, 0xcf, 0xbd, 0xcf,
+	0xf3, 0xe8, 0xce, 0x9d, 0xb9, 0xf7, 0x4e, 0x02, 0xb6, 0xe3, 0xc8, 0x8d, 0xea, 0x0f, 0xe2, 0xc8,
+	0x3d, 0x8e, 0xe2, 0x90, 0x84, 0x30, 0xc3, 0x0c, 0xb7, 0x8d, 0x96, 0x47, 0xda, 0x9d, 0xfa, 0xb1,
+	0x1b, 0x5e, 0x3e, 0x68, 0x85, 0xad, 0xf0, 0x01, 0xf3, 0xd6, 0x3b, 0x4d, 0xb6, 0x62, 0x0b, 0xf6,
+	0x8b, 0xb3, 0xf4, 0xb7, 0xd7, 0xc0, 0xb2, 0x49, 0xdc, 0x06, 0xfc, 0x18, 0x2c, 0x97, 0x9c, 0x4b,
+	0xac, 0x29, 0x07, 0xca, 0xe1, 0x5a, 0x7e, 0x7b, 0xd0, 0xcf, 0xae, 0xf7, 0x9c, 0x4b, 0xff, 0x33,
+	0x3d, 0x70, 0x2e, 0xb1, 0x8e, 0x98, 0x13, 0x1a, 0xe0, 0xda, 0x89, 0x43, 0x9c, 0x13, 0x2f, 0xd6,
+	0x16, 0x19, 0x6e, 0x67, 0xd0, 0xcf, 0x6e, 0x73, 0x5c, 0xc3, 0x21, 0x8e, 0xd1, 0xf0, 0x62, 0x1d,
+	0x0d, 0x31, 0xf0, 0x08, 0xac, 0xbc, 0xcc, 0x59, 0x14, 0xbd, 0xc4, 0xd0, 0x70, 0xd0, 0xcf, 0x6e,
+	0x71, 0xf4, 0x97, 0x8e, 0xcf, 0xc1, 0x02, 0x01, 0x8b, 0x40, 0xb5, 0xbc, 0x84, 0xe0, 0xa0, 0xe0,
+	0x7b, 0x38, 0x20, 0xe7, 0xc8, 0x4a, 0xb4, 0xe5, 0x83, 0xa5, 0xc3, 0xb5, 0xfc, 0x47, 0x83, 0x7e,
+	0xf6, 0x16, 0x67, 0xf9, 0x0c, 0x61, 0xb8, 0x0c, 0x62, 0x74, 0x62, 0x3f, 0xd1, 0xd1, 0x14, 0x0d,
+	0x22, 0xb0, 0x93, 0x6b, 0x5c, 0xe1, 0x98, 0x78, 0x09, 0x96, 0xd4, 0x32, 0x4c, 0xed, 0x60, 0xd0,
+	0xcf, 0xde, 0xe5, 0x6a, 0xce, 0x10, 0x94, 0x16, 0x9c, 0x45, 0x86, 0x05, 0xb0, 0xc5, 0xbf, 0x53,
+	0xc1, 0x38, 0x66, 0x72, 0x2b, 0x4c, 0xee, 0xce, 0xa0, 0x9f, 0xdd, 0x4b, 0x05, 0x17, 0x61, 0x1c,
+	0x0b, 0xa5, 0x09, 0x0a, 0xac, 0x03, 0xad, 0x18, 0x78, 0xc4, 0x73, 0xfc, 0xd1, 0x27, 0x46, 0x72,
+	0xd7, 0x98, 0xdc, 0xfd, 0x41, 0x3f, 0xab, 0x73, 0x39, 0x8f, 0x23, 0x8d, 0x71, 0x94, 0x92, 0xf2,
+	0x5c, 0x1d, 0x98, 0x07, 0x5b, 0xc2, 0x57, 0xf0, 0x3b, 0x09, 0xc1, 0xb1, 0xb6, 0xca, 0x72, 0x7f,
+	0x7b, 0xd0, 0xcf, 0xde, 0x4c, 0x2b, 0xbb, 0x1c, 0xa0, 0xa3, 0x09, 0x06, 0x4d, 0x60, 0xda, 0x52,
+	0x25, 0x0e, 0xc1, 0xda, 0x1a, 0x13, 0x92, 0x12, 0x38, 0x21, 0x64, 0x24, 0x14, 0xa6, 0xa3, 0x59,
+	0xe4, 0x69, 0x4d, 0x3b, 0xbc, 0xc0, 0x81, 0x06, 0x3e, 0xa4, 0x49, 0x28, 0x6c, 0x4a, 0x93, 0x91,
+	0xe1, 0x63, 0xb0, 0x59, 0x0d, 0x9c, 0x28, 0x69, 0x87, 0xa4, 0x10, 0x76, 0x02, 0xa2, 0xad, 0x1f,
+	0x28, 0x87, 0x4b, 0xf9, 0x5b, 0x83, 0x7e, 0x76, 0x97, 0xab, 0x25, 0xc2, 0x6d, 0xb8, 0xd4, 0xaf,
+	0xa3, 0x34, 0x1e, 0x5a, 0xe0, 0xfa, 0xf3, 0x4e, 0x48, 0x9c, 0xbc, 0xe3, 0x5e, 0xe0, 0xa0, 0x91,
+	0xef, 0x11, 0x9c, 0x68, 0x1b, 0x4c, 0x64, 0x7f, 0xd0, 0xcf, 0xde, 0xe6, 0x22, 0xaf, 0x29, 0xc4,
+	0xa8, 0x73, 0x8c, 0x51, 0xa7, 0x20, 0x1d, 0x4d, 0x13, 0x69, 0x75, 0x54, 0x62, 0xfc, 0x22, 0x24,
+	0x58, 0xdb, 0x3c, 0x50, 0x0e, 0x57, 0xe5, 0xea, 0x88, 0x62, 0x6c, 0x5c, 0x85, 0x34, 0x3b, 0x43,
+	0x8c, 0x9c, 0x91, 0x30, 0x8e, 0x3b, 0x11, 0x29, 0xb4, 0xb1, 0x7b, 0xa1, 0x6d, 0x31, 0xea, 0xac,
+	0x8c, 0x70, 0x94, 0xe1, 0x52, 0x98, 0x94, 0x11, 0x89, 0xac, 0xff, 0x29, 0x03, 0x56, 0x9e, 0xe1,
+	0xcb, 0x3a, 0x8e, 0xe1, 0x17, 0x60, 0x83, 0x16, 0xb6, 0xd9, 0xc5, 0x6e, 0xc5, 0x21, 0x6d, 0x51,
+	0xd8, 0x52, 0x6e, 0x30, 0x71, 0x1b, 0x06, 0xee, 0x62, 0xd7, 0x88, 0x1c, 0xd2, 0xd6, 0x51, 0x0a,
+	0x0e, 0x1f, 0x81, 0xb5, 0x5c, 0x0b, 0x07, 0x24, 0xd7, 0x68, 0xc4, 0x2c, 0xaf, 0x6b, 0xf9, 0xdd,
+	0x41, 0x3f, 0x7b, 0x5d, 0x94, 0x0e, 0x75, 0x19, 0x4e, 0xa3, 0x11, 0xeb, 0x68, 0x8c, 0xa3, 0xf9,
+	0x7c, 0xe2, 0x78, 0x7e, 0x14, 0x7a, 0x01, 0x39, 0xb5, 0xed, 0x0a, 0x23, 0x6f, 0x30, 0xb2, 0x94,
+	0xcf, 0xe6, 0x10, 0x62, 0xb4, 0x09, 0x89, 0x84, 0xca, 0x34, 0x91, 0xe6, 0x33, 0xef, 0x24, 0x98,
+	0xf6, 0x0f, 0x3c, 0xd9, 0x6d, 0xea, 0x4e, 0x82, 0x45, 0xb7, 0x11, 0x18, 0xf8, 0x19, 0x58, 0xa7,
+	0x3b, 0xb0, 0xc2, 0x16, 0xdb, 0x6f, 0x93, 0x51, 0xb4, 0x41, 0x3f, 0x7b, 0x43, 0xda, 0xaf, 0x1f,
+	0xb6, 0xc4, 0x76, 0x65, 0x30, 0xcc, 0x81, 0x4d, 0xba, 0xe4, 0x05, 0x6f, 0x5b, 0x55, 0xed, 0x1b,
+	0x85, 0x1d, 0x83, 0x54, 0x35, 0x8c, 0x2e, 0x1a, 0x05, 0xa1, 0x35, 0x98, 0x66, 0xc0, 0xa7, 0x60,
+	0x7b, 0x6c, 0xa8, 0xc4, 0x61, 0xb7, 0xa7, 0x7d, 0xcb, 0x45, 0xee, 0x0e, 0xfa, 0x59, 0x6d, 0x5a,
+	0x24, 0xa2, 0x18, 0x1d, 0x4d, 0xb2, 0x86, 0xb1, 0xd0, 0x8a, 0xe6, 0x32, 0xdf, 0xcd, 0x8e, 0x85,
+	0xb5, 0x03, 0x21, 0x92, 0x66, 0xc0, 0x0a, 0x80, 0x63, 0x55, 0x33, 0x68, 0xb0, 0xbc, 0x6a, 0x6f,
+	0xf9, 0x15, 0xc8, 0x0e, 0xfa, 0xd9, 0x3b, 0xd3, 0xe1, 0x60, 0x01, 0xd3, 0xd1, 0x0c, 0x2e, 0xfc,
+	0x29, 0x1f, 0x13, 0xda, 0xd7, 0xb4, 0xef, 0xaf, 0x3f, 0x5c, 0x3f, 0x66, 0xd3, 0xe6, 0x98, 0xda,
+	0xe4, 0x61, 0x41, 0x05, 0x75, 0xc4, 0xa0, 0xfa, 0xff, 0xd6, 0xc1, 0x8a, 0x8d, 0x59, 0x43, 0x79,
+	0x0c, 0x36, 0xf9, 0xaf, 0x12, 0x26, 0x5f, 0x86, 0xf1, 0xc5, 0xf4, 0x65, 0x24, 0xcc, 0x6d, 0x04,
+	0xdc, 0xaf, 0xa3, 0x34, 0x1e, 0xfe, 0x1c, 0x00, 0x6e, 0x60, 0x37, 0x8a, 0xcf, 0x9e, 0x9b, 0x83,
+	0x7e, 0x16, 0xa6, 0xd8, 0xfc, 0x26, 0x49, 0x48, 0xda, 0xb6, 0x4f, 0xb0, 0xef, 0xf4, 0x2c, 0x87,
+	0xe0, 0xc0, 0xed, 0x3d, 0x4b, 0xd8, 0x55, 0xde, 0x94, 0xdb, 0x76, 0x83, 0xfa, 0x0d, 0x9f, 0x03,
+	0x8c, 0x4b, 0xda, 0xb6, 0xd3, 0x14, 0xf8, 0x5b, 0xa0, 0xa6, 0x2d, 0xe8, 0x8a, 0x5d, 0xea, 0x4d,
+	0xf9, 0x52, 0x4f, 0xca, 0x18, 0xf1, 0x95, 0x8e, 0xa6, 0x78, 0x74, 0x23, 0x28, 0xec, 0x04, 0x0d,
+	0xcb, 0xbb, 0xf4, 0x88, 0xb6, 0x7b, 0xa0, 0x1c, 0x66, 0xe4, 0x8d, 0xc4, 0xd4, 0x67, 0xf8, 0xd4,
+	0xa9, 0x23, 0x09, 0x09, 0x7f, 0x03, 0x36, 0xcd, 0xae, 0x47, 0xca, 0x01, 0x2d, 0x93, 0x4e, 0x8c,
+	0xb5, 0x9b, 0x53, 0x77, 0xa2, 0xeb, 0x11, 0x23, 0x0c, 0x8c, 0x26, 0x07, 0xd0, 0x3b, 0x21, 0x13,
+	0xe0, 0x29, 0x50, 0x0b, 0x61, 0x90, 0xb0, 0x89, 0xe4, 0xf6, 0x78, 0xaf, 0xd9, 0x9b, 0xbc, 0x9f,
+	0xee, 0x18, 0x31, 0xec, 0x33, 0x53, 0x2c, 0xf8, 0x29, 0x58, 0x37, 0x03, 0xa7, 0xee, 0xe3, 0x4a,
+	0x14, 0x87, 0x4d, 0x4d, 0x63, 0x22, 0x7b, 0x83, 0x7e, 0x76, 0x47, 0x44, 0xc2, 0x9c, 0x46, 0x44,
+	0xbd, 0xb4, 0xce, 0xc6, 0x58, 0xf8, 0x39, 0xd8, 0x10, 0xf1, 0x14, 0x9c, 0x04, 0x27, 0x5a, 0x96,
+	0x4d, 0x3d, 0xa9, 0x48, 0x45, 0xf4, 0x86, 0x4b, 0xdd, 0x3a, 0x4a, 0xa1, 0xe9, 0x69, 0x8a, 0x35,
+	0xcb, 0xeb, 0xb3, 0x44, 0x3b, 0x98, 0x3c, 0xcd, 0x21, 0x9f, 0x1f, 0x07, 0x3b, 0xcd, 0x34, 0x85,
+	0x0e, 0x48, 0x61, 0xa9, 0xb6, 0x3b, 0xcd, 0xa6, 0x8f, 0xb5, 0x7b, 0x93, 0xa9, 0x1c, 0x8a, 0x24,
+	0x1c, 0x30, 0xd6, 0x10, 0x0c, 0x78, 0x26, 0xf5, 0xb9, 0x42, 0x78, 0x79, 0xe9, 0x04, 0x8d, 0x44,
+	0xd3, 0x27, 0x5f, 0x2b, 0xe3, 0x3e, 0xe7, 0x0a, 0x8c, 0xdc, 0xe6, 0x86, 0x3c, 0xba, 0x2b, 0xd4,
+	0x09, 0x02, 0x1c, 0x8f, 0x5a, 0xf5, 0x8f, 0xd8, 0xfd, 0x96, 0x76, 0x15, 0x33, 0xbf, 0xdc, 0xac,
+	0x27, 0x28, 0xf4, 0xf9, 0x64, 0x76, 0x09, 0x8e, 0x03, 0xc7, 0x1f, 0xc9, 0x1c, 0x31, 0x19, 0x29,
+	0x20, 0x2c, 0x10, 0xb2, 0xd0, 0x14, 0x8d, 0x1e, 0x6f, 0x95, 0xc4, 0x38, 0x49, 0xec, 0x5e, 0x84,
+	0x13, 0x0d, 0xb3, 0x6d, 0x49, 0xc7, 0x9b, 0x30, 0xa7, 0x41, 0xa8, 0x57, 0x47, 0x32, 0x96, 0xde,
+	0x52, 0xbe, 0x3c, 0xc3, 0xbd, 0xaa, 0xf7, 0x15, 0x66, 0x4d, 0x38, 0x23, 0xa7, 0x56, 0x90, 0x2f,
+	0x70, 0xcf, 0x48, 0xbc, 0xaf, 0xe8, 0x2d, 0x4d, 0x11, 0x68, 0xe7, 0x4a, 0x19, 0x2c, 0x27, 0x6e,
+	0x61, 0xad, 0xc5, 0x64, 0xa4, 0x99, 0x38, 0x21, 0x63, 0xf8, 0x14, 0xa6, 0xa3, 0x19, 0x5c, 0xf8,
+	0x02, 0xdc, 0x18, 0x5b, 0x3b, 0xcd, 0xa6, 0xd7, 0x45, 0x4e, 0xd0, 0xc2, 0x5a, 0x9b, 0x69, 0xea,
+	0x83, 0x7e, 0x76, 0x7f, 0x5a, 0x93, 0xe1, 0x8c, 0x98, 0x02, 0x75, 0x34, 0x93, 0x0f, 0x7f, 0x0f,
+	0xf6, 0x66, 0xd9, 0xed, 0x6e, 0xa0, 0x79, 0x4c, 0x5a, 0x7a, 0xcb, 0xcd, 0x91, 0x36, 0x48, 0x37,
+	0xd0, 0xd1, 0x3c, 0x19, 0x3a, 0x51, 0x46, 0x2e, 0xbb, 0x1b, 0x94, 0xa3, 0x44, 0xfb, 0x03, 0x53,
+	0x96, 0x8e, 0x54, 0x52, 0x26, 0xdd, 0xc0, 0x08, 0xa3, 0x44, 0x47, 0x93, 0xac, 0xf1, 0xb1, 0xf0,
+	0xa6, 0x9e, 0xf0, 0xe9, 0x96, 0x49, 0x3d, 0x94, 0xb8, 0x0e, 0x9f, 0x05, 0xc9, 0xe8, 0x58, 0x04,
+	0x01, 0xfe, 0x0c, 0xac, 0x71, 0xc3, 0xf3, 0x4a, 0x95, 0x8f, 0xb5, 0x8c, 0xfc, 0x1c, 0x10, 0xec,
+	0xd7, 0xf4, 0xeb, 0x63, 0xa0, 0xfe, 0x47, 0x05, 0x5c, 0x43, 0xf8, 0x75, 0x07, 0x27, 0x04, 0x1e,
+	0x83, 0xb5, 0x72, 0x84, 0x63, 0x87, 0x78, 0x61, 0xc0, 0xda, 0xff, 0xd6, 0x43, 0x55, 0x0c, 0x91,
+	0x91, 0x1d, 0x8d, 0x21, 0xf0, 0x93, 0xe1, 0x43, 0x46, 0xe3, 0x13, 0x67, 0x53, 0x80, 0xb9, 0x11,
+	0x0d, 0x5f, 0x39, 0x9f, 0x0c, 0x67, 0x0c, 0xfb, 0x13, 0x63, 0x0c, 0xe3, 0x46, 0x24, 0x9c, 0xfa,
+	0xe7, 0x60, 0x15, 0xe1, 0x24, 0x0a, 0x83, 0x04, 0x43, 0x0d, 0x5c, 0xab, 0x76, 0x5c, 0x17, 0x27,
+	0x09, 0x8b, 0x63, 0x15, 0x0d, 0x97, 0xf0, 0x26, 0x58, 0xa1, 0x8f, 0xd5, 0x4e, 0xc2, 0x27, 0x0c,
+	0x12, 0xab, 0xa3, 0x7f, 0x2a, 0x52, 0xf0, 0x70, 0x0b, 0x80, 0x52, 0x48, 0xaa, 0xc4, 0x89, 0x09,
+	0x6e, 0xa8, 0x0b, 0xf0, 0x06, 0x50, 0xc5, 0x53, 0x8c, 0xd9, 0xe8, 0xec, 0x53, 0x15, 0xb8, 0x0d,
+	0xd6, 0x11, 0x4e, 0x46, 0x86, 0x45, 0xb8, 0x01, 0x56, 0xcf, 0x3c, 0xdf, 0x67, 0xab, 0x25, 0xea,
+	0xa6, 0x9d, 0x20, 0x17, 0xbb, 0x6d, 0xef, 0x0a, 0xab, 0xcb, 0x54, 0xe5, 0x04, 0x27, 0x24, 0x0e,
+	0x7b, 0x14, 0xc1, 0x9e, 0x54, 0x6a, 0x06, 0xde, 0x02, 0xbb, 0x79, 0xdf, 0x71, 0x2f, 0xda, 0xa1,
+	0xcf, 0x9e, 0xf8, 0x95, 0x30, 0x26, 0x76, 0x17, 0x75, 0xd5, 0x06, 0xbc, 0x03, 0xf6, 0xce, 0x83,
+	0xfa, 0x4c, 0x27, 0x86, 0xbb, 0xe0, 0x3a, 0xeb, 0x77, 0x29, 0x73, 0x13, 0xee, 0x81, 0x9d, 0xf3,
+	0xa0, 0x31, 0xe5, 0x68, 0x1d, 0xfd, 0x6d, 0x85, 0xc7, 0x23, 0x5a, 0x2d, 0xe5, 0x9f, 0x15, 0x2d,
+	0xab, 0x56, 0x2e, 0x99, 0xb5, 0x27, 0x65, 0xcb, 0x2a, 0xbf, 0x34, 0x91, 0xba, 0x00, 0x7f, 0x0c,
+	0x0e, 0xa7, 0xcc, 0xb5, 0xf3, 0x92, 0x5d, 0xb4, 0x6a, 0x36, 0x2a, 0x3e, 0x7d, 0x6a, 0xa2, 0x5a,
+	0xb5, 0x94, 0xab, 0x54, 0x4f, 0xcb, 0x36, 0x4f, 0x01, 0x43, 0x5b, 0x66, 0xee, 0xc4, 0x44, 0xea,
+	0x22, 0xbc, 0x0f, 0x74, 0xc9, 0x30, 0x8f, 0xb8, 0x34, 0x22, 0x3e, 0x3f, 0x2f, 0xa3, 0xf3, 0x67,
+	0xea, 0x32, 0xcb, 0x1d, 0x35, 0xe4, 0x2c, 0x4b, 0xcd, 0xc0, 0x23, 0x70, 0x3f, 0x6f, 0xe5, 0x0a,
+	0x67, 0xa7, 0x65, 0xcb, 0xac, 0x55, 0x4c, 0x13, 0xd5, 0x2a, 0x65, 0x64, 0xd7, 0xec, 0x57, 0x35,
+	0xf4, 0x2a, 0x1d, 0x71, 0x03, 0xe6, 0xc0, 0x17, 0xdf, 0x0f, 0x3b, 0x2f, 0x1a, 0x0c, 0x7f, 0x00,
+	0x0e, 0xe6, 0x4b, 0x88, 0xbd, 0x35, 0xe1, 0xaf, 0xc0, 0x2f, 0x3e, 0x84, 0x9a, 0xf7, 0x89, 0xd6,
+	0xfb, 0x3f, 0x21, 0xb2, 0xd0, 0x86, 0xf7, 0xc0, 0x47, 0xf3, 0x51, 0x34, 0x35, 0x1e, 0xfc, 0x21,
+	0xd0, 0x4f, 0x4c, 0x2b, 0xf7, 0xbb, 0xf7, 0xa7, 0xe5, 0x8d, 0x02, 0x7f, 0x0d, 0x3e, 0xfd, 0x30,
+	0x70, 0x5e, 0xc0, 0xdf, 0x28, 0xf0, 0x1e, 0xb8, 0x3b, 0x9b, 0x2f, 0x12, 0xf2, 0xad, 0x02, 0x7f,
+	0x09, 0x1e, 0xbd, 0x0f, 0x32, 0x4f, 0xfc, 0xbb, 0xf7, 0x88, 0x8b, 0x54, 0xbc, 0x55, 0xe0, 0x3e,
+	0xb8, 0x35, 0x1b, 0x42, 0xf3, 0xf0, 0x77, 0x05, 0x6a, 0x60, 0xa7, 0x54, 0xae, 0x3d, 0xc9, 0x15,
+	0xad, 0xda, 0xcb, 0xa2, 0x7d, 0x5a, 0xab, 0xda, 0xc8, 0xac, 0x56, 0xd5, 0xbf, 0x2e, 0xc2, 0x43,
+	0xf0, 0x71, 0xca, 0x53, 0x2a, 0x0b, 0x67, 0xed, 0x49, 0x19, 0xd5, 0xac, 0xe2, 0x0b, 0xb3, 0x44,
+	0x91, 0x5f, 0x2f, 0xc2, 0x6d, 0x00, 0x28, 0xac, 0x52, 0x2e, 0x96, 0xec, 0xaa, 0xfa, 0xe7, 0x25,
+	0xb8, 0x09, 0x56, 0xcd, 0x57, 0xb6, 0x89, 0x4a, 0x39, 0x4b, 0xfd, 0xef, 0xd2, 0x51, 0x08, 0xc0,
+	0x78, 0xf8, 0xc1, 0x15, 0xb0, 0x78, 0xf6, 0x42, 0x5d, 0x80, 0x6b, 0x20, 0x63, 0x99, 0xb9, 0xaa,
+	0xa9, 0x2a, 0x70, 0x07, 0x6c, 0x9b, 0x96, 0x59, 0xb0, 0x8b, 0xe5, 0x52, 0x0d, 0x9d, 0x97, 0x4a,
+	0xac, 0x08, 0x54, 0xb0, 0xf1, 0x32, 0x67, 0x17, 0x4e, 0x87, 0x96, 0x25, 0x5a, 0x6c, 0x56, 0xb9,
+	0x70, 0x56, 0x43, 0xb9, 0x82, 0x89, 0x86, 0xe6, 0x65, 0x0a, 0x64, 0x42, 0x43, 0x4b, 0xe6, 0xe1,
+	0x63, 0xb0, 0x66, 0xc7, 0x4e, 0x90, 0x44, 0x61, 0x4c, 0xe0, 0x43, 0x79, 0xb1, 0x25, 0xda, 0x9e,
+	0xe8, 0xb6, 0xb7, 0xb7, 0x47, 0x6b, 0xde, 0xf4, 0xf4, 0x85, 0x43, 0xe5, 0x27, 0x4a, 0xfe, 0xc6,
+	0x9b, 0x7f, 0xef, 0x2f, 0xbc, 0x79, 0xb7, 0xaf, 0xfc, 0xe3, 0xdd, 0xbe, 0xf2, 0xaf, 0x77, 0xfb,
+	0xca, 0x5f, 0xfe, 0xb3, 0xbf, 0x50, 0x5f, 0x61, 0xff, 0x0a, 0x7a, 0xf4, 0xff, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0x4d, 0xf3, 0x65, 0xc5, 0x53, 0x12, 0x00, 0x00,
 }

+ 19 - 13
tools/functional-tester/rpcpb/rpc.proto

@@ -86,29 +86,35 @@ message Member {
 
 enum FailureCase {
   KILL_ONE_FOLLOWER = 0;
-  KILL_LEADER = 1;
-  KILL_ONE_FOLLOWER_FOR_LONG = 2;
-  KILL_LEADER_FOR_LONG = 3;
+  KILL_ONE_FOLLOWER_UNTIL_TRIGGER_SNAPSHOT = 1;
+  KILL_LEADER = 2;
+  KILL_LEADER_UNTIL_TRIGGER_SNAPSHOT = 3;
   KILL_QUORUM = 4;
   KILL_ALL = 5;
 
-  BLACKHOLE_PEER_PORT_TX_RX_ONE_FOLLOWER = 6;
-  BLACKHOLE_PEER_PORT_TX_RX_LEADER = 7;
-  BLACKHOLE_PEER_PORT_TX_RX_ALL = 8;
+  BLACKHOLE_PEER_PORT_TX_RX_ONE_FOLLOWER = 100;
+  BLACKHOLE_PEER_PORT_TX_RX_ONE_FOLLOWER_UNTIL_TRIGGER_SNAPSHOT = 101;
+  BLACKHOLE_PEER_PORT_TX_RX_LEADER = 102;
+  BLACKHOLE_PEER_PORT_TX_RX_LEADER_UNTIL_TRIGGER_SNAPSHOT = 103;
+  BLACKHOLE_PEER_PORT_TX_RX_QUORUM = 104;
+  BLACKHOLE_PEER_PORT_TX_RX_ALL = 105;
 
-  DELAY_PEER_PORT_TX_RX_ONE_FOLLOWER = 9;
-  DELAY_PEER_PORT_TX_RX_LEADER = 10;
-  DELAY_PEER_PORT_TX_RX_ALL = 11;
+  DELAY_PEER_PORT_TX_RX_ONE_FOLLOWER = 200;
+  DELAY_PEER_PORT_TX_RX_ONE_FOLLOWER_UNTIL_TRIGGER_SNAPSHOT = 201;
+  DELAY_PEER_PORT_TX_RX_LEADER = 202;
+  DELAY_PEER_PORT_TX_RX_LEADER_UNTIL_TRIGGER_SNAPSHOT = 203;
+  DELAY_PEER_PORT_TX_RX_QUORUM = 204;
+  DELAY_PEER_PORT_TX_RX_ALL = 205;
 
   // NO_FAIL_WITH_STRESS runs no-op failure injection for specified period
   // while stressers are still sending requests.
-  NO_FAIL_WITH_STRESS = 100;
+  NO_FAIL_WITH_STRESS = 300;
   // NO_FAIL_WITH_NO_STRESS_FOR_LIVENESS runs no-op failure injection
   // with all stressers stopped.
-  NO_FAIL_WITH_NO_STRESS_FOR_LIVENESS = 101;
+  NO_FAIL_WITH_NO_STRESS_FOR_LIVENESS = 301;
 
-  FAILPOINTS = 200;
-  EXTERNAL = 300;
+  FAILPOINTS = 400;
+  EXTERNAL = 500;
 }
 
 enum StressType {