Add support for the new rd_kafka_error_t type

edenhill · edenhill · commit bf7abda92c61 · 2020-03-09T11:56:39.000+01:00
diff --git a/confluent_kafka/src/confluent_kafka.c b/confluent_kafka/src/confluent_kafka.c
@@ -63,6 +63,9 @@ typedef struct {
 		      * was provided by librdkafka.
 		      * Else falls back on err2str(). */
         int   fatal; /**< Set to true if a fatal error. */
+        int   retriable; /**< Set to true if operation is retriable. */
+        int   txn_abortable; /**< Set to true if this is an abortable
+                              *   transaction error. */
 } KafkaError;
 
 
@@ -90,6 +93,18 @@ static PyObject *KafkaError_fatal (KafkaError *self, PyObject *ignore) {
         return ret;
 }
 
+static PyObject *KafkaError_retriable (KafkaError *self, PyObject *ignore) {
+        PyObject *ret = self->retriable ? Py_True : Py_False;
+        Py_INCREF(ret);
+        return ret;
+}
+
+static PyObject *KafkaError_txn_abortable (KafkaError *self, PyObject *ignore) {
+        PyObject *ret = self->txn_abortable ? Py_True : Py_False;
+        Py_INCREF(ret);
+        return ret;
+}
+
 
 static PyObject *KafkaError_test_raise_fatal (KafkaError *null,
                                               PyObject *ignore) {
@@ -130,6 +145,21 @@ static PyMethodDef KafkaError_methods[] = {
         { "_test_raise_fatal", (PyCFunction)KafkaError_test_raise_fatal,
           METH_NOARGS|METH_STATIC
         },
+        { "retriable", (PyCFunction)KafkaError_retriable, METH_NOARGS,
+          "  :returns: True if the operation that failed may be retried, "
+          "else False.\n"
+          "  :rtype: bool\n"
+          "\n"
+        },
+        { "txn_abortable", (PyCFunction)KafkaError_txn_abortable, METH_NOARGS,
+          "  :returns: True if the error is an abortable transaction error, "
+          "allowing the application to abort the current transaction with "
+          "abort_transaction() and start a new transaction with "
+          "begin_transaction(). This will only return true for errors from "
+          "the transactional producer API.\n"
+          "  :rtype: bool\n"
+          "\n"
+        },
 
 	{ NULL }
 };
@@ -274,6 +304,8 @@ static void KafkaError_init (KafkaError *self,
 			     rd_kafka_resp_err_t code, const char *str) {
 	self->code = code;
         self->fatal = 0;
+        self->retriable = 0;
+        self->txn_abortable = 0;
 	if (str)
 		self->str = strdup(str);
 	else
@@ -319,6 +351,26 @@ PyObject *KafkaError_new0 (rd_kafka_resp_err_t err, const char *fmt, ...) {
 }
 
 
+/**
+ * @brief Create a KafkaError object from  an rd_kafka_error_t *
+ *        and destroy the C object when done.
+ */
+PyObject *KafkaError_new_from_error_destroy (rd_kafka_error_t *error) {
+        KafkaError *kerr;
+
+        kerr = (KafkaError *)KafkaError_new0(rd_kafka_error_code(error),
+                                             "%s",
+                                             rd_kafka_error_string(error));
+
+        kerr->fatal = rd_kafka_error_is_fatal(error);
+        kerr->retriable = rd_kafka_error_is_retriable(error);
+        kerr->txn_abortable = rd_kafka_error_is_txn_abortable(error);
+        rd_kafka_error_destroy(error);
+
+        return (PyObject *)kerr;
+}
+
+
 /**
  * @brief Raise exception from fatal error.
  */
diff --git a/confluent_kafka/src/confluent_kafka.h b/confluent_kafka/src/confluent_kafka.h
@@ -176,7 +176,7 @@ extern PyObject *KafkaException;
 
 PyObject *KafkaError_new0 (rd_kafka_resp_err_t err, const char *fmt, ...);
 PyObject *KafkaError_new_or_None (rd_kafka_resp_err_t err, const char *str);
-
+PyObject *KafkaError_new_from_error_destroy (rd_kafka_error_t *error);
 
 /**
  * @brief Raise an exception using KafkaError.
@@ -188,6 +188,14 @@ PyObject *KafkaError_new_or_None (rd_kafka_resp_err_t err, const char *str);
 		PyErr_SetObject(KafkaException, _eo);			\
 	} while (0)
 
+/**
+ * @brief Create a Python exception from an rd_kafka_error_t *
+ *        and destroy it the C object when done.
+ */
+#define cfl_PyErr_from_error_destroy(error) do {                        \
+		PyObject *_eo = KafkaError_new_from_error_destroy(error); \
+		PyErr_SetObject(KafkaException, _eo);			\
+	} while (0)
 
 
 /****************************************************************************
