Skip to content

Commit f7b72d4

Browse files
committed
rgw/ops-log: explicitly specify object name in the log entry
Pseudo-directories can be used when naming an object (key): e.g., "my/weird/object.txt". This would lead to cases where the name of the object cannot be derived deterministically. For example, if an object name uses pseudo-directories and starts with "<bucket_name>/" and virtual-host style is used when accessing object, we cannot figure out the name of the object. Note that in DNS (virtual host) style bucket naming, since bucket name is specified as a part of the host name, URI doesn't contain any reference to the bucket. boto_client = boto3.client(..., config=Config(s3={'addressing_style': 'virtual'})) boto_client.put_object( Body=b"this is the data", Key="my-bucket/my-object", Bucket="my-bucket" ) The corresponding log entry is { ..., "bucket":"my-bucket", ..., "uri":"PUT /my-bucket/my-object HTTP/1.1", ... } We can falsely conclude that the name of the object is "my-object". By having the name of the object listed in the log-entry, we address this ambiguity. Signed-off-by: Oguzhan Ozmen <[email protected]>
1 parent 38f11f2 commit f7b72d4

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

src/rgw/rgw_log.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ void rgw_format_ops_log_entry(struct rgw_log_entry& entry, Formatter *formatter)
251251
{
252252
formatter->open_object_section("log_entry");
253253
formatter->dump_string("bucket", entry.bucket);
254+
formatter->dump_string("object", entry.obj.name);
254255
{
255256
auto t = utime_t{entry.time};
256257
t.gmtime(formatter->dump_stream("time")); // UTC

0 commit comments

Comments
 (0)