lifecycle | Versioned object doesn't leave a delete marker

Signed-off-by: naveenpaul1 <napaul@redhat.com>

Author: naveenpaul1

src/api/object_api.js

@@ -1140,6 +1140,9 @@ module.exports = {
                     filter_delete_markers: {
                         type: 'boolean',
                     },
+                    latest_versions: {
+                        type: 'boolean',
+                    },
                     size_less: {
                         type: 'integer'
                     },
@@ -1152,6 +1155,9 @@ module.exports = {
                     limit: {
                         type: 'integer'
                     },
+                    delete_version: {
+                        type: 'boolean'
+                    },
                     reply_objects: {
                         type: 'boolean'
                     }

src/server/bg_services/lifecycle.js

@@ -38,6 +38,10 @@ async function delete_expired_objects(system, bucket, rule, reply_objects) {
         size_greater: rule.filter.object_size_greater_than,
         tags: rule.filter.tags,
         limit: config.LIFECYCLE_BATCH_SIZE,
+        filter_delete_markers: true,
+        latest_versions: true,
+        // deleting only the latest verion and creating delete marker for expired objects
+        delete_version: false,
         reply_objects,
     }, {
         auth_token: auth_server.make_auth_token({

src/server/object_services/object_server.js

@@ -978,6 +978,7 @@ async function delete_multiple_objects_by_filter(req) {
         key,
         max_create_time: req.rpc_params.create_time,
         tagging: req.rpc_params.tags,
+        latest_versions: req.rpc_params.latest_versions,
         filter_delete_markers: req.rpc_params.filter_delete_markers,
         max_size: req.rpc_params.size_less,
         min_size: req.rpc_params.size_greater,
@@ -991,7 +992,7 @@ async function delete_multiple_objects_by_filter(req) {
             bucket: req.bucket.name,
             objects: _.map(objects, obj => ({
                 key: obj.key,
-                version_id: MDStore.instance().get_object_version_id(obj),
+                version_id: req.rpc_params.delete_version ? MDStore.instance().get_object_version_id(obj) : '',
             }))
         }
     }));

src/test/lifecycle/common.js

@@ -188,6 +188,7 @@ function days_lifecycle_configuration(Bucket, Key) {
         },
     };
 }
+exports.days_lifecycle_configuration = days_lifecycle_configuration;
 
 function tags_lifecycle_configuration(Bucket, Key, Value) {
     return {

src/test/unit_tests/test_lifecycle.js

@@ -535,15 +535,16 @@ mocha.describe('lifecycle', () => {
             assert.strictEqual(versions_list.objects.length, 2);
         });
 
-        async function create_mock_version(version_key, bucket, age, version_count) {
+        async function create_mock_version(version_key, bucket, age, version_count, expire_all = false) {
             const obj_upload_ids = [];
             for (let i = 0; i < version_count; ++i) {
                 const content_type = 'application/octet_stream';
                 const { obj_id } = await rpc_client.object.create_object_upload({ bucket, key: version_key, content_type });
                 await rpc_client.object.complete_object_upload({ obj_id, bucket, key: version_key });
 
-                // everything but last will be aged
-                if (i < version_count - 1) {
+                // everything but last will be aged, 
+                // For simple Expiration rule all version should be expired 
+                if (expire_all || i < version_count - 1) {
                     obj_upload_ids.push(new mongodb.ObjectId(obj_id));
                 }
             }
@@ -557,6 +558,41 @@ mocha.describe('lifecycle', () => {
                 console.log('blow_version_objects: update_objects_by_ids', update_result);
             }
         }
+
+        mocha.it('lifecyle - version object expired', async () => {
+            const age = 30;
+            const version_count = 10;
+            const version_bucket_key = 'test-lifecycle-version1';
+            await create_mock_version(version_bucket_key, version_bucket, age, version_count, true);
+            const putLifecycleParams = commonTests.days_lifecycle_configuration(version_bucket, version_bucket_key);
+            await s3.putBucketLifecycleConfiguration(putLifecycleParams);
+            await lifecycle.background_worker();
+            // version_count count only, not deleted
+            await verify_version_deleted(version_count + 1, version_bucket_key);
+        });
+
+        mocha.it('lifecyle - version object not expired', async () => {
+            const age = 5;
+            const version_count = 10;
+            const version_bucket_key = 'test-lifecycle-version2';
+            await create_mock_version(version_bucket_key, version_bucket, age, version_count, true);
+            const putLifecycleParams = commonTests.days_lifecycle_configuration(version_bucket, version_bucket_key);
+            await s3.putBucketLifecycleConfiguration(putLifecycleParams);
+            await lifecycle.background_worker();
+            // version_count count plus delete marker
+            await verify_version_deleted(version_count, version_bucket_key);
+        });
+
+        async function verify_version_deleted(expected_length, key) {
+            const obj_params = {
+                bucket: version_bucket,
+                prefix: key,
+            };
+            const list_obj = await rpc_client.object.list_object_versions(obj_params);
+            console.log('list_objects_admin objects: ', util.inspect(list_obj.objects));
+            const actual_length = list_obj.objects.length;
+            assert.strictEqual(actual_length, expected_length, `listObjectResult actual ${actual_length} !== ${expected_length}`);
+        }
     });
 
     function readable_buffer(data, split = 1, finish = 'end') {