rgw/logging: add tests for flushed object name

when using API call to flush the pending logging object of
the bucket, the flshed object name is returned.
tests were added to verify the right name is returned.

Signed-off-by: Yuval Lifshitz <ylifshit@ibm.com>

diff --git a/s3tests_boto3/functional/test_s3.py b/s3tests_boto3/functional/test_s3.py
index 529deb6039bdd9c80af4fdd905bd5ee766f5b189..ed71303c44269b75c376098aeea8043c00d897df 100644 (file)
--- a/s3tests_boto3/functional/test_s3.py
+++ b/s3tests_boto3/functional/test_s3.py
@@ -14976,10 +14976,13 @@ def test_put_bucket_logging():
 
 def _flush_logs(client, src_bucket_name, dummy_key="dummy"):
     if _has_bucket_logging_extension():
-        client.post_bucket_logging(Bucket=src_bucket_name)
+        result = client.post_bucket_logging(Bucket=src_bucket_name)
+        assert result['ResponseMetadata']['HTTPStatusCode'] == 200
+        return result['FlushedLoggingObject']
     else:
         time.sleep(expected_object_roll_time*1.1)
         client.put_object(Bucket=src_bucket_name, Key=dummy_key, Body='dummy')
+        return None
 
 
 def _bucket_logging_key_filter(log_type):
@@ -15039,13 +15042,15 @@ def _bucket_logging_key_filter(log_type):
 
     expected_count = len(names)
 
-    _flush_logs(client, src_bucket_name, dummy_key="test/dummy.txt")
+    flushed_obj = _flush_logs(client, src_bucket_name, dummy_key="test/dummy.txt")
 
     response = client.list_objects_v2(Bucket=log_bucket_name)
     keys = _get_keys(response)
     assert len(keys) == 1
 
     for key in keys:
+        if flushed_obj is not None:
+            assert key == flushed_obj
         assert key.startswith('log/')
         response = client.get_object(Bucket=log_bucket_name, Key=key)
         body = _get_body(response)
@@ -15068,6 +15073,12 @@ def test_bucket_logging_key_filter_j():
     _bucket_logging_key_filter('Journal')
 
 
+def _post_bucket_logging(client, src_bucket_name, flushed_objs):
+    result = client.post_bucket_logging(Bucket=src_bucket_name)
+    assert result['ResponseMetadata']['HTTPStatusCode'] == 200
+    flushed_objs[src_bucket_name] = result['FlushedLoggingObject']
+
+
 def _bucket_logging_flush(logging_type, single_prefix, concurrency):
     if not _has_bucket_logging_extension():
         pytest.skip('ceph extension to bucket logging not supported at client')
@@ -15117,18 +15128,18 @@ def _bucket_logging_flush(logging_type, single_prefix, concurrency):
     assert len(keys) == 0
 
     t = []
+    flushed_objs = {}
     for src_bucket_name in buckets:
         if concurrency:
-            thr = threading.Thread(target = client.post_bucket_logging,
-                               kwargs={'Bucket': src_bucket_name})
+            thr = threading.Thread(target = _post_bucket_logging,
+                                   args=(client, src_bucket_name, flushed_objs))
             thr.start()
             t.append(thr)
         else:
-            client.post_bucket_logging(Bucket=src_bucket_name)
-        if single_prefix and logging_type == 'Standard':
-            # in case of single prefix we flush only once
-            # because flushing itself will be logged
-            # and the next flush will commit the log
+            result = client.post_bucket_logging(Bucket=src_bucket_name)
+            assert result['ResponseMetadata']['HTTPStatusCode'] == 200
+            flushed_objs[src_bucket_name] = result['FlushedLoggingObject']
+        if single_prefix:
             break
 
     _do_wait_completion(t)
@@ -15138,8 +15149,10 @@ def _bucket_logging_flush(logging_type, single_prefix, concurrency):
 
     if single_prefix:
         assert len(keys) == 1
+        assert len(flushed_objs) == 1
     else:
-        assert len(keys) >= num_buckets
+        assert len(keys) == num_buckets
+        assert len(flushed_objs) >= num_buckets
 
     for key in keys:
         response = client.get_object(Bucket=log_bucket_name, Key=key)
@@ -15148,6 +15161,9 @@ def _bucket_logging_flush(logging_type, single_prefix, concurrency):
         for j in range(num_buckets):
             prefix = log_prefixes[j]
             if key.startswith(prefix):
+                flushed_obj = flushed_objs.get(buckets[j])
+                if flushed_obj is not None:
+                    assert key == flushed_obj
                 found = True
                 assert _verify_records(body, buckets[j], 'REST.PUT.OBJECT', src_names, logging_type, num_keys)
                 assert _verify_records(body, buckets[j], 'REST.DELETE.OBJECT', src_names, logging_type, num_keys)
@@ -15544,13 +15560,15 @@ def _bucket_logging_objects(src_client, src_bucket_name, log_client, log_bucket_
     response = src_client.list_objects_v2(Bucket=src_bucket_name)
     src_keys = _get_keys(response)
 
-    _flush_logs(src_client, src_bucket_name)
+    flushed_obj = _flush_logs(src_client, src_bucket_name)
 
     response = log_client.list_objects_v2(Bucket=log_bucket_name)
     keys = _get_keys(response)
     assert len(keys) == 1
 
     for key in keys:
+        if flushed_obj is not None:
+            assert key == flushed_obj
         assert key.startswith('log/')
         response = log_client.get_object(Bucket=log_bucket_name, Key=key)
         body = _get_body(response)
@@ -15868,7 +15886,7 @@ def _bucket_logging_put_objects(versioned):
     response = client.list_objects_v2(Bucket=src_bucket_name)
     src_keys = _get_keys(response)
 
-    _flush_logs(client, src_bucket_name)
+    flushed_obj = _flush_logs(client, src_bucket_name)
 
     response = client.list_objects_v2(Bucket=log_bucket_name)
     keys = _get_keys(response)
@@ -15877,6 +15895,8 @@ def _bucket_logging_put_objects(versioned):
     record_type = 'Standard' if not has_extensions else 'Journal'
 
     for key in keys:
+        if flushed_obj is not None:
+            assert key == flushed_obj
         assert key.startswith('log/')
         response = client.get_object(Bucket=log_bucket_name, Key=key)
         body = _get_body(response)