YDA-5892: delete revision avu for data objects in trash

The job for revision creation now removes revision creation AVUs from data objects in trash.
This makes it easier to monitor the number of data objects waiting for revision creation.

revisions.py

@@ -361,6 +361,10 @@ def rule_revision_batch(ctx, verbose, balance_id_min, balance_id_max, batch_size
 
         minimum_timestamp = int(time.time() - config.async_revision_delay_time)
 
+        # Remove revision creation AVUs from deleted data objects.
+        # This makes it easier to monitor the number of data objects waiting for revision creation.
+        remove_revision_creation_avu_from_deleted_data_objects(ctx, print_verbose)
+
         # Get list of up to batch size limit of data objects (in research space) scheduled for revision, taking into account
         # modification time.
         log.write(ctx, "verbose = {}".format(verbose))
@@ -1054,3 +1058,28 @@ def memory_limit_exceeded(rss_limit):
     """
     rss_limit = int(rss_limit)
     return rss_limit and memory_rss_usage() > rss_limit
+
+
+def remove_revision_creation_avu_from_deleted_data_objects(ctx, print_verbose):
+    """
+    Removes revision creation AVUs from deleted data objects [marked with 'org_revision_scheduled' metadata].
+
+    :param ctx:  Combined type of a callback and rei struct
+    :param print_verbose: Whether to log verbose messages for troubleshooting (Boolean)
+    """
+    revision_avu_name = constants.UUORGMETADATAPREFIX + "revision_scheduled"
+
+    iter = genquery.row_iterator(
+        "COLL_NAME, DATA_NAME",
+        "COLL_NAME like '%{}/trash/home/%' AND META_DATA_ATTR_NAME = '{}'".format(user.zone(ctx), revision_avu_name),
+        genquery.AS_LIST, ctx
+    )
+
+    for coll_name, data_name in iter:
+        path = coll_name + '/' + data_name
+        try:
+            avu.rmw_from_data(ctx, path, revision_avu_name, "%")  # use wildcard cause rm_from_data causes problems
+            if print_verbose:
+                log.write(ctx, 'Removed revision creation AVUs from data object: {}'.format(path))
+        except Exception as e:
+            log.write(ctx, "Error processing data object {}: {}".format(path, str(e)))