]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #47010 from yuvalif/wip-yuval-fix-lua-post-ctx
authorYuval Lifshitz <ylifshit@redhat.com>
Mon, 15 Aug 2022 16:31:34 +0000 (19:31 +0300)
committerGitHub <noreply@github.com>
Mon, 15 Aug 2022 16:31:34 +0000 (19:31 +0300)
rgw/lua: post request context does not work

reviewed-by: cbodley, zenomri

1  2 
src/rgw/rgw_process.cc

index 8c13105e872d1c74c7b5109b4372269cf189a5c2,5f6bda5d228a2fe0373c51da142cf3917b296726..14f1ee41fe6d3bab1632de0bc36d3788e1df06d8
@@@ -402,19 -401,21 +402,21 @@@ int process_request(rgw::sal::Store* co
    }
  
  done:
-   if (op && s->trace) {
-     s->trace->SetAttribute(tracing::rgw::RETURN, op->get_ret());
-     if (s->user) {
-       s->trace->SetAttribute(tracing::rgw::USER_ID, s->user->get_id().id);
-     }
-     if (s->bucket) {
-       s->trace->SetAttribute(tracing::rgw::BUCKET_NAME, s->bucket->get_name());
-     }
-     if (s->object) {
-       s->trace->SetAttribute(tracing::rgw::OBJECT_NAME, s->object->get_name());
+   if (op) {
+     if (s->trace) {
+       s->trace->SetAttribute(tracing::rgw::RETURN, op->get_ret());
+       if (!rgw::sal::User::empty(s->user)) {
+         s->trace->SetAttribute(tracing::rgw::USER_ID, s->user->get_id().id);
+       }
+       if (!rgw::sal::Bucket::empty(s->bucket)) {
+         s->trace->SetAttribute(tracing::rgw::BUCKET_NAME, s->bucket->get_name());
+       }
+       if (!rgw::sal::Object::empty(s->object)) {
+         s->trace->SetAttribute(tracing::rgw::OBJECT_NAME, s->object->get_name());
+       }
      }
      std::string script;
 -    auto rc = rgw::lua::read_script(s, store, s->bucket_tenant, s->yield, rgw::lua::context::postRequest, script);
 +    auto rc = rgw::lua::read_script(s, lua_manager.get(), s->bucket_tenant, s->yield, rgw::lua::context::postRequest, script);
      if (rc == -ENOENT) {
        // no script, nothing to do
      } else if (rc < 0) {