[CLIENT-1854] Python client crashes while doing IO during server upgrade/downgrade

.gitmodules

@@ -1,5 +1,5 @@
 [submodule "aerospike-client-c"]
 	path = aerospike-client-c
 	# url = [email protected]:aerospike/aerospike-client-c.git
-	url = https://github.com/aerospike/aerospike-client-c.git
+	url = git@github.com:aerospike/aerospike-client-c.git
 	branch = stage

Releases.md

@@ -1,3 +1,119 @@
+# Version 7.2.0
+date: 10/14/2022
+
+## Bug Fixes
+
+   - [CLIENT-1854] - Python client crashes while doing IO during server upgrade/downgrade
+
+## Deprecations​
+
+    - client().connect() has been deprecated and it is a no-op. Client call itself establishes the connection object.
+    - client().close() has been deprecated and it is a no-op. Client destroy unwinds the conection.
+   - If user authentication method is used, then make sure to add user/password information into config dictionary for client call to succeed
+
+ex) config = {
+        'hosts': hosts,
+        'policies': {'auth_mode': aerospike.AUTH_INTERNAL},
+    }
+    client = aerospike.client(config)
+    client.connect(user, password)
+
+    the above is changed to:
+
+config = {
+        'hosts': hosts,
+        'policies': {'auth_mode': aerospike.AUTH_INTERNAL},
+        'user': user,
+        'password': password
+    }
+    client = aerospike.client(config)
+    #following is no-op
+    client.connect(user, password)
+
+
+# Version 7.1.1
+date: 10/03/2022
+
+## Bug Fixes
+
+   - [CLIENT-1784] - Potential Memory leak with Python client.
+
+## Improvements
+
+   - [CLIENT-1830] - Add CDT CTX base64 method for using sindex-create info command.
+   - [CLIENT-1825] - Expose ttl as part query object attributes.
+
+# Version  7.1.0
+date: 09/09/2022
+
+## Bug Fixes
+
+   - [CLIENT-1810] - Read policy POLICY_KEY_SEND is not respected when set at the client level.
+
+## New Features
+
+   - [CLIENT-1799] - Support batch read operations.
+
+## Improvements
+
+  - [CLIENT-1749] - Add 'EXISTS' return type for CDT read operations.
+  - [CLIENT-1801] - Support creating an secondary index on elements within a CDT using context.
+  - [CLIENT-1795] - Make c-client "fail_if_not_connected" option configurable.
+  - [CLIENT-1791] - Review and clean up Sphinx documentation.
+  - [CLIENT-1792] - Update build instructions.
+
+# Version 7.0.2
+date: 05/31/2022
+
+## Bug Fixes
+
+   - [CLIENT-1742] - Fix reference count leaks in client 7.x Batch APIs.
+   - [CLIENT-1753] - Fix reference count leak in cdt_ctx map_key_create and list_index_create cases.
+   - [CLIENT-1710] - Change BatchRecords default argument from an empty list to None.
+
+# Version 7.0.1
+date: 04/18/2022
+
+## Bug Fixes
+
+   - [CLIENT-1708] Fix 'Unable to load batch_records module' error when batch_operate, batch_apply, or batch_remove are used without importing aerospike_helpers.batch.records.
+
+# Version 7.0.0
+date: 4/06/2022
+
+## Breaking Changes
+
+   - Old predexp support has been removed. See [Incompatible API Changes](https://developer.aerospike.com/client/python/usage/incompatible#version-700) for details.
+   - Remove support for deprecated Debian 8.
+   - IndexNotFound and IndexNotReadable errors can now trigger retries.
+   - Bytes blobs read from the database will now be read as bytes instead of bytearray. See [Incompatible API Changes](https://developer.aerospike.com/client/python/usage/incompatible#version-700) for details.
+   - Query policies max_records and records_per_second are now fields of the Query class. See [Incompatible API Changes](https://developer.aerospike.com/client/python/usage/incompatible#version-700) for details.
+
+## Features
+
+   - [CLIENT-1651] - Provide an API to extract an expression's base-64 representation.
+   - [CLIENT-1655] - Support new 6.0 truncate, udf-admin, and sindex-admin privileges. This feature requires server version 6.0+.
+   - [CLIENT-1659] - Support batch_write, batch_apply, batch_operate, and batch_remove client methods. This feature requires server version 6.0+.
+   - [CLIENT-1658] - Support partition queries. This feature requires server version 6.0+.
+   - [CLIENT-1690] - Support get_partitions_status for Scan objects.
+   - [CLIENT-1693] - Add short_query query policy. This feature requires server version 6.0+.
+
+## Improvements
+
+   - [CLIENT-1687] - Deprecate send_set_name batch policy. Batch transactions now always send set name to the server.
+   - [CLIENT-1681] - Drop predexp support.
+   - [CLIENT-1683] - Add max retries exceeded exception.
+   - [CLIENT-1691] - Document partition scan functionality.
+   - [CLIENT-1692] - Update C client to 6.0.
+   - [CLIENT-1657] - Move Python client CI tests to github actions.
+   - [CLIENT-1694] - Make query policies max_records and records_per_second Query fields instead.
+   - [CLIENT-1675] - Bytes blobs read from the database will now be read as bytes instead of bytearray.
+   - [CLIENT-1634] - Remove support for deprecated Debian 8.
+
+## Updates
+
+   - [Aerospike C Client 6.0.0.](/download/client/c/notes.html#6.0.0)
+
 # Version 6.1.2
 
 ## Fixes

aerospike_helpers/operations/bitwise_operations.py

@@ -81,7 +81,7 @@
     from aerospike import exception as e
     from aerospike_helpers.operations import bitwise_operations
 
-    config = {'hosts': [('127.0.0.1', 3000)]}
+    config = self.connection_config.copy()
     client = aerospike.client(config).connect()
 
     key = ('test', 'demo', 'bit_example')

doc/aerospike.rst

@@ -28,9 +28,8 @@ Client
 
 .. py:function:: client(config)
 
-    Creates a new instance of the :class:`Client` class.
+    Creates a new instance of the :class:`Client` class and immediately connects to the cluster.
 
-    This client can connect to the cluster and perform operations on the database.
     See :ref:`client` for more details.
 
     Internally, this is a wrapper function which calls the constructor for the :class:`Client` class.
@@ -360,6 +359,10 @@ Only the `hosts` key is required; the rest of the keys are optional.
             If ``tls-name`` is specified, it must match the tls-name specified in the node's \
             server configuration file, as well as the server's CA certificate.
 
+        * **user** (:class:`str`)
+            (Optional) A defined user with roles in the cluster. See :meth:`admin_create_user`.
+        * **password** (:class:`str`)
+            (Optional) The password will be hashed by the client using bcrypt.
         * **lua** (:class:`dict`)
             (Optional) Contains the paths to two types of Lua modules
 

doc/client.rst

@@ -56,7 +56,7 @@ Connection
 
     .. method:: connect([username, password])
 
-        Connect to the cluster. The optional *username* and *password* only
+        If there is currently no connection to the cluster, connect to it. The optional *username* and *password* only
         apply when connecting to the Enterprise Edition of Aerospike.
 
         :param str username: a defined user with roles in the cluster. See :meth:`admin_create_user`.
@@ -86,6 +86,8 @@ Connection
         Close all connections to the cluster. It is recommended to explicitly \
         call this method when the program is done communicating with the cluster.
 
+        You may call :meth:`~aerospike.Client.connect` again after closing the connection.
+
 Record Operations
 -----------------
 

src/include/client.h

@@ -50,6 +50,8 @@ AerospikeClient *AerospikeClient_New(PyObject *self, PyObject *args,
 /**
  * Connect to the database.
  */
+PyObject *AerospikeClientConnect(AerospikeClient *self);
+
 PyObject *AerospikeClient_Connect(AerospikeClient *self, PyObject *args,
                                   PyObject *kwds);
 

src/main/client/batch_get_ops.c

@@ -69,6 +69,7 @@ static bool batch_read_operate_cb(const as_batch_read *results, uint32_t n,
 
         r = (as_batch_read *)&results[i];
         py_key = PyList_GetItem(data->py_keys, i);
+        // key_to_pyobject(&err, &r->key, &py_key);
         rec = &r->record;
 
         as_error_init(&err);

src/main/client/connect.c

@@ -30,36 +30,18 @@
  * Establishes a connection to the Aerospike DB instance.
  *
  * @param self                  AerospikeClient object
- * @param args                  The args is a tuple object containing an argument
- *                              list passed from Python to a C function
- * @param kwds                  Dictionary of keywords
  *
  * Returns an instance of aerospike.Client, Which can be used later to do usual
  * database operations.
  * In case of error,appropriate exceptions will be raised.
  *******************************************************************************************************
  */
-PyObject *AerospikeClient_Connect(AerospikeClient *self, PyObject *args,
-                                  PyObject *kwds)
+PyObject *AerospikeClientConnect(AerospikeClient *self)
 {
     as_error err;
     as_error_init(&err);
     char *alias_to_search = NULL;
     bool free_alias_to_search = false;
-    PyObject *py_username = NULL;
-    PyObject *py_password = NULL;
-
-    if (PyArg_ParseTuple(args, "|OO:connect", &py_username, &py_password) ==
-        false) {
-        return NULL;
-    }
-
-    if (py_username && PyString_Check(py_username) && py_password &&
-        PyString_Check(py_password)) {
-        char *username = PyString_AsString(py_username);
-        char *password = PyString_AsString(py_password);
-        as_config_set_user(&self->as->config, username, password);
-    }
 
     if (!self || !self->as || !self->as->config.hosts ||
         !self->as->config.hosts->size) {
@@ -168,6 +150,48 @@ PyObject *AerospikeClient_Connect(AerospikeClient *self, PyObject *args,
     return (PyObject *)self;
 }
 
+/**
+ *******************************************************************************************************
+ * Establishes a connection to the Aerospike DB instance.
+ *
+ * @param self                  AerospikeClient object
+ * @param args                  The args is a tuple object containing an argument
+ *                              list passed from Python to a C function
+ * @param kwds                  Dictionary of keywords
+ *
+ * Returns an instance of aerospike.Client, Which can be used later to do usual
+ * database operations.
+ * In case of error,appropriate exceptions will be raised.
+ *******************************************************************************************************
+ */
+PyObject *AerospikeClient_Connect(AerospikeClient *self, PyObject *args,
+                                  PyObject *kwds)
+{
+    as_error err;
+    as_error_init(&err);
+    PyObject *py_username = NULL;
+    PyObject *py_password = NULL;
+
+    if (self->as && aerospike_cluster_is_connected(self->as)) {
+        Py_INCREF(self);
+        return (PyObject *)self;
+    }
+
+    if (PyArg_ParseTuple(args, "|OO:connect", &py_username, &py_password) ==
+        false) {
+        return NULL;
+    }
+
+    if (py_username && PyString_Check(py_username) && py_password &&
+        PyString_Check(py_password)) {
+        char *username = PyString_AsString(py_username);
+        char *password = PyString_AsString(py_password);
+        as_config_set_user(&self->as->config, username, password);
+    }
+
+    return AerospikeClientConnect(self);
+}
+
 /**
  *******************************************************************************************************
  * Tests the connection to the Aerospike DB

src/main/client/type.c

@@ -1399,8 +1399,21 @@ static int AerospikeClient_Type_Init(AerospikeClient *self, PyObject *args,
             PyObject_IsTrue(py_fail_if_not_connected);
     }
 
+    PyObject *py_user_name = PyDict_GetItemString(py_config, "user");
+    PyObject *py_user_pwd = PyDict_GetItemString(py_config, "password");
+    if (py_user_name && PyString_Check(py_user_name) && py_user_pwd &&
+        PyString_Check(py_user_pwd)) {
+        char *username = PyString_AsString(py_user_name);
+        char *password = PyString_AsString(py_user_pwd);
+        as_config_set_user(&config, username, password);
+    }
+
     self->as = aerospike_new(&config);
 
+    if (AerospikeClientConnect(self) == NULL) {
+        return -1;
+    }
+
     return 0;
 
 CONSTRUCTOR_ERROR:
@@ -1660,8 +1673,6 @@ AerospikeClient *AerospikeClient_New(PyObject *parent, PyObject *args,
     switch (return_code) {
     // 0 Is success
     case 0: {
-        // Initialize connection flag
-        self->is_conn_16 = false;
         return self;
     }
     case -1: {

test/config.conf

@@ -1,5 +1,5 @@
 [community-edition]
-hosts : 127.0.0.1:3000
+hosts: 127.0.0.1:3000
 
 [enterprise-edition]
 hosts :