File tree Expand file tree Collapse file tree 1 file changed +13
-5
lines changed Expand file tree Collapse file tree 1 file changed +13
-5
lines changed Original file line number Diff line number Diff line change 9
9
"encoding/binary"
10
10
"fmt"
11
11
"net"
12
+ "strings"
12
13
13
14
"github.com/go-mysql-org/go-mysql/mysql"
14
15
"github.com/pingcap/tidb/util/hack"
@@ -212,11 +213,6 @@ loop:
212
213
for {
213
214
serverPkt , err := backendIO .ReadPacket ()
214
215
if err != nil {
215
- // tiproxy pp enabled, tidb pp disabled, tls disabled => invalid sequence
216
- // tiproxy pp disabled, tidb pp enabled, tls disabled => invalid sequence
217
- if pktIdx == 0 {
218
- return errors .Wrap (ErrBackendPPV2 , err )
219
- }
220
216
return err
221
217
}
222
218
var packetErr * mysql.MyError
@@ -235,6 +231,18 @@ loop:
235
231
return err
236
232
}
237
233
if packetErr != nil {
234
+ // tiproxy pp enabled, tidb pp disabled, tls disabled => invalid sequence
235
+ // tiproxy pp disabled, tidb pp enabled, tls disabled => invalid sequence
236
+ for _ , p := range []string {
237
+ "packets out of order" ,
238
+ "(nvali): d sequence" ,
239
+ "invalid sequence" ,
240
+ "PROXY Protocol" ,
241
+ } {
242
+ if strings .Contains (packetErr .Message , p ) {
243
+ return errors .Wrap (ErrBackendPPV2 , packetErr )
244
+ }
245
+ }
238
246
return errors .Wrap (ErrClientAuthFail , packetErr )
239
247
}
240
248
You can’t perform that action at this time.
0 commit comments