[#3][irods/irods#5927] test_repave_replica now passes in iRODS >= 4.2.12

PRC post PUT replication still does emulate the PUT api's after-the-fact
replication, and for test_repave_replicas to pass post-4.2.11, it was
merely necessary to remove REG_CHKSUM from the keywords active for REPL.

Author: d-w-moore

irods/exception.py

@@ -558,6 +558,10 @@ class SYS_REPLICA_DOES_NOT_EXIST(iRODSException):
     code = -164000
 
 
+class SYS_NOT_ALLOWED(iRODSException):
+    code = -169000
+
+
 class UserInputException(iRODSException):
     pass
 
@@ -758,6 +762,10 @@ class LOCKED_DATA_OBJECT_ACCESS(SystemException):
     code = -406000
 
 
+class USER_INCOMPATIBLE_PARAMS(iRODSException):
+    code = -402000
+
+
 class CHECK_VERIFICATION_RESULTS(SystemException):
     code = -407000
 

irods/manager/data_object_manager.py

@@ -161,8 +161,14 @@ def put(self, local_path, irods_path, return_data_object = False, num_threads =
                     for chunk in chunks(f, self.WRITE_BUFFER_SIZE):
                         o.write(chunk)
         if kw.ALL_KW in options:
-            options[kw.UPDATE_REPL_KW] = ''
-            self.replicate(obj, **options)
+            repl_options = options.copy()
+            repl_options[kw.UPDATE_REPL_KW] = ''
+            # Leaving REG_CHKSUM_KW set would raise the error:
+            # Requested to register checksum without verifying, but source replica has a checksum. This can result
+            # in multiple replicas being marked good with different checksums, which is an inconsistency.
+            del repl_options[kw.REG_CHKSUM_KW]
+            self.replicate(obj, **repl_options)
+
 
         if return_data_object:
             return self.get(obj)

irods/session.py

@@ -1,5 +1,6 @@
 from __future__ import absolute_import
 import os
+import ast
 import json
 import errno
 import logging
@@ -158,6 +159,13 @@ def port(self):
 
     @property
     def server_version(self):
+        try:
+            reported_vsn = os.environ.get("PYTHON_IRODSCLIENT_REPORTED_SERVER_VERSION","")
+            return tuple(ast.literal_eval(reported_vsn))
+        except SyntaxError:  # environment variable was malformed, empty, or unset
+            return self.__server_version()
+
+    def __server_version(self):
         try:
             conn = next(iter(self.pool.active))
             return conn.server_version

irods/test/data_obj_test.py

@@ -932,69 +932,70 @@ def test_replica_number(self):
 
     def test_repave_replicas(self):
         # Can't do one step open/create with older servers
-        if self.sess.server_version <= (4, 1, 4):
+        server_vsn = self.sess.server_version
+        if server_vsn <= (4, 1, 4):
             self.skipTest('For iRODS 4.1.5 and newer')
+        try:
+            number_of_replicas = 7
+            session = self.sess
+            zone = session.zone
+            username = session.username
+            test_dir = '/tmp'
+            filename = 'repave_replica_test_file.txt'
+            test_file = os.path.join(test_dir, filename)
+            obj_path = '/{zone}/home/{username}/{filename}'.format(**locals())
+            ufs_resources = []
+
+            # make test file
+            obj_content = u'foobar'
+            checksum = base64.b64encode(hashlib.sha256(obj_content.encode('utf-8')).digest()).decode()
+            with open(test_file, 'w') as f:
+                f.write(obj_content)
+
+            # put test file onto default resource
+            options = {kw.REG_CHKSUM_KW: ''}
+            session.data_objects.put(test_file, obj_path, **options)
+
+            # make ufs resources and replicate object
+            for i in range(number_of_replicas):
+                resource_name = unique_name(my_function_name(),i)
+                resource_type = 'unixfilesystem'
+                resource_host = session.host
+                resource_path = '/tmp/{}'.format(resource_name)
+                ufs_resources.append(session.resources.create(
+                    resource_name, resource_type, resource_host, resource_path))
 
-        number_of_replicas = 7
-        session = self.sess
-        zone = session.zone
-        username = session.username
-        test_dir = '/tmp'
-        filename = 'repave_replica_test_file.txt'
-        test_file = os.path.join(test_dir, filename)
-        obj_path = '/{zone}/home/{username}/{filename}'.format(**locals())
-
-        # make test file
-        obj_content = u'foobar'
-        checksum = base64.b64encode(hashlib.sha256(obj_content.encode('utf-8')).digest()).decode()
-        with open(test_file, 'w') as f:
-            f.write(obj_content)
-
-        # put test file onto default resource
-        options = {kw.REG_CHKSUM_KW: ''}
-        session.data_objects.put(test_file, obj_path, **options)
-
-        # make ufs resources and replicate object
-        ufs_resources = []
-        for i in range(number_of_replicas):
-            resource_name = unique_name(my_function_name(),i)
-            resource_type = 'unixfilesystem'
-            resource_host = session.host
-            resource_path = '/tmp/{}'.format(resource_name)
-            ufs_resources.append(session.resources.create(
-                resource_name, resource_type, resource_host, resource_path))
-
-            session.data_objects.replicate(obj_path, resource=resource_name)
-
-        # refresh object
-        obj = session.data_objects.get(obj_path)
+                session.data_objects.replicate(obj_path, resource=resource_name)
 
-        # verify each replica's checksum
-        for replica in obj.replicas:
-            self.assertEqual(replica.checksum, 'sha2:{}'.format(checksum))
+            # refresh object
+            obj = session.data_objects.get(obj_path)
 
-        # now repave test file
-        obj_content = u'bar'
-        checksum = base64.b64encode(hashlib.sha256(obj_content.encode('utf-8')).digest()).decode()
-        with open(test_file, 'w') as f:
-            f.write(obj_content)
+            # verify each replica's checksum
+            for replica in obj.replicas:
+                self.assertEqual(replica.checksum, 'sha2:{}'.format(checksum))
 
-        # update all replicas
-        options = {kw.REG_CHKSUM_KW: '', kw.ALL_KW: ''}
-        session.data_objects.put(test_file, obj_path, **options)
-        obj = session.data_objects.get(obj_path)
+            # now repave test file
+            obj_content = u'bar'
+            checksum = base64.b64encode(hashlib.sha256(obj_content.encode('utf-8')).digest()).decode()
+            with open(test_file, 'w') as f:
+                f.write(obj_content)
 
-        # verify each replica's checksum
-        for replica in obj.replicas:
-            self.assertEqual(replica.checksum, 'sha2:{}'.format(checksum))
+            options = {kw.REG_CHKSUM_KW: '', kw.ALL_KW: ''}
+            session.data_objects.put(test_file, obj_path, **options)
+            obj = session.data_objects.get(obj_path)
 
-        # remove object
-        obj.unlink(force=True)
-
-        # remove ufs resources
-        for resource in ufs_resources:
-            resource.remove()
+            # verify each replica's checksum
+            for replica in obj.replicas:
+                self.assertEqual(replica.checksum, 'sha2:{}'.format(checksum))
 
+        finally:
+            # remove data object
+            data = self.sess.data_objects
+            if data.exists(obj_path):
+                data.unlink(obj_path,force=True)
+            # remove ufs resources
+            for resource in ufs_resources:
+                resource.remove()
 
     def test_get_replica_size(self):
         session = self.sess