From c3ffc0ba9c40102c97b947d6a4255e3c85cc1ace Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Mon, 5 Jun 2017 20:39:03 +0300
Subject: [PATCH] Improve cdc.py error handling

When the CDC service reponds with an error, the program prints the error
and exits.
---
 server/modules/protocol/examples/cdc.py | 27 +++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/server/modules/protocol/examples/cdc.py b/server/modules/protocol/examples/cdc.py
index e44664267..750c23390 100755
--- a/server/modules/protocol/examples/cdc.py
+++ b/server/modules/protocol/examples/cdc.py
@@ -20,7 +20,10 @@ import selectors
 import binascii
 import os
 
+schema_read = False
+
 def read_data():
+    global schema_read
     sel = selectors.DefaultSelector()
     sel.register(sock, selectors.EVENT_READ)
 
@@ -29,8 +32,17 @@ def read_data():
             events = sel.select(timeout=int(opts.read_timeout) if int(opts.read_timeout) > 0 else None)
             buf = sock.recv(4096, socket.MSG_DONTWAIT)
             if len(buf) > 0:
+                # If the request for data is rejected, an error will be sent instead of the table schema
+                if not schema_read:
+                    if "err" in buf.decode().lower():
+                        print(buf.decode(), file=sys.stderr)
+                        exit(1)
+                    else:
+                        schema_read = True
+
                 os.write(sys.stdout.fileno(), buf)
                 sys.stdout.flush()
+
             else:
                 raise Exception('Socket was closed')
 
@@ -40,6 +52,13 @@ def read_data():
             print(ex, file=sys.stderr)
             break
 
+
+def check_for_err(err):
+    if "err" in err.lower().strip():
+        print(err.strip(), file=sys.stderr)
+        exit(1)
+
+
 parser = argparse.ArgumentParser(description = "CDC Binary consumer", conflict_handler="resolve")
 parser.add_argument("-h", "--host", dest="host", help="Network address where the connection is made", default="localhost")
 parser.add_argument("-P", "--port", dest="port", help="Port where the connection is made", default="4001")
@@ -60,13 +79,17 @@ auth_string += bytes(hashlib.sha1(opts.password.encode("utf_8")).hexdigest().enc
 sock.send(auth_string)
 
 # Discard the response
-response = str(sock.recv(1024)).encode('utf_8')
+response = sock.recv(1024).decode()
+
+check_for_err(response)
 
 # Register as a client as request Avro format data
 sock.send(bytes(("REGISTER UUID=XXX-YYY_YYY, TYPE=" + opts.format).encode()))
 
 # Discard the response again
-response = str(sock.recv(1024)).encode('utf_8')
+response = sock.recv(1024).decode()
+
+check_for_err(response)
 
 # Request a data stream
 sock.send(bytes(("REQUEST-DATA " + opts.FILE + (" " + opts.GTID if opts.GTID else "")).encode()))